diff --git a/src/assets/js/api/dangerousBigProject.js b/src/assets/js/api/dangerousBigProject.js
index 59bb178b..4324da80 100644
--- a/src/assets/js/api/dangerousBigProject.js
+++ b/src/assets/js/api/dangerousBigProject.js
@@ -86,4 +86,6 @@ export const deleteDangerousEngineeringProgressRecordApi = data => post('xmgl/da
 export const deleteDangerousEngineeringSideStationApi = data => post('xmgl/dangerousEngineeringSideStation/delete', data);
 // 删除隐患记录
 export const deletehiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/delete', data); 
-export const deleteFinlahiddenDangerInspectRecordApi = data => post('xmgl/xzSecurityQualityInspectionRecord/delete', data); 
\ No newline at end of file
+export const deleteFinlahiddenDangerInspectRecordApi = data => post('xmgl/xzSecurityQualityInspectionRecord/delete', data); 
+
+export const selectSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualityRectifyRecord/selectRectifyRecordList',data); //质量整改记录
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 82bddebf..791a1115 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -86,7 +86,7 @@ if (process.env.NODE_ENV == 'development') {
   // 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://182.90.224.237:51234' //郭圣雄远程
+  // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // 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/' // 百色三标段项目
@@ -96,7 +96,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
   // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
   // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-  // axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
+  axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
 
 
diff --git a/src/store/index.js b/src/store/index.js
index a6262f9e..28ccf823 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,25 +48,27 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄
-    FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄
-    WORKFLOWURL: 'http://localhost:88/#/workspace/forms',//测试工作流地址(本地)
+    // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄
+    // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄
+    // UPLOADURL:'http://42.180.188.17:11211/upload/image/',// 鞍钢本地测试文件地址
+    // FILEURL:'http://42.180.188.17:11211/image/',// 鞍钢本地测试文件地址
+    // WORKFLOWURL: 'http://localhost:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    // BASEURL: baseUrl
-    //   ? baseUrl
-    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
-    //   window.location.protocol +
-    //   "//" +
-    //   window.location.host +
-    //   "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    BASEURL: baseUrl
+      ? baseUrl
+      : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    UPLOADURL:
+      window.location.protocol +
+      "//" +
+      window.location.host +
+      "/upload/image", //正式环境
+    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
     // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
     // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
-    // WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
+    WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl
diff --git a/src/views/projectFront/dangerousBigProject/addPlan.vue b/src/views/projectFront/dangerousBigProject/addPlan.vue
index f997b5d2..49cb4493 100644
--- a/src/views/projectFront/dangerousBigProject/addPlan.vue
+++ b/src/views/projectFront/dangerousBigProject/addPlan.vue
@@ -36,14 +36,19 @@
                                     :value="item.id">
                                 </el-option>
                             </el-select> -->
+                             
                              <el-cascader
+                                popper-class="cls-attr-cascader"
                                 :disabled="isDisabled"
                                 v-model="addForm.typeDescribeId"
                                 @change="changeDescribe"
                                 placeholder="请选择类别描述"
                                 :options="describeOptions"
                                 :props="props2"
-                                clearable>
+                                clearable >
+                                <template v-slot:default="{ data }">
+                                    <span :title="data.describeName">{{ data.describeName }}</span>
+                                </template>
                             </el-cascader>
                         </el-form-item>
 
@@ -418,6 +423,7 @@ export default {
                 console.log(res)
                 if(res.code == 200 && res.result){
                     this.describeOptions = res.result
+                    console.log(this.describeOptions,"==============================================================")
                 }
             })
         },
@@ -737,7 +743,17 @@ export default {
 }
 </script>
 
+<style lang="scss">
+.el-cascader-node {
+  max-width: 300px;
+}
+// .cls-attr-cascader .el-cascader-panel .el-cascader-menu {
+//       width: 0;
+//     }
+</style>
+
 <style lang="less" scoped>
+
 .plan-form{
     height: calc(100% - 56px);
     width: 100%;
@@ -797,6 +813,10 @@ export default {
                 /deep/.el-cascader{
                     width: 100%;
                 }
+                /deep/.el-cascader-node{
+                    width: 250px;
+                }
+
             }
         }
         .control-point{
diff --git a/src/views/projectFront/dangerousBigProject/detail.vue b/src/views/projectFront/dangerousBigProject/detail.vue
index 741cc292..4d11500d 100644
--- a/src/views/projectFront/dangerousBigProject/detail.vue
+++ b/src/views/projectFront/dangerousBigProject/detail.vue
@@ -249,11 +249,21 @@
                   </div>
                   <div class="plan-detail flex">
                     <div class="plan-content">
-                      旁站记录：{{
-                        sideStationData.length > 0
-                          ? sideStationData[0].buildSituation
-                          : "- -"
-                      }}
+                      <div>
+                        施工部位：{{
+                          sideStationData.length > 0
+                            ? sideStationData[0].sideStationAddr
+                            : "- -"
+                        }}
+                      </div>
+                      <div>
+                        旁站记录: {{
+                          sideStationData.length > 0
+                            ? sideStationData[0].buildSituation
+                            : "- -"
+                        }}
+                      </div>
+                      
                       <div
                         v-if="
                           sideStationData.length > 0 &&
@@ -290,10 +300,10 @@
                     <div class="plan-content2">
                       验收结果：{{
                         checkData.length > 0
-                          ? checkData[0].acceptanceResult == 1
-                            ? "合格"
-                            : "不合格"
-                          : "- -"
+                          ? checkData[0].acceptanceResult == undefined || checkData[0].acceptanceResult == null || checkData[0].acceptanceResult == ''
+                            ? "待确认"
+                            : checkData[0].acceptanceResult == 1 ? '合格' : checkData[0].acceptanceResult == 2 ? '不合格' : "- -"
+                            : ''
                       }}
                     </div>
                     <div class="plan-content2">
@@ -321,18 +331,16 @@
                       }}
                       <div
                         v-if="
