Преглед изворни кода

feat:水文站名称修改+离线摄像头图标添加

lavinia пре 2 месеци
родитељ
комит
ceeae8f12f

+ 4 - 3
src/views/components/layerList/index.vue

@@ -84,8 +84,8 @@ export default {
           id: '2',
           label: '水文监测',
           children: [
-            { id: '2-1', label: '水文监测点1', meta: { type: 'point', url: '/sddnWeihe/geojson/sw1.geojson' } },
-            { id: '2-2', label: '水文监测点2', meta: { type: 'point', url: '/sddnWeihe/geojson/sw2.geojson' } }
+            { id: '2-1', label: '连霍高速G30与河堤路交接桥站', meta: { type: 'point', url: '/sddnWeihe/geojson/sw1.geojson' } },
+            { id: '2-2', label: '兴武排洪渠与河堤路交界站', meta: { type: 'point', url: '/sddnWeihe/geojson/sw2.geojson' } }
           ]
         },
         {
@@ -290,6 +290,7 @@ export default {
       }
     },
     getStyleByName(name) {
+      console.info(name)
       if (name === '生态区界限') {
         return { type: 'polyline', styleOptions: { color: '#0c5b0f', width: 2 } }
       } else if (name === '提防背河坡脚线') {
@@ -323,7 +324,7 @@ export default {
             outlineColor: '#57e0a9'
           }
         }
-      } else if (name.indexOf('水文') > -1) {
+      } else if (name === '连霍高速G30与河堤路交接桥站' || name === '兴武排洪渠与河堤路交界站') {
         const ptStyle = this.getPointStyle(name)
         return {
           type: 'billboard',

BIN
src/views/safety-inspection/image/greyCamera.png


+ 1 - 1
src/views/safety-inspection/index.vue

@@ -53,7 +53,7 @@ export default {
       const graphic = new this.mars3d.graphic.BillboardEntity({
         position: [point.longitude, point.latitude],
         style: {
-          image: require('./image/camera.png'),
+          image: point.status == 0?require('./image/camera.png'):require('./image/greyCamera.png'),
           scale: 0.8,
           horizontalOrigin: this.Cesium.HorizontalOrigin.CENTER,
           verticalOrigin: this.Cesium.VerticalOrigin.BOTTOM

+ 4 - 2
src/views/water-station-popup/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="water-station-popup-container" v-if="visible">
     <div class="water-station-popup-title">
-      <span class="title-text">水文监测点</span>
+      <span class="title-text">{{title}}</span>
       <img src="@/assets/image/common/close.png" style="cursor: pointer" alt="" @click="closeModal" />
     </div>
     <div class="water-station-popup-content">
@@ -137,6 +137,7 @@ export default {
       visible: false,
       typeVal: '1',
       radius: '',
+      title:'水文监测点',
       activeIndex: 0,
       monitorList: [],
       stationGraphic: {},
@@ -155,6 +156,7 @@ export default {
         this.getMonitoringStatistics(18)
       }
       this.stationGraphic = data.graphic
+      this.title = data.layer.options.name
     })
   },
   destroyed() {
@@ -568,7 +570,7 @@ export default {
   height: 100%;
   text-align: center;
   img {
-    margin-top: px-to-rem(70);
+    margin-top: px-to-rem(40);
     margin-bottom: px-to-rem(20);
   }
   .txt {