Bladeren bron

Merge remote-tracking branch 'kunshan/master'

BAI 2 weken geleden
bovenliggende
commit
f23e1b04dd
3 gewijzigde bestanden met toevoegingen van 22 en 13 verwijderingen
  1. BIN
      src/assets/images/圩区.png
  2. 6 3
      src/views/map/index.vue
  3. 16 10
      src/views/waterStation/index.vue

BIN
src/assets/images/圩区.png


+ 6 - 3
src/views/map/index.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="large-screen">
     <!-- 地图 -->
-    <mapScene ref="mapSceneRef" v-show="(state.activeIndex === '1' || state.activeIndex === '3') && !state.showVideoPlayer"></mapScene>
+    <mapScene ref="mapSceneRef" v-show="state.activeIndex === '1' && !state.showVideoPlayer"></mapScene>
     <div class="fusion-bg" v-show="state.activeIndex === '2'">
       <img src="@/assets/images/昆山水文站.jpg" alt="昆山水文站" />
     </div>
+    <div class="business-bg" v-show="state.activeIndex === '3'">
+      <img src="@/assets/images/圩区.png" alt="圩区" />
+    </div>
     <div class="history-bg" v-show="state.activeIndex === '4'">
       <video v-if="!state.showHistoryImage" ref="historyVideoRef" class="history-bg-video" loop autoplay muted>
         <source :src="state.historyVideoSrc" type="video/mp4">
@@ -35,7 +38,7 @@
       </div>
     </div>
     <!-- 地图切换按钮 -->
-    <div class="map-switch-btns" v-show="state.activeIndex === '1' || state.activeIndex === '3'">
+    <div class="map-switch-btns" v-show="state.activeIndex === '1'">
       <div class="map-switch-btn" :class="{ active: state.currentMapMode === 'suzhou' }" @click="switchToSuzhouMap">
         <span>苏州地图</span>
       </div>
@@ -649,7 +652,7 @@ function handleMapPlayComplete() {
   }
 }
 
-.fusion-bg, .history-bg, .culture-bg, .science-bg {
+.fusion-bg, .business-bg, .history-bg, .culture-bg, .science-bg {
   position: absolute;
   z-index: 1;
   left: 0;

+ 16 - 10
src/views/waterStation/index.vue

@@ -75,24 +75,24 @@
     <div class="bottom-panel">
       <div class="bottom-container">
         <div class="stat-item">
-          <div class="stat-value">57</div>
-          <div class="stat-label">测站总数</div>
+          <div class="stat-value">18</div>
+          <div class="stat-label">骨干河道</div>
         </div>
         <div class="stat-item">
-          <div class="stat-value">42</div>
-          <div class="stat-label">河道站</div>
+          <div class="stat-value">94</div>
+          <div class="stat-label">圩区总数</div>
         </div>
         <div class="stat-item">
-          <div class="stat-value">8</div>
-          <div class="stat-label">雨量站</div>
+          <div class="stat-value">618</div>
+          <div class="stat-label">防洪闸</div>
         </div>
         <div class="stat-item">
-          <div class="stat-value">7</div>
-          <div class="stat-label">水质站</div>
+          <div class="stat-value">560</div>
+          <div class="stat-label">排涝站</div>
         </div>
         <div class="stat-item">
-          <div class="stat-value">100%</div>
-          <div class="stat-label">在线率</div>
+          <div class="stat-value">2173.69<span class="stat-unit">m³/s</span></div>
+          <div class="stat-label">排涝流量</div>
         </div>
       </div>
     </div>
@@ -519,6 +519,12 @@ function handleWaterStationClick(data) {
       font-weight: bold;
       color: #30dcff;
       text-shadow: 0 0 10px rgba(48, 220, 255, 0.5);
+      
+      .stat-unit {
+        font-size: 14px;
+        margin-left: 4px;
+        opacity: 0.8;
+      }
     }
     
     .stat-label {