fix: 冲突解决

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); 
+export const deleteFinlahiddenDangerInspectRecordApi = data => post('xmgl/xzSecurityQualityInspectionRecord/delete', data); 
+
+export const selectSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualityRectifyRecord/selectRectifyRecordList',data); //质量整改记录

src/assets/js/http.js

@@ -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/'//测试地址
 
 

src/store/index.js

@@ -48,25 +48,25 @@ 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/',// 郭圣雄
+    // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄
-    FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄
+    // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄
-    WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
+    // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    // BASEURL: baseUrl
+    BASEURL: baseUrl
-    //   ? baseUrl
+      ? baseUrl
-    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
+    UPLOADURL:
-    //   window.location.protocol +
+      window.location.protocol +
-    //   "//" +
+      "//" +
-    //   window.location.host +
+      window.location.host +
-    //   "/upload/image", //正式环境
+      "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/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

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{

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 class="" style="display: flex;justify-content:center;font-weight:bold">
-                <div style="display: flex">
+                <div style="display: flex;justify-content:center">
-                  <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 === '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>

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)
+
+          })
         }
       });
     },

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>

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -1852,24 +1852,24 @@
                   </div>
                 </el-col>
 
-<el-col :span="12">
+                <el-col :span="12">
-  <div class="grid-content">
+                  <div class="grid-content">
-    <span class="label">现场照片：</span>
+                    <span class="label">现场照片：</span>
-    <span class="value" style="cursor: pointer;">
+                    <span class="value" style="cursor: pointer;">
-      <el-image
+                      <el-image
-        v-for="(item, index) in parseImage2(
+                        v-for="(item, index) in parseImage2(
-          detailData.imageUrl
+                          detailData.imageUrl
-        )"
+                        )"
-        :key="index"
+                        :key="index"
-        style="width: 100px; height: 100px; margin-right: 10px"
+                        style="width: 100px; height: 100px; margin-right: 10px"
-        :src="item"
+                        :src="item"
-        :preview-src-list="parseImage2(item.fileUrl)"
+                        :preview-src-list="parseImage2(item.fileUrl)"
-        @click="openImg(item)"
+                        @click="openImg(item)"
-      >
+                      >
-      </el-image>
+                      </el-image>
-    </span>
+                    </span>
-  </div>
+                  </div>
-</el-col>
+                </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12" v-show="detailData.recordType == 2">