From 7564b625f866c187a0279c31ccb592164a50b61b Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 23 May 2024 20:29:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/laborPerson.js              |   2 +-
 .../allInfo/componentsModule/dataListData.vue |   2 +-
 .../hadRead/componentsModule/dataListData.vue |   2 +-
 .../notRead/componentsModule/dataListData.vue |   2 +-
 .../projectFront/inspectRoute/routeManage.vue | 927 ++++++++++++------
 .../projectFront/inspectRoute/selfInspect.vue | 630 ------------
 .../laborManage/personDetails.vue             |  14 +-
 7 files changed, 626 insertions(+), 953 deletions(-)
 delete mode 100644 src/views/projectFront/inspectRoute/selfInspect.vue

diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js
index 98bd6140..70398efa 100644
--- a/src/assets/js/api/laborPerson.js
+++ b/src/assets/js/api/laborPerson.js
@@ -88,7 +88,7 @@ export const workerAttendanceRuleAdd = data => post('xmgl/workerAttendanceRule/a
 export const workerAttendanceRuleEdit = data => post('xmgl/workerAttendanceRule/edit', data);//编辑考勤规则信息
 export const workerAttendanceRuleDelete = data => post('xmgl/workerAttendanceRule/delete', data);//删除考勤规则信息
 
-// 安全扣分详情
+// 安全分详情
 export const safeReduceDetailList = data => get('xmgl/xzDeductScoreRecord/list', data);//列表查询考勤规则信息
 export const resetScoreApi = data => post('xmgl/workerInfo/updateById', data);//重置分数
 
diff --git a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
index 5bc0a94f..8089471a 100644
--- a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
@@ -174,7 +174,7 @@ export default {
         { name: "安全", value: 10 },
         { name: "AI", value: 8 },
         { name: "通知公告", value: "other" },
-        { name: "安全履职报警", value: "safeAlarm" },
+        { name: "安全履职报警", value: 35 },
       ],
       devSn: "",
       // 遮罩层
diff --git a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
index 5706da90..16befa32 100644
--- a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
@@ -165,7 +165,7 @@ export default {
         { name: "安全", value: 10 },
         { name: "AI", value: 8 },
         { name: "通知公告", value: "other" },
-        { name: "安全履职报警", value: "safeAlarm" },
+        { name: "安全履职报警", value: 35 },
       ],
       devSn: "",
       // 遮罩层
diff --git a/src/views/infoCenter/notRead/componentsModule/dataListData.vue b/src/views/infoCenter/notRead/componentsModule/dataListData.vue
index bb08c279..27020197 100644
--- a/src/views/infoCenter/notRead/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/notRead/componentsModule/dataListData.vue
@@ -169,7 +169,7 @@ export default {
         { name: "安全", value: 10 },
         { name: "AI", value: 8 },
         { name: "通知公告", value: "other" },
-        { name: "安全履职报警", value: "safeAlarm" },
+        { name: "安全履职报警", value: 35 },
       ],
       devSn: "",
       // 遮罩层
diff --git a/src/views/projectFront/inspectRoute/routeManage.vue b/src/views/projectFront/inspectRoute/routeManage.vue
index 9d96219d..b5b5c886 100644
--- a/src/views/projectFront/inspectRoute/routeManage.vue
+++ b/src/views/projectFront/inspectRoute/routeManage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="fullHeight">
+  <div class="fullHeight" v-if="!taskDetailBool">
     <div class="searchBox whiteBlock">
       <el-form
         :inline="true"
@@ -7,7 +7,7 @@
         :model="searchForm"
         ref="searchForm"
       >
-        <el-form-item label="巡检点名称">
+        <el-form-item label="巡检路线名称">
           <el-input
             placeholder="请输入"
             v-model="searchForm.checkingPointName"
@@ -24,125 +24,67 @@
     </div>
     <div class="table_wrap whiteBlock">
       <vue-scroll class="tables">
-      <el-table :data="tableData">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-        ></el-table-column>
-        <el-table-column
-          prop="checkingPointName"
-          label="巡检点名称"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="position"
-          label="巡检位置"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="createUserName"
-          label="创建人"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="createDate"
-          label="创建时间"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="regionName"
-          label="所属区域"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="enterpriseName"
-          label="责任企业"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="inspectUserNames"
-          label="检查人员"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="noticeUserNames"
-          label="通知人"
-          align="center"
-        ></el-table-column>
+        <el-table :data="tableData" @row-click="rowClickFn">
+          <el-table-column
+            label="序号"
+            align="center"
+            type="index"
+          ></el-table-column>
+          <el-table-column
+            prop="checkingPointName"
+            label="路线名称"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检人员"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检通知人员"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检周期"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检频次"
+            align="center"
+          ></el-table-column>
 
-        <el-table-column prop="qrCode" label="二维码" align="center">
-          <template slot-scope="{ row }">
-            <!-- {{$store.state.FILEURL + row.qrCode}} -->
-            <el-image
-              style="
-                margin-right: 8px;
-                width: 80px;
-                height: 80px;
-                cursor: pointer;
-                border-radius: 4px;
-              "
-              fit="cover"
-              :src="$store.state.FILEURL + row.qrCode"
-              :preview-src-list="[$store.state.FILEURL + row.qrCode]"
-            />
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          :label="$t('message.personnelPosition.beaconManage.table.operation')"
-          align="center"
-          width="400"
-        >
-          <template slot-scope="scope">
-            <div class="tableBtns">
-              <div class="operationText">
-                <i
-                  class="el-icon-download"
-                  style="
-                    width: 30px;
-                    height: 30px;
-                    color: #1684fc;
-                    margin-top: 15px;
-                  "
-                ></i>
-                <a
-                  class="download"
-                  target="_blank"
-                  :href="$store.state.FILEURL + scope.row.qrCode"
-                  download
-                  >下载巡检二维码</a
-                >
+          <el-table-column
+            :label="
+              $t('message.personnelPosition.beaconManage.table.operation')
+            "
+            align="center"
+            width="200"
+          >
+            <template slot-scope="scope">
+              <div class="operation-style">
+                <div class="operationText" @click="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">
+                  <img
+                    src="@/assets/images/icon-delete.png"
+                    width="15px"
+                    height="15px"
+                  />
+                  <span>删除</span>
+                </div>
               </div>
-
-              <div class="operationText" @click="deilBtn(scope.row)">
-                <i
-                  class="el-icon-tickets"
-                  style="color: #8dacfa; font-size: 16px; margin-right: 2px"
-                ></i>
-                <span>详情</span>
-              </div>
-              <div class="operationText" @click="editBtn(scope.row)">
-                <img
-                  src="@/assets/images/icon-edit.png"
-                  width="15px"
-                  height="15px"
-                />
-                <span>编辑</span>
-              </div>
-              <div @click="toDelete(scope.row)" class="operationText">
-                <img
-                  src="@/assets/images/icon-delete.png"
-                  width="15px"
-                  height="15px"
-                />
-                <span>删除</span>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </vue-scroll>
+            </template>
+          </el-table-column>
+        </el-table>
+      </vue-scroll>
       <el-pagination
         class="pagerBox"
         @size-change="handleSizeChange"
@@ -160,10 +102,10 @@
       :modal-append-to-body="false"
       :title="cardDialogTitle"
       :visible.sync="cardDialog"
-      width="667px"
+      width="60%"
       @close="close"
     >
-      <div class="dialog_content">
+      <div class="dialog-route-content">
         <el-form
           size="medium"
           :model="cardForm"
@@ -172,21 +114,14 @@
           label-width="150px"
           class="dialogFormBox"
         >
-          <el-form-item label="巡检点名称：" prop="checkingPointName">
+          <el-form-item label="路线名称：" prop="checkingPointName">
             <el-input
               :disabled="cardDialogTitle == '详情'"
               v-model="cardForm.checkingPointName"
               :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
-          <el-form-item label="巡检点位置：" prop="position">
-            <el-input
-              :disabled="cardDialogTitle == '详情'"
-              v-model="cardForm.position"
-              :placeholder="isAdding ? '请输入' : ''"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="所属区域：" prop="qualityRegionId">
+          <el-form-item label="区域名称：" prop="qualityRegionId">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -204,7 +139,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="责任企业：" prop="enterpriseId">
+          <el-form-item label="企业名称：" prop="enterpriseId">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -223,7 +158,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="责任人：" prop="inspectUserIds">
+          <el-form-item label="巡检人员：" prop="inspectUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -241,25 +176,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="巡检人员：" prop="inspectUserIds">
-            <el-select
-              :disabled="cardDialogTitle == '详情'"
-              collapse-tags
-              filterable
-              v-model="cardForm.inspectUserIds"
-              multiple
-              :placeholder="isAdding ? '请选择' : ''"
-            >
-              <el-option
-                v-for="item in accountList"
-                :key="item.userId + 'inspectUserIds'"
-                :label="item.workerName"
-                :value="item.userId"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item> -->
-          <el-form-item label="巡检记录通知人员：" prop="noticeUserIds">
+          <el-form-item label="通知人员：" prop="noticeUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -277,7 +194,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="巡检时间范围：" prop="startTime">
+          <el-form-item label="计划检查时间：" prop="startTime">
             <!-- 开始日期 结束日期 -->
             <el-date-picker
               :disabled="cardDialogTitle == '详情'"
@@ -293,7 +210,7 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="巡检频次：" prop="frequencyNum">
+          <el-form-item label="检查频次：" prop="frequencyNum">
             <el-input-number
               :disabled="cardDialogTitle == '详情'"
               class="smallInput"
@@ -319,74 +236,318 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- 
-          <el-form-item label="经度：" prop="longitude">
-            <el-input v-model="cardForm.longitude"></el-input>
-          </el-form-item>
-
-          <el-form-item label="纬度：" prop="latitude">
-            <el-input v-model="cardForm.latitude"></el-input>
-          </el-form-item> -->
-
-          <el-form-item label="自定义范围：" prop="standArea">
-            <el-select
-              :disabled="cardDialogTitle == '详情'"
-              v-model="cardForm.standArea"
-              :placeholder="isAdding ? '请输入' : ''"
-              @change="drawCircle()"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item"
-                :label="item + $t('message.laborMange.meter')"
-                :value="item"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <div class="addrTitle" style="width: calc(100% - 160px):">
-            <el-form-item label="区域：" prop="addr">
-              <el-input
-                :disabled="cardDialogTitle == '详情'"
-                size="medium"
-                v-model="cardForm.addr"
-                id="tipinput"
-                :placeholder="isAdding ? '请输入' : ''"
-              >
-                <el-button slot="append" icon="el-icon-search"></el-button>
-              </el-input>
-            </el-form-item>
+        </el-form>
+        <div class="route-manage">
+          <div class="route-manage-title">
+            <span>巡检路线</span>
           </div>
+          <vue-scroll style="height: 80%; margin-top: 10px">
+            <div class="route-manage-list">
+              <el-form
+                size="medium"
+                :model="routeForm"
+                ref="routeForm"
+                :rules="routeFormRules"
+                label-width="80px"
+                style="width: 95%; margin: 0 auto"
+              >
+                <div
+                  class="list-item"
+                  v-for="(item, index) in routeForm.tableList"
+                  :key="index"
+                >
+                  <el-form-item
+                    label="排序:"
+                    :prop="`tableList[${index}].rank`"
+                    :rules="routeFormRules.rank"
+                  >
+                    <el-input
+                      :disabled="cardDialogTitle == '详情'"
+                      v-model="cardForm.checkingPointName"
+                      :placeholder="isAdding ? '请输入' : ''"
+                      style="width: 100px"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item
+                    label="巡检点:"
+                    :prop="`tableList[${index}].point`"
+                    :rules="routeFormRules.point"
+                  >
+                    <el-select
+                      :disabled="cardDialogTitle == '详情'"
+                      collapse-tags
+                      filterable
+                      v-model="cardForm.qualityRegionId"
+                      :placeholder="isAdding ? '请选择' : ''"
+                      @change="updateArea"
+                      style="width: 120px"
+                    >
+                      <el-option
+                        v-for="item in pointAreaList"
+                        :key="item.id"
+                        :label="item.regionName"
+                        :value="item.id"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <i
+                    class="el-icon-close"
+                    style="
+                      color: #ec1111;
+                      position: absolute;
+                      top: 0px;
+                      right: 0px;
+                      font-size: 20px;
+                    "
+                  ></i>
+                </div>
+              </el-form>
+            </div>
+          </vue-scroll>
+          <div class="add-route" v-if="cardDialogTitle != '详情'">
+            <img src="@/assets/images/icon-add.png" alt="" srcset="" />
+            <span>添加巡检点</span>
+          </div>
+        </div>
+      </div>
+      <div class="dialog-footer" v-if="cardDialogTitle != '详情'">
+        <el-button
+          class="cancleBtn"
+          @click="closeEvent"
+          icon="el-icon-circle-close"
+          size="medium"
+          >取消</el-button
+        >
+        <el-button
+          v-if="isAdding != false"
+          type="primary"
+          icon="el-icon-circle-check"
+          @click="addCardFn"
+          size="medium"
+          >确定</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+  <div class="task-detail-main" v-else>
+    <div class="searchBox whiteBlock">
+      <span>巡检路线：一号巡检路线</span>
+      <el-button
+        type="warning"
+        size="medium"
+        plain
+        @click="taskDetailBool = false"
+        style="margin-left: 35px"
+        >返回</el-button
+      >
+    </div>
+    <div class="task-detail-part">
+      <vue-scroll
+        style="height: 100%; width: 370px"
+        class="task-detail-option whiteBlock"
+      >
+        <div class="option-title">巡检任务</div>
+        <ul>
+          <li
+            class="el-menu-item2"
+            :class="checkedId == item.id ? 'checked_item' : ''"
+            v-for="(item, index) in centerModuleList"
+            @click="selectMenu(item)"
+            :key="index"
+          >
+            <div class="option-list-item">
+              <span>{{ item.name }}</span>
+              <img
+                src="@/assets/images/icon-edit.png"
+                width="15px"
+                height="15px"
+              />
+              <img
+                src="@/assets/images/icon-delete.png"
+                width="15px"
+                height="15px"
+              />
+            </div>
+          </li>
+        </ul>
+      </vue-scroll>
+      <vue-scroll class="task-detail-table whiteBlock">
+        <el-table :data="tableData" style="height: 87%">
+          <el-table-column
+            label="序号"
+            align="center"
+            type="index"
+          ></el-table-column>
+          <el-table-column
+            prop="checkingPointName"
+            label="路线名称"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检人员"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检通知人员"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检周期"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="inspectUserNames"
+            label="巡检频次"
+            align="center"
+          ></el-table-column>
 
-          <div
-            id="container"
-            style="width: 580px; height: 400px; background: pink"
-          ></div>
-          <div class="addrTitle">{{ cardForm.addr }}</div>
+          <el-table-column
+            :label="
+              $t('message.personnelPosition.beaconManage.table.operation')
+            "
+            align="center"
+            width="200"
+          >
+            <template slot-scope="scope">
+              <div class="operation-style">
+                <div class="operationText" @click="detailsShow = true">
+                  <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>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-pagination
+          class="pagerBox"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pageNo"
+          :page-sizes="$store.state.PAGESIZRS"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next"
+          :total="Number(total)"
+          background
+        ></el-pagination>
+      </vue-scroll>
+    </div>
+
+    <!-- 详情弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="巡检记录详情"
+      :visible.sync="detailsShow"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          ref="addEditForm"
+          label-width="130px"
+          class="dialogFormBox"
+        >
+          <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.position" 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.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"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="异常巡检图片" v-if="detailData.status == 2">
+            <img
+              v-if="imgSrc"
+              style="width: 150px; height: 100px"
+              :src="$store.state.FILEURL + imgSrc"
+              :preview="$store.state.FILEURL + imgSrc"
+              alt=""
+            />
+          </el-form-item>
+          <!-- <div class="grid-content" v-if="detailData.status == 2">
+            <div class="label">异常巡检图片</div>
+            <div class="value">
+              <img
+                v-if="imgSrc"
+                style="width: 150px; height: 100px"
+                :src="$store.state.FILEURL + imgSrc"
+                alt=""
+              />
+            </div>
+          </div> -->
+          <el-form-item
+            :label="item.title"
+            v-for="(item, index) in templateList"
+            :key="index"
+          >
+            <el-input
+              style="width: 320px"
+              v-model="item.value"
+              disabled
+            ></el-input>
+          </el-form-item>
           <!-- 动态表单 -->
-          <dynamicForms
-            ref="dynamicFormsRef"
-            :templateData="formData"
-            :isAdding="isAdding"
-          ></dynamicForms>
-
-          <div id="qrCode" ref="qrCodeDiv"></div>
+          <!-- <div
+            class="formBox"
+            style="padding-left: 10%; padding-bottom: 5%; margin-top: -5%"
+          >
+            <div
+              class="formInput flex"
+              v-for="(item, index) in templateList"
+              :key="index"
+            >
+              <input class="fromsTit" v-model="item.title" disabled />
+              <el-input
+                style="width: 400px !important"
+                disabled
+                class="inputBox"
+                v-model="item.value"
+              ></el-input>
+            </div>
+          </div> -->
           <div class="dialog-footer">
-            <el-button
-              class="cancleBtn"
-              @click="closeEvent"
-              icon="el-icon-circle-close"
-              size="medium"
-              >取消</el-button
-            >
-            <el-button
-              v-if="isAdding != false"
-              type="primary"
-              icon="el-icon-circle-check"
-              @click="addCardFn"
-              size="medium"
-              >生成巡检二维码</el-button
-            >
+            <el-button @click="detailsShow = false" type="primary" size="medium"
+              >关闭
+            </el-button>
           </div>
         </el-form>
       </div>
@@ -412,6 +573,29 @@ export default {
   components: { dynamicForms },
   data() {
     return {
+      routeForm: {
+        tableList: [{ rank: null, point: null }],
+      },
+      routeFormRules: {
+        rank: [
+          {
+            required: true,
+            message: "XXX不能为空",
+            trigger: "blur",
+          },
+        ],
+        point: [
+          {
+            required: true,
+            message: "XXX不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      detailsShow: false,
+      detailData: {},
+      checkedId: 1,
+      taskDetailBool: false,
       chargerList: [],
       enterpriseList: [],
       pickerOptions: {
@@ -446,6 +630,11 @@ export default {
       qrCode: "",
       cardDialog: false,
       projectSn: "",
+      centerModuleList: [
+        { id: 1, name: "个人信息" },
+        { id: 2, name: "修改密码" },
+        { id: 3, name: "安全日志" },
+      ],
       cardFormRules: {
         checkingPointName: [
           { required: true, message: "请输入巡检点名称", trigger: "blur" },
@@ -491,6 +680,47 @@ export default {
     this.getPointAreaFn();
   },
   methods: {
+    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); // 添加新的数据到数组中
+      });
+      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) {
+      console.log("切换菜单", value);
+      this.checkedId = value.id;
+    },
     //切换 整改人
     changeDutyId(value) {
       console.log(this.cardForm, 777888);
@@ -538,41 +768,8 @@ export default {
       });
     },
     //查看详情
-    deilBtn(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); // 添加新的数据到数组中
-      });
-      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();
+    deilBtn() {
+      this.taskDetailBool = true;
     },
     //地图加载
     initMap() {
@@ -916,66 +1113,45 @@ export default {
     },
     // 生成二维码
     addCardFn() {
-      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();
-              }
-            });
-            //   document.getElementById("qrCode").innerHTML = "";
-            //   console.log("QRCode", QRCode);
-            //   let QRCodeData = new QRCode(this.$refs.qrCodeDiv, {
-            //     text: JSON.stringify(data),
-            //     width: 150,
-            //     height: 150,
-            //     colorDark: "#333333", //二维码颜色
-            //     colorLight: "#ffffff", //二维码背景色
-            //     correctLevel: QRCode.CorrectLevel.L //容错率，L/M/H
-            //   });
-            //   console.log("QRCodeData", QRCodeData);
-            //   setTimeout(() => {
-            //     let img = QRCodeData._el.innerHTML;
-            //     let baseurl = img
-            //       .split("=")[5].split('"')[1]
-            //     console.log("baseurl", baseurl);
-            //     data.qrCode = baseurl;
-            //     data.createDate = this.selectNowDate();
-            //     addPointApi(data).then(res => {
-            //       console.log("新增", res);
-            //       if (res.code == 200) {
-            //         this.cardDialog = false;
-            //         this.getPointList()
-            //       }
-            //     });
-            //   }, 500);
-          } else if (this.cardDialogTitle == "编辑巡检点") {
-            editPointApi(data).then((res) => {
-              if (res.success) {
-                this.$message.success(res.message);
-                this.getPointList();
-              }
-            });
-          }
-          this.cardDialog = false;
+      this.$refs.routeForm.validate((valid) => {
+        if(valid){
+          console.log('成功')
         }
-      });
+      })
+      // 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() {
@@ -985,7 +1161,7 @@ export default {
       // })
       this.closeEvent();
     },
-    resetForm(){
+    resetForm() {
       this.cardForm = {
         checkingPointName: "",
         position: "",
@@ -1001,7 +1177,7 @@ export default {
         latitude: "", //纬度
         longitude: "", //经度
         addr: "", //地图区域
-      }
+      };
     },
     //检查人员下拉列表
     getAccountList() {
@@ -1062,7 +1238,130 @@ export default {
   font-size: 16px;
   line-height: 56px;
 }
-::v-deep .el-tag{
+::v-deep .el-tag {
   max-width: 200px;
 }
+
+// 新增弹框的样式
+.dialog-route-content {
+  display: flex;
+  .route-manage {
+    width: 470px;
+    background: #ffffff;
+    border-radius: 10px 10px 10px 10px;
+    border: 1px dashed #5181f6;
+    &-title {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 7px;
+      span {
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: bold;
+        font-size: 14px;
+        color: #5181f6;
+        border-bottom: 2px solid #5181f6;
+      }
+    }
+    &-list {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .list-item {
+        background: #ffffff;
+        border-radius: 10px 10px 10px 10px;
+        border: 1px dashed #5181f6;
+        padding: 16px 0px;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+        position: relative;
+        /deep/.el-form-item {
+          margin-bottom: 0;
+        }
+      }
+      .list-item:not(:last-child) {
+        margin-bottom: 10px;
+      }
+    }
+    .add-route {
+      width: 203px;
+      height: 32px;
+      margin: 0 auto;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 400;
+      font-size: 14px;
+      background: #ffffff;
+      border-radius: 4px 4px 4px 4px;
+      border: 1px dashed #d8dbe8;
+      cursor: pointer;
+      img {
+        width: 20px;
+        height: 20px;
+        margin-right: 10px;
+      }
+      span {
+        font-family: Source Han Sans CN, Source Han Sans CN;
+        font-weight: 400;
+        font-size: 14px;
+        color: #a2a4af;
+      }
+    }
+  }
+}
+.task-detail-main {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .task-detail-part {
+    display: flex;
+    flex: 1;
+    .task-detail-option {
+      .option-title {
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 400;
+        font-size: 15px;
+        color: #000000;
+        margin: 12px 0 10px 15px;
+      }
+      .el-menu-item2 {
+        border-bottom: 2px #ebf0fc solid;
+        height: 43px;
+        line-height: 43px;
+        padding: 0 30px !important;
+        cursor: pointer;
+        .option-list-item {
+          display: flex;
+          align-items: center;
+          span {
+            margin-right: auto;
+          }
+          img {
+            width: 15px;
+            height: 15px;
+            margin-right: 15px;
+          }
+        }
+      }
+      .checked_item {
+        border-left: 3px solid #5181f6;
+        padding: 0 27px !important;
+        background-color: #e1e8fa !important;
+      }
+    }
+    .task-detail-table {
+      width: calc(100% - 370px);
+      margin-left: 36px;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      .pagerBox {
+        margin-top: 35px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/projectFront/inspectRoute/selfInspect.vue b/src/views/projectFront/inspectRoute/selfInspect.vue
deleted file mode 100644
index 1430fda0..00000000
--- a/src/views/projectFront/inspectRoute/selfInspect.vue
+++ /dev/null
@@ -1,630 +0,0 @@
-<template>
-  <div class="fullHeight">
-    <div class="searchBox whiteBlock">
-      <el-form
-        :inline="true"
-        size="medium"
-        :model="searchForm"
-        ref="searchForm"
-      >
-        <el-form-item label="巡检点名称">
-          <el-input
-            placeholder="请输入"
-            v-model="searchForm.checkingPointName"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-select v-model="searchForm.status" placeholder="请选择">
-            <el-option label="正常" :value="1"></el-option>
-            <el-option label="异常" :value="2"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="巡检时间">
-          <el-date-picker
-            v-model="timeValue"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
-            @change="getTime"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-button size="medium" type="primary" plain @click="getPointList"
-          >查询</el-button
-        >
-        <el-button size="medium" type="warning" plain @click="toRefresh"
-          >刷新</el-button
-        >
-      </el-form>
-    </div>
-    <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="tableData">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-        ></el-table-column>
-        <el-table-column
-          prop="checkingPointName"
-          label="巡检点名称"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="position"
-          label="巡检位置"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="checkingPointUserName"
-          label="巡检人员"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="noticeUserNames"
-          label="巡检记录通知人员"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="createDate"
-          label="巡检时间"
-          align="center"
-        ></el-table-column>
-        <el-table-column prop="status" label="状态" align="center">
-          <template slot-scope="scope">{{
-            scope.row.status == 2 ? "异常" : "正常"
-          }}</template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="280">
-          <template slot-scope="scope">
-            <div class="tableBtns">
-              <div class="operationText styleDom" @click="detailBtn(scope.row)">
-                <i
-                  class="el-icon-tickets"
-                  style="color: #8dacfa; font-size: 16px; margin-right: 2px"
-                ></i>
-                <span>详情</span>
-              </div>
-
-              <div @click="deleteDev(scope.row)" class="operationText styleDom">
-                <img
-                  src="@/assets/images/icon-delete.png"
-                  width="15px"
-                  height="15px"
-                />
-                <span>删除</span>
-              </div>
-              <div
-                @click="dispBtn(scope.row.id)"
-                class="operationText"
-                v-show="scope.row.handleDone == 0 && scope.row.status != 1"
-              >
-                <span style="background: #5181f6; color: #fff; width: 60px"
-                  >待处置</span
-                >
-              </div>
-              <div
-                @click="closedBtn(scope.row)"
-                class="operationText"
-                v-show="scope.row.handleDone == 1 && scope.row.status != 1"
-              >
-                <span style="background: #a2a4af; color: #fff; width: 60px"
-                  >已闭合</span
-                >
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        class="pagerBox"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="pageNo"
-        :page-sizes="$store.state.PAGESIZRS"
-        :page-size="pageSize"
-        layout="total, sizes, prev, pager, next"
-        :total="Number(total)"
-        background
-      ></el-pagination>
-    </div>
-    <!-- 处置记录弹框-->
-    <el-dialog
-      :modal-append-to-body="false"
-      @close="close"
-      :title="disTitle"
-      :visible.sync="recordShow"
-      width="667px"
-    >
-      <div class="dialog_content">
-        <el-form
-          size="medium"
-          ref="addEditForm"
-          :model="addEditForm"
-          :rules="addEditRules"
-          label-width="120px"
-          class="dialogFormBox"
-        >
-          <el-form-item label="操作人" v-if="disTitle == '处置记录'">
-            <el-input v-model="addEditForm.operateName" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="操作时间" v-if="disTitle == '处置记录'">
-            <el-input v-model="addEditForm.operateTime" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="处置结果" prop="handleResult">
-            <el-radio
-              v-model="addEditForm.handleResult"
-              :label="1"
-              :disabled="disTitle == '处置记录'"
-              >已处置</el-radio
-            >
-            <el-radio
-              v-model="addEditForm.handleResult"
-              :label="2"
-              :disabled="disTitle == '处置记录'"
-              >误报忽略</el-radio
-            >
-          </el-form-item>
-          <el-form-item
-            label="描述"
-            prop="description"
-            v-if="addEditForm.handleResult == 1"
-          >
-            <el-input
-              :disabled="disTitle == '处置记录'"
-              type="textarea"
-              :rows="2"
-              v-model="addEditForm.description"
-              :placeholder="disTitle == '处置记录' ? '' : '请输入'"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="处理图片"
-            prop="image"
-            v-if="addEditForm.handleResult == 1"
-          >
-            <el-upload
-              :disabled="disTitle == '处置记录'"
-              :action="$store.state.UPLOADURL"
-              list-type="picture-card"
-              multiple
-              name="files"
-              :limit="1"
-              :file-list="fileList"
-              :on-success="handleSuccess"
-              :on-remove="handleRemove"
-            >
-              <i class="el-icon-plus"></i>
-            </el-upload>
-          </el-form-item>
-          <div class="dialog-footer">
-            <el-button
-              class="cancleBtn"
-              icon="el-icon-circle-close"
-              size="medium"
-              @click="recordShow = false"
-              >取消
-            </el-button>
-            <el-button
-              @click="addBtn"
-              type="primary"
-              icon="el-icon-circle-check"
-              size="medium"
-              v-if="disTitle == '处置详情' || disTitle == '修改处置记录'"
-              >确定
-            </el-button>
-            <el-button
-              v-if="disTitle == '处置记录'"
-              type="primary"
-              icon="el-icon-edit-outline"
-              size="medium"
-              @click="editRecord"
-              >修改
-            </el-button>
-          </div>
-        </el-form>
-      </div>
-    </el-dialog>
-    <!-- 详情弹框-->
-    <el-dialog
-      :modal-append-to-body="false"
-      title="巡检记录详情"
-      :visible.sync="detailsShow"
-      width="667px"
-    >
-      <div class="dialog_content">
-        <el-form
-          size="medium"
-          ref="addEditForm"
-          label-width="130px"
-          class="dialogFormBox"
-        >
-          <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.position" 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.noticeUserNames" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-input :value="getStatusText(detailData.status)" 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"
-              disabled
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="异常巡检图片" v-if="detailData.status == 2">
-            <img
-              v-if="imgSrc"
-              style="width: 150px; height: 100px"
-              :src="$store.state.FILEURL + imgSrc"
-              :preview="$store.state.FILEURL + imgSrc"
-              alt=""
-            />
-          </el-form-item>
-          <!-- <div class="grid-content" v-if="detailData.status == 2">
-            <div class="label">异常巡检图片</div>
-            <div class="value">
-              <img
-                v-if="imgSrc"
-                style="width: 150px; height: 100px"
-                :src="$store.state.FILEURL + imgSrc"
-                alt=""
-              />
-            </div>
-          </div> -->
-          <el-form-item
-            :label="item.title"
-            v-for="(item, index) in templateList"
-            :key="index"
-          >
-            <el-input
-              style="width: 320px"
-              v-model="item.value"
-              disabled
-            ></el-input>
-          </el-form-item>
-          <!-- 动态表单 -->
-          <!-- <div
-            class="formBox"
-            style="padding-left: 10%; padding-bottom: 5%; margin-top: -5%"
-          >
-            <div
-              class="formInput flex"
-              v-for="(item, index) in templateList"
-              :key="index"
-            >
-              <input class="fromsTit" v-model="item.title" disabled />
-              <el-input
-                style="width: 400px !important"
-                disabled
-                class="inputBox"
-                v-model="item.value"
-              ></el-input>
-            </div>
-          </div> -->
-          <div class="dialog-footer">
-            <el-button @click="detailsShow = false" type="primary" size="medium"
-              >关闭
-            </el-button>
-          </div>
-        </el-form>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  getCheckPointApi,
-  editCheckPointApi,
-  deleteCheckPointApi,
-} from "@/assets/js/api/insect.js";
-export default {
-  data() {
-    return {
-      detailData: {},
-      timeValue: [],
-      devName: "",
-      searchForm: {
-        checkingPointName: "",
-        status: "",
-        queryStartTime: "",
-        queryEndTime: "",
-      },
-      queryStr: "",
-      tableData: [],
-      total: 0,
-      pageNo: 1,
-      pageSize: 10,
-      towerList: [],
-      addEditForm: {},
-      addEditForm: {
-        operateName: "", //操作人
-        operateTime: "", //操作时间
-        handleResult: 1,
-        description: "",
-        handleDone: 0,
-        image: "",
-        id: "",
-        alarmTime: "",
-      },
-      fileList: [],
-      dialogShow: false, //处置详情弹框
-      recordShow: false, //处置记录弹框
-      detailsShow: false, //详情弹框
-      disTitle: "",
-      addEditRules: {
-        handleResult: [
-          { required: true, message: "必填", trigger: "blur" },
-          { required: true, message: "必填", trigger: "change" },
-        ],
-      },
-      templateList: [],
-      imgSrc: "",
-    };
-  },
-  mounted() {
-    this.getPointList();
-  },
-  methods: {
-    //选择时间时
-    getTime() {
-      if (this.timeValue) {
-        this.searchForm.queryStartTime = this.timeValue[0];
-        this.searchForm.queryEndTime = this.timeValue[1];
-      } else {
-        this.searchForm.queryStartTime = "";
-        this.searchForm.queryEndTime = "";
-      }
-    },
-
-    getStatusText(status) {
-      if (status == 1) {
-        return "正常";
-      } else if (status == 2) {
-        return "异常";
-      } else if (status == 0) {
-        return "未知状态";
-      }
-    },
-    //点击待处置
-    dispBtn(val) {
-      this.disTitle = "处置详情";
-      this.recordShow = true;
-      this.addEditForm.id = val;
-      // this.addEditForm.handleResult = 1
-    },
-    //点击已闭合
-    closedBtn(obj) {
-      console.log("点击已闭合", obj);
-      this.recordShow = true;
-      this.disTitle = "处置记录";
-      this.addEditForm = JSON.parse(JSON.stringify(obj));
-      this.fileList = obj.image;
-    },
-    //点击详情修改
-    editRecord() {
-      this.disTitle = "修改处置记录";
-      this.dialogShow = true;
-    },
-    processTheFile() {
-      //处理el上传的文件格式(结构)
-      this.addEditForm.image = [];
-      this.fileList.map((item) => {
-        if (!item.response) {
-          this.addEditForm.image.push(item);
-        } else if (item.response) {
-          this.addEditForm.image.push({
-            name: item.response.data[0].filename,
-            url: item.response.data[0].imageUrl,
-          });
-        }
-      });
-      this.addEditForm.image = JSON.stringify(this.addEditForm.image);
-    },
-    deleteDev(val) {
-      console.log("删除", val);
-      this.$confirm("此操作将永久删除该巡检点, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          let data = {
-            id: val.id,
-          };
-          deleteCheckPointApi(data).then((res) => {
-            if (res.success) {
-              this.getPointList();
-              this.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-            } else {
-              this.$message({
-                type: "error",
-                message: res.message,
-              });
-            }
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    //查看详情
-    detailBtn(val) {
-      this.detailData = val;
-      console.log("查看详情1111", this.detailData);
-      this.templateList =
-        this.detailData.template != ""
-          ? JSON.parse(this.detailData.template)
-          : [];
-      let imgType =
-        this.detailData.alarmImage != null
-          ? JSON.parse(this.detailData.alarmImage)
-          : "";
-      if (imgType && imgType.length > 0) {
-        this.imgSrc = imgType[0].url;
-      } else {
-        this.imgSrc = "";
-      }
-      this.detailsShow = true;
-      this.addEditForm = JSON.parse(JSON.stringify(val));
-    },
-    //待处置提交
-    addBtn() {
-      this.processTheFile();
-      let params = JSON.parse(JSON.stringify(this.addEditForm));
-      params.projectSn = this.$store.state.projectSn;
-      params.handleDone = 1;
-      this.$refs.addEditForm.validate((valid) => {
-        if (valid) {
-          if (this.disTitle == "处置详情" || this.disTitle == "修改处置记录") {
-            editCheckPointApi(params).then((result) => {
-              if (result.success) {
-                this.$message.success(result.message);
-                this.getPointList();
-              }
-            });
-          }
-          this.recordShow = false;
-        } else {
-          return false;
-        }
-      });
-    },
-    close() {
-      this.addEditForm = {};
-      this.fileList = [];
-      this.$nextTick(() => {
-        this.$refs.addEditForm.clearValidate();
-      });
-    },
-    //查看条数
-    handleSizeChange(val) {
-      this.pageSize = val;
-      this.getPointList();
-    },
-    //查看页
-    handleCurrentChange(val) {
-      this.pageNo = val;
-      this.getPointList();
-    },
-    inptValue(val) {
-      console.log("输入的内容", val);
-    },
-    // 查询
-    getPointList() {
-      let data = new FormData(); //new出来的对象
-      data.append("queryStr", this.queryStr);
-      data.append("projectSn", this.$store.state.projectSn);
-      data.append("pageNo", this.pageNo);
-      data.append("pageSize", this.pageSize);
-      data.append(
-        "checkingPointName",
-        this.searchForm.checkingPointName
-          ? this.searchForm.checkingPointName
-          : ""
-      );
-      data.append(
-        "status",
-        this.searchForm.status ? this.searchForm.status : ""
-      );
-      data.append(
-        "queryEndTime",
-        this.searchForm.queryEndTime ? this.searchForm.queryEndTime : ""
-      );
-      data.append(
-        "queryStartTime",
-        this.searchForm.queryStartTime ? this.searchForm.queryStartTime : ""
-      );
-      getCheckPointApi(data).then((res) => {
-        console.log("res111111111", res);
-        this.tableData = res.result.records;
-        this.total = Number(res.result.total);
-        res.result.records.map((item) => {
-          if (item.image != null) {
-            item.image = JSON.parse(item.image);
-            if (
-              item.image.length !== 0 &&
-              !item.image[0].url.includes(this.$store.state.FILEURL)
-            ) {
-              item.image[0].url = this.$store.state.FILEURL + item.image[0].url;
-            }
-          } else {
-            item.image = [];
-          }
-        });
-      });
-    },
-    // 刷新
-    toRefresh() {
-      this.queryStr = "";
-      this.searchForm = {};
-      this.timeValue = [];
-      // data.append("queryEndTime", this.searchForm.queryEndTime);
-      // data.append("queryStartTime", this.searchForm.queryStartTime);
-      this.getPointList();
-    },
-    handleSuccess(response, file, fileList) {
-      this.fileList = fileList;
-    },
-    handleRemove(response, fileList) {
-      this.fileList = fileList;
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.formInput {
-  .fromsTit {
-    border: none;
-    width: 120px;
-    padding: 12px 6px;
-    outline: none;
-    background: #fff;
-    &:focus {
-      outline: none;
-    }
-  }
-}
-.grid-content {
-  overflow: hidden;
-  margin-bottom: 10px;
-  padding-left: 10%;
-  .label {
-    margin-bottom: 10px;
-  }
-  // .value {
-  //   float: left;
-  //   width: calc(100% - 80px);
-  // }
-}
-</style>
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index ac943eb1..5d843998 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -2109,7 +2109,7 @@
           </div>
           <div id="getAJob" class="table" style="padding-bottom: 100px">
             <div class="pageTitle" style="display: flex; align-items: center">
-              <span>安全扣分详情</span>
+              <span>安全分详情</span>
               <!-- 重置 -->
               <el-button
                 size="medium"
@@ -2138,7 +2138,11 @@
               <el-table-column
                 prop="deductScore"
                 label="加/扣分值"
-              ></el-table-column>
+              >
+              <template slot-scope="scope">
+                  <span>{{ scope.row.deductScore>=0?'+' + scope.row.deductScore:scope.row.deductScore }}</span>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="curScore"
                 label="当前安全评分分值"
@@ -2230,7 +2234,7 @@
           :class="activeClass == 9 ? 'checkedClass' : ''"
           @click="getActiveClass(9)"
         >
-          安全扣分详情
+          安全分详情
         </div>
       </div>
     </div>
@@ -2425,7 +2429,7 @@ export default {
       physicalsList: [], //体检
       safeEducationList: [], //安全教育
       workExperienceList: [], //从业信息
-      reduceScoreList: [], //安全扣分详情
+      reduceScoreList: [], //安全分详情
       badList: [], //奖罚 --不良记录
       rewardList: [], //奖罚 --奖励记录
       nationList: this.$t("message.laborMange.nationList"), //民族
@@ -2870,7 +2874,7 @@ export default {
         }
       });
     },
-    // 获取安全扣分详情
+    // 获取安全分详情
     getSafeScoreDetail() {
       safeReduceDetailList({
         projectSn: this.$store.state.projectSn,