From 79905566201c9e91df5e43231312f8d730917c25 Mon Sep 17 00:00:00 2001
From: chenhaojie <chenhaojie@datametatech.com>
Date: Thu, 7 Mar 2024 10:35:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aiSupervision/fourPredictions/index.vue   |   4 +-
 src/views/aiSupervision/layerManage/index.vue |   4 +-
 .../aiSupervision/waterSetting/index.vue      |   4 +-
 vue.config.js                                 | 118 +++++++++---------
 4 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/src/views/aiSupervision/fourPredictions/index.vue b/src/views/aiSupervision/fourPredictions/index.vue
index dca0b09..6b17223 100644
--- a/src/views/aiSupervision/fourPredictions/index.vue
+++ b/src/views/aiSupervision/fourPredictions/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <Layout>
-    <router-view />
-  </Layout>
+  <Layout> </Layout>
 </template>
 
 <script>
diff --git a/src/views/aiSupervision/layerManage/index.vue b/src/views/aiSupervision/layerManage/index.vue
index dca0b09..6b17223 100644
--- a/src/views/aiSupervision/layerManage/index.vue
+++ b/src/views/aiSupervision/layerManage/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <Layout>
-    <router-view />
-  </Layout>
+  <Layout> </Layout>
 </template>
 
 <script>
diff --git a/src/views/aiSupervision/waterSetting/index.vue b/src/views/aiSupervision/waterSetting/index.vue
index dca0b09..6b17223 100644
--- a/src/views/aiSupervision/waterSetting/index.vue
+++ b/src/views/aiSupervision/waterSetting/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <Layout>
-    <router-view />
-  </Layout>
+  <Layout> </Layout>
 </template>
 
 <script>
diff --git a/vue.config.js b/vue.config.js
index b5a3c6e..cc2cc7a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,15 +1,15 @@
-'use strict'
-const path = require('path')
-const defaultSettings = require('./src/settings.js')
+'use strict';
+const path = require('path');
+const defaultSettings = require('./src/settings.js');
 // const httpConfig = require('./public/config')
-const webpack = require("webpack")
+const webpack = require('webpack');
 function resolve(dir) {
-  return path.join(__dirname, dir)
+  return path.join(__dirname, dir);
 }
 
-const name = defaultSettings.title || '广东省水工程运行管理系统' // 标题
+const name = defaultSettings.title || '广东省水工程运行管理系统'; // 标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -45,7 +45,7 @@ module.exports = {
       //   }
       // },
       [process.env.VUE_APP_BASE_API]: {
-        target: "http://shuili-admin.product.dev.com:30115",
+        target: 'http://shuili-admin.product.dev.com:30115',
         // target: "http://127.0.0.1:18082",
         changeOrigin: true,
         pathRewrite: {
@@ -62,25 +62,23 @@ module.exports = {
         '@': resolve('src')
       }
     },
+    devtool: 'source-map',
     plugins: [
       new webpack.ProvidePlugin({
-        $: "jquery",
-        jQuery: "jquery",
-        "window.jQuery": "jquery",
-        "window.$": "jquery",
-        Popper: ["popper.js", "default"]
+        $: 'jquery',
+        jQuery: 'jquery',
+        'window.jQuery': 'jquery',
+        'window.$': 'jquery',
+        Popper: ['popper.js', 'default']
       })
     ]
   },
   chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
+    config.plugins.delete('preload'); // TODO: need test
+    config.plugins.delete('prefetch'); // TODO: need test
 
     // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
+    config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end();
     config.module
       .rule('icons')
       .test(/\.svg$/)