-                          sideStationData.length > 0 &&
-                            sideStationData[0].imageUrl
+                          checkData.length > 0 &&
+                            checkData[0].photo
                         "
                         style="margin-left: 48px;"
                       >
+                          <!-- v-for="(item, index) in checkData" :key="index" -->
                         <el-image
-                          v-for="(item,
-                          index) in sideStationData[0].imageUrl.split(',')"
-                          :key="index"
                           style="width: 80px; height: 80px;margin-left: 20px;margin-top: 10px"
-                          :src="fileUrl + item"
-                          :preview-src-list="[fileUrl + item]"
+                          :src="fileUrl + checkData[0].photo"
+                          :preview-src-list="[fileUrl + checkData[0].photo]"
                         >
                         </el-image>
                       </div>
@@ -715,6 +723,8 @@
         height="500"
         style="width: 100%;"
       >
+        <el-table-column prop="sideStationAddr" label="施工部位">
+        </el-table-column>
         <el-table-column prop="buildSituation" label="旁站记录">
         </el-table-column>
         <el-table-column label="图片">
@@ -764,7 +774,11 @@
         </el-table-column>
         <el-table-column label="验收结果">
           <template slot-scope="scope">
-            {{ scope.row.acceptanceResult == 1 ? "合格" : "不合格" }}
+            <p v-if="scope.row.acceptanceResult === undefined 
+            || scope.row.acceptanceResult === null || scope.row.acceptanceResult === ''">待确认</p>
+            <p v-if="scope.row.acceptanceResult === 1">合格</p>
+            <p v-if="scope.row.acceptanceResult === 2">不合格</p>
+            <!-- {{ scope.row.acceptanceResult == 1 ? "合格" : "不合格" }} -->
           </template>
         </el-table-column>
         <el-table-column label="图片">
@@ -794,7 +808,7 @@
     <el-dialog
       title="历史隐患记录"
       :visible.sync="dialogVisible4"
-      width="880px"
+      width="1280px"
       :modal-append-to-body="false"
     >
       <el-table
@@ -803,40 +817,90 @@
         height="500"
         style="width: 100%;"
       >
-        <el-table-column label="检查结果">
+      
+        <el-table-column
+          align="center"
+          width="200"
+          prop="changeLimitTime"
+          :label="
+            $t('message.quality.inspectionResult') +
+              '/' +
+              $t('message.quality.rectificationLimit')
+          "
+        >
           <template slot-scope="scope">
-            <!-- 2待整改，3待复查，4合格，5不合格 -->
-            <p>
+            <el-button type="text" v-if="scope.row.status != 6">
               {{
-                scope.row.status == 2
-                  ? "待整改"
+                scope.row.status == 1
+                  ? $t("message.quality.noRectification")
+                  : scope.row.status == 2
+                  ? $t("message.quality.afterRectification")
                   : scope.row.status == 3
-                  ? "待复查"
+                  ? $t("message.quality.toReview")
                   : scope.row.status == 4
-                  ? "合格"
+                  ? $t("message.quality.toCheck")
                   : scope.row.status == 5
-                  ? "不合格"
+                  ? $t("message.quality.qualified")
+                  : scope.row.status == 6
+                  ? $t("message.quality.disqualification")
+                  : scope.row.status == ""
+                  ? $t("message.quality.qualified")
                   : ""
               }}
-            </p>
-            <el-tag
-              type="danger"
-              effect="dark"
-              size="mini"
-              v-if="scope.row.overdueType"
-              >超期</el-tag
+            </el-button>
+            <span style="color: #94979E;" v-else>已撤回</span>
+            <span class="tableStatus" v-show="scope.row.overTime == true && scope.row.status != 6"
+              >超期</span
             >
