Merge remote-tracking branch 'origin/master'

src/views/disasterRiskMonitor/easyToFloodPoint.vue

@@ -21,7 +21,11 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="易涝点名称" prop="flood_name" align="center" />
+          <el-table-column
+            label="易涝点名称"
+            prop="flood_name"
+            align="center"
+          />
           <el-table-column label="提供单位" prop="unit" align="center" />
           <el-table-column label="视频" prop="publicTime" align="center">
             <template #default="scope">
@@ -29,6 +33,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-show="total > 0"
+          v-model:page="queryParams.current"
+          v-model:limit="queryParams.size"
+          :total="total"
+          :pager-count="3"
+          size="small"
+          layout="prev, pager, next"
+          @pagination="getTableDetail"
+        />
       </div>
     </div>
   </div>
@@ -38,13 +52,14 @@
 import { ElTable, ElTableColumn } from "element-plus";
 import { onMounted, reactive, ref } from "vue";
 import router from "@/router";
-import {getEasyFlood} from "@/api/disasterRiskMonitor/easyFlood";
+import { getEasyFlood } from "@/api/disasterRiskMonitor/easyFlood";
 
 let detailsData = ref({
   dataList: []
 });
 let showPicker = ref(false);
 let labelData = ref("");
+let total = ref(0);
 const liveMapState = reactive({
   show: false,
   activeIndex: 0,
@@ -56,7 +71,9 @@ const queryParams = ref({
   query: {
     area: "",
     keyword: ""
-  }
+  },
+  current: 1,
+  size: 10
 });
 const initData = () => {
   getTableDetail();
@@ -83,6 +100,7 @@ const handlePlay = row => {
 const getTableDetail = () => {
   getEasyFlood(queryParams.value).then(res => {
     detailsData.value.dataList = res.rows;
+    total.value = res.total;
   });
 };
 onMounted(() => {

src/views/disasterRiskMonitor/riverMonitor.vue

@@ -66,8 +66,8 @@
       <el-table-column label="站点" prop="address" align="center" />
       <el-table-column label="河流" prop="name" align="center" />
       <el-table-column label="时间" prop="data3" align="center" />
-      <el-table-column label="水位(m)" prop="data4" align="center" />
-      <el-table-column label="超警戒(m)" prop="data5" align="center" sortable />
+      <el-table-column label="水位(m)" prop="warningLevel" align="center" />
+      <el-table-column label="超警戒(m)" prop="waterDiff" align="center" sortable />
     </el-table>
   </div>
 </template>

src/views/disasterRiskMonitor/windAndFloodPrevention.vue

@@ -176,6 +176,16 @@
           </el-table-column>
         </el-table>
       </div>
+      <pagination
+        v-show="total > 0"
+        v-model:page="queryParams2.current"
+        v-model:limit="queryParams2.size"
+        :total="total"
+        :pager-count="3"
+        size="small"
+        layout="prev, pager, next"
+        @pagination="getTableDetail"
+      />
     </div>
     <van-popup v-model:show="showPicker" round position="bottom">
       <van-picker
@@ -286,6 +296,7 @@ let detailsData = ref({
 });
 let showPicker = ref(false);
 let labelData = ref("");
+let total = ref(0);
 const columns = ref([
   { text: "所有区县", value: "" },
   { text: "茂南区", value: "1" },
@@ -298,7 +309,9 @@ const queryParams2 = ref({
   query: {
     area: "",
     keyword: ""
-  }
+  },
+  current: 1,
+  size: 10
 });
 const option1 = ref(chartOption2);
 const getRiverDetail = () => {
@@ -435,6 +448,7 @@ const initData = () => {
 const getTableDetail = () => {
   getEasyFlood(queryParams2.value).then(res => {
     detailsData.value.dataList = res.rows;
+    total.value = res.total;
   });
 };
 // table样式