yangyuxuan 1 month ago
parent
commit
514bea542c

+ 1 - 1
src/views/disasterRiskMonitor/easyToFloodPoint.vue

@@ -113,7 +113,7 @@ const getTableRowClass = ({ rowIndex }) => {
 
 <style scoped lang="scss">
 .container {
-  height: calc(100vh);
+  height: calc(100vh - 55px);
   padding: 16px;
   .card {
     background-color: #ffffff;

+ 3 - 9
src/views/disasterRiskMonitor/rainfall.vue

@@ -13,7 +13,7 @@
               ? 'box-tag tag-active'
               : 'box-tag'
           "
-          @click="handleClickMenu('1', item.value)"
+          @click="handleClickMenu(1, item.value)"
         >
           {{ item.text }}
         </div>
@@ -29,7 +29,7 @@
               ? 'box-tag tag-active'
               : 'box-tag'
           "
-          @click="handleClickMenu2('2', item.value)"
+          @click="handleClickMenu2(2, item.value)"
         >
           {{ item.text }}
         </div>
@@ -154,13 +154,7 @@ const levelColumns = ref([
   { text: "电白", value: "2" },
   { text: "高州", value: "3" }
 ]);
-// const levelColumns = ref([
-//   { text: "全部", value: "" },
-//   ...(district_type.value?.map(item => ({
-//     text: item.dictLabel,
-//     value: item.dictValue
-//   })) || [])
-// ]);
+
 let showLevelPicker = ref(false);
 const onSelectLevelConfirm = ({ selectedOptions }) => {
   showLevelPicker.value = false;

+ 14 - 6
src/views/disasterRiskMonitor/windAndFloodPrevention.vue

@@ -75,9 +75,9 @@
         <div class="card-item">
           <i class="icon1" />
           <div class="flex">
-            <div class="text1">漫坝</div>
+            <div class="text1">{{ reservoirStatus[0].type }}</div>
             <div class="text2 text-red">
-              11
+              {{ reservoirStatus[0].value }}
               <div class="text3">个</div>
             </div>
           </div>
@@ -85,9 +85,9 @@
         <div class="card-item2">
           <i class="icon2" />
           <div class="flex">
-            <div class="text1">超保证</div>
+            <div class="text1">{{ reservoirStatus[1].type }}</div>
             <div class="text2 text-orange">
-              40
+              {{ reservoirStatus[1].value }}
               <div class="text3">个</div>
             </div>
           </div>
@@ -95,9 +95,9 @@
         <div class="card-item3">
           <i class="icon3" />
           <div class="flex">
-            <div class="text1">超警戒</div>
+            <div class="text1">{{ reservoirStatus[2].type }}</div>
             <div class="text2 text-blue">
-              37
+              {{ reservoirStatus[2].value }}
               <div class="text3">个</div>
             </div>
           </div>
@@ -206,6 +206,7 @@ import { chartOption2 } from "./chartOptions";
 import { getEasyFlood } from "@/api/disasterRiskMonitor/easyFlood";
 import router from "@/router";
 import { getRiverStatus } from "@/api/disasterRiskMonitor/riverInform";
+import { getReservoirWaterStatus } from "@/api/globalMap/reservoirMonitor";
 
 let tabs = reactive([
   { name: "6h降水", value: "6h_precipitation" },
@@ -219,6 +220,7 @@ let tabs = reactive([
 let tabActive = ref("hourly_temperature");
 
 const riverStatus = ref();
+const reservoirStatus = ref();
 const liveMapState = reactive({
   show: false,
   activeIndex: 0,
@@ -320,6 +322,12 @@ const getRiverDetail = () => {
   });
 };
 getRiverDetail();
+const getReservoirStatus = () => {
+  getReservoirWaterStatus().then(res => {
+    reservoirStatus.value = res.rows;
+  });
+};
+getReservoirStatus();
 watch(
   () => liveMapState.show,
   () => {