+            <div>{{ scope.row.changeLimitTime }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="检查人/检查时间" width="180">
+        
+        
+        <el-table-column
+          align="center"
+          prop="inspectManName"
+          :label="
+            $t('message.quality.rummager') +
+              '/' +
+              $t('message.quality.inspectionTime')
+          "
+          width="180"
+        >
           <template slot-scope="scope">
-            <p>{{ scope.row.inspectManName }}</p>
-            <p>{{ scope.row.createTime }}</p>
+            <div>{{ scope.row.inspectManName }}</div>
+            <!-- <div>{{ scope.row.createEnterpriseName }}</div> -->
+            <div>{{ scope.row.inspectTime }}</div>
           </template>
         </el-table-column>
 
+        <el-table-column
+          align="center"
+          prop="dangerItemContent"
+          label="安全问题信息"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="changeName"
+          :label="$t('message.quality.rectificationPeople')"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="reviewName"
+          :label="$t('message.quality.reviewOfThePeople')"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="verifyManName"
+          :label="$t('message.quality.checkOne')"
+        >
+        </el-table-column>
+
         <!-- 隐患信息 -->
-        <el-table-column label="隐患信息" width="300">
+        <!-- <el-table-column label="隐患信息" width="300">
           <template slot-scope="scope">
             <p v-if="scope.row.status != 1">
               <el-tag
@@ -849,10 +913,6 @@
             </p>
             <p v-else>该区域排查无隐患</p>
             <p class="table_bottom_txt">
-              <!-- <span style="margin-right: 10px"
-                ><i class="el-icon-picture" style="margin-right: 6px"></i
-                >{{ scope.row.fileList.length }}</span
-              > -->
               <span style="margin-right: 10px"
                 ><i
                   class="el-icon-location-information"
@@ -870,7 +930,7 @@
               >
             </p>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- 隐患信息 -->
 
         <!-- <el-table-column
@@ -886,8 +946,7 @@
                         </el-image>
                     </template>
                 </el-table-column> -->
-        <el-table-column prop="changeName" label="整改人">
-        </el-table-column>
+       
         <el-table-column label="隐患详情">
           <template slot-scope="scope">
             <a
@@ -910,7 +969,7 @@
     <el-dialog
       title="历史排查记录"
       :visible.sync="dialogVisible5"
-      width="880px"
+      width="1280px"
       :modal-append-to-body="false"
     >
       <el-table
@@ -919,9 +978,9 @@
         height="500"
         style="width: 100%;"
       >
-        <el-table-column label="检查说明/责任区域">
+        <el-table-column label="检查部位">
           <template slot-scope="scope">
-            <p v-if="scope.row.dangerDesc">{{ scope.row.dangerDesc }}</p>
+            <!-- <p v-if="scope.row.dangerDesc">{{ scope.row.dangerDesc }}</p>
             <p v-else>该区域排查无隐患</p>
             <p class="table_bottom_txt">
               <el-tag
@@ -933,9 +992,12 @@
                 <i class="el-icon-location-information"></i>
                 {{ scope.row.dutyRegion }}
               </el-tag>
-            </p>
+            </p> -->
+            <p>{{scope.row.regionName}}</p>
           </template>
         </el-table-column>
+        <el-table-column prop="dangerItemContent" label="排查分类"> </el-table-column>
+        <el-table-column prop="addedDescription" label="事件描述"> </el-table-column>
         <el-table-column label="图片">
           <template slot-scope="scope">
             <el-image
@@ -948,9 +1010,10 @@
             </el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="inspectManName" label="记录人">
+        <el-table-column prop="inspectManName" label="检查人">
         </el-table-column>
-        <el-table-column prop="createTime" label="记录时间"> </el-table-column>
+        <el-table-column prop="createTime" width="180" label="检查时间"> </el-table-column>
+        <el-table-column prop="enterpriseName" label="分包单位"> </el-table-column>
         <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <i
@@ -965,205 +1028,434 @@
       :modal-append-to-body="false"
       title="查看详情"
       :visible.sync="dialogVisible6"
-      width="900px"
+      width="870px"
       :close-on-click-modal="false"
     >
-      <div style="height:600px;">
-        <vue-scroll :ops="ops" style="height:100%;" scroll-y>
-          <el-divider content-position="left">隐患记录</el-divider>
-          <el-tag
-            type="danger"
-            effect="dark"
-            size="mini"
-            v-if="historyDetail.overdueType"
-            style="float:right;margin-top:-35px;z-index:2;position:relative;"
-            >超期整改</el-tag
-          >
-          <!-- <div class="topDataBox">
-                    <p><span>检查结果：{{historyDetail.status?statusArr[historyDetail.status-1]:''}}</span><span>责任区域：222</span></p>
-                    <p><span>检查人：{{historyDetail.createUserName}}</span><span>检查时间：{{historyDetail.createTime}}</span></p>
-                    <el-tag type="danger" effect="dark" size="mini" v-if="historyDetail.overdueType">超期整改</el-tag>
-            </div> -->
-          <div class="detailBox">
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <div class="grid-content">
-                  <span class="label">检查结果：</span>
-                  <span class="value">{{
-                    historyDetail.status ? statusArr[historyDetail.status - 1] : ""
-                  }}</span>
-                </div>
-              </el-col>
-              <el-col :span="12">
-                <div class="grid-content">
-                  <span class="label">责任区域：</span>
-                  <!-- <span class="value">{{ historyDetail.dutyRegion }}</span> -->
-                  <span class="value">{{ historyDetail.regionName }}</span>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <div class="grid-content">
-                  <span class="label">检查人：</span>
-                  <span class="value">{{ historyDetail.inspectManName }}</span>
-                </div>
-              </el-col>
-              <el-col :span="12">
-                <div class="grid-content">
-                  <span class="label">检查时间：</span>
-                  <span class="value">{{ historyDetail.createTime }}</span>
-                </div>
-              </el-col>
-            </el-row>
-            <div v-if="historyDetail.status != 1">
+      <div style="height: 600px">
+        <vue-scroll>
+          <div style="width: 800px">
+            <div class="headerLeft">隐患记录</div>
+            <div
+              class="back-btn"
+              v-if="
+                historyDetail.status == 2 &&
+                rectifyRecordList.length == 0 &&
+                historyDetail.inspectManId == $store.state.userInfo.userId
+              "
+              @click="backQuestion(historyDetail)"
+            >
+              <!-- <i class="el-icon-refresh-right"></i>
+              <span>撤回</span> -->
+            </div>
+            <span
+              v-else-if="historyDetail.overTime == true"
+              style="
+                color: red;
+                font-weight: 500;
+                position: absolute;
+                left: 89%;
+                top: 1%;
+              "
+              >超期整改</span
+            >
+            <div class="detailBox">
               <el-row :gutter="20">
                 <el-col :span="12">
                   <div class="grid-content">
-                    <span class="label">隐患类别：</span>
-                    <span class="value"
-                      >
-                      {{historyDetail.urgentLevel === '1' ? '一般' : historyDetail.urgentLevel === '2' ? '严重' : historyDetail.urgentLevel === '3' ? '紧要' : ''}}
-                      <!-- {{ historyDetail.checkItem }}/{{
-                        historyDetail.checkSubitem
-                      }} -->
-                      </span
+                    <span class="label">检查类型：</span>
+                    <span
+                      class="value"
+                      style="font-weight: 500; color: #5181f6; cursor: pointer"
+                      >{{
+                        historyDetail.recordType == 1 ? "安全问题" : "排查记录"
+                      }}</span
                     >
                   </div>
                 </el-col>
                 <el-col :span="12">
                   <div class="grid-content">
-                    <span class="label">隐患明细：</span>
-                    <span class="value">{{ historyDetail.dangerItemContent }}</span>
+                    <span class="label">分包单位：</span>
+                    <span class="value" :title="historyDetail.enterpriseName">{{ historyDetail.enterpriseName }}</span>
                   </div>
                 </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12">
                   <div class="grid-content">
-                    <span class="label">隐患级别：</span>
-                    <span class="value">{{
-                      historyDetail.level
+                    <span class="label">整改结果：</span>
+
+                    <span
+                      class="value"
+                      :style="{
+                        'font-weight': 500,
+                        cursor: 'pointer',
+                        color:
+                          historyDetail.status == 2
+                            ? '#5181f6'
+                            : historyDetail.status == 3
+                            ? '#ff8c00'
+                            : historyDetail.status == 4
+                            ? '#a020f0'
+                            : historyDetail.status == 5
+                            ? '#21c28e'
+                            : historyDetail.status == 6
+                            ? '#262D47'
+                            : '',
+                      }"
+                    >
+                      <span
+                        class="radiusD"
+                        :style="{
+                          background:
+                            historyDetail.status == 2
+                              ? '#5181f6'
+                              : historyDetail.status == 3
+                              ? '#ff8c00'
+                              : historyDetail.status == 4
+                              ? '#a020f0'
+                              : historyDetail.status == 5
+                              ? '#21c28e'
+                              : historyDetail.status == 6
+                              ? '#262D47'
+                              : '',
+                        }"
+                      ></span>
+                      <span>
+                        {{
+                          historyDetail.status == 2
+                            ? "待整改"
+                            : historyDetail.status == 3
+                            ? "待复查"
+                            : historyDetail.status == 4
+                            ? "待核验"
+                            : historyDetail.status == 5
+                            ? "合格"
+                            : historyDetail.status == 6
+                            ? "已撤回"
+                            : ""
+                        }}</span
+                      >
+                    </span>
+                  </div>
+                </el-col>
+                <el-col :span="12">
+                  <div class="grid-content">
+                    <span class="label">检查时间：</span>
+                    <span class="value">{{ historyDetail.inspectTime }}</span>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <div class="grid-content">
+                    <span class="label" style="margin-left: -14px"
+                      >检查人：</span
+                    >
+                    <span class="value" style="margin-left: 25px">{{
+                      historyDetail.inspectManName
                     }}</span>
                   </div>
                 </el-col>
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">补充说明：</span>
-                    <span class="value">{{ historyDetail.dangerDesc }}</span>
+                    <span class="value">
+                      {{ historyDetail.dangerDesc }}
+                    </span>
                   </div>
                 </el-col>
               </el-row>
+              <div>
+                <el-row :gutter="20" v-show="historyDetail.recordType == 1">
+                  <el-col :span="12">
+                    <div class="grid-content">
+                      <span class="label" style="margin-left: -14px"
+                        >核验人：</span
+                      >
+                      <span class="value" style="margin-left: 25px">{{
+                        historyDetail.verifyManName
+                      }}</span>
+                    </div>
+                  </el-col>
+                  <el-col :span="12">
+                    <div class="grid-content">
+                      <span class="label">问题等级：</span>
+                      <span class="value">{{
+                        historyDetail.level == 1
+                          ? "一级"
+                          : historyDetail.level == 2
+                          ? "二级"
+                          : historyDetail.level == 3
+                          ? "三级"
+                          : "四级"
+                      }}</span>
+                    </div>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <div class="grid-content">
+                      <span class="label">检查部位：</span>
+                      <span class="value" :title="historyDetail.regionName">{{
+                        historyDetail.regionName
+                      }}</span>
+                    </div>
+                  </el-col>
+                  <el-col :span="12">
+                    <div class="grid-content">
+                      <span class="label">事件描述：</span>
+                      <span class="value">
+                        {{ historyDetail.addedDescription }}
+                      </span>
+                    </div>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12" v-show="historyDetail.recordType == 1">
+                    <div class="grid-content">
+                      <span class="label">现场整改：</span>
+                      <span
+                        class="value"
+                        :style="{
+                          color:
+                            historyDetail.status == 1 || historyDetail.status == 5
+                              ? '#21c28e'
+                              : '#ff8c00',
+                        }"
+                        >{{
+                          historyDetail.status == 1 || historyDetail.status == 5
+                            ? "已完成"
+                            : "未完成"
+                        }}</span
+                      >
+                    </div>
+                  </el-col>
+                  <el-col :span="12" v-show="historyDetail.recordType == 1">
+                    <div class="grid-content">
+                      <span class="label">紧急程度：</span>
+                      <span class="value">{{
+                        historyDetail.urgentLevel == 1
+                          ? "一般"
+                          : historyDetail.urgentLevel == 2
+                          ? "严重"
+                          : historyDetail.urgentLevel == 3
+                          ? "紧要"
+                          : ""
+                      }}</span>
+                    </div>
+                  </el-col>
+                </el-row>
+              </div>
               <el-row :gutter="20">
