本地开发

hd-glasses-app/src/pages/hd_map.vue

@@ -59,7 +59,7 @@ import * as interaction from 'ol/interaction'; // 交互
 import {OL as ol} from "plot-ol/plottingol";
 import GeoJSON from 'ol/format/GeoJSON'
 import service from "@/utils/service";
-import {appInit, getStatisFileUrl} from "../utils/publicFun";
+import {appInit, getStatisFileUrl, getUrlParam} from "../utils/publicFun";
 
 
 export default {
@@ -131,12 +131,11 @@ export default {
     this.page = this.$route.query.page;
     this.pageType = this.$route.query.type;
 
-    this.token = this.$route.query.token || "";
-    if (this.token > 10) {
+    this.token = getUrlParam("token")
+    if (this.token !=null) {
       localStorage.setItem("hd_token", this.token)
     }
 
-
     setInterval(() => {
       let hd_gps_location = localStorage.getItem("hd_gps_location")
       if (hd_gps_location) {
@@ -580,6 +579,7 @@ export default {
           pageNo: 1,
           pageSize: 50
         }
+
       }).then((res) => {
         if (res.status == 200) {
           this.map.removeLayer(this.equipmentLayer)
@@ -739,11 +739,19 @@ export default {
                   // anchor: [0.5, 0.5],
                   scale: 0.4,
                 }),
+                text: new Text({
+                  testAlign: 'center',
+                  text: [record.equipmentName, 'bold 16px sans-serif', '\n',''],
+                  font: 'bold 20px 微软雅黑',
+                  fill: new Fill({
+                    color: 'rgb(155, 155, 155)',
+                  }),
+                  offsetY: 36
+                })
               })
           );
         }
 
-
         if (record.isOnline == "true") {
           // 未接受告警数量为0，全部都接受 绿色
            if(alarmNum==0){
@@ -755,6 +763,14 @@ export default {
                      // anchor: [0.5, 0.5],
                      scale: 0.4,
                    }),
+                   text: new Text({
+                     testAlign: 'center',
+                     text: [record.equipmentName, 'bold 16px sans-serif', '\n',''],
+                     font: 'bold 20px 微软雅黑',
+                     fill: new Fill({
+                       color: 'rgb(22, 206, 129)',
+                     })
+                   })
                  })
              );
            }
@@ -769,10 +785,10 @@ export default {
                   }),
                   text:new Text({
                     testAlign: 'center',
-                    text: `${alarmNum}条告警未接受`,
+                    text: [record.equipmentName, 'bold 16px sans-serif', '\n','',`${alarmNum}条告警未接受`, 'bold 16px sans-serif',],
                     font: 'bold 16px 微软雅黑',
                     fill: new Fill({
-                      color: '#369FFF',
+                      color: 'rgb(54, 159, 255)',
                     }),
                     // offsetX: 40,
                     offsetY: 26