fix：增加巡检任务查询条件

src/api/xj/disease.js

@@ -142,3 +142,12 @@ export function getDetailsBySnapShotId(snapShotId) {
     params: { snapShotId },
   });
 }
+
+// 巡检任务下拉接口
+export function getTaskList(params) {
+  return request({
+    url: "/xj/xjtask/taskDropDown",
+    method: "get",
+    params,
+  });
+}

src/api/xj/road.js

@@ -76,3 +76,12 @@ export function detailRoad(id) {
     method: "get",
   });
 }
+
+// 巡检任务下拉接口
+export function getTaskList(params) {
+  return request({
+    url: "/xj/xjtask/taskDropDown",
+    method: "get",
+    params,
+  });
+}

src/views/xj/inspection/disease-management/index.vue

@@ -156,6 +156,21 @@
           clearable
         />
       </el-form-item>
+      <el-form-item label="巡检任务" prop="taskId">
+        <el-select
+          v-model="queryParams.taskId"
+          placeholder="请选择巡检任务"
+          filterable
+          clearable
+        >
+          <el-option
+            v-for="item in taskList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -658,7 +673,6 @@ import {
   delDefect,
   addDefect,
   updateDefect,
-  getDefectTypes,
   getSegment,
   getDefectList,
   getStatesList,
@@ -667,6 +681,7 @@ import {
   splitDefect,
   getDefectById,
   getDetailsBySnapShotId,
+  getTaskList,
 } from "@/api/xj/disease";
 import { getToken } from "@/utils/auth";
 import MergeDialog from "./components/merge-dialog.vue";
@@ -726,9 +741,12 @@ export default {
         maxArea: undefined,
         id: "",
         snapshotId: "",
+        taskId: "",
       },
       // 日期范围
       dateTime: [],
+      // 巡检任务下拉数据
+      taskList: [],
       // 病害类型级联下拉绑定
       paramsDefectType: [],
       // 新增/编辑表单参数
@@ -806,8 +824,6 @@ export default {
           { required: true, message: "请选择上下行", trigger: "change" },
         ],
       },
-      // 病害类型级联下拉选项
-      defectTypeOptions: [],
       // 路段下拉选项
       segmentList: [],
       // 列表病害状态数据
@@ -839,11 +855,11 @@ export default {
   },
   created() {
     this.getList();
-    this.getdefectTypes();
     this.getSegmentList();
     this.getTableDefect();
     this.getStates();
     this.getDefectStatusList();
+    this.getTaskSelectList();
   },
   methods: {
     /**
@@ -887,23 +903,6 @@ export default {
       }
     },
 
-    /**
-     * @description: 获取病害类型下拉数据
-     * @param {*} val
-     * @return {*}
-     */
-    getdefectTypes() {
-      getDefectTypes().then((response) => {
-        this.defectTypeOptions = JSON.parse(response.msg).map((item) => {
-          return {
-            label: item.label,
-            value: item.value,
-            children: item.childrens,
-          };
-        });
-      });
-    },
-
     /**
      * @description: 查询校验状态下拉数据
      * @param {*} val
@@ -930,6 +929,19 @@ export default {
       });
     },
 
+    /**
+     * @description: 查询巡检任务下拉数据
+     * @param {*} val
+     * @return {*}
+     */
+    getTaskSelectList() {
+      getTaskList().then(({ code, data }) => {
+        if (code === 200) {
+          this.taskList = data;
+        }
+      });
+    },
+
     /**
      * @description: 查询缺陷列表
      * @param {*} val
@@ -1013,6 +1025,7 @@ export default {
         maxArea: undefined,
         id: "",
         snapshotId: "",
+        taskId: "",
       };
       this.paramsDefectType = [];
       this.dateTime = [];

src/views/xj/inspection/road-management/index.vue

@@ -103,14 +103,15 @@
           <i class="el-icon-info"></i>
         </el-tooltip>
       </el-form-item>
-      <el-form-item label="巡检任务" prop="defectType3">
+      <el-form-item label="巡检任务" prop="taskId">
         <el-select
-          v-model="queryParams.defectType3"
+          v-model="queryParams.taskId"
           placeholder="请选择巡检任务"
+          filterable
           clearable
         >
           <el-option
-            v-for="item in tableDefect"
+            v-for="item in taskList"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -247,7 +248,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="巡检任务" align="center" prop="stakeEnd" />
+      <el-table-column label="巡检任务" align="center" prop="taskId" />
       <!-- <el-table-column label="校验状态" align="center" prop="datastatus">
         <template slot-scope="scope">
           <span>{{ scope.row.datastatus === "1" ? "未校验" : "已校验" }}</span>
@@ -324,7 +325,6 @@
         :dialogItem="dialogItem"
         :segmentList="segmentList"
         :roadType="roadType"
-        :tableDefect="tableDefect"
         :defectStatus="defectStatus"
       ></road-add>
     </el-dialog>
@@ -381,6 +381,7 @@ import {
   getDefectStatus,
   deleteRoad,
   changeRoad,
+  getTaskList,
 } from "@/api/xj/road";
 import RoadAdd from "./components/road-add.vue";
 import RoadView from "./components/road-view.vue";
@@ -398,7 +399,7 @@ export default {
         // 校验状态
         dataStatus: "",
         // 巡检任务
-        defectType3: "",
+        taskId: "",
         // 公里桩
         stakeStart: "",
         stakeEnd: "",
@@ -426,7 +427,8 @@ export default {
       ],
       // 列表数据绑定
       roadList: [],
-      tableDefect: [],
+      // 巡检任务下拉数据
+      taskList: [],
       // 列表加载状态
       loading: false,
       // 列表已选数组
@@ -463,6 +465,7 @@ export default {
     this.getSegmentList();
     this.getRoadTypeList();
     this.getDefectStatusList();
+    this.getTaskSelectList();
   },
   methods: {
     /* 获取道路名称下拉数据 */
@@ -492,6 +495,15 @@ export default {
       });
     },
 
+    /* 获取巡检任务下拉数据 */
+    getTaskSelectList() {
+      getTaskList().then(({ data, code }) => {
+        if (code === 200) {
+          this.taskList = data;
+        }
+      });
+    },
+
     /* 点击搜索事件 */
     handleQuery() {
       const phonereg = /^K\d{4}\+\d{3}$/;
@@ -526,7 +538,7 @@ export default {
         equipmentType: "",
         dataStatus: "",
         inspectDirection: "",
-        defectType3: "",
+        taskId: "",
         stakeStart: "",
         stakeEnd: "",
         state: "",

src/views/xj/inspection/task-management/index.vue

@@ -101,13 +101,10 @@
         align="center"
         class-name="small-padding fixed-width"
       >
-        <template slot-scope="scope">
+        <!-- slot-scope="scope" -->
-          <el-button
+        <template>
-            size="mini"
+          <el-button size="mini" type="text" icon="el-icon-s-flag">
-            type="text"
+            <!-- @click="viewDefect(scope.row)" -->
-            icon="el-icon-s-flag"
-            @click="viewDefect(scope.row)"
-          >
           </el-button>
         </template>
       </el-table-column>