-                <el-col :span="12">
+                <el-col :span="12" v-show="historyDetail.recordType == 1">
                   <div class="grid-content">
-                    <span class="label">分包单位：</span>
-                    <span class="value">{{ historyDetail.enterpriseName }}</span>
+                    <span class="label">问题分类：</span>
+                    <span class="value" :title="historyDetail.dangerItemContent">
+                      {{ historyDetail.dangerItemContent }}
+                    </span>
                   </div>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" v-show="historyDetail.recordType == 1">
                   <div class="grid-content">
-                    <span class="label">整改人：</span>
-                    <span class="value">{{ historyDetail.changeName }}</span>
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <div class="grid-content">
-                    <span class="label">整改时限：</span>
-                    <span class="value">{{ historyDetail.changeLimitTime }}</span>
-                  </div>
-                </el-col>
-                <el-col :span="12">
-                  <div class="grid-content">
-                    <span class="label">事故隐患：</span>
-                    <span class="value">{{
-                      historyDetail.faultLevel == 1 ? "一般" : "重大"
+                    <span class="label" style="margin-left: -14px"
+                      >责任人：</span
+                    >
+                    <span class="value" style="margin-left: 25px">{{
+                      historyDetail.changeName
                     }}</span>
                   </div>
                 </el-col>
               </el-row>
               <el-row :gutter="20">
-                <el-col :span="24">
+                <el-col :span="12" v-show="historyDetail.recordType == 1">
                   <div class="grid-content">
                     <span class="label">整改要求：</span>
-                    <span class="value">{{ historyDetail.remark }}</span>
+                    <span class="value" :title="historyDetail.remark">
+                      {{ historyDetail.remark }}
+                    </span>
+                  </div>
+                </el-col>
+                <el-col :span="12" v-show="historyDetail.recordType == 1">
+                  <div class="grid-content">
+                    <span class="label">整改时限：</span>
+                    <span class="value">{{ historyDetail.changeLimitTime }}</span>
                   </div>
                 </el-col>
               </el-row>
+               <el-row :gutter="20">
+                <el-col :span="12" v-show="historyDetail.recordType == 1">
+                  <div class="grid-content">
+                    <span class="label">问题描述：</span>
+                    <span class="value">
+                      {{ historyDetail.problemDescription }}
+                    </span>
+                  </div>
+                </el-col>
+                <el-col :span="12" v-show="historyDetail.recordType == 1">
+                  <div class="grid-content">
+                    <span class="label" style="margin-left: -14px"
+                      >复查人：</span
+                    >
+                    <span class="value" style="margin-left: 25px">{{
+                      historyDetail.reviewName
+                    }}</span>
+                  </div>
+                </el-col>
+              </el-row>
+
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <div class="grid-content">
+                    <span class="label" style="line-height: 25px"
+                      >现场视频：</span
+                    >
+                    <span
+                      style="color: #5181f6; cursor: pointer; margin-top: 3px"
+                      class="value"
+                      @click.stop="playerVideo(historyDetail.fileUrl)"
+                    >
+                      {{ videoName }}
+                    </span>
+                  </div>
+                </el-col>
+
+                <el-col :span="12">
+                  <div class="grid-content">
+                    <span class="label">现场照片：</span>
+                    <span class="value" style="cursor: pointer;">
+                      <!-- <el-image
+                        v-for="(item, index) in parseImage2(
+                          historyDetail.imageUrl
+                        )"
+                        :key="index"
+                        style="width: 100px; height: 100px; margin-right: 10px"
+                        :src="item"
+                        :preview-src-list="parseImage2(item.fileUrl)"
+                        @click="openImg(item)"
+                      > -->
+                      <el-image
+                        style="width: 100px; height: 100px; margin-right: 10px"
+                        :src="fileUrl + historyDetail.imageUrl"
+                        :preview-src-list="parseImage2(historyDetail.fileUrl)"
+                        @click="openImg(fileUrl + historyDetail.imageUrl)"
+                      >
+                      </el-image>
+                    </span>
+                  </div>
+                </el-col>
+              </el-row>
+              <!-- <el-row :gutter="20">
+                <el-col :span="12" v-show="historyDetail.recordType == 2">
+                  <div class="grid-content">
+                    <span class="label">排查分类：</span>
+                    <span class="value" :title="historyDetail.dangerItemContent">{{
+                      historyDetail.dangerItemContent
+                    }}</span>
+                  </div>
+                </el-col>
+              </el-row> -->
+
+              <div class="headerLeft" v-if="rectifyRecordList.length > 0">
+                整改&复核记录
+              </div>
+              <el-timeline class="detailBox" :reverse="true">
+                <el-timeline-item
+                  :timestamp="item.rectifyTime"
+                  placement="top"
+                  v-for="(item, index) in rectifyRecordList"
+                  :key="index"
+                >
+                  <el-card>
+                    <p class="grid-content">
+                      <span class="label">{{
+                        item.type == 1
+                          ? "责任人："
+                          : item.type == 2
+                          ? "复查人："
+                          : item.type == 3
+                          ? "核验人："
+                          : "无"
+                      }}</span
+                      ><span class="value">{{ item.createUserName }}</span>
+                    </p>
+                    <p class="grid-content" v-if="item.type == 1">
+                      <span class="label">整改状态：</span
+                      ><span class="value">{{
+                        item.status == 2 ? "已整改" : "未整改"
+                      }}</span>
+                    </p>
+                    <p class="grid-content" v-else-if="item.type == 2">
+                      <span class="label">复查状态：</span
+                      ><span class="value">{{
+                        item.status == 2 ? "合格" : "不合格"
+                      }}</span>
+                    </p>
+                    <p class="grid-content" v-else>
+                      <span class="label">核验状态：</span
+                      ><span class="value">{{
+                        item.status == 2 ? "合格" : "不合格"
+                      }}</span>
+                    </p>
+                    <p class="grid-content" v-if="item.status == 1">
+                      <span class="label">驳回说明：</span
+                      ><span class="value">{{ item.additionalRemarks }}</span>
+                    </p>
+                    <p class="grid-content" v-if="item.status == 2">
+                      <span class="label">补充说明：</span
+                      ><span class="value">{{ item.additionalRemarks }}</span>
+                    </p>
+                    <div class="grid-content">
+                      <span class="label">{{
+                        item.type == 1
+                          ? "整改照片："
+                          : item.type == 2
+                          ? "复查照片："
+                          : "核验照片："
+                      }}</span>
+                      <span class="value" style="cursor: pointer;">
+                        <el-image
+                          v-for="(item2, index) in item.fileUrl"
+                          :key="index"
+                          style="
+                            width: 100px;
+                            height: 100px;
+                            margin-right: 10px;
+                          "
+                          :src="item2"
+                          :preview-src-list="item2.fileUrl"
+                          @click="openImg(item2)"
+                        >
+                        </el-image>
+                      </span>
+                    </div>
+                  </el-card>
+                </el-timeline-item>
+              </el-timeline>
             </div>
-            <el-row :gutter="20">
-              <el-col :span="24">
-                <div class="grid-content">
-                  <span class="label">相关照片：</span>
-                  <span class="value">
-                    <el-image
-                      v-for="(item, index) in parseImage2(historyDetail.imageUrl)"
-                      :key="index"
-                      style="width: 100px; height: 100px;margin-right:10px"
-                      :src="item"
-                      :preview-src-list="parseImage2(historyDetail.imageUrl)"
-                    >
-                    </el-image>
-                  </span>
-                </div>
-              </el-col>
-            </el-row>
           </div>
-          <el-divider
-            content-position="left"
-            v-if="rectifyRecordList.length > 0"
-            >整改&复查记录</el-divider
-          >
-          <el-timeline class="detailBox" :reverse="true">
-            <el-timeline-item
-              :timestamp="item.createTime"
-              placement="top"
-              v-for="(item, index) in rectifyRecordList"
-              :key="index"
-            >
-              <el-card>
-                <p class="grid-content">
-                  <span class="label"
-                    >{{ item.type == 1 ? "整改人" : "复查人" }}：</span
-                  ><span class="value">{{ item.createUserName }}</span>
-                </p>
-                <p class="grid-content" v-if="item.type == 1">
-                  <span class="label">整改状态：</span
-                  ><span class="value">{{
-                    item.status == 2 ? "已整改" : "未整改"
-                  }}</span>
-                </p>
-                <p class="grid-content" v-else>
-                  <span class="label">复查状态：</span
-                  ><span class="value">{{
-                    item.status == 2 ? "合格" : "不合格"
-                  }}</span>
-                </p>
-                <p class="grid-content">
-                  <span class="label">相关说明：</span
-                  ><span class="value">{{ item.additionalRemarks }}</span>
-                </p>
-                <div class="grid-content" v-if="item.type == 1">
-                  <span class="label">相关照片：</span>
-                  <span class="value">
-                    <el-image
-                      v-for="(url, index) in parseImage2(item.fileUrl)"
-                      :key="index"
-                      style="width: 50px; height: 50px;margin-right:10px"
-                      :src="url"
-                      :preview-src-list="parseImage2(item.fileUrl)"
-                    >
-                    </el-image>
-                  </span>
-                </div>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
         </vue-scroll>
       </div>
-      <!-- <el-divider content-position="left">复查记录</el-divider> -->
+    </el-dialog>
+    <!-- 视频播放 -->
+    <el-dialog
+      class="video"
+      :modal-append-to-body="false"
+      :visible.sync="isShow"
+      @close="closeBtn"
+    >
+      <video
+        v-if="isShow || player"
+        width="100%"
+        height="550"
+        controls
+        autoplay
+        style="margin-left: 10px"
+      >
+        <source :src="player" type="video/mp4" />
+        <source :src="player" type="video/mp4" />
+        <source :src="player" type="video/mp4" />
+        您的浏览器不支持 video 标签。
+      </video>
     </el-dialog>
   </div>
 </template>
@@ -1192,10 +1484,14 @@ import {
 
   deleteFinalDangerousEngineeringAcceptanceCheckApi,
 } from "@/assets/js/api/dangerousBigProject";
+import {
+  selectSafeRectifyRecordListApi,
+} from "@/assets/js/api/quality.js";
 import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit";
 import {
   getEnterpriseInfoList
 } from "@/assets/js/api/laborPerson";
+import moment from "moment";
 export default {
   props: ["id", "isSuperDanger"],
   data() {
@@ -1257,7 +1553,18 @@ export default {
       rectifyRecordList: [],
       statusArr: ["无需整改", "待整改", "待复查", "合格", "不合格"],
       COMPANY: "",
-      historyDetail: {}
+      historyDetail: {},
+      isShow: false,
+      player: '',
+      videoName: '',
+      replyData: {
+        rectifyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+        fileUrl: "",
+        additionalRemarks: "",
+        qualityId: "",
+      },
+      fileListRectification: [],
+      imgList: [],
     };
   },
   created() {
@@ -1279,6 +1586,112 @@ export default {
     this.getProjectList();
   },
   methods: {
+    //整改记录
+    selectRectifyRecordList(id) {
+      selectSafeRectifyRecordListApi({
+        qualityId: id,
+      }).then((res) => {
+        this.rectifyRecordList = res.result;
+        this.rectifyRecordList.forEach((item) => {
+          if (item.fileUrl) {
+            this.imgList = [];
+            if (item.fileUrl.startsWith("[") && item.fileUrl.endsWith("]")) {
+              let fileListI = JSON.parse(item.fileUrl);
+              fileListI.forEach((file) => {
+                let url = file.url;
+                if (!url.startsWith("http://")) {
+                  url = this.fileUrl + url;
+                }
+                this.imgList.push(url);
+              });
+            } else {
+              let fileListI = item.fileUrl.split(",");
+              fileListI.forEach((url) => {
+                if (!url.startsWith("http://")) {
+                  url = this.fileUrl + url;
+                }
+                this.imgList.push(url);
+              });
+            }
+            item.fileUrl = this.imgList;
+          } else {
+            item.fileUrl = [];
+          }
+        });
+        console.log("整改记录-处理后--", this.rectifyRecordList);
+      });
+    },
+    openImg(src) {
+      window.open(src);
+    },
+
+    //暂时保留
+    parseImage22(){
+      let arr = [];
+      if (urls) {
+        arr = urls.split(",");
+      }
+      arr.forEach((element, index) => {
+        arr[index] = this.$store.state.FILEURL + element;
+        let result = arr[index].substring(0, arr[index].indexOf("*"));
+        arr[index] = result;
+      });
+      return arr;
+    },
+    //关闭视频
+    closeBtn() {
+      this.isShow = false;
+      this.player = "";
+    },
+    //视频播放
+    playerVideo(item) {
+      if (item) {
+        let index = item.indexOf("*");
+        let videoUrl = item.substring(index + 1);
+        console.log("点击", videoUrl);
+        this.isShow = false;
+        this.$nextTick(() => {
+          this.player = videoUrl;
+          this.isShow = true;
+        });
+      } else {
+        this.$message.error("暂无视频");
+      }
+    },
+    previewDetail(item) {
+      this.getRectifyRecordList(item.id);
+      // this.detailData = item;
+      this.historyDetail = item;
+      console.log("historyDetailhistoryDetail",this.historyDetail)
+      console.log("historyDetailhistoryDetail",this.historyDetail)
+      console.log("historyDetailhistoryDetail",this.historyDetail)
+      this.dialogVisible6 = true;
+
+      this.videoName = item.fileUrl.split("*")[0];
+      console.log("新版查看详情", item);
+      this.selectRectifyRecordList(item.id);
+      this.replyData = {
+        rectifyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+        fileUrl: "",
+        additionalRemarks: "",
+      };
+      this.fileListRectification = [];
+    },
+    parseImage2(urls) {
+      let arr = [];
+      if (urls) {
+        arr = urls.split(",");
+      }
+      arr.forEach((element, index) => {
+        // arr[index] = this.$store.state.FILEURL + element;
+
+        arr[index] = this.$store.state.FILEURL + element;
+        let result = arr[index].substring(0, arr[index].indexOf("*"));
+        arr[index] = result;
+      });
+      return arr;
+    },
+    
     //获取企业 || 劳务公司 列表
     getProjectList() {
       let data = {
@@ -1406,6 +1819,9 @@ export default {
             }
           });
           this.checkData = res.result;
+          console.log('最终验收列表checkData',this.checkData)
+          console.log('最终验收列表checkData',this.checkData)
+          console.log('最终验收列表checkData',this.checkData)
         }
       });
     },