@@ -91,49 +89,47 @@ module.exports = {
       .options({
         symbolId: 'icon-[name]'
       })
-      .end()
+      .end();
 
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single'),
+    config.when(process.env.NODE_ENV !== 'development', (config) => {
+      config
+        .plugin('ScriptExtHtmlWebpackPlugin')
+        .after('html')
+        .use('script-ext-html-webpack-plugin', [
           {
-            from: path.resolve(__dirname, './public/robots.txt'),//防爬虫文件
-            to: './',//到根目录下
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/
+          }
+        ])
+        .end();
+      config.optimization.splitChunks({
+        chunks: 'all',
+        cacheGroups: {
+          libs: {
+            name: 'chunk-libs',
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: 'initial' // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: 'chunk-elementUI', // split elementUI into a single package
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+          },
+          commons: {
+            name: 'chunk-commons',
+            test: resolve('src/components'), // can customize your rules
+            minChunks: 3, //  minimum common number
+            priority: 5,
+            reuseExistingChunk: true
           }
         }
-      )
+      });
+      config.optimization.runtimeChunk('single'),
+        {
+          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+          to: './' //到根目录下
+        };
+    });
   }
-}
+};

From e2f1a3b67b59a626ebad98261772302751d351b6 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 7 Mar 2024 10:39:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dike/index.js                         |  2 +-
 src/api/sluice/index.js                       |  9 ++++++
 .../enginerring/patrolRouteSettings/index.vue | 32 +++++++++----------
 .../maintenance/maintenanceManage/index.vue   | 11 ++++++-
 .../maintenance/maintenancePlan/index.vue     | 11 ++++++-
 .../maintenance/maintenanceRecords/index.vue  | 15 +++++++--
 .../pestAnimalControl/controlManage/index.vue | 11 ++++++-
 .../governanceRecords/index.vue               | 11 ++++++-
 .../planManagement/index.vue                  | 11 ++++++-
 .../methodsManage/index.vue                   | 11 ++++++-
 .../maintenance/maintenanceRecords/index.vue  | 11 ++++++-
 11 files changed, 108 insertions(+), 27 deletions(-)

diff --git a/src/api/dike/index.js b/src/api/dike/index.js
index 39afee1..ff393ab 100644
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@@ -29,7 +29,7 @@ export function getDikeYhPlanList(data) {
 }
 
 // 修改维养记录状态
