多任务模式波形和状态的处理

frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js

@@ -195,7 +195,7 @@ export default {
         ]
       },
       detailUav: {
-        visible: true,
+        visible: false,
         id: 1,
         baseInfo: {
           url: require('@/assets/img/uav.png'),
@@ -1110,6 +1110,8 @@ export default {
             // 测试
             // this.addUavToScene(item)
           })
+          this.detailUav.id = data[0].id
+          this.detailUav.visible = true
           taskListResource = data
           this.taskList.data = list
           if (this.taskList.data.length) {
@@ -2737,7 +2739,7 @@ export default {
       let data = JSON.parse(info.body)
       console.log('id对比', this.detailUav.id, data.payloadId);
       // && this.detailUav.id === data.payloadId
-      if (this.detailUav.visible) {
+      if (this.detailUav.visible && this.detailUav.id === data.jobId) {
         let channel1False = []
         let channel1Real = []
         let channel2False = []
@@ -2984,7 +2986,7 @@ export default {
           this.taskList.data[findIndex].statusName = this.jobStatus[data.jobStatus + '']
           taskListResource[findIndex].statusName = this.jobStatus[data.jobStatus + '']
         }
-        if (data.jobStatus === 1) {
+        if (data.jobStatus === 1 && this.detailUav.id === data.jobId) {
           this.updateUavInfo(data.sarStatus)
         }
         this.taskList.data[findIndex].status = data.jobStatus
@@ -3043,7 +3045,11 @@ export default {
       }
     },
     //#endregion
-
+    // 打开状态和波形信息展示
+    openSarStatusDetail(data) {
+      this.detailUav.id = data.id
+      this.detailUav.visible = true
+    },
 
     //#region
     handleUavDetailCollapse(actives) {

frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue

@@ -73,10 +73,14 @@
               v-for="(item, index) in taskList.data"
               :key="item.id"
               class="task-item"
+              @click="openSarStatusDetail(item)"
             >
               <div class="left-part">
                 <!--            <div class="task-progress-bar" :style="'width: ' + item.uavCompletion +'%;'"></div>-->
-                <div class="execute-info" @click="openTaskLineDetail(item)">
+                <div
+                  class="execute-info"
+                  @click.stop="openTaskLineDetail(item)"
+                >
                   <span
                     class="execute-type-icon"
                     :class="'execute-state-' + item.status"
@@ -407,7 +411,7 @@
                 ></dt-multiple-analysis>
               </div>
             </el-collapse-item>
-            <el-collapse-item title="回传图像" name="5">
+            <!-- <el-collapse-item title="回传图像" name="5">
               <div class="back-image">
                 <div
                   v-for="item in detailInfo.pictureList"
@@ -442,7 +446,7 @@
                   </div>
                 </div>
               </div>
-            </el-collapse-item>
+            </el-collapse-item> -->
           </el-collapse>
         </div>
       </div>