merge

src/packages/components/Charts/Maps/MapLayer/index.vue

@@ -325,6 +325,7 @@ const isFirstLoad = ref(true);
 const initMap = (newData: any) => {
   // 第一次加载
   if(isFirstLoad.value){
+
     map = new mars3d.Map(vChartRef.value, newData);
   }else{ // 之后更新
     // map.setOptions(newData);

src/packages/components/Charts/Maps/MapMars3d/index.vue

@@ -189,6 +189,8 @@ const stopWatch = watch(
  async option => {
   let options = JSON.parse(JSON.stringify(props.chartConfig.option.mapOptions))
 
+  console.log("options",options);
+  // debugger;
     await nextTick();
 
 

src/packages/components/Tasks/Tasks/TaskAssign/index.vue

@@ -959,7 +959,7 @@
   const handlerGetTaskList = () => {
     let sql = `
     SELECT "Id","Content","Lng","Lat","Address","State","TaskTime","Image","ActOn" 
-    from fm_firecluetask where "Fireclueid" = '${clueInfo.value.id}' AND "State" IN (2,3)
+    from fm_firecluetask where "Fireclueid" = '${clueInfo.value.id}' AND "State" IN (3)
     ORDER BY "TaskTime"
     `;
     axios.post(VITE_GLOB_API_URL+'/api/FireResources/GetDataBySql',{
@@ -1081,7 +1081,8 @@
 
 
            data.forEach((item,index)=>{
-              let iconUrl = index == 0 ? '/public/components/task/taskassign/map-monitor-active.png' : '/public/components/task/taskassign/map-monitor.png';
+              let iconUrl = index == 0 ? '/public/components/task/taskassign/map-monitor-common.png' : '/public/components/task/taskassign/map-monitor-active.png';
+              let labelName = index == 0 ? "LH"+clueInfo.value.id : "LH"+item.Name
               let graphic = new mars3d.graphic.BillboardEntity({
                 position: [parseFloat(item.Lng),parseFloat(item.Lat)],
                 attr: item,
@@ -1096,7 +1097,7 @@
                   verticalOrigin: Cesium.VerticalOrigin.BOTTOM, 
                   pixelOffset: new Cesium.Cartesian2(0, 0),
                   label:{
-                    text: "LH"+clueInfo.value.id,  // 显示的文字，可换成 item 里的字段
+                    text: labelName,
                     font: '14px sans-serif',
                     fillColor: Cesium.Color.WHITE,
                     outlineColor: Cesium.Color.BLACK,
@@ -1104,7 +1105,7 @@
                     style: Cesium.LabelStyle.FILL_AND_OUTLINE,
                     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                     horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                    pixelOffset: new Cesium.Cartesian2(0, -116), // 向上偏移，值根据图标高度调整
+                    pixelOffset: new Cesium.Cartesian2(0, -105), // 向上偏移，值根据图标高度调整
                     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
                   },
                   
@@ -1140,6 +1141,10 @@
         lat: clueInfo.value.lat
       }).then((res) => {
         console.log("res1123",res);
+        if(res.length == 0){
+          
+            return null;
+        }
         airPortStoreVal.setAirPort('sn', res[0].droneportsn);
         airPortStoreVal.setUAV('sn', res[0].Sn);
         airPortStoreVal.setGateway(res[0].GateWay);
@@ -1211,6 +1216,15 @@
         _lat:parseFloat(clueInfo.value.lat),
         _alt:window.globalMap.getHeight([parseFloat(clueInfo.value.lng),parseFloat(clueInfo.value.lat)])+100
       }
+
+      if(!droneData.value?.droneInDock){
+        ElMessage({
+              message:"周边没有机场！",
+              type: 'error',
+            })
+            return null;
+      }
+      
       
       // 飞行
       if (droneData.value.droneInDock == 1) {