@@ -1471,26 +1887,11 @@ export default {
     getRectifyRecordList(inspectId) {
       getselectHiddenDangerRectifyRecordListApi({ inspectId: inspectId }).then(
         (res) => {
-          this.rectifyRecordList = res.result;
+          // this.rectifyRecordList = res.result;
         }
       );
     },
-    previewDetail(row) {
-      this.getRectifyRecordList(row.id);
-      // this.detailData = row;
-      this.historyDetail = row;
-      this.dialogVisible6 = true;
-    },
-    parseImage2(urls) {
-      let arr = [];
-      if (urls) {
-        arr = urls.split(",");
-      }
-      arr.forEach((element, index) => {
-        arr[index] = this.$store.state.FILEURL + element;
-      });
-      return arr;
-    },
+    
     // 删除进度记录
     deleteDangerousEngineeringProgressRecord(val) {
       if(this.detailData.finalAcceptanceStatus === 2){
@@ -1791,6 +2192,50 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.tableStatus {
+  width: 55px;
+  height: 25px;
+  display: inline-block;
+  background: red;
+  color: #fff;
+  line-height: 25px;
+  border-radius: 5px;
+  position: absolute;
+  top: 18%;
+  left: 65%;
+}
+.detailBox {
+  .grid-content {
+    overflow: hidden;
+    margin-bottom: 10px;
+
+    .label {
+      float: left;
+      width: 80px;
+      text-align: right;
+    }
+
+    .value {
+      float: left;
+      width: calc(80% - 80px);
+      margin-left: 10px;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+  }
+}
+
+.headerLeft {
+  height: 30px;
+  background: #ededed;
+  font-size: 14px;
+  color: #616266;
+  line-height: 30px;
+  padding: 0 10px;
+  margin-bottom: 20px;
+}
+
 .plan-form {
   height: calc(100% - 56px);
   width: 100%;
diff --git a/src/views/projectFront/dangerousBigProject/index.vue b/src/views/projectFront/dangerousBigProject/index.vue
index a0bf5a5b..2182f83e 100644
--- a/src/views/projectFront/dangerousBigProject/index.vue
+++ b/src/views/projectFront/dangerousBigProject/index.vue
@@ -33,7 +33,7 @@
           <!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
           <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
 
-          <el-table-column align="center"
+          <el-table-column align="center" width="200"
             :label="$t('message.dangerousBigProject.category')"
             show-overflow-tooltip
           >
@@ -42,12 +42,15 @@
               <div
                 class="table-category-item"
                 @click="viewData(scope.$index, tableData)"
+                style="display:flex;justify-content:center;"
               >
+              <div style="display:flex;text-overflow: ellipsis;overflow: hidden; ">
                 <div class="item-status" v-if="scope.row.issuperdanger">
                   <img src="@/assets/images/yu.png" alt="">
                   <span>超危</span>
                 </div>
                 <p class="item-title">{{ scope.row.engineeringTypeName }}</p>
+              </div>
                 <!-- <p>{{ scope.row.describeName }}</p> -->
                 <!-- <span class="item-status" v-if="scope.row.dangerType == 2">
                   超危
@@ -62,9 +65,9 @@
             :label="$t('message.dangerousBigProject.dangerProject')"
           >
             <template slot-scope="scope">
-              <div class="table-item">
-                <div style="display: flex">
-                  <el-tag type="danger" effect="dark" size="mini" v-if="scope.row.isOverdue" >超期</el-tag>
+              <div class="" style="display: flex;justify-content:center;font-weight:bold">
+                <div style="display: flex;justify-content:center">
+                  <el-tag type="danger" effect="dark" size="mini" v-if="scope.row.isoverdue === '1'" >超期</el-tag>
                   <!-- <el-tag type="danger" effect="dark" size="mini">超期</el-tag> -->
                   <p class="item-title" style="margin-left:5px">{{ scope.row.engineeringName }}</p>
                 </div>
diff --git a/src/views/projectFront/materialManage/materialEntryManage.vue b/src/views/projectFront/materialManage/materialEntryManage.vue
index a8dc6f34..9b68130e 100644
--- a/src/views/projectFront/materialManage/materialEntryManage.vue
+++ b/src/views/projectFront/materialManage/materialEntryManage.vue
@@ -165,6 +165,21 @@
               align="center"
               label="备注">
             </el-table-column>
+            <el-table-column
+              width="300"
+              prop="imageUrl"
+              align="center"
+              label="图片">
+              <template slot-scope="scope">
+                <span class="value" v-if="scope.row.imageUrl && JSON.parse(scope.row.imageUrl).length > 0"  
+                  style="display: flex;justify-content:center;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
+                  <div v-for="(item,index) in JSON.parse(scope.row.imageUrl)" :key="index" style="">
+                    <img :preview="item ? $store.state.FILEURL + item.url : ''"
+                        :src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
+                  </div>
+                </span>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -253,6 +268,10 @@ export default {
         console.log("返回的值", res);
         if (res.code == 200) {
           this.dialogTableData = res.result;
+          this.dialogTableData.map(item => {
+            // item.imageUrl = JSON.parse(item.imageUrl)
+
+          })
         }
       });
     },
diff --git a/src/views/projectFront/materialManage/materialExitManage.vue b/src/views/projectFront/materialManage/materialExitManage.vue
index dc229e00..057d5a87 100644
--- a/src/views/projectFront/materialManage/materialExitManage.vue
+++ b/src/views/projectFront/materialManage/materialExitManage.vue
@@ -165,6 +165,21 @@
               align="center"
               label="备注">
             </el-table-column>
+            <el-table-column
+              width="300"
+              prop="imageUrl"
+              align="center"
+              label="图片">
+              <template slot-scope="scope">
+                <span class="value" v-if="scope.row.imageUrl && JSON.parse(scope.row.imageUrl).length > 0"  
+                  style="display: flex;justify-content:center;word-wrap: break-word;white-space: normal; flex-wrap: wrap">
+                  <div v-for="(item,index) in JSON.parse(scope.row.imageUrl)" :key="index" style="">
+                    <img :preview="item ? $store.state.FILEURL + item.url : ''"
+                        :src="item ? $store.state.FILEURL + item.url : ''" alt="" width="50px" height="50px" style="margin-right: 10px;"/>
+                  </div>
+                </span>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue
index 44160698..921db14a 100644
--- a/src/views/projectFront/safeSame/inspectionLedger.vue
+++ b/src/views/projectFront/safeSame/inspectionLedger.vue
@@ -1852,24 +1852,24 @@
                   </div>
                 </el-col>
 
-<el-col :span="12">
-  <div class="grid-content">
-    <span class="label">现场照片：</span>
-    <span class="value" style="cursor: pointer;">
-      <el-image
-        v-for="(item, index) in parseImage2(
-          detailData.imageUrl
-        )"
-        :key="index"
-        style="width: 100px; height: 100px; margin-right: 10px"
-        :src="item"
-        :preview-src-list="parseImage2(item.fileUrl)"
-        @click="openImg(item)"
-      >
-      </el-image>
-    </span>
-  </div>
-</el-col>
+                <el-col :span="12">
+                  <div class="grid-content">
+                    <span class="label">现场照片：</span>
+                    <span class="value" style="cursor: pointer;">
+                      <el-image
+                        v-for="(item, index) in parseImage2(
+                          detailData.imageUrl
+                        )"
+                        :key="index"
+                        style="width: 100px; height: 100px; margin-right: 10px"
+                        :src="item"
+                        :preview-src-list="parseImage2(item.fileUrl)"
+                        @click="openImg(item)"
+                      >
+                      </el-image>
+                    </span>
+                  </div>
+                </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12" v-show="detailData.recordType == 2">