-export function updateDikeYhRecordStatus(data) {
+export function updateYhRecordStatus(data) {
   return request({
     url: `/run/df/yh/record/status`,
     method: 'put',
diff --git a/src/api/sluice/index.js b/src/api/sluice/index.js
index 9aa8d4a..1f4744c 100644
--- a/src/api/sluice/index.js
+++ b/src/api/sluice/index.js
@@ -104,6 +104,15 @@ export function getSluiceYhRecordDetails(id) {
   })
 }
 
+// 修改维养记录状态
+export function updateYhRecordStatus(data) {
+  return request({
+    url: `/run/sz/yh/record/status`,
+    method: 'put',
+    data
+  })
+}
+
 // 巡查记录-巡查记录详情
 export function getSluicePatrolDetails(id) {
   return request({
diff --git a/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue b/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue
index 6546c5e..30dc2ea 100644
--- a/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue
+++ b/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue
@@ -1,31 +1,31 @@
 <!-- 巡查路线设置-堤防 -->
 <script>
-import GaoDeMap from "../components/GaoDeMap.vue"
+import GaoDeMap from "../components/GaoDeMap.vue";
 export default {
-  name: '',
+  name: "",
   components: {
-    GaoDeMap
+    GaoDeMap,
   },
   data() {
     return {
-      selectTab: 'first'
-    }
-  },
-  methods: {
-
+      selectTab: "first",
+    };
   },
-  created(){
-    
-  }
-}
+  methods: {},
+  created() {},
+};
 </script>
 
 <template>
   <div class="slider-right">
     <div class="top-title">
-      <el-button class="back-btn" size="mini" @click="
-        $router.go(-1);" icon="el-icon-back" />
-      {{ $route.query.name || '基础信息管理' }}
+      <el-button
+        class="back-btn"
+        size="mini"
+        @click="$router.go(-1)"
+        icon="el-icon-back"
+      />
+      {{ $route.query.name || "基础信息管理" }}
     </div>
     <div class="map-box">
       <el-tabs v-model="selectTab" class="tab">
@@ -85,4 +85,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/dike/runManage/maintenance/maintenanceManage/index.vue b/src/views/dike/runManage/maintenance/maintenanceManage/index.vue
index 455faed..d4907f9 100644
--- a/src/views/dike/runManage/maintenance/maintenanceManage/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceManage/index.vue
@@ -77,7 +77,8 @@
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
@@ -136,6 +137,14 @@ export default {
     this.getTableData();
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取列表信息
     getTableData() {
       getDikeYhProjectList({
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index 290c6fb..63fbe7d 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -108,6 +108,14 @@ export default {
     },
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 删除对应维修计划
     deleteTableItem(row) {
       deleteDFMaintenancePlan(row.id).then((res) => {
@@ -375,7 +383,8 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index 2bbdb21..93d78d5 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@@ -11,7 +11,7 @@ import {
   listUser,
 } from "@/api/management";
 
-import { getDikeYhRecordList, updateDikeYhRecordStatus } from "@/api/dike";
+import { getDikeYhRecordList, updateYhRecordStatus } from "@/api/dike";
 export default {
   name: "InspectionItems",
   data() {
@@ -79,6 +79,14 @@ export default {
     },
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 删除对应维修记录
     deleteTableItem(row) {
       deleteDFMaintenanceRecords(row.id).then((res) => {
@@ -135,7 +143,7 @@ export default {
     },
     // 记录确认
     confirmPlanDetails(row) {
-      updateDikeYhRecordStatus({
+      updateYhRecordStatus({
         id: row.id,
         status: "1",
       }).then(() => {
@@ -470,7 +478,8 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
diff --git a/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue b/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue
index 2dff497..aab2a3a 100644
--- a/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue
@@ -70,7 +70,8 @@
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
@@ -232,6 +233,14 @@ export default {
     this.getTableData();
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取列表信息
     getTableData() {
       getDikeAnimalProList({
diff --git a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
index 6acce24..d70b316 100644
--- a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
@@ -114,6 +114,14 @@ export default {
     },
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 删除对应防治计划
     deleteTableItem(row) {
       deleteDikeAnimalRecordDetails(row.id).then(() => {
@@ -484,7 +492,8 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
index 2a9cbe5..e34871d 100644
--- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
@@ -101,6 +101,14 @@ export default {
     },
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取堤防等级
     resolveDikeGrad(dikeGrad) {
       return (
@@ -456,7 +464,8 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
diff --git a/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue b/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue
index 3d341d4..b3b922d 100644
--- a/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue
+++ b/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue
@@ -102,6 +102,14 @@ export default {
     },
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取堤防等级
     resolveDikeGrad(dikeGrad) {
       return (
@@ -295,7 +303,8 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index f8d6e03..faf2c18 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -10,6 +10,7 @@ import {
   putSluiceYhRecord,
   deleteSluiceYhRecord,
   getSluiceYhPlanDetails,
+  updateYhRecordStatus,
 } from "@/api/sluice";
 export default {
   name: "maintenanceRecords",
@@ -132,7 +133,15 @@ export default {
       });
     },
     // 确认记录
-    confirmPlanDetails(row) {},
+    confirmPlanDetails(row) {
+      updateYhRecordStatus({
+        id: row.id,
+        status: "1",
+      }).then(() => {
+        this.getTableData();
+        this.$message.success("确认成功");
+      });
+    },
     resetForm() {
       this.$refs.ruleForm.resetFields();
       this.dialogVisible = false;

From 0966b70c33fe550ff956d69f2cf969f06f8b8f3d Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 7 Mar 2024 10:41:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=AD=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runManage/maintenance/maintenanceManage/index.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/views/dike/runManage/maintenance/maintenanceManage/index.vue b/src/views/dike/runManage/maintenance/maintenanceManage/index.vue
index d4907f9..2777f12 100644
--- a/src/views/dike/runManage/maintenance/maintenanceManage/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceManage/index.vue
@@ -113,16 +113,7 @@ export default {
           value: "",
         },
       ], // 堤防类型列表
-      tableData: [
-        {
-          id: 1,
-          dikeName: "北江大堤",
-          dikeCode: "BHA100000001",
-          engineeringManagementUnit: "北江流域局",
-          waterAdministrativeDepartment: "北江流域局",
-          updateTime: "2023-9-5 10:00:00",
-        },
-      ],
+      tableData: [],
     };
   },
   created() {