From f8ea630f616abfe97dd63290ab7afe52c1c5fde4 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 20 Feb 2023 09:24:29 +0800
Subject: [PATCH] zuoyeshipin

---
 src/views/bigScreen/index.vue | 38 +++++++++++++++++++++++++----------
 src/views/wf/state.vue        |  1 +
 src/views/wf/steps.vue        |  3 ++-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 354910a6..20f96278 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -477,6 +477,17 @@
 									<span v-if="scope.row.dept_ter_">{{scope.row.dept_ter_.name}}</span>
 									</template>
 								</el-table-column>
+								<el-table-column label="监控设备">
+									<template #default="scope">
+										<el-tag
+											v-for="item in scope.row.vchannels_"
+											:key="item.id"
+											@click="showVchannel(item)"
+											style="margin-right: 10px;margin-left:0"
+											>{{ item.name }}
+										</el-tag>
+									</template>
+								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -525,7 +536,7 @@
 						<span class="job-item-name">业务部门：</span>
 						<span class="job-item-info">{{screenJobItem.dept_bus_.name}}</span>
 					</div>
-					<div class="job-item">
+					<!-- <div class="job-item">
 						<span class="job-item-name">监控设备：</span>
 						<el-tag
 							v-for="item in screenJobItem.vchannels_"
@@ -534,8 +545,7 @@
 							style="margin-right: 10px;margin-left:0"
 							>{{ item.name }}
 						</el-tag>
-						<!-- <span class="job-item-info">{{screenJobItem.vchannels_[0].name}}</span> -->
-					</div>
+					</div> -->
 				</div>
 				<div class="simple-title">
 					<div>作业票</div>
@@ -671,7 +681,7 @@
 </template>
 
 <script>
-import flvjs from "../../utils/flv.js";
+// import flvjs from "./../../utils/flv";
 import { genTree } from "@/utils/verificate";
 import sysConfig from "@/config";
 import videoView from "./../am/videoView";
@@ -835,13 +845,19 @@ export default {
 			channelName:'',
 		}
 	},
-	// created() {
-	// 	var scriptInfo = document.createElement("script");
-    //     scriptInfo.setAttribute("data-callType", "callScript");
-    //     // scriptInfo.src = "https://cdn.bootcdn.net/ajax/libs/flv.js/1.6.2/flv.js";
-    //     scriptInfo.src = "../../../src/utils/flv.js";
-    //     document.head.appendChild(scriptInfo);
-	// },
+	created() {
+		const scriptInfo = document.createElement("script");
+		scriptInfo.setAttribute("data-callType", "callScript");
+		scriptInfo.src = "https://cdn.bootcdn.net/ajax/libs/flv.js/1.6.2/flv.js";
+		document.head.appendChild(scriptInfo);
+
+
+		// var scriptInfo = document.createElement("script");
+        // scriptInfo.setAttribute("data-callType", "callScript");
+        // // scriptInfo.src = "https://cdn.bootcdn.net/ajax/libs/flv.js/1.6.2/flv.js";
+        // scriptInfo.src = "../../../src/utils/flv.js";
+        // document.head.appendChild(scriptInfo);
+	},
 	mounted() {
 		let that = this;
 		let date = new Date();
diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue
index 39b8f9f6..d23b6304 100644
--- a/src/views/wf/state.vue
+++ b/src/views/wf/state.vue
@@ -162,6 +162,7 @@
               style="width: 100%"
               v-model="addForm.participant"
               multiple
+              filterable
               placeholder="请选择参与者"
             >
               <el-option
diff --git a/src/views/wf/steps.vue b/src/views/wf/steps.vue
index 83f606a3..cb84be1b 100644
--- a/src/views/wf/steps.vue
+++ b/src/views/wf/steps.vue
@@ -27,7 +27,8 @@ export default {
     };
   },
   mounted() {
-    this.workId = this.ticket?this.ticket:this.$route.query.id;
+    // this.workId = this.ticket?this.ticket:this.$route.query.id;
+    this.workId = this.$route.query.id;
     this.getFlowSteps();
   },
   methods: {