暂存危大工程

src/assets/js/api/dangerousBigProject.js

@@ -72,6 +72,8 @@ export const selectDangerousEngineeringProgressRecordApi = data => post('xmgl/da
 export const selectDangerousEngineeringSideStationApi = data => post('xmgl/dangerousEngineeringSideStation/selectList', data);
 // 分页列表查询危大工程-验收记录信息
 export const selectDangerousEngineeringAcceptanceCheckApi = data => post('xmgl/dangerousEngineeringAcceptanceCheck/selectlist', data);
+// 分页列表查询危大工程-最终验收记录信息
+export const selectFinalDangerousEngineeringAcceptanceCheckApi = data => get('xmgl/xzDangerousEngineeringAcceptance/list', data);
 // 分页列表查询隐患检查记录信息
 export const selectHiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/list', data);
 // 删除危大工程-验收记录信息

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/' // 百色三标段项目

src/store/index.js

@@ -48,8 +48,8 @@ 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://192.168.34.221:9111/upload/image/',// 郭圣雄
+    UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄
-    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄
     WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试

src/views/projectFront/dangerousBigProject/detail.vue

@@ -283,7 +283,8 @@
                 <div class="line"></div>
                 <div class="info-item">
                   <div class="box-title">
-                    一般验收
+                    <!-- 一般验收 -->
+                    最终验收
                   </div>
                   <div class="plan-detail flex">
                     <div class="plan-content2">
@@ -315,7 +316,7 @@
                     <div class="plan-content">
                       验收描述：{{
                         checkData.length > 0
-                          ? checkData[0].acceptanceDescribe
+                          ? checkData[0].acceptanceDesc
                           : "- -"
                       }}
                       <div
@@ -752,7 +753,7 @@
         height="500"
         style="width: 100%;"
       >
-        <el-table-column prop="acceptanceDescribe" label="验收描述">
+        <el-table-column prop="acceptanceDesc" label="验收描述">
         </el-table-column>
         <el-table-column label="验收类型">
           <template slot-scope="scope">
@@ -769,15 +770,15 @@
         <el-table-column label="图片">
           <template slot-scope="scope">
             <el-image
-              v-if="scope.row.imageUrl"
+              v-if="scope.row.photo"
               style="width: 50px; height: 50px;"
-              :src="fileUrl + scope.row.imageUrl.split(',')[0]"
+              :src="fileUrl + scope.row.photo.split(',')[0]"
               :preview-src-list="scope.row.fileList"
             >
             </el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="createUserName" label="记录人">
+        <el-table-column prop="acceptanceUserName" label="记录人">
         </el-table-column>
         <el-table-column prop="createTime" label="记录时间"> </el-table-column>
         <el-table-column label="操作" width="80">
@@ -1171,6 +1172,7 @@ import {
   selectDangerousEngineeringProgressRecordApi,
   selectDangerousEngineeringSideStationApi,
   selectDangerousEngineeringAcceptanceCheckApi,
+  selectFinalDangerousEngineeringAcceptanceCheckApi,
   selectHiddenDangerInspectRecordApi,
   deleteDangerousEngineeringProgressRecordApi,
   deleteDangerousEngineeringSideStationApi,
@@ -1373,10 +1375,14 @@ export default {
     },
     // 查询一般验收记录
     selectDangerousEngineeringAcceptanceCheck() {
-      selectDangerousEngineeringAcceptanceCheckApi({
+      // selectDangerousEngineeringAcceptanceCheckApi({
+      selectFinalDangerousEngineeringAcceptanceCheckApi({
         engineeringId: this.id,
       }).then((res) => {
-        console.log(res.result, "-----一般验收");
+        console.log(res.result, "-----最终验收");
+        console.log(res.result, "-----最终验收");
+        console.log(res.result, "-----最终验收");
+        console.log(res.result, "-----最终验收");
         if (res.code == 200 && res.result) {
           res.result.forEach((item) => {
             item.fileList = [];

src/views/projectFront/dangerousBigProject/index.vue

@@ -64,8 +64,8 @@
             <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> -->
+                  <el-tag type="danger" effect="dark" size="mini" v-if="scope.row.isOverdue" >超期</el-tag>
-                  <el-tag type="danger" effect="dark" size="mini">超期</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>
                 <!-- <p>{{scope.row.people}}识别于：{{ scope.row.date }}</p> -->