diff --git a/src/assets/js/api/insect.js b/src/assets/js/api/insect.js
index 774b01c3..59af851c 100644
--- a/src/assets/js/api/insect.js
+++ b/src/assets/js/api/insect.js
@@ -20,4 +20,12 @@ export const deleteCheckPointApi = data => post('/xmgl/checkingPointInfo/delete'
 // 区域
 export const pointAreaApi = data => post('/xmgl/qualityRegion/notTreeList', data); // 删除巡检点记录列表
 
+// 巡检路线模块
+export const routeCheckPageApi = data => get('/xmgl/xzCheckingRoute/page', data);
+export const routeCheckAddApi = data => post('/xmgl/xzCheckingRoute/add', data);
+export const routeCheckEditApi = data => post('/xmgl/xzCheckingRoute/edit', data);
+export const routeCheckDetailApi = data => get('/xmgl/xzCheckingRoute/queryById', data);
+export const routeCheckDeleteApi = data => post('/xmgl/xzCheckingRoute/delete', data);
+export const routeTaskListApi = data => get('/xmgl/xzCheckingRouteTask/list', data);
+export const routeTaskDeleteApi = data => post('/xmgl/xzCheckingRouteTask/delete', data);
 
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 08e97487..6778e31c 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
-  axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
diff --git a/src/views/projectFront/inspecPoint/selfInspect.vue b/src/views/projectFront/inspecPoint/selfInspect.vue
index 1430fda0..6dde48d9 100644
--- a/src/views/projectFront/inspecPoint/selfInspect.vue
+++ b/src/views/projectFront/inspecPoint/selfInspect.vue
@@ -47,16 +47,37 @@
           align="center"
           type="index"
         ></el-table-column>
+        <el-table-column
+          prop="routeName"
+          label="巡检路线"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="itemName"
+          label="任务名称"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="checkingPointName"
           label="巡检点名称"
           align="center"
         ></el-table-column>
+        <el-table-column
+          width="200"
+          prop="minInspectTime"
+          label="最低巡检时长(分钟)"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="position"
           label="巡检位置"
           align="center"
         ></el-table-column>
+        <el-table-column
+          prop="inspectTime"
+          label="巡检时长(分钟)"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="checkingPointUserName"
           label="巡检人员"
@@ -238,9 +259,21 @@
         <el-form
           size="medium"
           ref="addEditForm"
-          label-width="130px"
+          label-width="150px"
           class="dialogFormBox"
         >
+        <el-form-item label="巡检路线">
+            <el-input
+              v-model="detailData.routeName"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="任务名称">
+            <el-input
+              v-model="detailData.itemName"
+              disabled
+            ></el-input>
+          </el-form-item>
           <el-form-item label="巡检点名称">
             <el-input
               v-model="detailData.checkingPointUserName"
@@ -250,12 +283,18 @@
           <el-form-item label="巡检点位置">
             <el-input v-model="detailData.position" disabled></el-input>
           </el-form-item>
+          <el-form-item label="最低巡检时长(分钟)">
+            <el-input v-model="detailData.minInspectTime" disabled></el-input>
+          </el-form-item>
           <el-form-item label="巡检人员">
             <el-input
               v-model="detailData.checkingPointUserName"
               disabled
             ></el-input>
           </el-form-item>
+          <el-form-item label="巡检时长(分钟)">
+            <el-input v-model="detailData.inspectTime" disabled></el-input>
+          </el-form-item>
           <el-form-item label="巡检记录通知人员">
             <el-input v-model="detailData.noticeUserNames" disabled></el-input>
           </el-form-item>
diff --git a/src/views/projectFront/inspectRoute/routeManage.vue b/src/views/projectFront/inspectRoute/routeManage.vue
index b5b5c886..f6e24a7c 100644
--- a/src/views/projectFront/inspectRoute/routeManage.vue
+++ b/src/views/projectFront/inspectRoute/routeManage.vue
@@ -10,10 +10,10 @@
         <el-form-item label="巡检路线名称">
           <el-input
             placeholder="请输入"
-            v-model="searchForm.checkingPointName"
+            v-model="searchForm.routeName"
           ></el-input>
         </el-form-item>
-        <el-button type="primary" size="medium" plain @click="getPointList"
+        <el-button type="primary" size="medium" plain @click="getRouteList"
           >查询</el-button
         >
         <el-button type="warning" size="medium" plain @click="refresh"
@@ -31,7 +31,7 @@
             type="index"
           ></el-table-column>
           <el-table-column
-            prop="checkingPointName"
+            prop="routeName"
             label="路线名称"
             align="center"
           ></el-table-column>
@@ -41,7 +41,7 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="inspectUserNames"
+            prop="noticeUserNames"
             label="巡检通知人员"
             align="center"
           ></el-table-column>
@@ -49,12 +49,35 @@
             prop="inspectUserNames"
             label="巡检周期"
             align="center"
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.startTime }}-{{ scope.row.endTime }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="inspectUserNames"
             label="巡检频次"
             align="center"
-          ></el-table-column>
+          >
+            <template v-slot="{ row }">
+              <span
+                >{{ row.frequencyNum
+                }}{{
+                  row.frequencyType == 1
+                    ? "次"
+                    : row.frequencyType == 2
+                    ? "次/日"
+                    : row.frequencyType == 3
+                    ? "次/周"
+                    : row.frequencyType == 4
+                    ? "次/月"
+                    : row.frequencyType == 5
+                    ? "次/年"
+                    : ""
+                }}</span
+              >
+            </template>
+          </el-table-column>
 
           <el-table-column
             :label="
@@ -65,14 +88,14 @@
           >
             <template slot-scope="scope">
               <div class="operation-style">
-                <div class="operationText" @click="deilBtn(scope.row)">
+                <div class="operationText" @click.stop="deilBtn(scope.row)">
                   <i
                     class="el-icon-tickets"
                     style="color: #8dacfa; font-size: 16px; margin-right: 2px"
                   ></i>
                   <span>任务详情</span>
                 </div>
-                <div @click="toDelete(scope.row)" class="operationText">
+                <div @click.stop="toDelete(scope.row)" class="operationText">
                   <img
                     src="@/assets/images/icon-delete.png"
                     width="15px"
@@ -112,17 +135,19 @@
           ref="cardForm"
           :rules="cardFormRules"
           label-width="150px"
-          class="dialogFormBox"
+          style="width: 40%"
         >
-          <el-form-item label="路线名称：" prop="checkingPointName">
+          <el-form-item label="路线名称：" prop="routeName">
             <el-input
               :disabled="cardDialogTitle == '详情'"
-              v-model="cardForm.checkingPointName"
+              v-model="cardForm.routeName"
               :placeholder="isAdding ? '请输入' : ''"
+              style="width: 100%"
             ></el-input>
           </el-form-item>
           <el-form-item label="区域名称：" prop="qualityRegionId">
             <el-select
+              style="width: 100%"
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
               filterable
@@ -141,6 +166,7 @@
           </el-form-item>
           <el-form-item label="企业名称：" prop="enterpriseId">
             <el-select
+              style="width: 100%"
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
               filterable
@@ -160,6 +186,7 @@
           </el-form-item>
           <el-form-item label="巡检人员：" prop="inspectUserIds">
             <el-select
+              style="width: 100%"
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
               filterable
@@ -178,6 +205,7 @@
           </el-form-item>
           <el-form-item label="通知人员：" prop="noticeUserIds">
             <el-select
+              style="width: 100%"
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
               filterable
@@ -198,7 +226,7 @@
             <!-- 开始日期 结束日期 -->
             <el-date-picker
               :disabled="cardDialogTitle == '详情'"
-              style="width: 320px"
+              style="width: 100%"
               v-model="checkDaterange"
               type="daterange"
               range-separator="-"
@@ -212,8 +240,8 @@
           </el-form-item>
           <el-form-item label="检查频次：" prop="frequencyNum">
             <el-input-number
+              style="width: 47%"
               :disabled="cardDialogTitle == '详情'"
-              class="smallInput"
               v-model="cardForm.frequencyNum"
               :min="1"
               :controls="false"
@@ -222,10 +250,9 @@
             <!-- 检查频次  选择单位 -->
             <el-select
               :disabled="cardDialogTitle == '详情'"
-              class="smallInput"
               v-model="cardForm.frequencyType"
               :placeholder="isAdding ? '请输入' : ''"
-              style="margin-left: 12px"
+              style="width: 47%; margin-left: 17px"
             >
               <el-option
                 v-for="(item, index) in frequencyType"
@@ -253,45 +280,47 @@
               >
                 <div
                   class="list-item"
-                  v-for="(item, index) in routeForm.tableList"
+                  v-for="(item, index) in routeForm.routeToPointList"
                   :key="index"
                 >
                   <el-form-item
                     label="排序:"
-                    :prop="`tableList[${index}].rank`"
-                    :rules="routeFormRules.rank"
+                    :prop="`routeToPointList[${index}].sort`"
+                    :rules="routeFormRules.sort"
                   >
                     <el-input
                       :disabled="cardDialogTitle == '详情'"
-                      v-model="cardForm.checkingPointName"
+                      v-model="routeForm.routeToPointList[index].sort"
                       :placeholder="isAdding ? '请输入' : ''"
                       style="width: 100px"
                     ></el-input>
                   </el-form-item>
                   <el-form-item
                     label="巡检点:"
-                    :prop="`tableList[${index}].point`"
-                    :rules="routeFormRules.point"
+                    :prop="`routeToPointList[${index}].checkingPointId`"
+                    :rules="routeFormRules.checkingPointId"
                   >
                     <el-select
                       :disabled="cardDialogTitle == '详情'"
                       collapse-tags
                       filterable
-                      v-model="cardForm.qualityRegionId"
+                      v-model="
+                        routeForm.routeToPointList[index].checkingPointId
+                      "
                       :placeholder="isAdding ? '请选择' : ''"
-                      @change="updateArea"
                       style="width: 120px"
                     >
                       <el-option
-                        v-for="item in pointAreaList"
+                        v-for="item in inspectPointList"
                         :key="item.id"
-                        :label="item.regionName"
+                        :label="item.checkingPointName"
                         :value="item.id"
                       >
                       </el-option>
                     </el-select>
                   </el-form-item>
                   <i
+                    v-if="cardDialogTitle != '详情'"
                     class="el-icon-close"
                     style="
                       color: #ec1111;
@@ -299,13 +328,19 @@
                       top: 0px;
                       right: 0px;
                       font-size: 20px;
+                      cursor: pointer;
                     "
+                    @click="deleteRouteItem(index)"
                   ></i>
                 </div>
               </el-form>
             </div>
           </vue-scroll>
-          <div class="add-route" v-if="cardDialogTitle != '详情'">
+          <div
+            class="add-route"
+            @click="addInspectPoint"
+            v-if="cardDialogTitle != '详情'"
+          >
             <img src="@/assets/images/icon-add.png" alt="" srcset="" />
             <span>添加巡检点</span>
           </div>
@@ -323,7 +358,7 @@
           v-if="isAdding != false"
           type="primary"
           icon="el-icon-circle-check"
-          @click="addCardFn"
+          @click="addRouteFn"
           size="medium"
           >确定</el-button
         >
@@ -332,7 +367,7 @@
   </div>
   <div class="task-detail-main" v-else>
     <div class="searchBox whiteBlock">
-      <span>巡检路线：一号巡检路线</span>
+      <span>巡检路线：{{ rowObj.routeName }}</span>
       <el-button
         type="warning"
         size="medium"
@@ -351,19 +386,15 @@
         <ul>
           <li
             class="el-menu-item2"
-            :class="checkedId == item.id ? 'checked_item' : ''"
+            :class="checkedIndex == index ? 'checked_item' : ''"
             v-for="(item, index) in centerModuleList"
-            @click="selectMenu(item)"
+            @click="selectMenu(item, index)"
             :key="index"
           >
             <div class="option-list-item">
-              <span>{{ item.name }}</span>
-              <img
-                src="@/assets/images/icon-edit.png"
-                width="15px"
-                height="15px"
-              />
+              <div :title="item.itemName">{{ item.itemName }}</div>
               <img
+                @click="deleteTaskItem(item)"
                 src="@/assets/images/icon-delete.png"
                 width="15px"
                 height="15px"
@@ -373,7 +404,7 @@
         </ul>
       </vue-scroll>
       <vue-scroll class="task-detail-table whiteBlock">
-        <el-table :data="tableData" style="height: 87%">
+        <el-table :data="recordTableData" style="height: 87%">
           <el-table-column
             label="序号"
             align="center"
@@ -381,29 +412,45 @@
           ></el-table-column>
           <el-table-column
             prop="checkingPointName"
-            label="路线名称"
+            label="巡检点名称"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="inspectUserNames"
+            prop="regionName"
+            label="所属区域"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="minInspectTime"
+            label="最低巡检时长(分钟)"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="checkingPointUserName"
             label="巡检人员"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="inspectUserNames"
+            prop="noticeUserNames"
             label="巡检通知人员"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="inspectUserNames"
-            label="巡检周期"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="inspectUserNames"
-            label="巡检频次"
+            prop="position"
+            label="巡检点位置"
             align="center"
           ></el-table-column>
+          <el-table-column label="巡检结果" align="center">
+            <template v-slot="{ row }">
+              <span>{{
+                row.handleResult == 1
+                  ? "已处置"
+                  : row.handleResult == 2
+                  ? "误报忽略"
+                  : ""
+              }}</span>
+            </template>
+          </el-table-column>
 
           <el-table-column
             :label="
@@ -414,20 +461,12 @@
           >
             <template slot-scope="scope">
               <div class="operation-style">
-                <div class="operationText" @click="detailsShow = true">
+                <div class="operationText" @click="recordDetail(scope.row)">
                   <i
                     class="el-icon-tickets"
                     style="color: #8dacfa; font-size: 16px; margin-right: 2px"
                   ></i>
-                  <span>任务详情</span>
-                </div>
-                <div @click="toDelete(scope.row)" class="operationText">
-                  <img
-                    src="@/assets/images/icon-delete.png"
-                    width="15px"
-                    height="15px"
-                  />
-                  <span>删除</span>
+                  <span>详情</span>
                 </div>
               </div>
             </template>
@@ -436,13 +475,13 @@
 
         <el-pagination
           class="pagerBox"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="pageNo"
+          @size-change="handleRecordSizeChange"
+          @current-change="handleRecordCurrentChange"
+          :current-page="recordTableParams.pageNo"
           :page-sizes="$store.state.PAGESIZRS"
-          :page-size="pageSize"
+          :page-size="recordTableParams.pageSize"
           layout="total, sizes, prev, pager, next"
-          :total="Number(total)"
+          :total="Number(recordTableParams.total)"
           background
         ></el-pagination>
       </vue-scroll>
@@ -456,45 +495,47 @@
       width="667px"
     >
       <div class="dialog_content">
-        <el-form
-          size="medium"
-          ref="addEditForm"
-          label-width="130px"
-          class="dialogFormBox"
-        >
+        <el-form size="medium" ref="addEditForm" label-width="150px">
           <el-form-item label="巡检点名称">
             <el-input
-              v-model="detailData.checkingPointUserName"
+              v-model="recordRowObj.checkingPointUserName"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="巡检点位置">
-            <el-input v-model="detailData.position" disabled></el-input>
+            <el-input v-model="recordRowObj.position" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="最低巡检时长(分钟)">
+            <el-input v-model="recordRowObj.minInspectTime" disabled></el-input>
           </el-form-item>
           <el-form-item label="巡检人员">
             <el-input
-              v-model="detailData.checkingPointUserName"
+              v-model="recordRowObj.checkingPointUserName"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="巡检记录通知人员">
-            <el-input v-model="detailData.noticeUserNames" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-input v-model="detailData.noticeUserNames" disabled> </el-input>
-          </el-form-item>
-          <el-form-item label="巡检时间">
-            <el-input v-model="detailData.createDate" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="异常详情" v-if="detailData.status == 2">
             <el-input
-              style="width: 320px"
-              type="textarea"
-              v-model="detailData.alarmDetails"
+              v-model="recordRowObj.noticeUserNames"
               disabled
             ></el-input>
           </el-form-item>
-          <el-form-item label="异常巡检图片" v-if="detailData.status == 2">
+          <el-form-item label="状态">
+            <el-input v-model="recordRowObj.noticeUserNames" disabled>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="巡检时间">
+            <el-input v-model="recordRowObj.createDate" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="异常详情" v-if="recordRowObj.status == 2">
+            <el-input
+              style="width: 320px"
+              type="textarea"
+              v-model="recordRowObj.alarmDetails"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="异常巡检图片" v-if="recordRowObj.status == 2">
             <img
               v-if="imgSrc"
               style="width: 150px; height: 100px"
@@ -503,7 +544,7 @@
               alt=""
             />
           </el-form-item>
-          <!-- <div class="grid-content" v-if="detailData.status == 2">
+          <!-- <div class="grid-content" v-if="recordRowObj.status == 2">
             <div class="label">异常巡检图片</div>
             <div class="value">
               <img
@@ -516,7 +557,7 @@
           </div> -->
           <el-form-item
             :label="item.title"
-            v-for="(item, index) in templateList"
+            v-for="(item, index) in formData"
             :key="index"
           >
             <el-input
@@ -532,7 +573,7 @@
           >
             <div
               class="formInput flex"
-              v-for="(item, index) in templateList"
+              v-for="(item, index) in formData"
               :key="index"
             >
               <input class="fromsTit" v-model="item.title" disabled />
@@ -557,11 +598,16 @@
 
 <script>
 import {
-  getPointListApi,
-  addPointApi,
-  deletePointApi,
-  editPointApi,
+  routeCheckPageApi,
+  routeCheckAddApi,
+  routeCheckEditApi,
+  routeCheckDeleteApi,
+  routeCheckDetailApi,
   pointAreaApi,
+  getPointListApi,
+  routeTaskListApi,
+  getCheckPointApi,
+  routeTaskDeleteApi,
 } from "@/assets/js/api/insect.js";
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
 import dynamicForms from "./components/dynamicForms/index.vue";
@@ -573,28 +619,32 @@ export default {
   components: { dynamicForms },
   data() {
     return {
+      recordTableParams: {
+        total: 0,
+        pageNo: 1,
+        pageSize: 10,
+      },
       routeForm: {
-        tableList: [{ rank: null, point: null }],
+        routeToPointList: [],
       },
       routeFormRules: {
-        rank: [
+        sort: [
           {
             required: true,
-            message: "XXX不能为空",
+            message: "请输入",
             trigger: "blur",
           },
         ],
-        point: [
+        checkingPointId: [
           {
             required: true,
-            message: "XXX不能为空",
-            trigger: "blur",
+            message: "请选择",
+            trigger: "change",
           },
         ],
       },
       detailsShow: false,
-      detailData: {},
-      checkedId: 1,
+      checkedIndex: 0,
       taskDetailBool: false,
       chargerList: [],
       enterpriseList: [],
@@ -604,15 +654,16 @@ export default {
         },
       },
       searchForm: {
-        checkingPointName: "",
+        routeName: "",
       },
       cardDialogTitle: "",
       tableData: [],
+      recordTableData: [],
       total: 0,
       pageNo: 1,
       pageSize: 10,
       cardForm: {
-        checkingPointName: "",
+        routeName: "",
         position: "",
         qualityRegionId: "", // 区域ID
         enterpriseId: "", // 责任企业
@@ -630,30 +681,28 @@ export default {
       qrCode: "",
       cardDialog: false,
       projectSn: "",
-      centerModuleList: [
-        { id: 1, name: "个人信息" },
-        { id: 2, name: "修改密码" },
-        { id: 3, name: "安全日志" },
-      ],
+      centerModuleList: [],
       cardFormRules: {
-        checkingPointName: [
+        routeName: [
           { required: true, message: "请输入巡检点名称", trigger: "blur" },
         ],
         position: [
           { required: true, message: "请输入巡检位置", trigger: "blur" },
         ],
         qualityRegionId: [
-          { required: true, message: "请选择", trigger: "blur" },
+          { required: true, message: "请选择", trigger: "change" },
+        ],
+        enterpriseId: [
+          { required: true, message: "请选择", trigger: "change" },
         ],
-        enterpriseId: [{ required: true, message: "请选择", trigger: "blur" }],
         inspectUserIds: [
-          { required: true, message: "请输入检查人员", trigger: "blur" },
+          { required: true, message: "请输入检查人员", trigger: "change" },
         ],
         noticeUserIds: [
-          { required: true, message: "请输入通知人员", trigger: "blur" },
+          { required: true, message: "请输入通知人员", trigger: "change" },
         ],
         startTime: [
-          { required: true, message: "请选择检查日期", trigger: "blur" },
+          { required: true, message: "请选择检查日期", trigger: "change" },
         ],
         frequencyNum: [
           { required: true, message: "请输入巡检频次", trigger: "blur" },
@@ -672,54 +721,127 @@ export default {
       isAdding: true,
       pointAreaList: [],
       areaData: {},
+      inspectPointList: [],
+      rowObj: {},
+      recordRowObj: {},
     };
   },
   mounted() {
     this.projectSn = this.$store.state.projectSn;
-    this.getPointList();
+    this.getRouteList();
     this.getPointAreaFn();
+    this.getPointList();
   },
   methods: {
+    recordDetail(row) {
+      this.recordRowObj = row;
+      this.detailsShow = true;
+    },
+    getRouteTaskRecordFn(item) {
+      let requestData = {
+        id: this.rowObj.id,
+        xzCheckingRouteTaskId: item.id,
+      };
+      getCheckPointApi(requestData).then((res) => {
+        console.log("res111111111", res);
+        this.recordTableData = res.result.records;
+        this.recordTableParams.total = Number(res.result.total);
+      });
+    },
+    deleteRouteItem(index) {
+      this.routeForm.routeToPointList.splice(index, 1);
+    },
+    // 查询任务详情左侧任务列表
+    getTaskListFn() {
+      let data = {
+        pageNo: 10,
+        pageSize: -1,
+        projectSn: this.projectSn,
+        xzCheckingRouteId: this.rowObj.id,
+      };
+      routeTaskListApi(data).then((res) => {
+        console.log("----巡检路线任务列表", res);
+        this.centerModuleList = res.result;
+        if (this.centerModuleList.length) {
+          this.checkedIndex = 0;
+          this.getRouteTaskRecordFn(this.centerModuleList[0]);
+        }
+      });
+    },
+    // 查询巡检点
+    getPointList() {
+      let data = {
+        pageNo: 10,
+        pageSize: -1,
+        projectSn: this.projectSn,
+      };
+      getPointListApi(data).then((res) => {
+        console.log("----巡检点列表", res);
+        this.inspectPointList = res.result.records;
+      });
+    },
+    addInspectPoint() {
+      this.routeForm.routeToPointList.push({
+        sort: null,
+        checkingPointId: null,
+      });
+    },
     rowClickFn(obj) {
-      this.isAdding = false;
-      this.cardDialogTitle = "详情";
-      this.cardDialog = true;
-      this.cardForm = JSON.parse(JSON.stringify(obj));
-      if (obj.startTime && obj.endTime) {
-        this.checkDaterange = [new Date(obj.startTime), new Date(obj.endTime)];
-      } else {
-        this.checkDaterange = [];
-      }
-      this.formData.splice(0); // 清空数组
-      JSON.parse(obj.template).forEach((item) => {
-        this.formData.push(item); // 添加新的数据到数组中
+      console.log(obj, 777888);
+      routeCheckDetailApi({ id: obj.id }).then((res) => {
+        console.log(res, "巡检路线详情");
+        let responseData = res.result;
+        if (responseData) {
+          this.isAdding = false;
+          this.cardDialogTitle = "详情";
+          this.cardDialog = true;
+          this.cardForm = { ...responseData };
+          this.routeForm.routeToPointList = responseData.routeToPointList;
+          console.log(this.cardForm, 888666);
+          if (responseData.startTime && responseData.endTime) {
+            this.checkDaterange = [
+              new Date(responseData.startTime),
+              new Date(responseData.endTime),
+            ];
+          } else {
+            this.checkDaterange = [];
+          }
+          // this.formData.splice(0); // 清空数组
+          // JSON.parse(responseData.template).forEach((item) => {
+          //   this.formData.push(item); // 添加新的数据到数组中
+          // });
+          if (this.cardForm.inspectUserIds) {
+            this.cardForm.inspectUserIds =
+              this.cardForm.inspectUserIds.split(",");
+          }
+          if (this.cardForm.enterpriseId) {
+            this.cardForm.enterpriseId = this.cardForm.enterpriseId.split(",");
+          }
+          if (this.cardForm.noticeUserIds) {
+            this.cardForm.noticeUserIds =
+              this.cardForm.noticeUserIds.split(",");
+          }
+          let findItem = this.pointAreaList.find((item) => {
+            return item.id == this.cardForm.qualityRegionId;
+          });
+          if (findItem) {
+            this.areaData = findItem;
+            this.chargerList = findItem.systemUsers;
+            this.enterpriseList = findItem.enterpriseInfos;
+          }
+          this.$nextTick(() => {
+            this.$refs.cardForm.clearValidate();
+            this.$refs.routeForm.clearValidate();
+          });
+          this.getAccountList();
+        }
       });
-      if (this.cardForm.inspectUserIds) {
-        this.cardForm.inspectUserIds = this.cardForm.inspectUserIds.split(",");
-      }
-      if (this.cardForm.enterpriseId) {
-        this.cardForm.enterpriseId = this.cardForm.enterpriseId.split(",");
-      }
-      if (this.cardForm.noticeUserIds) {
-        this.cardForm.noticeUserIds = this.cardForm.noticeUserIds.split(",");
-      }
-      let findItem = this.pointAreaList.find((item) => {
-        return item.id == this.cardForm.qualityRegionId;
-      });
-      if (findItem) {
-        this.areaData = findItem;
-        this.chargerList = findItem.systemUsers;
-        this.enterpriseList = findItem.enterpriseInfos;
-      }
-      this.$nextTick(() => {
-        this.initMap();
-      });
-      this.getAccountList();
     },
     //切换 单位类型
-    selectMenu(value) {
+    selectMenu(value, index) {
       console.log("切换菜单", value);
-      this.checkedId = value.id;
+      this.checkedIndex = index;
+      this.getRouteTaskRecordFn(value);
     },
     //切换 整改人
     changeDutyId(value) {
@@ -768,91 +890,12 @@ export default {
       });
     },
     //查看详情
-    deilBtn() {
+    deilBtn(row) {
+      console.log(row, 666777);
+      this.rowObj = row;
+      this.getTaskListFn();
       this.taskDetailBool = true;
     },
-    //地图加载
-    initMap() {
-      var that = this;
-      //地图加载
-      this.map = new AMap.Map("container", {
-        resizeEnable: true,
-      });
-      var geocoder = new AMap.Geocoder({});
-      //输入提示
-      var autoOptions = {
-        input: "tipinput",
-      };
-      this.auto = new AMap.Autocomplete(autoOptions);
-      this.placeSearch = new AMap.PlaceSearch({
-        map: this.map,
-      }); //构造地点查询类
-      AMap.event.addListener(this.auto, "select", this.select); //注册监听，当选中某条记录时会触发
-      mouseTool = new AMap.MouseTool(this.map);
-      mouseTool.on("draw", function (event) {
-        // event.obj 为绘制出来的覆盖物对象
-        console.log("覆盖物对象绘制完成", event.obj.getPath());
-
-        let overlaysList = that.map.getAllOverlays("polygon");
-
-        if (overlaysList.length > 1) {
-          that.map.remove(overlaysList[0]);
-        }
-
-        that.locationList = [];
-        var pathArr = event.obj.getPath();
-        pathArr.forEach((element) => {
-          that.locationList.push({
-            longitude: element.lng,
-            latitude: element.lat,
-          });
-        });
-      });
-      geocoder.getLocation(this.cardForm.addr, function (status, result) {
-        if (status === "complete" && result.geocodes.length) {
-          var lnglat = result.geocodes[0].location;
-          console.log(result.geocodes[0]);
-          // var arr = lnglat.split(',')
-          that.locationList = [
-            {
-              longitude: lnglat.lng,
-              latitude: lnglat.lat,
-            },
-          ];
-          that.drawCircle();
-        }
-      });
-      this.map.on("click", (e) => {
-        console.log(
-          "您在 [ " +
-            e.lnglat.getLng() +
-            "," +
-            e.lnglat.getLat() +
-            " ] 的位置单击了地图！"
-        );
-        this.cardForm.latitude = e.lnglat.getLat();
-        this.cardForm.longitude = e.lnglat.getLng();
-
-        this.locationList = [];
-        this.locationList.push({
-          longitude: e.lnglat.getLng(),
-          latitude: e.lnglat.getLat(),
-        });
-        var lnglatXY = new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat());
-        geocoder.getAddress(lnglatXY, function (status, result) {
-          console.log(status, result);
-          that.cardForm.addr = result.regeocode.formattedAddress;
-        });
-        this.drawCircle();
-        //  else {
-        //   this.locationList.push({
-        //     longitude: e.lnglat.getLng(),
-        //     latitude: e.lnglat.getLat(),
-        //   });
-
-        // }
-      });
-    },
     //关键字查询查询
     select(e) {
       console.log("select", e);
@@ -957,25 +1000,33 @@ export default {
         this.cardForm.endTime = "";
       }
     },
+    handleRecordSizeChange(val) {
+      this.recordTableParams.pageSize = val;
+      this.getRouteTaskRecordFn();
+    },
+    //查看页
+    handleRecordCurrentChange(val) {
+      this.recordTableParams.pageNo = val;
+      this.getRouteTaskRecordFn();
+    },
     //查看条数
     handleSizeChange(val) {
       this.pageSize = val;
-      this.getPointList();
+      this.getRouteList();
     },
     //查看页
     handleCurrentChange(val) {
       this.pageNo = val;
-      this.getPointList();
+      this.getRouteList();
     },
     // 查询
-    getPointList() {
+    getRouteList() {
       let data = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
-        checkingPointName: this.searchForm.checkingPointName,
       };
-      getPointListApi(data).then((res) => {
+      routeCheckPageApi(data).then((res) => {
         console.log("----巡检点列表", res);
         this.tableData = res.result.records;
         this.total = res.result.total;
@@ -985,7 +1036,7 @@ export default {
     },
     // 刷新
     toRefresh() {
-      this.getPointList();
+      this.getRouteList();
     },
     editBtn(obj) {
       console.log("编辑的信息", obj);
@@ -1021,9 +1072,6 @@ export default {
         this.chargerList = findItem.systemUsers;
         this.enterpriseList = findItem.enterpriseInfos;
       }
-      this.$nextTick(() => {
-        this.initMap();
-      });
       this.getAccountList();
     },
     // 新增
@@ -1038,13 +1086,12 @@ export default {
         value: "",
       });
       this.checkDaterange = [];
-      this.cardDialogTitle = "新建巡检点";
+      this.cardDialogTitle = "新建巡检路线";
       this.areaData = {};
       this.chargerList = [];
       this.enterpriseList = [];
       this.resetForm();
       this.$nextTick(() => {
-        this.initMap();
         this.$refs.cardForm.clearValidate();
       });
       this.getAccountList();
@@ -1061,9 +1108,42 @@ export default {
           let data = {
             id: val.id,
           };
-          deletePointApi(data).then((res) => {
+          routeCheckDeleteApi(data).then((res) => {
             if (res.success) {
-              this.getPointList();
+              this.getRouteList();
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: res.message,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    deleteTaskItem(val) {
+      console.log("删除", val);
+      this.$confirm("请确认是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let data = {
+            id: val.id,
+          };
+          routeTaskDeleteApi(data).then((res) => {
+            if (res.success) {
+              this.getTaskListFn();
               this.$message({
                 type: "success",
                 message: "删除成功!",
@@ -1111,47 +1191,44 @@ export default {
         seconds;
       return timer;
     },
-    // 生成二维码
-    addCardFn() {
-      this.$refs.routeForm.validate((valid) => {
-        if(valid){
-          console.log('成功')
+    // 添加路线
+    addRouteFn() {
+      this.$refs.cardForm.validate((valid) => {
+        if (valid) {
+          if (!this.routeForm.routeToPointList.length) {
+            this.$message.error("请添加巡检路线");
+            return;
+          }
+          this.$refs.routeForm.validate((valid) => {
+            if (valid) {
+              let data = { ...this.cardForm, ...this.routeForm };
+              data.projectSn = this.$store.state.projectSn;
+              data.createUserId = this.$store.state.userInfo.userId;
+              data.createUserName = this.$store.state.userInfo.account;
+              data.inspectUserIds = data.inspectUserIds.join(",");
+              data.enterpriseId = data.enterpriseId.join(",");
+              data.noticeUserIds = data.noticeUserIds.join(",");
+              if (this.cardDialogTitle == "新建巡检路线") {
+                routeCheckAddApi(data).then((res) => {
+                  console.log("新增", res);
+                  if (res.code == 200) {
+                    this.$message.success("添加成功！");
+                    this.getRouteList();
+                  }
+                });
+              } else if (this.cardDialogTitle == "编辑巡检点") {
+                routeCheckEditApi(data).then((res) => {
+                  if (res.success) {
+                    this.$message.success(res.message);
+                    this.getRouteList();
+                  }
+                });
+              }
+              this.cardDialog = false;
+            }
+          });
         }
-      })
-      // this.$refs.cardForm.validate((valid) => {
-      //   if (valid) {
-      //     let formTemplate;
-      //     formTemplate = this.$refs.dynamicFormsRef.dynamicFroms;
-
-      //     // 新增
-      //     let data = { ...this.cardForm };
-      //     data.projectSn = this.$store.state.projectSn;
-      //     data.createUserId = this.$store.state.userInfo.userId;
-      //     data.createUserName = this.$store.state.userInfo.account;
-      //     data.inspectUserIds = data.inspectUserIds.join(",");
-      //     data.enterpriseId = data.enterpriseId.join(",");
-      //     data.noticeUserIds = data.noticeUserIds.join(",");
-      //     data.template = JSON.stringify(formTemplate);
-      //     if (this.cardDialogTitle == "新建巡检点") {
-      //       addPointApi(data).then((res) => {
-      //         console.log("新增", res);
-      //         if (res.code == 200) {
-      //           this.$message.success("添加成功！");
-
-      //           this.getPointList();
-      //         }
-      //       });
-      //     } else if (this.cardDialogTitle == "编辑巡检点") {
-      //       editPointApi(data).then((res) => {
-      //         if (res.success) {
-      //           this.$message.success(res.message);
-      //           this.getPointList();
-      //         }
-      //       });
-      //     }
-      //     this.cardDialog = false;
-      //   }
-      // });
+      });
     },
 
     close() {
@@ -1163,7 +1240,7 @@ export default {
     },
     resetForm() {
       this.cardForm = {
-        checkingPointName: "",
+        routeName: "",
         position: "",
         qualityRegionId: "", // 区域ID
         enterpriseId: "", // 责任企业
@@ -1178,6 +1255,7 @@ export default {
         longitude: "", //经度
         addr: "", //地图区域
       };
+      this.routeForm.routeToPointList = [];
     },
     //检查人员下拉列表
     getAccountList() {
@@ -1199,7 +1277,7 @@ export default {
     },
     refresh() {
       this.searchForm = {};
-      this.getPointList();
+      this.getRouteList();
     },
   },
 };
@@ -1231,9 +1309,6 @@ export default {
   line-height: 36px;
 }
 
-.dialogFormBox {
-  width: 580px;
-}
 .addrTitle {
   font-size: 16px;
   line-height: 56px;
@@ -1244,7 +1319,9 @@ export default {
 
 // 新增弹框的样式
 .dialog-route-content {
+  width: 100%;
   display: flex;
+  justify-content: space-around;
   .route-manage {
     width: 470px;
     background: #ffffff;
@@ -1301,7 +1378,7 @@ export default {
       img {
         width: 20px;
         height: 20px;
-        margin-right: 10px;
+        margin-right: 8px;
       }
       span {
         font-family: Source Han Sans CN, Source Han Sans CN;
@@ -1336,7 +1413,11 @@ export default {
         .option-list-item {
           display: flex;
           align-items: center;
-          span {
+          div {
+            width: 80%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
             margin-right: auto;
           }
           img {