Prechádzať zdrojové kódy

修改站点时间格式

chc 1 rok pred
rodič
commit
03c6a1867b
4 zmenil súbory, kde vykonal 252 pridanie a 236 odobranie
  1. 1 1
      .env.development
  2. 1 1
      index.html
  3. 3 2
      src/utils/TFMapUitl.ts
  4. 247 232
      src/views/map/Map.vue

+ 1 - 1
.env.development

@@ -88,5 +88,5 @@ VITE_GLOB_BASE_IMG = http://192.168.2.111:8001
 
 #自动更新数据时间update
 VITE_GLOB_UPDATE_TIME = 5000
-#自动更新数据时间map
+#自动更新数据时间map 更新地图站点数据时间
 VITE_GLOB_UPDATE_TIME_MP = 1200000

+ 1 - 1
index.html

@@ -109,7 +109,7 @@
         min-width: 120px;
         height: 56px;
         color: #fff;
-        padding:2px 10px;
+        padding:2px 6px;
         background-size: 100% 260px;
         overflow: hidden;
       }

+ 3 - 2
src/utils/TFMapUitl.ts

@@ -415,10 +415,11 @@ class TFMapUitl {
     </div>`;
     for (let j = 0; j < i.sensor?.length; j++) {
       str2 += `<li><span> ${i.sensor[j].sensor_name} </span>  <br/>
-      <span style=" display: inline-block;"><span style="font-size:17px;color:#00A2FF; display: inline-block;margin-right:5px"> ${i.sensor[j].sensor_name.indexOf('风向') ==-1 ? i.sensor[j].real_value : this.setWd(i.sensor[j].real_value)}</span><span style="font-size:14px; display: inline-block;margin-right:10px"> ${i.sensor[j].sensor_name.indexOf('风向') ==-1  ? i.sensor[j].dchar : ''}</span>     ${i.sensor[j].real_time?.slice(11, 16)}</span></li>`
+      <span style=" display: inline-block;"><span style="font-size:17px;color:#00A2FF; display: inline-block;margin-right:5px"> ${i.sensor[j].sensor_name.indexOf('风向') ==-1 ? i.sensor[j].real_value : this.setWd(i.sensor[j].real_value)}</span><span style="font-size:14px; display: inline-block;margin-right:10px"> ${i.sensor[j].sensor_name.indexOf('风向') ==-1  ? i.sensor[j].dchar : ''}</span>     ${i.sensor[j].real_time?.slice(5, 16)}</span></li>`
     }
     return str + str2 + str3
   }
