From 32251add93495a71e8133fae17381e06f15bd11b Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 7 Mar 2024 10:22:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dike/index.js                         |  9 ++++
 .../enginerring/inspectionPlan/index.vue      | 47 +++++++++++-------
 .../enginerring/inspectionRecords/index.vue   | 13 ++++-
 .../enginerring/patrolManage/index.vue        | 11 ++++-
 .../maintenance/maintenanceRecords/index.vue  | 22 ++++++---
 .../planManagement/index.vue                  |  1 +
 .../enginerring/inspectionItems/index.vue     | 11 ++++-
 .../enginerring/inspectionPlan/index.vue      | 49 ++++++++++++-------
 .../enginerring/inspectionRecords/index.vue   | 11 ++++-
 .../enginerring/patrolManage/index.vue        | 11 ++++-
 vue.config.js                                 |  1 -
 11 files changed, 136 insertions(+), 50 deletions(-)

diff --git a/src/api/dike/index.js b/src/api/dike/index.js
index 5d0e2ce..39afee1 100644
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@@ -28,6 +28,15 @@ export function getDikeYhPlanList(data) {
   })
 }
 
+// 修改维养记录状态
+export function updateDikeYhRecordStatus(data) {
+  return request({
+    url: `/run/df/yh/record/status`,
+    method: 'put',
+    data
+  })
+}
+
 // 获取维修养护记录列表
 export function getDikeYhRecordList(data) {
   return request({
diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
index e7331d4..3afd165 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
@@ -81,6 +81,14 @@ export default {
     },
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 编辑巡查项目
     editTableItem(row) {
       getDFInspectionPlan(row.id).then((res) => {
@@ -309,28 +317,30 @@ export default {
       <div class="font-18 mb-12 font-700">
         {{ $route.query.dikeName }}-巡查计划
       </div>
-      <div class="top-search">
-        <span>计划名称：</span>
-        <el-input
-          class="search-input"
-          v-model="searchInput"
-          placeholder="请输入计划名称"
-        />
+      <div class="flex justify-between">
+        <div class="top-search">
+          <span>计划名称：</span>
+          <el-input
+            class="search-input"
+            v-model="searchInput"
+            placeholder="请输入计划名称"
+          />
+          <el-button
+            class="search-btn"
+            type="success"
+            @click="getTableData(searchInput)"
+            >搜索</el-button
+          >
+          <el-button @click="resetSearch()">重置</el-button>
+        </div>
         <el-button
           class="search-btn"
+          style="margin-right: 16px; margin-bottom: 8px; float: right"
           type="success"
-          @click="getTableData(searchInput)"
-          >搜索</el-button
+          @click="dialogVisible = true"
+          >添加</el-button
         >
-        <el-button @click="resetSearch()">重置</el-button>
       </div>
-      <el-button
-        class="search-btn"
-        style="margin-right: 16px; margin-bottom: 8px; float: right"
-        type="success"
-        @click="dialogVisible = true"
-        >添加</el-button
-      >
       <el-table height="625" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100" />
         <el-table-column prop="name" align="center" label="计划名称" />
@@ -399,7 +409,8 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
       >
       </el-pagination>
     </div>
diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
index 5f6d363..74d2703 100644
--- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
@@ -16,6 +16,14 @@ export default {
     };
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 路线设置
     routeSetting(row) {
       this.$router.push({
@@ -92,7 +100,7 @@ export default {
         >
         <el-button @click="resetSearch()">重置</el-button>
       </div>
-      <el-table class="table" height="665" :data="tableData" border>
+      <el-table class="table" height="635" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100" />
         <el-table-column prop="name" align="center" label="巡检记录" />
         <el-table-column align="center" label="有无异常">
@@ -130,7 +138,8 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
       >
       </el-pagination>
     </div>
diff --git a/src/views/dike/runManage/enginerring/patrolManage/index.vue b/src/views/dike/runManage/enginerring/patrolManage/index.vue
index ca60cff..63ebb64 100644
--- a/src/views/dike/runManage/enginerring/patrolManage/index.vue
+++ b/src/views/dike/runManage/enginerring/patrolManage/index.vue
@@ -76,7 +76,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>
@@ -242,6 +243,14 @@ export default {
     this.getTableData();
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取列表信息
     getTableData() {
       getDikeProjectList({
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index e5d34a0..2bbdb21 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 } from "@/api/dike";
+import { getDikeYhRecordList, updateDikeYhRecordStatus } from "@/api/dike";
 export default {
   name: "InspectionItems",
   data() {
@@ -53,7 +53,7 @@ export default {
         selectUser: [],
         implement: "",
         remark: "",
-        status: 0,
+        status: "0",
       },
       rules: {
         planId: [
@@ -133,8 +133,16 @@ export default {
         this.dialogVisible = true;
       });
     },
-    // 确认记录
-    confirmPlanDetails(row) {},
+    // 记录确认
+    confirmPlanDetails(row) {
+      updateDikeYhRecordStatus({
+        id: row.id,
+        status: "1",
+      }).then(() => {
+        this.getTableData();
+        this.$message.success("确认成功");
+      });
+    },
     resetForm() {
       this.$refs.ruleForm.resetFields();
       this.dialogVisible = false;
@@ -154,7 +162,7 @@ export default {
           console.log("🚀user🚀", user);
           this.ruleForm.operators = user;
           if (confirm) {
-            this.ruleForm.status = 1;
+            this.ruleForm.status = "1";
           }
           this.ruleForm.maintenanceFunds = Number(
             this.ruleForm.maintenanceFunds
@@ -321,6 +329,7 @@ export default {
                 class="w-360"
                 type="daterange"
                 range-separator="至"
+                value-format="yyyy-MM-dd 00:00:00"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
               >
@@ -331,6 +340,7 @@ export default {
                 type="daterange"
                 class="w-360"
                 range-separator="至"
+                value-format="yyyy-MM-dd 00:00:00"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
               ></el-date-picker>
@@ -669,7 +679,7 @@ export default {
           >保存</el-button
         >
         <el-button
-          v-if="this.ruleForm.status == 0 && prohibitEditing"
+          v-if="this.ruleForm.status == '0' && prohibitEditing"
           size="mini"
           type="primary"
           @click="submitForm('ruleForm', true)"
diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
index b6a7eff..2a9cbe5 100644
--- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
@@ -565,6 +565,7 @@ export default {
           <el-date-picker
             v-model="ruleForm.planTime"
             type="month"
+            value-format="yyyy-MM"
             placeholder="选择日期"
           >
           </el-date-picker>
diff --git a/src/views/sluice/runManage/enginerring/inspectionItems/index.vue b/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
index 94008fb..7afb02c 100644
--- a/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
@@ -47,6 +47,14 @@ export default {
     };
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 表格筛选
     searchTableList() {
       postSZInspectionProjectList({
@@ -316,7 +324,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/enginerring/inspectionPlan/index.vue b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
index 0e71b12..9db98ea 100644
--- a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
@@ -81,6 +81,14 @@ export default {
     },
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 编辑巡查项目
     editTableItem(row) {
       getSZInspectionPlan(row.id).then((res) => {
@@ -325,29 +333,31 @@ export default {
       <div class="font-18 mb-12 font-700">
         {{ $route.query.wagaName }}-巡查计划
       </div>
-      <div class="top-search">
-        <span>计划名称：</span>
-        <el-input
-          class="search-input"
-          v-model="searchInput"
-          placeholder="请输入计划名称"
-        />
+      <div class="flex justify-between">
+        <div class="top-search">
+          <span>计划名称：</span>
+          <el-input
+            class="search-input"
+            v-model="searchInput"
+            placeholder="请输入计划名称"
+          />
+          <el-button
+            class="search-btn"
+            type="success"
+            @click="getTableData(searchInput)"
+            >搜索</el-button
+          >
+          <el-button @click="resetSearch()">重置</el-button>
+        </div>
         <el-button
           class="search-btn"
+          style="margin-right: 16px; margin-bottom: 8px; float: right"
           type="success"
-          @click="getTableData(searchInput)"
-          >搜索</el-button
+          @click="dialogVisible = true"
+          >添加</el-button
         >
-        <el-button @click="resetSearch()">重置</el-button>
       </div>
-      <el-button
-        class="search-btn"
-        style="margin-right: 16px; margin-bottom: 8px; float: right"
-        type="success"
-        @click="dialogVisible = true"
-        >添加</el-button
-      >
-      <el-table height="575" :data="tableData" border>
+      <el-table height="625" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100" />
         <el-table-column prop="name" align="center" label="计划名称" />
         <el-table-column align="center" label="巡查类型">
@@ -415,7 +425,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/enginerring/inspectionRecords/index.vue b/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue
index 4795aae..35bb670 100644
--- a/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue
@@ -16,6 +16,14 @@ export default {
     };
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 路线设置
     routeSetting(row) {
       this.$router.push({
@@ -118,7 +126,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/enginerring/patrolManage/index.vue b/src/views/sluice/runManage/enginerring/patrolManage/index.vue
index ffa1fe7..adec1f5 100644
--- a/src/views/sluice/runManage/enginerring/patrolManage/index.vue
+++ b/src/views/sluice/runManage/enginerring/patrolManage/index.vue
@@ -76,7 +76,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>
@@ -242,6 +243,14 @@ export default {
     this.getTableData();
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取列表信息
     getTableData() {
       getSluiceProjectList({
diff --git a/vue.config.js b/vue.config.js
index b5a3c6e..1d9291d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,6 @@ module.exports = {
     port: 80,
     open: true,
     proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
       // [process.env.VUE_APP_BASE_API + '/run/sz/superviseWay']: {
       //   target: "http://172.16.34.27:18082",
       //   changeOrigin: true,