1.【标定设置】保存后视频播放窗口会黑屏，实际视频还在播放<br/>2.场景设置只显示运行中的任务

src/api/baseUrl.js

@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV);
 switch (process.env.NODE_ENV) {
 switch (process.env.NODE_ENV) {
   case "development":
   case "development":
     // baseUrl = "http://192.168.9.234:20080"; // 测试环境url
     // baseUrl = "http://192.168.9.234:20080"; // 测试环境url
-    baseUrl = "http://192.168.9.62:20080"; // 测试环境url
+    baseUrl = "http://192.168.9.149:20080"; // 测试环境url
     // baseUrl = "http://192.168.9.82:8080"; // 测试环境url
     // baseUrl = "http://192.168.9.82:8080"; // 测试环境url
     // baseUrl = "http://192.168.9.61:8086";
     // baseUrl = "http://192.168.9.61:8086";
     // baseUrl = 'http://vion-panda.51vip.biz:52510';
     // baseUrl = 'http://vion-panda.51vip.biz:52510';

src/views/sceneManage/index.vue

@@ -18,7 +18,7 @@
             v-for="(item, index) in taskdata"
             v-for="(item, index) in taskdata"
             :key="index"
             :key="index"
             @click="selecttask(item, index)"
             @click="selecttask(item, index)"
-            v-if=" item.status == 'Running'"
+            v-if="item.status == 'Running'"
           >
           >
             <span
             <span
               :class="{
               :class="{
@@ -45,6 +45,7 @@
                 :title="subTask.subtask_name"
                 :title="subTask.subtask_name"
                 v-for="subTask in subTasks"
                 v-for="subTask in subTasks"
                 :key="subTask.subtask_id"
                 :key="subTask.subtask_id"
+                v-show="subTask.enableStatus != 1"
                 :class="[
                 :class="[
                   { subtaskActive: subTask.subtask_id == currentSubtaskId },
                   { subtaskActive: subTask.subtask_id == currentSubtaskId },
                   { disabledColor: subTask.enableStatus == 5 }
                   { disabledColor: subTask.enableStatus == 5 }
@@ -105,7 +106,7 @@ export default {
       taskdata: [],
       taskdata: [],
       subtaskdata: "",
       subtaskdata: "",
       subTasks: [],
       subTasks: [],
-      vchandata:{},
+      vchandata: {},
       subindex: -1,
       subindex: -1,
       playurl: "",
       playurl: "",
       taskID: "",
       taskID: "",
@@ -128,6 +129,7 @@ export default {
       });
       });
     },
     },
     subTasksClick(vdata) {
     subTasksClick(vdata) {
+      console.log(vdata);
       //删除中的任务不能点击
       //删除中的任务不能点击
       if (vdata.enableStatus == 5) {
       if (vdata.enableStatus == 5) {
         return;
         return;
@@ -135,7 +137,6 @@ export default {
       this.$store.commit("setocxstate", 1);
       this.$store.commit("setocxstate", 1);
       this.currentSubtaskId = vdata.subtask_id;
       this.currentSubtaskId = vdata.subtask_id;
       this.subtaskdata = vdata;
       this.subtaskdata = vdata;
-      console.log('vdata',vdata)
       this.$refs.setting.TaskParams(vdata.subtask_id);
       this.$refs.setting.TaskParams(vdata.subtask_id);
       if (vdata.running_status != "Running") {
       if (vdata.running_status != "Running") {
         this.$message({
         this.$message({
@@ -161,9 +162,9 @@ export default {
     //发送推流请求
     //发送推流请求
     pushSteam(vdata) {
     pushSteam(vdata) {
       let data = {
       let data = {
-       	send_stream: true,
+        send_stream: true,
         task_id: this.currentSubtaskId,
         task_id: this.currentSubtaskId,
-        is_analyse: true,
+        is_analyse: true
       };
       };
       this.$api.task
       this.$api.task
         .getStream(this.dev_unid, vdata.vchan.vchan_refid, data)
         .getStream(this.dev_unid, vdata.vchan.vchan_refid, data)

src/views/sceneManage/setting/demarcate.vue

@@ -801,6 +801,7 @@ export default {
       this.XMLstr = this.oParse.writeXML(obj);
       this.XMLstr = this.oParse.writeXML(obj);
       this.$parent.submit(this.XMLstr, "calibration", this.taskData);
       this.$parent.submit(this.XMLstr, "calibration", this.taskData);
       this.dialogVisible = false;
       this.dialogVisible = false;
+      this.handleClose();
     },
     },
     clear: function() {
     clear: function() {
       (this.traffic = {
       (this.traffic = {

src/views/taskManage/editVideo.vue

@@ -70,7 +70,7 @@
                     :visible-arrow="false"
                     :visible-arrow="false"
                   >
                   >
                     <span
                     <span
-                      class="el-icon-delete delIcon"
+                      :class="{'el-icon-delete':true, 'delIcon':true,'nodel': scope.row.enableStatus == 5?true:false}"
                       @click="delFun(scope.$index, scope.row)"
                       @click="delFun(scope.$index, scope.row)"
                     ></span>
                     ></span>
                   </el-tooltip>
                   </el-tooltip>
@@ -265,6 +265,9 @@ export default {
       console.log("b", data);
       console.log("b", data);
     },
     },
     delFun(index, data, action = "tree") {
     delFun(index, data, action = "tree") {
+      if (data.enableStatus == 5) {
+        return;
+      }
       if (!data.subtask_id) {
       if (!data.subtask_id) {
         this.tableData.forEach((ele, i) => {
         this.tableData.forEach((ele, i) => {
           if (ele.vchan_refid == data.vchan_refid) {
           if (ele.vchan_refid == data.vchan_refid) {