Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

src/api/dike/index.js

@@ -123,6 +123,14 @@ export function updateDikeAnimalRecordData(data) {
   })
 }
 
+// 害堤动物防治--更改记录状态
+export function updateDikeAnimalRecordStatus(data) {
+  return request({
+    url: `/run/df/animal/record/status`,
+    method: 'put',
+    data
+  })
+}
 
 /**       水雨情            */
 // 水雨情--获取工程列表

src/api/management/sluice.js

@@ -45,7 +45,7 @@ export function deleteSZInspectionProject(id) {
 }
 
 // 巡查计划管理-巡查计划列表
-export function postSZInspectionPlanlist(data) {
+export function postSZInspectionPlanList(data) {
   return request({
     url: '/run/sz/plan/list',
     method: 'post',
@@ -215,4 +215,4 @@ export function deleteSZMaintenanceRecords(id) {
     url: `/run/sz/yh/record/${id}`,
     method: 'delete'
   })
-}
+}

src/views/dike/runManage/enginerring/inspectionItems/index.vue

@@ -340,7 +340,7 @@ export default {
       title="新增/编辑巡查项目"
       @close="closeDialog"
       :visible.sync="dialogVisible"
-      width="50%"
+      width="720"
     >
       <div style="display: flex; margin-bottom: 16px">
         <div

src/views/dike/runManage/enginerring/inspectionRecords/index.vue

@@ -106,7 +106,7 @@ export default {
         <el-table-column align="center" label="有无异常">
           <template slot-scope="scope">
             <div
-              v-if="scope.row.status != 0"
+              v-if="scope.row.status != '0'"
               style="display: flex; justify-content: center; flex-wrap: wrap"
             >
               <div v-if="scope.row.parts" class="normal">正常</div>
@@ -119,7 +119,7 @@ export default {
         <el-table-column prop="operatorName" align="center" label="巡查人员" />
         <el-table-column prop="status" align="center" label="状态">
           <template slot-scope="scope">
-            <span>{{ scope.row.status === 0 ? "检查中" : "已完成" }}</span>
+            <span>{{ scope.row.status == "0" ? "检查中" : "已完成" }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="address" align="center" label="操作">

src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@@ -90,7 +90,6 @@ export default {
     // 删除对应维修记录
     deleteTableItem(row) {
       deleteDFMaintenanceRecords(row.id).then((res) => {
-        console.log("🚀res🚀", res);
         this.getTableData();
         this.$message.success("删除成功");
       });
@@ -285,6 +284,7 @@ export default {
           minRepairCost: this.repairCostArr[0],
           maxRepairCost: this.repairCostArr[1],
           status: this.selectStatus,
+          dikeCode: this.$route.query.dikeCode,
         },
         cv: {
           name: "name",

src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue

@@ -295,6 +295,7 @@ export default {
           },
           status: this.paramsData.status,
           location: this.paramsData.location,
+          dikeCode: this.$route.query.dikeCode,
         },
         pageSize: this.pageData.pageSize,
         pageNum: this.pageData.pageNum,

src/views/dike/runManage/pestAnimalControl/planManagement/index.vue

@@ -289,6 +289,7 @@ export default {
           },
           name: this.paramsData.name,
           type: this.paramsData.type,
+          dikeCode: this.$route.query.dikeCode,
         },
         cv: {
           name: "name",
@@ -341,10 +342,8 @@ export default {
       });
     },
     handleChangeDike(value) {
-      console.log("value >>>>>  ", value);
       this.ruleForm.name = this.ruleForm.dikeCode;
       let res = this.embankmentList.find((v) => v.dikeCode === value);
-      console.log("res >>>>>  ", res);
       this.ruleForm.dikeName = res?.dikeName;
       // this.dikeDetailsDialog.id = res?.id || ''
     },

src/views/sluice/runManage/enginerring/inspectionPlan/index.vue

@@ -2,7 +2,7 @@
 <script>
 import {
   getDicts,
-  postSZInspectionPlanlist,
+  postSZInspectionPlanList,
   postSZInspectionPlan,
   putSZInspectionPlan,
   postSZInspectionProjectList,
@@ -115,7 +115,7 @@ export default {
           });
         }
         this.ruleForm = res.data;
-        this.ruleForm.type = res.data.type.toString();
+        this.ruleForm.type = res.data.type?.toString() || "";
         this.ruleForm.wagaCode = this.$route.query.wagaCode;
         if (res.data.cycleType) {
           this.ruleForm.cycleType = res.data.cycleType.toString();
@@ -238,11 +238,12 @@ export default {
     },
     // 获取数据
     getTableData(search) {
-      postSZInspectionPlanlist({
+      postSZInspectionPlanList({
         data: {
           timeView: {
             timeField: "create_time",
           },
+          wagaCode: this.$route.query.wagaCode,
         },
         cv: {
           name: "name",
@@ -289,7 +290,6 @@ export default {
     },
     // 上传前
     beforeAvatarUpload(e) {
-      console.log("beforeAvatarUpload >>>>>  ", e);
       let formData = new FormData();
       formData.append({
         file: e,
@@ -306,21 +306,25 @@ export default {
     handleChange(e) {
       console.log("handleChange >>>>>  ", e);
     },
+    // 获取巡查类型
+    getXcType(val) {
+      let type = "";
+      this.examType.forEach((element) => {
+        if (element.dictValue == val) {
+          type = element.dictLabel;
+        }
+      });
+      return type;
+    },
   },
   mounted() {
     // 获取列表数据
     this.getTableData();
     getDicts("xs_classfy").then((res) => {
-      if (res.data && Array.isArray(res.data)) {
+      this.examType = res.data || [];
-        res.data.forEach((element) => {
-          element.dictValue = element.dictValue;
-        });
-        this.examType = res.data;
-      }
     });
     getDicts("xs_cycle_type").then((res) => {
-      console.log("🚀res.data🚀", res.data);
+      this.patrolType = res.data || [];
-      this.patrolType = res.data;
     });
   },
 };
@@ -362,10 +366,7 @@ export default {
         <el-table-column prop="name" align="center" label="计划名称" />
         <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
-            <span v-if="examType.length > 0">{{
+            <span>{{ getXcType(scope.row.type) }}</span>
-              examType.find((item) => item.dictValue == scope.row.type)
-                .dictLabel || ""
-            }}</span>
           </template>
         </el-table-column>
         <el-table-column