+  // 重要测站点
   impotPointDom(i) {
     const data = JSON.stringify(i).replace(/\"/g, "'");
     let str = 
@@ -433,7 +434,7 @@ class TFMapUitl {
       <span style="font-family: Source Han Sans CN;
       font-size: 14px;
       font-weight: 500;
-      color: #FFFFFF;margin-right:10px;"><span style="margin-right:10px">${i.st_name}</span> ${i.data_real[j].real_time?.slice(11, 16)}</span> 
+      color: #FFFFFF;margin-right:10px;"><span style="margin-right:10px">${i.st_name}</span> ${i.data_real[j].real_time?.slice(5, 16)}</span> 
       <img style="display: inline-block;width:12px"  title='查看详情' onclick="siteDetail(${data})" src='./static/img/detailArrow.png' />
       </div>
       <div style="width:100%">

+ 247 - 232
src/views/map/Map.vue

@@ -67,7 +67,7 @@ import fenquData from './fenqu.json';
 import { useMessage } from '/@/hooks/web/useMessage';
 import  './range.js'
 import { getAppEnvConfig } from '/@/utils/env';
-const { VITE_GLOB_UPDATE_TIME } = getAppEnvConfig();
+const { VITE_GLOB_UPDATE_TIME_MP } = getAppEnvConfig();
 let dzdxInfoList = null;
 let gcInfoList = null;
 let monitorSensorsList = null;
@@ -122,6 +122,7 @@ export default defineComponent({
       qixiangData.value = [...basicStore.getStDetailInfo.st_wea_general, ...basicStore.getStDetailInfo.st_wea_standard];
       // 关闭基础图层
       if (val.flag) {
+        window.isThematicMap=true
         window.clearImpoint()
         map.showOverlay('shuiwenzhan*', false);
         map.showOverlay('shuiweizhan*', false);
@@ -228,6 +229,7 @@ export default defineComponent({
           });
         }
       } else {
+        window.isThematicMap=false
         // 获取重要测站点
         window.impointFlag=true
         window.getImportSites()
@@ -606,6 +608,8 @@ export default defineComponent({
   },
 
   mounted() {
+     // 进入专题图模式
+    window.isThematicMap=false
     window.impointFlag=true
     const geologicalStore = useGeologicalStore();
     const monitorDevicesStore = useMonitorDevicesStore();
@@ -620,7 +624,10 @@ export default defineComponent({
 
       this.getGCSite();
       // 二十分钟更新一次测站点信息
-      setInterval(()=>{ 
+      setInterval(()=>{
+        if(window.isThematicMap){
+          return
+        } 
         // 移除重新加载
         map.removeOverlay('shuiwenzhan*');
           map.removeOverlay('shuiweizhan*');
@@ -629,7 +636,7 @@ export default defineComponent({
           map.removeOverlay('biaozhunqixiangzhan*');
           map.removeOverlay('tanshuitongliangzhan*');
           this.getStDetailInfoAxios();
-      },VITE_GLOB_UPDATE_TIME)
+      },VITE_GLOB_UPDATE_TIME_MP)
       // rainMap({"start_time":"2023-07-05 10:00:00","end_time":"2023-07-05 01:00:00"})
       // //地灾点
       // this.getDzdxInfo(geologicalStore);
@@ -1003,229 +1010,229 @@ export default defineComponent({
       //   });
     },
 
-    getWater(monitorDevicesStore) {
-      monitorDevicesStore
-        .waterDevice({
-          pageNo: 1,
-          pageSize: 1000,
-        })
-        .then((res) => {
-          console.log('', res);
-          let devRes = {
-            success: true,
-            message: '',
-            code: 200,
-            result: {
-              records: [
-                {
-                  id: '90610001',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:12',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '羊村水文站',
-                  hydrologyDeviceCode: '90610001',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区山南市桑日县羊村',
-                  hydrologyDeviceLon: 91.816667,
-                  hydrologyDeviceLat: 29.266667,
-                  hydrologyDeviceonline: 0,
-                  catchmentArea: 153191,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '离线',
-                },
-                {
-                  id: '90610002',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:12',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '朗县水文站',
-                  hydrologyDeviceCode: '90610002',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: null,
-                  hydrologyDeviceLon: 93.033333,
-                  hydrologyDeviceLat: 29.05,
-                  hydrologyDeviceonline: 0,
-                  catchmentArea: 162844,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '离线',
-                },
-                {
-                  id: '90610003',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:12',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: 'ML水文站',
-                  hydrologyDeviceCode: '90610003',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区林芝市米林县扎西绕登乡甲玛村',
-                  hydrologyDeviceLon: 94.233333,
-                  hydrologyDeviceLat: 29.233333,
-                  hydrologyDeviceonline: 1,
-                  catchmentArea: 172170,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '在线',
-                },
-                {
-                  id: '90610004',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:12',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '派镇水文站',
-                  hydrologyDeviceCode: '90610004',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: null,
-                  hydrologyDeviceLon: 94.866667,
-                  hydrologyDeviceLat: 29.516667,
-                  hydrologyDeviceonline: 0,
-                  catchmentArea: 192977,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '离线',
-                },
-                {
-                  id: '90610005',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:12',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '排龙水文站',
-                  hydrologyDeviceCode: '90610005',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区波密县境内',
-                  hydrologyDeviceLon: 95.05,
-                  hydrologyDeviceLat: 30.066667,
-                  hydrologyDeviceonline: 1,
-                  catchmentArea: 25656,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '在线',
-                },
-                {
-                  id: '90610006',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:12',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '汗密水文站',
-                  hydrologyDeviceCode: '90610006',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区林芝市墨脱县背崩乡汗密',
-                  hydrologyDeviceLon: 95.133333,
-                  hydrologyDeviceLat: 29.366667,
-                  hydrologyDeviceonline: 1,
-                  catchmentArea: 126,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '在线',
-                },
-                {
-                  id: '90610007',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:12',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '德兴水文站',
-                  hydrologyDeviceCode: '90610007',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区林芝市墨脱县德兴乡德兴村',
-                  hydrologyDeviceLon: 95.3,
-                  hydrologyDeviceLat: 29.316667,
-                  hydrologyDeviceonline: 1,
-                  catchmentArea: 225871,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '在线',
-                },
-                {
-                  id: '90610008',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:13',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '希让水文站',
-                  hydrologyDeviceCode: '90610008',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区林芝市墨脱县背崩乡希让村',
-                  hydrologyDeviceLon: 95.016667,
-                  hydrologyDeviceLat: 29.166667,
-                  hydrologyDeviceonline: 0,
-                  catchmentArea: 227409,
-                  isNew: 0,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '离线',
-                },
-                {
-                  id: '90610009',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:13',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '扎西绕登水文站',
-                  hydrologyDeviceCode: '90610009',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区林芝市米林县扎西绕登乡',
-                  hydrologyDeviceLon: 94.033333,
-                  hydrologyDeviceLat: 29.266667,
-                  hydrologyDeviceonline: 0,
-                  catchmentArea: 1050,
-                  isNew: 1,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '离线',
-                },
-                {
-                  id: '90610010',
-                  createBy: 'sw',
-                  createTime: '2023-07-11 14:48:13',
-                  updateBy: null,
-                  updateTime: '2023-07-13 00:00:01',
-                  hydrologyDeviceName: '尼西水文站',
-                  hydrologyDeviceCode: '90610010',
-                  hydrologyDeviceKind: 'L3SW',
-                  hydrologyDeviceLocation: '西藏自治区林芝市巴宜区尼西村',
-                  hydrologyDeviceLon: 94.2,
-                  hydrologyDeviceLat: 29.75,
-                  hydrologyDeviceonline: 0,
-                  catchmentArea: 16148,
-                  isNew: 1,
-                  hydrologyDeviceKind_dictText: '水文站',
-                  hydrologyDeviceonline_dictText: '离线',
-                },
-              ],
-              total: 94,
-              size: 10,
-              current: 1,
-              orders: [],
-              optimizeCountSql: true,
-              searchCount: true,
-              countId: null,
-              maxLimit: null,
-              pages: 10,
-            },
-            timestamp: 1689238515268,
-          };
-          monitorDevicesList = devRes.result.records;
-          monitorDevicesList.map((e) => {
-            e.deviceKind = e.hydrologyDeviceKind;
-            e.deviceLon = e.hydrologyDeviceLon;
-            e.deviceLat = e.hydrologyDeviceLat;
-            e.online = e.hydrologyDeviceonline;
-            e.deviceName = e.hydrologyDeviceName;
-            e.elevation = '0';
-            e.deviceCode = e.hydrologyDeviceCode;
-          });
-          // i.deviceLon, i.deviceLat, map.terrain ? i.elevation : 0
-          this.waterMarker(monitorDevicesList);
-          this.devicesMarkerWord(monitorDevicesList);
-          setTimeout(() => this.controlMarker(), 2000);
-        });
-    },
+    // getWater(monitorDevicesStore) {
+    //   monitorDevicesStore
+    //     .waterDevice({
+    //       pageNo: 1,
+    //       pageSize: 1000,
+    //     })
+    //     .then((res) => {
+    //       console.log('', res);
+    //       let devRes = {
+    //         success: true,
+    //         message: '',
+    //         code: 200,
+    //         result: {
+    //           records: [
+    //             {
+    //               id: '90610001',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:12',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '羊村水文站',
+    //               hydrologyDeviceCode: '90610001',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区山南市桑日县羊村',
+    //               hydrologyDeviceLon: 91.816667,
+    //               hydrologyDeviceLat: 29.266667,
+    //               hydrologyDeviceonline: 0,
+    //               catchmentArea: 153191,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '离线',
+    //             },
+    //             {
+    //               id: '90610002',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:12',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '朗县水文站',
+    //               hydrologyDeviceCode: '90610002',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: null,
+    //               hydrologyDeviceLon: 93.033333,
+    //               hydrologyDeviceLat: 29.05,
+    //               hydrologyDeviceonline: 0,
+    //               catchmentArea: 162844,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '离线',
+    //             },
+    //             {
+    //               id: '90610003',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:12',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: 'ML水文站',
+    //               hydrologyDeviceCode: '90610003',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区林芝市米林县扎西绕登乡甲玛村',
+    //               hydrologyDeviceLon: 94.233333,
+    //               hydrologyDeviceLat: 29.233333,
+    //               hydrologyDeviceonline: 1,
+    //               catchmentArea: 172170,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '在线',
+    //             },
+    //             {
+    //               id: '90610004',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:12',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '派镇水文站',
+    //               hydrologyDeviceCode: '90610004',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: null,
+    //               hydrologyDeviceLon: 94.866667,
+    //               hydrologyDeviceLat: 29.516667,
+    //               hydrologyDeviceonline: 0,
+    //               catchmentArea: 192977,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '离线',
+    //             },
+    //             {
+    //               id: '90610005',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:12',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '排龙水文站',
+    //               hydrologyDeviceCode: '90610005',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区波密县境内',
+    //               hydrologyDeviceLon: 95.05,
+    //               hydrologyDeviceLat: 30.066667,
+    //               hydrologyDeviceonline: 1,
+    //               catchmentArea: 25656,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '在线',
+    //             },
+    //             {
+    //               id: '90610006',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:12',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '汗密水文站',
+    //               hydrologyDeviceCode: '90610006',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区林芝市墨脱县背崩乡汗密',
+    //               hydrologyDeviceLon: 95.133333,
+    //               hydrologyDeviceLat: 29.366667,
+    //               hydrologyDeviceonline: 1,
+    //               catchmentArea: 126,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '在线',
+    //             },
+    //             {
+    //               id: '90610007',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:12',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '德兴水文站',
+    //               hydrologyDeviceCode: '90610007',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区林芝市墨脱县德兴乡德兴村',
+    //               hydrologyDeviceLon: 95.3,
+    //               hydrologyDeviceLat: 29.316667,
+    //               hydrologyDeviceonline: 1,
+    //               catchmentArea: 225871,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '在线',
+    //             },
+    //             {
+    //               id: '90610008',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:13',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '希让水文站',
+    //               hydrologyDeviceCode: '90610008',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区林芝市墨脱县背崩乡希让村',
+    //               hydrologyDeviceLon: 95.016667,
+    //               hydrologyDeviceLat: 29.166667,
+    //               hydrologyDeviceonline: 0,
+    //               catchmentArea: 227409,
+    //               isNew: 0,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '离线',
+    //             },
+    //             {
+    //               id: '90610009',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:13',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '扎西绕登水文站',
+    //               hydrologyDeviceCode: '90610009',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区林芝市米林县扎西绕登乡',
+    //               hydrologyDeviceLon: 94.033333,
+    //               hydrologyDeviceLat: 29.266667,
+    //               hydrologyDeviceonline: 0,
+    //               catchmentArea: 1050,
+    //               isNew: 1,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '离线',
+    //             },
+    //             {
+    //               id: '90610010',
+    //               createBy: 'sw',
+    //               createTime: '2023-07-11 14:48:13',
+    //               updateBy: null,
+    //               updateTime: '2023-07-13 00:00:01',
+    //               hydrologyDeviceName: '尼西水文站',
+    //               hydrologyDeviceCode: '90610010',
+    //               hydrologyDeviceKind: 'L3SW',
+    //               hydrologyDeviceLocation: '西藏自治区林芝市巴宜区尼西村',
+    //               hydrologyDeviceLon: 94.2,
+    //               hydrologyDeviceLat: 29.75,
+    //               hydrologyDeviceonline: 0,
+    //               catchmentArea: 16148,
+    //               isNew: 1,
+    //               hydrologyDeviceKind_dictText: '水文站',
+    //               hydrologyDeviceonline_dictText: '离线',
+    //             },
+    //           ],
+    //           total: 94,
+    //           size: 10,
+    //           current: 1,
+    //           orders: [],
+    //           optimizeCountSql: true,
+    //           searchCount: true,
+    //           countId: null,
+    //           maxLimit: null,
+    //           pages: 10,
+    //         },
+    //         timestamp: 1689238515268,
+    //       };
+    //       monitorDevicesList = devRes.result.records;
+    //       monitorDevicesList.map((e) => {
+    //         e.deviceKind = e.hydrologyDeviceKind;
+    //         e.deviceLon = e.hydrologyDeviceLon;
+    //         e.deviceLat = e.hydrologyDeviceLat;
+    //         e.online = e.hydrologyDeviceonline;
+    //         e.deviceName = e.hydrologyDeviceName;
+    //         e.elevation = '0';
+    //         e.deviceCode = e.hydrologyDeviceCode;
+    //       });
+    //       // i.deviceLon, i.deviceLat, map.terrain ? i.elevation : 0
+    //       this.waterMarker(monitorDevicesList);
+    //       this.devicesMarkerWord(monitorDevicesList);
+    //       setTimeout(() => this.controlMarker(), 2000);
+    //     });
+    // },
 
     //获取传感器列表
     getMonitorSensorsList(monitorDevicesStore) {
@@ -2099,11 +2106,15 @@ export default defineComponent({
                           TFMapUitl.impotPointDom(data)
                         ).init()
                         if(i.st_name=='派镇'){
-                          markerWindow.setOff(-50, -10)
+                          markerWindow.setOff(-46, -10)
                         }else if(i.st_name=='德兴'){
-                          markerWindow.setOff(-52, 30)
+                          markerWindow.setOff(-50, 55)
                         }else if(i.st_name=='加热萨'){
-                          markerWindow.setOff(-54, 24)
+                          markerWindow.setOff(-54, 55)
+                        }else if(i.st_name=='尼西'){
+                          markerWindow.setOff(-54, -20)
+                        }else if(i.st_name=='ML'){
+                          markerWindow.setOff(-48, 0)
                         }
                         else{
                           markerWindow.setOff(-52, -0)
@@ -2194,11 +2205,15 @@ export default defineComponent({
                           TFMapUitl.impotPointDom(data)
                         ).init()
                         if(i.st_name=='派镇'){
-                          markerWindow.setOff(-50, -10)
+                          markerWindow.setOff(-46, -10)
                         }else if(i.st_name=='德兴'){
-                          markerWindow.setOff(-52, 30)
+                          markerWindow.setOff(-50, 55)
                         }else if(i.st_name=='加热萨'){
-                          markerWindow.setOff(-54, 20)
+                          markerWindow.setOff(-54, 55)
+                        }else if(i.st_name=='尼西'){
+                          markerWindow.setOff(-54, -20)
+                        }else if(i.st_name=='ML'){
+                          markerWindow.setOff(-48, 0)
                         }
                         else{
                           markerWindow.setOff(-52, -0)