Jelajahi Sumber

大屏更新

xieqy 3 tahun lalu
induk
melakukan
618272ba64

+ 2 - 2
public/config.js

@@ -56,7 +56,7 @@ export const appconfig = {
           {
             "key": "chinavec2d",
             "name": "中国电子地图",
-            "url": "http://192.168.2.238:8090/iserver/services/map-citymap-2/rest/maps/citymap_yc"
+            "url": "https://yeepms.yeec.com.cn/iserver/services/map-citymap/rest/maps/citymap_yc"
           },
         ]
       },
@@ -67,7 +67,7 @@ export const appconfig = {
           {
             "key": "jzcj",
             "name": "建筑场景",
-            "url": "http://192.168.2.238:8090/iserver/services/3D-TF_PAPN_BUILD/rest/realspace"
+            "url": "https://yeepms.yeec.com.cn/iserver/services/3D-TF_PAPN_BUILD/rest/realspace"
           },
         ]
       },

+ 10 - 8
src/views/groupPage/baseMap/components/EchartsMap.vue

@@ -515,7 +515,8 @@ export default {
       domImg.crossOrigin = 'anonymous'
       domImg.src = require('@/views/groupPage/images/mapbj.png')
       setTimeout(() => {
-        mapInit()
+        // mapInit()
+        domImg.onload = mapInit()
       }, 1000)
       function tooltipCustom(toolTipSource) {
         if (!toolTipSource) {
@@ -523,10 +524,10 @@ export default {
         }
         if (!toolTipSource.body.data.datas) return
         const data = toolTipSource.body.data.datas
-        let header = `<div class="echart-tooltip-header"><div class="name" title=${toolTipSource.body.name}>${toolTipSource.body.name}</div><div class="status">${data.stage}</div></div>`
+        let header = `<div class="echart-tooltip-header"><div class="name" title=${data.type}>${data.type}</div><div class="status">${data.stage}</div></div>`
         let body = []
         body.push(
-          `<div class="echart-tooltip-body-item"><div class="name">项目类型:</div><div class="value" title=${data.type}>${data.type}</div></div>`
+          `<div class="echart-tooltip-body-item"><div class="name">项目名称:</div><div class="value" title=${toolTipSource.body.name}>${toolTipSource.body.name}</div></div>`
         )
         body.push(
           `<div class="echart-tooltip-body-item"><div class="name">开工时间:</div><div class="value" title=${data.realBeginTime}>${data.realBeginTime}</div></div>`
@@ -810,8 +811,8 @@ export default {
     box-shadow: 0px 3px 13px 0px #000000;
     border: 1px solid;
     border-image: linear-gradient(90deg, rgba(24, 255, 168, 1), rgba(25, 137, 252, 1)) 1;
-    height: 1.041667rem /* 200/192 */;
-    width: 0.9375rem /* 180/192 */;
+    // height: 1.041667rem /* 200/192 */;
+    width: 1.375rem; /* 264/192 */
     font-size: 0.0625rem /* 12/192 */ !important;
     padding: 0.052083rem /* 10/192 */ !important;
     font-family: Source Han Sans CN;
@@ -839,6 +840,7 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
+          font-size: 0.072917rem; /* 14/192 */
         }
       }
       .echart-tooltip-body {
@@ -857,9 +859,9 @@ export default {
           .value {
             color: rgba(14, 202, 240, 1);
             flex: 1;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
+            // overflow: hidden;
+            // text-overflow: ellipsis;
+            white-space: normal;
           }
         }
       }

+ 1 - 1
src/views/groupPage/districtPageModules/projectPanoramic/ParticipationUnits.vue

@@ -36,7 +36,7 @@ export default class ParticipationUnits extends Vue {}
   $size20: 0.104167rem /* 20/192 */;
   z-index: 2;
   //position
-  top: 1.911458rem /* 367/192 */;
+  top: 2.197917rem /* 422/192 */;
   bottom: 1.5625rem /* 300/192 */;
   margin-left: $size20 /* 20/192 */;
   left: 0rem /* 0/192 */;

+ 4 - 1
src/views/groupPage/districtPageModules/projectPanoramic/ProjectOverview.vue

@@ -108,7 +108,7 @@ export default class ProjectOverview extends Vue {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        margin: 0.078125rem /* 15/192 */ 0.09375rem /* 18/192 */;
+        margin: 0 0.09375rem /* 18/192 */ 0.078125rem /* 15/192 */ 0.09375rem /* 18/192 */;
         padding: 0.052083rem /* 10/192 */;
         border-bottom: 1px solid rgba(14, 167, 255, 0.26);
         font-family: Source Han Sans CN;
@@ -132,6 +132,9 @@ export default class ProjectOverview extends Vue {
           -webkit-text-fill-color: transparent;
         }
       }
+      .info-item:nth-child(1) {
+        margin: 0.078125rem /* 15/192 */ 0.09375rem /* 18/192 */ 0.078125rem /* 15/192 */ 0.09375rem /* 18/192 */;
+      }
     }
   }
 }

+ 3 - 5
src/views/groupPage/groupPageModules/ProjectStatistic.vue

@@ -78,6 +78,9 @@ export default {
         this.$store.state.bigScreen.groupProject = data
       },
       deep: true
+    },
+    groupName() {
+      this.getPageData()
     }
   },
   computed: {
@@ -88,11 +91,6 @@ export default {
       return this.$store.state.bigScreen.groupName
     }
   },
-  watch: {
-    groupName() {
-      this.getPageData()
-    }
-  },
   methods: {
     roundFun(value, n) {
       return Math.round(value * Math.pow(10, n)) / Math.pow(10, n)