From 5b8234b65bf5164290d359ee49fd41af843fdde5 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 24 May 2024 23:13:23 +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/http.js                         |  4 +--
 .../projectFront/inspecPoint/selfInspect.vue  | 11 +++---
 .../projectFront/inspectRoute/routeManage.vue | 35 +++++++++++--------
 .../chartComponents/ChartThree.vue            |  7 ++++
 .../chartComponents/ChartTwo.vue              |  7 ++++
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 1d5eb6a7..6778e31c 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -84,10 +84,10 @@ 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.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://jxj.zhgdyun.com:61212/' //彭洁远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
   // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
diff --git a/src/views/projectFront/inspecPoint/selfInspect.vue b/src/views/projectFront/inspecPoint/selfInspect.vue
index e0be6488..15a1a381 100644
--- a/src/views/projectFront/inspecPoint/selfInspect.vue
+++ b/src/views/projectFront/inspecPoint/selfInspect.vue
@@ -100,7 +100,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="280">
           <template slot-scope="scope">
-            <div class="tableBtns">
+            <div class="operation-style">
               <div class="operationText styleDom" @click="detailBtn(scope.row)">
                 <i
                   class="el-icon-tickets"
@@ -117,7 +117,7 @@
                 />
                 <span>删除</span>
               </div>
-              <div
+              <!-- <div
                 @click="dispBtn(scope.row.id)"
                 class="operationText"
                 v-show="scope.row.handleDone == 0 && scope.row.status != 1"
@@ -125,7 +125,7 @@
                 <span style="background: #5181f6; color: #fff; width: 60px"
                   >待处置</span
                 >
-              </div>
+              </div> -->
               <div
                 @click="closedBtn(scope.row)"
                 class="operationText"
@@ -305,7 +305,8 @@
           <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">
+          <!-- v-if="detailData.status == 2" -->
+          <el-form-item label="巡检详情" >
             <el-input
               style="width: 320px"
               type="textarea"
@@ -313,7 +314,7 @@
               disabled
             ></el-input>
           </el-form-item>
-          <el-form-item label="异常巡检图片" v-if="detailData.status == 2">
+          <el-form-item label="巡检图片">
             <img
               v-if="imgSrc"
               style="width: 150px; height: 100px"
diff --git a/src/views/projectFront/inspectRoute/routeManage.vue b/src/views/projectFront/inspectRoute/routeManage.vue
index b84dc17c..3daa6161 100644
--- a/src/views/projectFront/inspectRoute/routeManage.vue
+++ b/src/views/projectFront/inspectRoute/routeManage.vue
@@ -420,6 +420,11 @@
             label="所属区域"
             align="center"
           ></el-table-column>
+          <el-table-column
+            prop="enterpriseName"
+            label="责任单位"
+            align="center"
+          ></el-table-column>
           <el-table-column
             prop="minInspectTime"
             label="最低巡检时长(分钟)"
@@ -443,11 +448,9 @@
           <el-table-column label="巡检结果" align="center">
             <template v-slot="{ row }">
               <span>{{
-                row.handleResult == 1
-                  ? "已处置"
-                  : row.handleResult == 2
-                  ? "误报忽略"
-                  : ""
+                row.status == 1
+                  ? "正常"
+                  : "异常"
               }}</span>
             </template>
           </el-table-column>
@@ -498,7 +501,7 @@
         <el-form size="medium" ref="addEditForm" label-width="150px">
           <el-form-item label="巡检点名称">
             <el-input
-              v-model="recordRowObj.checkingPointUserName"
+              v-model="recordRowObj.checkingPointName"
               disabled
             ></el-input>
           </el-form-item>
@@ -521,13 +524,13 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="状态">
-            <el-input v-model="recordRowObj.noticeUserNames" disabled>
+            <el-input v-model="recordRowObj.statusName" 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-form-item label="巡检详情">
             <el-input
               style="width: 320px"
               type="textarea"
@@ -535,16 +538,16 @@
               disabled
             ></el-input>
           </el-form-item>
-          <el-form-item label="异常巡检图片" v-if="recordRowObj.status == 2">
+          <el-form-item label="巡检图片">
             <img
-              v-if="imgSrc"
+              v-if="recordRowObj.alarmImage"
               style="width: 150px; height: 100px"
-              :src="$store.state.FILEURL + imgSrc"
-              :preview="$store.state.FILEURL + imgSrc"
+              :src="$store.state.FILEURL + recordRowObj.alarmImage[0].url"
+              :preview="$store.state.FILEURL + recordRowObj.alarmImage[0].url"
               alt=""
             />
           </el-form-item>
-          <!-- <div class="grid-content" v-if="recordRowObj.status == 2">
+          <!-- <div class="grid-content">
             <div class="label">异常巡检图片</div>
             <div class="value">
               <img
@@ -748,7 +751,11 @@ export default {
       });
     },
     recordDetail(row) {
-      this.recordRowObj = row;
+      this.recordRowObj = {...row};
+      this.recordRowObj.statusName = row.status == 1?'正常':'异常'
+      if(row.alarmImage){
+        this.recordRowObj.alarmImage = JSON.parse(row.alarmImage)
+      }
       this.detailsShow = true;
     },
     getRouteTaskRecordFn(item) {
diff --git a/src/views/projectFront/videoDataAnalysis/chartComponents/ChartThree.vue b/src/views/projectFront/videoDataAnalysis/chartComponents/ChartThree.vue
index f59d219a..4e87e9a2 100644
--- a/src/views/projectFront/videoDataAnalysis/chartComponents/ChartThree.vue
+++ b/src/views/projectFront/videoDataAnalysis/chartComponents/ChartThree.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="main-content">
+    <span class="title-text">前七天巡检</span>
     <div class="chart" ref="ChartThree"></div>
     <!-- <div v-if="statsEnterpriseList.length == 0">
       <div class="placeholderBox">
@@ -142,6 +143,12 @@ export default {
 .main-content {
   width: 100%;
   height: 100%;
+  position: relative;
+  .title-text{
+    position: absolute;
+    top: 10px;
+    left: 10px;
+  }
   .chart {
     width: 100%;
     height: 100%;
diff --git a/src/views/projectFront/videoDataAnalysis/chartComponents/ChartTwo.vue b/src/views/projectFront/videoDataAnalysis/chartComponents/ChartTwo.vue
index 2fe135c9..86619189 100644
--- a/src/views/projectFront/videoDataAnalysis/chartComponents/ChartTwo.vue
+++ b/src/views/projectFront/videoDataAnalysis/chartComponents/ChartTwo.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="main-content">
+    <span class="title-text">前七天巡检</span>
     <div class="chart" ref="ChartTwo"></div>
     <!-- <div v-if="statsEnterpriseList.length == 0">
       <div class="placeholderBox">
@@ -144,6 +145,12 @@ export default {
 .main-content {
   width: 100%;
   height: 100%;
+  position: relative;
+  .title-text{
+    position: absolute;
+    top: 10px;
+    left: 10px;
+  }
   .chart {
     width: 100%;
     height: 100%;