flx：修改质量安全样式问题 应急展示问题

src/assets/i18n/langs/cn/quality.js

@@ -94,7 +94,7 @@ export default {
     completed: '已完成',
     unfinished: '未完成',
     uploadPictures: '上传图片',
-    uploadHint: '支持格式jpg,jepg,png，最多上传10张照片',
+    uploadHint: '支持格式jpg,jepg,png，最多上传5张照片',
     uploadAttachment: '上传附件',
     uploadHint2: '只能上传MP3/MP4文件',
     classification: '排查分类',

src/views/projectFront/emergencyDisposal/emergencyPush.vue

@@ -6,7 +6,7 @@
                     <el-form-item label="企业">
                         <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
                             <el-option :label="item.enterpriseName" :value="item.id"
-                                v-for="(item, index) in responsibilityList" :key="index">
+                                v-for="(item, index) in responsibilityList2" :key="index">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -168,6 +168,7 @@ export default {
             formLabelWidthDetail: "270px",
             detailData: {},
             responsibilityList: [],
+            responsibilityList2: [],
             planDate: "",
             pickerOptions: {
                 disabledDate(time) {
@@ -317,7 +318,7 @@ export default {
             }).then((res) => {
                 if (res.result) {
                     console.log(res.result, 1)
-                    this.responsibilityList = res.result;
+                    this.responsibilityList2 = res.result;
                 }
             })
         },

src/views/projectFront/quality/inspectionLedger.vue

@@ -883,8 +883,8 @@
                   :before-upload="(file) => beforeUpload(file, 1)"
                   name="files"
                   :file-list="fileList1"
-                  :limit="5"
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <!--                支持格式-->
@@ -1190,12 +1190,14 @@
                   :on-remove="
                     (file, fileList) => handleRemove(file, fileList, 3)
                   "
+                  :before-upload="(file) => beforeUpload(file, 1)"
                   :on-preview="(file) => handlePreview(file, 3)"
-                  :limit="5"
+                  
                   :file-list="fileList3"
                   accept="image/jpeg,image/jpg,image/png"
                   name="files"
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <span>{{ $t("message.quality.uploadHint") }}</span>
@@ -1873,7 +1875,7 @@
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">现场照片：</span>
-                    <span class="value" style="cursor: pointer">
+                    <span  style="cursor: pointer;float: left;width: calc(80% - 80px);margin-left: 10px;">
                       <el-image
                         v-for="(item, index) in parseImage2(
                           detailData.imageUrl
@@ -2077,6 +2079,7 @@
                           :disabled="type == 'detail'"
                           :action="uploadUrl"
                           list-type="picture-card"
+                          :before-upload="(file) => beforeUpload(file, 5)"
                           :on-success="(file) => handleSuccess(file, 5)"
                           :on-error="(file) => handleError(file, 5)"
                           :on-remove="
@@ -2087,8 +2090,9 @@
                           :file-list="fileListRectification"
                           accept="image/jpeg,image/jpg,image/png"
                           required
-                          :limit="5"
+                          
                         >
+                        <!-- :limit="5" -->
                           <i class="el-icon-plus"></i>
                         </el-upload>
                       </span>
@@ -3380,6 +3384,14 @@ export default {
     },
 
     beforeUpload(file, type) {
+      if (type == 1 || type == 3 || type == 5) {
+        // console.log(this.fileList1.length)
+        if(this.fileList1.length >= 5 || this.fileList3.length >= 5 || this.fileListRectification .length >= 5){
+          this.$message.warning("最多只能上传5张图片");
+          return false;
+        }
+        return true
+      }
       if (type == 2 || type == 4) {
         const fileType = file.type;
         const fileTypeList = ["audio/mp3", "video/mp4"];
@@ -3399,12 +3411,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList1.length >= 4) {
+        // if (this.fileList1.length >= 5) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
+         
+        // }
         this.fileList1.push(data);
-        }
       } else if (type == 2) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,
@@ -3417,12 +3430,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList3.length >= 4) {
+        // if (this.fileList3.length >= 4) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
+         
+        // }
         this.fileList3.push(data);
-        }
       } else if (type == 4) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -873,8 +873,9 @@
                   :before-upload="(file) => beforeUpload(file, 1)"
                   name="files"
                   :file-list="fileList1"
-                  :limit="5"
+                  
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <!--                支持格式-->
@@ -1177,11 +1178,12 @@
                     (file, fileList) => handleRemove(file, fileList, 3)
                   "
                   :on-preview="(file) => handlePreview(file, 3)"
-                  :limit="5"
+                 
                   :file-list="fileList3"
                   accept="image/jpeg,image/jpg,image/png"
                   name="files"
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <span>{{ $t("message.quality.uploadHint") }}</span>
@@ -1858,7 +1860,7 @@
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">现场照片：</span>
-                    <span class="value" style="cursor: pointer;">
+                    <span  style="cursor: pointer;float: left;width: calc(80% - 80px);margin-left: 10px;">
                       <el-image
                         v-for="(item, index) in parseImage2(
                           detailData.imageUrl
@@ -2062,13 +2064,15 @@
                           :on-remove="
                             (file, fileList) => handleRemove(file, fileList, 5)
                           "
+                          :before-upload="(file) => beforeUpload(file, 5)"
                           :on-preview="(file) => handlePreview(file, 5)"
                           name="files"
                           :file-list="fileListRectification"
                           accept="image/jpeg,image/jpg,image/png"
                           required
-                          :limit="5"
+                          
                         >
+                        <!-- :limit="5" -->
                           <i class="el-icon-plus"></i>
                         </el-upload>
                       </span>
@@ -3339,6 +3343,14 @@ export default {
     },
 
     beforeUpload(file, type) {
+      if (type == 1 || type == 3 || type == 5) {
+        // console.log(this.fileList1.length)
+        if(this.fileList1.length >= 5 || this.fileList3.length >= 5 || this.fileListRectification .length >= 5){
+          this.$message.warning("最多只能上传5张图片");
+          return false;
+        }
+        return true
+      }
       if (type == 2 || type == 4) {
         const fileType = file.type;
         const fileTypeList = ["audio/mp3", "video/mp4"];
@@ -3358,12 +3370,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList1.length >= 4) {
+        // if (this.fileList1.length >= 4) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
+         
+        // }
         this.fileList1.push(data);
-        }
       } else if (type == 2) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,
@@ -3376,12 +3389,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList3.length >= 4) {
+        // if (this.fileList3.length >= 4) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
+          
+        // }
         this.fileList3.push(data);
-        }
       } else if (type == 4) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,