From 43a9fbb0c2acd1fea3b8961047dae898d4c2a0e5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Sep 2023 14:22:17 +0800
Subject: [PATCH] 全局国际化

---
 src/components/GMap.vue |   70 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 77351a9..575a8c8 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -173,7 +173,7 @@
       <div class="fz16 pl5 pr5 flex-align-center flex-row flex-justify-between"
         style="border-bottom: 1px solid #515151; height: 10%;">
         <span>{{ osdVisible.gateway_callsign }}</span>
-        <span><a style="color: white;" @click="() => osdVisible.visible = false">
+        <span><a style="color: white;" @click="closeOsdWindow">
             <CloseOutlined />
           </a></span>
       </div>
@@ -360,14 +360,14 @@
             </a-col>
             <a-col span="11">
               <a-button :class="[showOption?'active-color':'unactive-color']" class="width-100" type="primary" :disabled="dockControlPanelVisible" size="small"
-                @click="setDockControlPanelVisible(true)">
+                @click="openFlySetting">
                 操作
               </a-button>
             </a-col>
           </a-row>
           <!-- 机场控制面板 -->
           <DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo"
-            @close-control-panel="onCloseControlPanel">
+            @close-control-panel="closeOperate">
           </DockControlPanel>
         </div>
       </div>
@@ -621,7 +621,7 @@
         </div>
       </div>
       <!-- 飞行指令 -->
-      <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads">
+      <DroneControlPanel v-model="openDroneControl" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads">
       </DroneControlPanel>
     </div>
   </div>
@@ -703,13 +703,13 @@
   label: string,
   more?: any
 }
+    // 打开飞行控制
+    const openDroneControl = ref(false)
     const root = getRoot()
     // 监控显示
     const showMonitor = ref(false)
     // 操作显示
     const showOption = ref(false)
-    // 飞行控制显示
-    const showFly = ref(false)
     const mouseMode = ref(false)
     const store = useMyStore()
     // 机场直播地址
@@ -725,7 +725,6 @@
     // 视频列表选择值
     const videoList = ref()
     const videoIndex = ref(0)
-    // 机场加载值
 
     // 飞机视频播放地址
     const aircraftUrl = ref('')
@@ -780,9 +779,7 @@
     const drawVisible = computed(() => {
       return store.state.drawVisible
     })
-    const osdVisible = computed(() => {
-      return store.state.osdVisible
-    })
+    const osdVisible = computed(() => JSON.parse(JSON.stringify(store.state.osdVisible)))
     const sn = computed(() => {
       return store.state.hmsInfoDetailSn
     })
@@ -792,6 +789,12 @@
         return val
       }
     })
+
+    // 关闭窗口
+    const closeOsdWindow = () => {
+      store.commit('SET_OSD_VISIBLE_INFO', false)
+    }
+
     // 打开监控权限
     const openMonitor = () => {
       showMonitor.value = !showMonitor.value
@@ -804,9 +807,12 @@
     // 打开飞机监控
     const openAircra = () => {
       showAircraft.value = !showAircraft.value
+      setDockControlPanelVisible(false)
       if (showAircraft.value) {
+        openDroneControl.value = true
         loadDroneVideo()
       } else {
+        openDroneControl.value = false
         closeFly()
       }
     }
@@ -817,7 +823,6 @@
       videoList.value = []
       droneIndex.value = 0
       cameraIndex.value = 0
-      console.log(deviceInfo, 'deviceInfo', sn.value)
       await getLiveCapacity({ id: store.state.common.projectId })
         .then(res => {
           if (res.code === 0) {
@@ -886,7 +891,6 @@
                 }
               })
               aircraSelected.value = aircraftList.value[0].value
-              console.log(aircraftList.value, 'aircraftList.value')
               flyOnStart()
             } else {
               showAircraft.value = false
@@ -968,6 +972,11 @@
       aircraftList.value = []
       aircraSelected.value = ''
     }
+    // 打开机场操作
+    const openFlySetting = () => {
+      openDroneControl.value = false
+      setDockControlPanelVisible(true)
+    }
     watch(() => store.state.deviceStatusEvent,
       data => {
         if (Object.keys(data.deviceOnline).length !== 0) {
@@ -987,7 +996,6 @@
         deep: true
       }
     )
-
     watch(() => store.state.deviceState, data => {
       if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
         if (osdVisible.value.visible && osdVisible.value.gateway_sn !== '') {
@@ -1006,9 +1014,24 @@
         }
       }
     }, {
-      deep: true
+      deep: true,
     })
-
+    watch(() => osdVisible.value, (data, oldData) => {
+      showMonitor.value = false
+      aircraftUrl.value = ''
+      showAircraft.value = false
+      aircraftList.value = []
+      aircraSelected.value = ''
+      airPortUrl.value = ''
+      droneList.value = []
+      if (deviceInfo.dock.basic_osd?.mode_code === 2) {
+        onCloseControlPanel(oldData.gateway_sn)
+      } else {
+        setDockControlPanelVisible(false)
+      }
+    }, {
+      deep: true,
+    })
     watch(
       () => store.state.wsEvent,
       newData => {
@@ -1075,7 +1098,14 @@
       setDockControlPanelVisible,
       onCloseControlPanel,
     } = useDockControl()
-
+    // 关闭设备控制方法
+    const closeOperate = (sn:string) => {
+      if (deviceInfo.dock.basic_osd?.mode_code === 2) {
+        onCloseControlPanel(sn)
+      } else {
+        setDockControlPanelVisible(false)
+      }
+    }
     // 连接或断开drc
     useConnectMqtt()
 
@@ -1264,7 +1294,6 @@
       sn,
       showMonitor,
       showOption,
-      showFly,
       airPortUrl,
       openMonitor,
       droneIndex,
@@ -1274,6 +1303,10 @@
       aircraftList,
       aircraSelected,
       selectChange,
+      closeOperate,
+      closeOsdWindow,
+      openDroneControl,
+      openFlySetting
     }
   }
 })
@@ -1400,4 +1433,5 @@
   position: absolute;
   min-height: 2px;
   border-radius: 2px;
-}</style>
+}
+</style>

--
Gitblit v1.9.3