Merge branch 'release-sy-v1.0.0' into 'dev'

fix: 修改动物防治接口和字典匹配

See merge request project/water/shuili-vue!17

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

@@ -25,40 +25,7 @@ export default {
       prohibitEditing: false,
       planList: [], //计划列表
       personnelList: [], // 人员列表
-      embankmentList: [
+      controlType: [],
-        {
-          label: "堤防1",
-          value: "1",
-          id: "1",
-        },
-        {
-          label: "堤防2",
-          value: "2",
-          id: "2",
-        },
-        {
-          label: "堤防3",
-          value: "3",
-          id: "3",
-        },
-      ], // 堤防名称列表
-      controlType: [
-        {
-          id: 1,
-          label: "普查",
-          value: 0,
-        },
-        {
-          id: 2,
-          label: "防治",
-          value: 1,
-        },
-        {
-          id: 3,
-          label: "治理",
-          value: 2,
-        },
-      ],
       tableData: [], // 检查列表
       workTable: [
         {
@@ -325,6 +292,9 @@ export default {
     },
   },
   mounted() {
+    this.getDicts("dh_jh_type").then((res) => {
+      this.controlType = res.data;
+    });
     // 获取列表数据
     this.getTableData();
   },
@@ -359,8 +329,8 @@ export default {
           <el-option label="全部" :value="3" />
           <el-option
             v-for="item in controlType"
-            :label="item.label"
+            :label="item.dictLabel"
-            :value="item.value"
+            :value="item.dictValue"
             :key="item.id"
           />
         </el-select>
@@ -525,9 +495,9 @@ export default {
             >
               <el-option
                 v-for="item in controlType"
+                :label="item.dictLabel"
+                :value="item.dictValue"
                 :key="item.id"
-                :label="item.label"
-                :value="item.value"
               >
               </el-option>
             </el-select>

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

@@ -14,12 +14,15 @@ export default {
   name: "InspectionItems",
   data() {
     return {
-      searchInput: "",
+      paramsData: {
-      controlInput: "",
+        name: "",
-      selectLevel: "",
+        dikeName: "",
-      selectType: "",
+        selectLevel: "",
+        selectType: "",
+      },
       dialogVisible: false,
       prohibitEditing: false,
+      dikeTypeList: [],
       personnelList: [], // 人员列表
       patrolType: [], // 提醒周期类型
       workMonth: [], // 工作月份
@@ -97,6 +100,27 @@ export default {
     },
   },
   methods: {
+    // 获取堤防等级
+    resolveDikeGrad(dikeGrad) {
+      return (
+        this.dikeLevel.find((v) => v.dictValue === dikeGrad)?.dictLabel ||
+        dikeGrad
+      );
+    },
+    // 获取堤防类型
+    resolveDikeType(dikeType) {
+      return (
+        this.dikeTypeList.find((v) => v.dictValue == dikeType)?.dictLabel ||
+        dikeType
+      );
+    },
+    // 获取防治类型
+    resolveType(type) {
+      console.log("type >>>>>  ", type);
+      return (
+        this.controlType.find((v) => v.dictValue == type)?.dictLabel || type
+      );
+    },
     // 打开新增弹窗
     openAddDialog() {
       // 获取字典数据
@@ -217,7 +241,6 @@ export default {
     },
     // 关闭dialog
     closeDialog(ruleForm = "ruleForm") {
-      console.log("触发关闭dialog", ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
         dikeCode: "",
@@ -249,11 +272,16 @@ export default {
           timeView: {
             timeField: "create_time",
           },
+          name: this.paramsData.name,
+          type: this.paramsData.type,
+          dikeName: this.paramsData.dikeName,
+          dikeGrad: this.paramsData.dikeGrad,
+          dikeType: this.paramsData.dikeType,
         },
         cv: {
           name: "name",
           type: "like",
-          value: this.searchInput,
+          value: this.name,
         },
         params: {
           orderBy: "create_time",
@@ -270,7 +298,7 @@ export default {
     },
     // 重置搜索
     resetSearch() {
-      this.searchInput = "";
+      this.name = "";
       this.selectStatus = "2";
       this.getTableData();
     },
@@ -306,6 +334,11 @@ export default {
       // this.dikeDetailsDialog.id = res?.id || ''
     },
   },
+  created() {
+    this.getDicts("embankment_type").then((response) => {
+      this.dikeTypeList = response.data;
+    });
+  },
   mounted() {
     // 获取列表数据
     this.getTableData();
@@ -328,17 +361,17 @@ export default {
         <span>防治计划名称：</span>
         <el-input
           class="search-input"
-          v-model="searchInput"
+          v-model="paramsData.name"
           placeholder="请输入"
         />
         <span>防治堤防：</span>
         <el-input
           class="search-input"
-          v-model="controlInput"
+          v-model="paramsData.dikeName"
           placeholder="请输入"
         />
         <span>堤防级别：</span>
-        <el-select v-model="selectLevel" placeholder="请选择">
+        <el-select v-model="paramsData.dikeGrad" placeholder="请选择">
           <el-option label="全部" value="0" />
           <el-option
             v-for="item in dikeLevel"
@@ -348,7 +381,7 @@ export default {
           />
         </el-select>
         <span style="margin-left: 10px">防治类型：</span>
-        <el-select v-model="selectType" placeholder="请选择">
+        <el-select v-model="paramsData.type" placeholder="请选择">
           <el-option label="全部" value="3" />
           <el-option
             v-for="item in controlType"
@@ -373,9 +406,19 @@ export default {
         <el-table-column type="index" align="center" label="序号" width="100" />
         <el-table-column prop="name" align="center" label="防治计划名称" />
         <el-table-column prop="dikeCode" align="center" label="堤防名称" />
-        <el-table-column prop="location" align="center" label="堤防级别" />
+        <el-table-column prop="dikeGrad" align="center" label="堤防级别">
-        <el-table-column prop="content" align="center" label="堤防类型" />
+          <template #default="{ row }">
-        <el-table-column prop="type" align="center" label="防治类型" />
+            {{ resolveDikeGrad(row.dikeGrad) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="dikeType" align="center" label="堤防类型">
+          <template #default="{ row }">{{
+            resolveDikeType(row.dikeType)
+          }}</template>
+        </el-table-column>
+        <el-table-column prop="type" align="center" label="防治类型">
+          <template #default="{ row }">{{ resolveType(row.type) }}</template>
+        </el-table-column>
         <el-table-column
           prop="createTime"
           align="center"