Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/packages/components/Uav/Uav/FlightControl/index.vue

@@ -390,13 +390,7 @@
       });
       endAiInspection({
         taskid: airPortStoreVal.getTaskId,
-      }).then((res) => {
-        if (res) {
-          if (socket) {
-            socket.disconnect();
-          }
-        }
-      });
+      }).then((res) => {});
     }
   };
   // 获取飞行控制权

src/packages/components/Uav/Uav/Inspection/index.vue

@@ -154,7 +154,6 @@
   const live_info = airPortStoreVal.getLiveInfo;
   const closeInspection = () => {};
   const submit = () => {
-    console.log(props.type);
     if (!instantiateItem.value.id) {
       createMessage.warning('请选择AI算法实例');
       return;
@@ -168,7 +167,7 @@
     //   return;
     // }
     const querys = {
-      taskId: props.taskId,
+      taskId: airPortStoreVal.getTaskId,
       algoInstanceId: instantiateItem.value.id,
       rtmpUrl: live_info.rtmp + liveCode.value,
       warningTitle: data.code,
@@ -177,7 +176,6 @@
     callAiModel(querys).then((res) => {
       console.log(res);
       createMessage.success('操作成功');
-      airPortStoreVal.setTaskId(props.taskId);
       option.status.hide = true;
     });
   };

src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/index.vue

@@ -68,7 +68,7 @@
      // 获取eventBus传过来的值
     GetUavPageList().then(resData => {
       option.dataset = resData.items;
-      resData.forEach(item => {
+      resData.items.forEach(item => {
         let topicUrl = `thing/product/${item.psn}/osd`;
         clientSubscribe(topicUrl);
       })