Merge branch 'release-sy-v1.0.0'

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

@@ -321,6 +321,9 @@ export default {
       if (this.formData.id) {
         putInspectionProjectData(this.formData).then((res) => {
           this.$message.success("保存成功");
+          setTimeout(() => {
+            this.$router.go(-1);
+          }, 500);
         });
       } else {
         postInspectionProjectData(this.formData).then((res) => {
@@ -328,6 +331,9 @@ export default {
             this.formData.id = res.data.id;
           }
           this.$message.success("保存成功");
+          setTimeout(() => {
+            this.$router.go(-1);
+          }, 500);
         });
       }
     },

src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue

@@ -565,28 +565,37 @@ export default {
           ...this.$refs.subFormRef.map((item) => item.validate()),
         ])
           .then((res) => {
-            this.formData.contents.forEach((item) => {
-              item.startDate = item.planDateTimeArr[0]
-                ? item.planDateTimeArr[0] + " 00:00:00"
-                : "";
-              item.endDate = item.planDateTimeArr[1]
-                ? item.planDateTimeArr[1] + " 23:59:59"
-                : "";
-            });
-            (this.id ? putProjectCheckingPlan : postProjectCheckingPlan)({
-              id: this.id || null,
-              ...this.formData,
+            // 二次确认
+            this.$confirm("确认提交吗？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
             })
-              .then((res) => {
-                this.$message.success("提交成功");
-                if (reset) {
-                  this.reset();
-                }
-                r();
+              .then(() => {
+                this.formData.contents.forEach((item) => {
+                  item.startDate = item.planDateTimeArr[0]
+                    ? item.planDateTimeArr[0] + " 00:00:00"
+                    : "";
+                  item.endDate = item.planDateTimeArr[1]
+                    ? item.planDateTimeArr[1] + " 23:59:59"
+                    : "";
+                });
+                (this.id ? putProjectCheckingPlan : postProjectCheckingPlan)({
+                  id: this.id || null,
+                  ...this.formData,
+                })
+                  .then((res) => {
+                    this.$message.success("提交成功");
+                    if (reset) {
+                      this.reset();
+                    }
+                    r();
+                  })
+                  .catch(() => {
+                    j();
+                  });
               })
-              .catch(() => {
-                j();
-              });
+              .catch(() => {});
           })
           .catch(() => {
             j();

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

@@ -142,7 +142,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           let user = [];
-          this.ruleForm.otherConfig.selectUser.forEach((element) => {
+          this.ruleForm.otherConfig.selectUser?.forEach((element) => {
             let a = {
               name: element.nickName,
               uid: element.id,
@@ -316,12 +316,12 @@ export default {
     },
     getDikeTypeName(type) {
       let name = "";
-      this.embankmentTypeOptions.forEach((element) => {
+      this.embankmentTypeOptions?.forEach((element) => {
         if (element.dictValue === type) {
           name = element.dictLabel;
         }
       });
-      return name;
+      return name || type;
     },
   },
   created() {
@@ -330,7 +330,7 @@ export default {
     });
     this.getDicts("xs_classfy").then((res) => {
       if (res.data && Array.isArray(res.data)) {
-        res.data.forEach((element) => {
+        res.data?.forEach((element) => {
           element.dictValue = element.dictValue;
         });
         this.examType = res.data;
@@ -438,8 +438,11 @@ export default {
           <el-button type="primary" size="small" @click="handleAdd"
             >新增</el-button
           >
-          <!-- <el-button size="small">编辑</el-button> -->
-          <el-button type="danger" size="small" @click="handleDelAll"
+          <el-button
+            type="danger"
+            size="small"
+            @click="handleDelAll"
+            v-hasPermi="['df:run:inspection:plan:delAll']"
             >删除</el-button
           >
         </div>
@@ -509,7 +512,7 @@ export default {
               @click="handleEdit(scope.row)"
               type="text"
               size="small"
-              v-hasPermi="['df:run:checking:plan:edit']"
+              v-hasPermi="['df:run:inspection:plan:item:edit']"
               >编辑</el-button
             >
             <el-popconfirm
@@ -525,7 +528,7 @@ export default {
                 type="text"
                 size="small"
                 slot="reference"
-                v-hasPermi="['df:run:checking:plan:delete']"
+                v-hasPermi="['df:run:inspection:plan:item:del']"
                 >删除</el-button
               >
             </el-popconfirm>

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

@@ -15,6 +15,13 @@
           @click="handleSave(true)"
           >保存并继续新增</el-button
         >
+        <el-button
+          type="primary"
+          size="small"
+          v-if="$route.query.mode === 'edit'"
+          @click="handleSave(false, true)"
+          >保存并完成巡查</el-button
+        >
         <el-button size="small" @click="handleCancel">取消</el-button>
       </div>
     </div>
@@ -35,8 +42,8 @@ export default {
   },
   created() {},
   methods: {
-    handleSave(reset) {
-      this.$refs.formRef.submit(reset).then((res) => {
+    handleSave(reset, endXc = false) {
+      this.$refs.formRef.submit(reset, endXc).then((res) => {
         if (!reset) {
           this.$router.go(-1);
         }

src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue

@@ -79,9 +79,12 @@
         </el-form-item>
         <el-form-item label="巡查路线类型" prop="lineType" class="ml-24">
           <el-select :disabled="true" class="w-240" v-model="formData.lineType">
-            <el-option label="日常巡查" value="0"></el-option>
-            <el-option label="年度检查" value="1"></el-option>
-            <el-option label="特别检查" value="2"></el-option>
+            <el-option
+              v-for="(item, index) in xcClassfyOptions"
+              :key="index"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -210,7 +213,11 @@
                   v-for="(item, index) in this.currentItem.problemImages"
                   :key="item"
                 >
-                  <el-image :src="item" class="w-240 h-124"></el-image>
+                  <el-image
+                    :src="item"
+                    class="w-240 h-124"
+                    :preview-src-list="[url]"
+                  ></el-image>
                   <i
                     class="el-icon-error del-icon"
                     :size="18"
@@ -295,6 +302,7 @@ export default {
       filterText: "",
       dutyHolderTypeOptions: [],
       xcProjectList: [],
+      xcClassfyOptions: [],
       planList: [],
       subPlanList: [],
       treeData: [],
@@ -330,6 +338,9 @@ export default {
     this.getDicts("person_type").then((response) => {
       this.dutyHolderTypeOptions = response.data;
     });
+    this.getDicts("xs_classfy").then((response) => {
+      this.xcClassfyOptions = response.data;
+    });
   },
   methods: {
     isSameArray(arr1, arr2) {
@@ -697,36 +708,48 @@ export default {
         }, 30);
       }
     },
-    submit(reset) {
+    submit(reset, endXc = false) {
       console.log("提交表单 >>>> ", this.formData);
       return new Promise((r, j) => {
         this.$refs.formRef.validate((valid) => {
           if (valid) {
-            this.items?.forEach((v) => {
-              if (v.hasProblem != "1") {
-                v.problem = "";
-                v.problemImages = [];
-              }
-            });
-
-            (this.id ? updateRecordData : addRecordData)({
-              id: this.id || null,
-              ...this.formData,
-              items: this.items,
-              startDate: this.xcDateArr[0] || "",
-              endDate: this.xcDateArr[1] || "",
-              subPlanStartDate: this.subPlanDateArr[0] || "",
-              subPlanEndDate: this.subPlanDateArr[1] || "",
+            // 二次确认
+            this.$confirm(`确认提交吗？`, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
             })
-              .then((res) => {
-                this.$message.success("提交成功");
-                if (reset) {
-                  this.reset();
-                }
-                r();
+              .then(() => {
+                this.items?.forEach((v) => {
+                  if (v.hasProblem != "1") {
+                    v.problem = "";
+                    v.problemImages = [];
+                  }
+                });
+
+                (this.id ? updateRecordData : addRecordData)({
+                  id: this.id || null,
+                  ...this.formData,
+                  items: this.items,
+                  startDate: this.xcDateArr[0] || "",
+                  endDate: this.xcDateArr[1] || "",
+                  subPlanStartDate: this.subPlanDateArr[0] || "",
+                  subPlanEndDate: this.subPlanDateArr[1] || "",
+                  status: endXc ? "1" : "0",
+                })
+                  .then((res) => {
+                    this.$message.success("提交成功");
+                    if (reset) {
+                      this.reset();
+                    }
+                    r();
+                  })
+                  .catch((e) => {
+                    console.log("err >>>>>  ", e);
+                    j();
+                  });
               })
-              .catch((e) => {
-                console.log("err >>>>>  ", e);
+              .catch(() => {
                 j();
               });
           } else {

src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue

@@ -232,6 +232,7 @@ export default {
       labelMapData: {},
       detailData: {},
       treeData: [],
+      xcClassfyOptions: [],
       entries: {},
     };
   },
@@ -246,7 +247,11 @@ export default {
       immediate: true,
     },
   },
-  created() {},
+  created() {
+    this.getDicts("xs_classfy").then((response) => {
+      this.xcClassfyOptions = response.data;
+    });
+  },
   methods: {
     handleChangeCollapse() {},
     initData() {

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

@@ -86,7 +86,7 @@ export default {
     handleEdit(row) {
       this.$router.push({
         path: "createInspectionRecords",
-        query: { id: row.id },
+        query: { id: row.id, mode: "edit" },
       });
     },
     handleDel(row) {
@@ -108,6 +108,10 @@ export default {
           console.log("取消删除");
         });
     },
+    calcHours(start, end) {
+      if (!start || !end) return "-";
+      return dayjs(end).diff(dayjs(start), "hour");
+    },
     getTreeData() {
       getAreasData().then((items) => {
         // console.log("getAreasData", items.data);
@@ -470,10 +474,15 @@ export default {
           <el-button
             size="small"
             v-if="tableCheckData.length"
+            v-hasPermi="['df:run:inspection:record:export']"
             @click="handleExport"
             >导出</el-button
           >
-          <el-button type="danger" size="small" @click="handleDelAll"
+          <el-button
+            type="danger"
+            size="small"
+            @click="handleDelAll"
+            v-hasPermi="['df:run:inspection:record:delAll']"
             >删除</el-button
           >
         </div>
@@ -536,14 +545,16 @@ export default {
           label="巡查开始时间/结束时间"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.startDate }}/{{ scope.row.endDate }}</span>
+            <span
+              >{{ scope.row.startDate || "-" }}/{{
+                scope.row.endDate || "-"
+              }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column align="center" label="巡查时长/小时">
           <template slot-scope="scope">
-            <span>{{
-              dayjs(scope.row.endDate).diff(dayjs(scope.row.startDate), "hours")
-            }}</span>
+            <span>{{ calcHours(scope.row.startDate, scope.row.endDate) }}</span>
           </template>
         </el-table-column>
 
@@ -560,16 +571,24 @@ export default {
               size="small"
               @click="handleEdit(scope.row)"
               :disabled="scope.row.status != '0'"
+              v-hasPermi="['df:run:inspection:record:item:edit']"
               >编辑</el-button
             >
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.status == '0' ||scope.row.handleStatus != '1'"
+              :disabled="
+                scope.row.status == '0' || scope.row.handleStatus != '1'
+              "
+              v-hasPermi="['df:run:inspection:record:item:deal']"
               @click="handleCheckDetails(scope.row, true)"
               >处置</el-button
             >
-            <el-button type="text" size="small" @click="handleDel(scope.row)"
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDel(scope.row)"
+              v-hasPermi="['df:run:inspection:record:item:del']"
               >删除</el-button
             >
           </template>

src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue

@@ -72,9 +72,12 @@
         </el-form-item>
         <el-form-item label="巡查路线类型" prop="type" class="ml-24">
           <el-select :disabled="!canEdit" class="w-240" v-model="formData.type">
-            <el-option label="日常巡查" value="1"></el-option>
-            <el-option label="特殊检查" value="2"></el-option>
-            <el-option label="定期巡查" value="3"></el-option>
+            <el-option
+              v-for="(item, index) in xcClassfyOptions"
+              :key="index"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -222,6 +225,7 @@ export default {
       filterText: "",
       xcProjectList: [],
       projectTypeOptions: [],
+      xcClassfyOptions: [],
       dikeList: [],
       treeData: [],
       checkTreeData: [],
@@ -254,6 +258,9 @@ export default {
     this.getDicts("embankment_type").then((response) => {
       this.projectTypeOptions = response.data;
     });
+    this.getDicts("xs_classfy").then((response) => {
+      this.xcClassfyOptions = response.data;
+    });
   },
   mounted() {},
   methods: {

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

@@ -122,6 +122,7 @@
         <el-radio-group
           size="small"
           v-model="displayType"
+          :disabled="isLoading"
           @change="handleChangeDisplayType"
         >
           <el-radio-button label="2">平铺</el-radio-button>
@@ -135,9 +136,14 @@
             size="small"
             v-if="tableCheckData.length"
             @click="handleExport"
+            v-hasPermi="['df:run:inspection:line:export']"
             >导出</el-button
           >
-          <el-button type="danger" size="small" @click="handleDelAll"
+          <el-button
+            type="danger"
+            size="small"
+            @click="handleDelAll"
+            v-hasPermi="['df:run:inspection:line:delAll']"
             >删除</el-button
           >
         </div>
@@ -148,178 +154,190 @@
         border
         @expand-change="handleTriggerRowExpand"
         @selection-change="handleSelectionChange"
+        v-loading="isLoading"
       >
-        <el-table-column type="expand" v-if="displayType === '1'" key="expand">
-          <template slot-scope="scope">
-            <div class="expand-box">
-              <el-row class="row row-header flex">
-                <el-col class="row-item row-checkbox">
-                  <el-checkbox
-                    v-model="scope.row.allChecked"
-                    @change="(e) => handleChangeRowAllChecked(e, scope.row)"
-                  ></el-checkbox>
-                </el-col>
-                <el-col class="row-item">路线名称</el-col>
-                <el-col class="row-item">巡查类型</el-col>
-                <el-col class="row-item">巡查人员类型</el-col>
-                <el-col class="row-item">巡查人员</el-col>
-                <el-col class="row-item">创建时间</el-col>
-                <el-col class="row-item row-operate">操作</el-col>
-              </el-row>
-              <el-row
-                class="row row-body flex"
-                v-for="(item, index) in scope.row.expendData"
-                :key="index"
-              >
-                <el-col class="row-item row-checkbox">
-                  <el-checkbox
-                    v-model="item.isChecked"
-                    @change="(e) => handleChangeRowChecked(e, scope.row, item)"
-                  ></el-checkbox>
-                </el-col>
-                <el-col class="row-item">{{ item.name }}</el-col>
-                <el-col class="row-item">{{
-                  getProTypeDictLabelName(item.dikeType)
-                }}</el-col>
-                <el-col class="row-item">{{
-                  getPersonTypeDictLabelName(item.dutyHolderType)
-                }}</el-col>
-                <el-col class="row-item">
-                  {{
-                    item.dutyHolders &&
-                    item.dutyHolders.find((v) => v.dutyHolderType === "0") &&
-                    item.dutyHolders.find((v) => v.dutyHolderType === "0").name
-                  }}
-                </el-col>
-                <el-col class="row-item">{{ item.updateTime }}</el-col>
-                <el-col class="row-item row-operate">
-                  <el-button
-                    class="custom-btn"
-                    type="text"
-                    @click="handleCheck(item)"
-                    >查看</el-button
-                  >
-                  <el-button
-                    class="custom-btn"
-                    type="text"
-                    @click="handleEdit(item)"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    class="custom-btn"
-                    type="text"
-                    @click="handleDel(item)"
-                    >删除</el-button
-                  >
-                </el-col>
-              </el-row>
-              <el-row
-                v-if="!scope.row.expendData || !scope.row.expendData.length"
+        <template v-if="displayType === '1'">
+          <el-table-column type="expand" key="expand">
+            <template slot-scope="scope">
+              <div class="expand-box">
+                <el-row class="row row-header flex">
+                  <el-col class="row-item row-checkbox">
+                    <el-checkbox
+                      v-model="scope.row.allChecked"
+                      @change="(e) => handleChangeRowAllChecked(e, scope.row)"
+                    ></el-checkbox>
+                  </el-col>
+                  <el-col class="row-item">路线名称</el-col>
+                  <el-col class="row-item">巡查类型</el-col>
+                  <el-col class="row-item">巡查人员类型</el-col>
+                  <el-col class="row-item">巡查人员</el-col>
+                  <el-col class="row-item">创建时间</el-col>
+                  <el-col class="row-item row-operate">操作</el-col>
+                </el-row>
+                <el-row
+                  class="row row-body flex"
+                  v-for="(item, index) in scope.row.expendData"
+                  :key="index"
+                >
+                  <el-col class="row-item row-checkbox">
+                    <el-checkbox
+                      v-model="item.isChecked"
+                      @change="
+                        (e) => handleChangeRowChecked(e, scope.row, item)
+                      "
+                    ></el-checkbox>
+                  </el-col>
+                  <el-col class="row-item">{{ item.name }}</el-col>
+                  <el-col class="row-item">{{
+                    getProTypeDictLabelName(item.dikeType)
+                  }}</el-col>
+                  <el-col class="row-item">{{
+                    getPersonTypeDictLabelName(item.dutyHolderType)
+                  }}</el-col>
+                  <el-col class="row-item">
+                    {{
+                      item.dutyHolders &&
+                      item.dutyHolders.find((v) => v.dutyHolderType === "0") &&
+                      item.dutyHolders.find((v) => v.dutyHolderType === "0")
+                        .name
+                    }}
+                  </el-col>
+                  <el-col class="row-item">{{ item.updateTime }}</el-col>
+                  <el-col class="row-item row-operate">
+                    <el-button
+                      class="custom-btn"
+                      type="text"
+                      @click="handleCheck(item)"
+                      >查看</el-button
+                    >
+                    <el-button
+                      class="custom-btn"
+                      type="text"
+                      @click="handleEdit(item)"
+                      >编辑</el-button
+                    >
+                    <el-button
+                      class="custom-btn"
+                      type="text"
+                      @click="handleDel(item)"
+                      >删除</el-button
+                    >
+                  </el-col>
+                </el-row>
+                <el-row
+                  v-if="!scope.row.expendData || !scope.row.expendData.length"
+                >
+                  <div>暂无数据</div>
+                </el-row>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="dikeName" align="center" label="堤防名称" />
+          <el-table-column prop="dikeType" align="center" label="堤防类型">
+            <template #default="{ row }">
+              {{
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType)
+                  .dictLabel
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="行政责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "2") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "2").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="巡查责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="技术责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "1") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "1").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operate"
+            align="center"
+            label="操作"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click="handleCheckDetail(scope.row)"
+                >查看</el-button
               >
-                <div>暂无数据</div>
-              </el-row>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          type="selection"
-          v-if="displayType === '2'"
-          key="selection"
-        ></el-table-column>
-        <el-table-column
-          prop="dikeName"
-          align="center"
-          label="堤防名称"
-          key="dikeName"
-        />
-        <el-table-column
-          key="dikeType"
-          prop="dikeType"
-          align="center"
-          label="堤防类型"
-        >
-          <template #default="{ row }">
-            {{
-              projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
-              projectTypeOptions.find((v) => v.dictValue == row.dikeType)
-                .dictLabel
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          key="name"
-          prop="name"
-          align="center"
-          label="巡查路线名称"
-          v-if="displayType === '2'"
-        />
-        <el-table-column
-          key="type"
-          prop="type"
-          align="center"
-          label="巡查类型"
-          v-if="displayType === '2'"
-        >
-          <template #default="{ row }">
-            {{
-              lineTypeOptions.find((v) => v.dictValue == row.type) &&
-              lineTypeOptions.find((v) => v.dictValue == row.type).dictLabel
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="operatorName"
-          key="operatorName2"
-          align="center"
-          label="行政责任人"
-          v-if="displayType === '1'"
-        >
-          <template #default="{ row }">
-            {{
-              row.dutyHolders &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "2") &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "2").name
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          key="operatorName0"
-          prop="operatorName"
-          align="center"
-          label="巡查责任人"
-        >
-          <template #default="{ row }">
-            {{
-              row.dutyHolders &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "0").name
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          key="operatorName1"
-          prop="operatorName"
-          align="center"
-          label="技术责任人"
-          v-if="displayType === '1'"
-        >
-          <template #default="{ row }">
-            {{
-              row.dutyHolders &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "1") &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "1").name
-            }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="operate"
-          align="center"
-          label="操作"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <template v-if="displayType === '2'">
+            </template>
+          </el-table-column>
+        </template>
+        <template v-else-if="displayType === '2'">
+          <el-table-column key="selection" type="selection"></el-table-column>
+          <el-table-column prop="dikeName" align="center" label="堤防名称" />
+          <el-table-column prop="dikeType" align="center" label="堤防类型">
+            <template #default="{ row }">
+              {{
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType)
+                  .dictLabel
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" align="center" label="巡查路线名称" />
+          <el-table-column prop="type" align="center" label="巡查类型">
+            <template #default="{ row }">
+              {{
+                lineTypeOptions.find((v) => v.dictValue == row.type) &&
+                lineTypeOptions.find((v) => v.dictValue == row.type).dictLabel
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="巡查责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operate"
+            align="center"
+            label="操作"
+            fixed="right"
+          >
+            <template slot-scope="scope">
               <el-button
                 class="custom-btn"
                 type="text"
@@ -330,24 +348,19 @@
                 class="custom-btn"
                 type="text"
                 @click="handleEdit(scope.row)"
+                v-hasPermi="['df:run:inspection:line:item:edit']"
                 >编辑</el-button
               >
               <el-button
                 class="custom-btn"
                 type="text"
                 @click="handleDel(scope.row)"
+                v-hasPermi="['df:run:inspection:line:item:del']"
                 >删除</el-button
               >
             </template>
-            <el-button
-              v-else
-              type="text"
-              size="small"
-              @click="handleCheckDetail(scope.row)"
-              >查看</el-button
-            >
-          </template>
-        </el-table-column>
+          </el-table-column>
+        </template>
       </el-table>
       <el-pagination
         background
@@ -432,6 +445,7 @@ export default {
   data() {
     return {
       displayType: "1", // 1: 按堤防 2: 平铺
+      isLoading: false,
       showBaseDetailDialog: false,
       showRouteDetailDialog: false,
       areasOptionProps: {
@@ -476,6 +490,7 @@ export default {
   },
   methods: {
     getTableData() {
+      this.isLoading = true;
       this.tableCheckData = [];
       if (this.displayType === "2") {
         getProjectCheckingLineRoute({
@@ -484,10 +499,14 @@ export default {
           data: {
             ...this.paramsData,
           },
-        }).then((response) => {
-          this.tableData = response.records;
-          this.pageData.total = response.total;
-        });
+        })
+          .then((response) => {
+            this.tableData = response.records;
+            this.pageData.total = response.total;
+          })
+          .finally(() => {
+            this.isLoading = false;
+          });
       } else {
         getProjectCheckingLine({
           pageNum: this.pageData.pageNum,
@@ -495,16 +514,20 @@ export default {
           data: {
             ...this.paramsData,
           },
-        }).then((response) => {
-          this.tableData = response.records.map((v) => {
-            return {
-              ...v,
-              allChecked: false,
-              expendData: [],
-            };
+        })
+          .then((response) => {
+            this.tableData = response.records.map((v) => {
+              return {
+                ...v,
+                allChecked: false,
+                expendData: [],
+              };
+            });
+            this.pageData.total = response.total;
+          })
+          .finally(() => {
+            this.isLoading = false;
           });
-          this.pageData.total = response.total;
-        });
       }
     },
     getTreeData() {
@@ -602,14 +625,14 @@ export default {
     },
     handleChangeRowAllChecked(checked, row) {
       if (checked) {
-        row.expendData.forEach((v) => {
+        row.expendData?.forEach((v) => {
           v.isChecked = true;
           if (!this.tableCheckData.find((v1) => v1.id === v.id)) {
             this.tableCheckData.push(v);
           }
         });
       } else {
-        row.expendData.forEach((v) => {
+        row.expendData?.forEach((v) => {
           v.isChecked = false;
           this.tableCheckData = this.tableCheckData.filter(
             (v1) => v1.id !== v.id
@@ -657,7 +680,11 @@ export default {
         });
     },
     handleChangeDisplayType() {
+      this.tableData = [];
       this.getTableData();
+      setTimeout(() => {
+        this.$forceUpdate();
+      }, 30);
     },
     handleAdd() {
       this.$router.push("createRoutePage");
@@ -676,7 +703,6 @@ export default {
     },
     // 查看
     handleCheck(row) {
-      console.log("row >>>>>  ", row);
       this.$set(this, "currentRow", row);
       this.showRouteDetailDialog = true;
     },