zc

src/views/safetyCheck/components/addPage/addPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="inspectionManagement-addPage">
+  <div class="inspectionManagement-addPage" v-loading.fullscreen.lock="loading">
     <div class="title-max-box">
       <p class="title-p">{{addPageTitle}}</p>
       <p class="title-button add-button-one-90" @click="outButton">返回</p>
@@ -128,6 +128,7 @@
                 </div>
                 <el-upload
                   style="display: inline-block;overflow: hidden"
+                  v-if="item.uploadDtoList.length<5"
                   class="avatar-uploader"
                   :action="uploadImgUrl"
                   :show-file-list="false"
@@ -170,6 +171,7 @@
     },
     data(){
       return{
+        loading:false,
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
           Authorization: "Bearer " + getToken(),
@@ -318,6 +320,7 @@
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res,item) {
+        this.$set(this,'loading',false);
         if(item.uploadDtoList.length>4){
           this.msgError('最多只可上传5张')
           return
@@ -349,10 +352,11 @@
             this.msgError('上传图片大小不能超过2M')
             return false
           }
+          this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;
         }else{
-          this.msgError('png/jpeg/gif格式')
+          this.msgError('仅支持jpg/png/bmp/gif格式')
           type = false;
         }
         return type;

src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -32,6 +32,7 @@
 -->
 <template>
   <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
+             v-loading="loading"
              :title="infoDialogData.checkHazardApplyDto.rectifyStatus==1?'已完成':(infoDialogData.checkHazardApplyDto.rectifyStatus==2?'待整改':(infoDialogData.checkHazardApplyDto.rectifyStatus==3?'待复核':(infoDialogData.checkHazardApplyDto.rectifyStatus==4?'暂无法整改':'')))"
              :visible.sync="infoDialogType" v-if="infoDialogType"
              width="1184px" append-to-body>
@@ -262,6 +263,7 @@
                 <p class="for-del-button el-icon-circle-close" @click="delImg(imgIndex)"></p>
               </div>
               <el-upload
+                v-if="addForm.uploadDtoList.length<5"
                 style="display: inline-block;overflow: hidden"
                 class="avatar-uploader"
                 :action="uploadImgUrl"
@@ -352,6 +354,7 @@
     },
     data(){
       return{
+        loading:false,
         upDataName:"",
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
@@ -536,6 +539,7 @@
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res,item) {
+        this.$set(this,'loading',false);
         if(item.uploadDtoList.length>4){
           this.msgError('最多只可上传5张')
           return
@@ -566,10 +570,11 @@
             this.msgError('上传图片大小不能超过2M')
             return false
           }
+          this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;
         }else{
-          this.msgError('png/jpeg/gif格式')
+          this.msgError('仅支持jpg/png/bmp/gif格式')
           type = false;
         }
         return type;
@@ -585,8 +590,8 @@
       //多次名称匹配
       frequencyCalculation(length,type){
         let textList = [
-          {value:'二次',key:'2'},{value:'三次',key:'3'},{value:'四次',key:'4'},{value:'五次',key:'5'}, {value:'六次',key:'6'}, {value:'七次',key:'7'},
-          {value:'八次',key:'8'},{value:'九次',key:'9'},{value:'十次',key:'10'}
+          {value:'二次',key:'2'},{value:'三次',key:'3'},{value:'四次',key:'4'},{value:'五次',key:'5'}, {value:'六次',key:'6'},
+          {value:'七次',key:'7'},{value:'八次',key:'8'},{value:'九次',key:'9'},{value:'十次',key:'10'}
         ]
         let num = type === 2?Math.ceil(length/2):Math.floor(length/2)
         if(type == 1){

src/views/safetyCheck/dataStatistics/laboratoryStatistics.vue

@@ -71,7 +71,7 @@
       </el-form-item>
     </el-form>
     <div class="num-data-box">
-      搜索到实验室总数 {{numData.sumTotal}}，存在危险源的实验室数 {{numData.hazardSubjectTotal}}，危险源总数 {{numData.hazardTotal}}，特种设备安全类 {{numData.specialTotal}}<span v-for="item in numData.classListVo">，{{item.levelName}} {{item.amount}}</span>
+      搜索到实验室总数 {{numData.sumTotal}}，存在危险源的实验室数 {{numData.hazardSubjectTotal}}，危险源总数 {{numData.hazardTotal}}，<span v-for="item in numData.classListVo">，{{item.levelName}} {{item.amount}}</span>
     </div>
     <el-table  border :data="tableList" ref="multipleTable"
                :row-key="getRowKeys"

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -84,7 +84,7 @@
           </el-form-item>
           <el-form-item label="检查材料:">
             <div class="dialog-material-max-box">
-              <div class="dialog-material-button-box" v-if="!lookInfoType">
+              <div class="dialog-material-button-box" v-if="!lookInfoType&&dialogForm.uploadDtoList.length<10">
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadImgUrl"
@@ -980,13 +980,12 @@
         this.$forceUpdate()
       },
       beforeAvatarUpload(file) {
-        this.$set(this,'loading',true);
         let type = false;
         if (file.type == 'application/pdf' || file.type == 'application/msword' || file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'|| file.type == 'application/vnd.ms-excel' || file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+          this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;
         }else{
-          this.$set(this,'loading',false);
           this.$message.error('只能上传doc/docx/xls/xlsx/pdf格式');
           type = false;
         }

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -22,7 +22,7 @@
             <el-input :disabled="lookInfoType" v-model="dialogForm.title" placeholder="请输入计划标题" maxLength="30" style="width:450px;"/>
           </el-form-item>
           <el-form-item label="检查类型:">
-            <p style="width:450px;background:#f5f5f5;border-radius:4px;padding:0 15px;">校级巡查</p>
+            <p style="width:450px;background:#f5f5f5;border-radius:4px;padding:0 15px;">校院巡查</p>
           </el-form-item>
           <el-form-item label="检查周期:" prop="dateRange">
             <div class="date-range-box">
@@ -84,7 +84,7 @@
           </el-form-item>
           <el-form-item label="检查材料:">
             <div class="dialog-material-max-box">
-              <div class="dialog-material-button-box" v-if="!lookInfoType">
+              <div class="dialog-material-button-box" v-if="!lookInfoType&&dialogForm.uploadDtoList.length<10">
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadImgUrl"
@@ -1346,13 +1346,12 @@
         this.$forceUpdate()
       },
       beforeAvatarUpload(file) {
-        this.$set(this,'loading',true);
         let type = false;
         if (file.type == 'application/pdf' || file.type == 'application/msword' || file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'|| file.type == 'application/vnd.ms-excel' || file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+          this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;
         }else{
-          this.$set(this,'loading',false);
           this.$message.error('只能上传doc/docx/xls/xlsx/pdf格式');
           type = false;
         }

src/views/safetyCheck/snapshotManagement/index.vue

@@ -113,6 +113,7 @@
     <listPage v-if="pageType == 2"></listPage>
     <infoPage v-if="pageType == 3" :infoPropsData="infoPropsData"></infoPage>
     <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
+               v-loading="loading"
                title="随手拍上报" :visible.sync="addDialogType" v-if="addDialogType"
                width="787px" append-to-body>
       <div>
@@ -164,6 +165,7 @@
               <p class="for-del-button el-icon-circle-close" @click="delImg(imgIndex)"></p>
             </div>
             <el-upload
+              v-if="addDialogForm.imgDtoList.length<5"
               style="display: inline-block;overflow: hidden"
               class="avatar-uploader"
               :action="uploadImgUrl"
@@ -202,6 +204,7 @@
     },
     data(){
       return{
+        loading:false,
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
           Authorization: "Bearer " + getToken(),
@@ -331,6 +334,7 @@
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res) {
+        this.$set(this,'loading',false);
         if(this.addDialogForm.imgDtoList.length>4){
           this.msgError('最多只可上传5张')
           return
@@ -360,10 +364,11 @@
             this.msgError('上传图片大小不能超过5M')
             return false
           }
+          this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;
         }else{
-          this.msgError('png/jpeg/gif格式')
+          this.msgError('仅支持jpg/png/bmp/gif格式')
           type = false;
         }
         return type;

src/views/safetyCheck/snapshotManagement/infoPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="snapshotManagement-infoPage">
+  <div class="snapshotManagement-infoPage" v-loading.fullscreen.lock="loading">
     <div class="title-box">
       <p>随手拍详情</p>
       <p class="add-button-one-90" @click="outButton" style="width:100px;margin-right:10px;">返回</p>
@@ -90,6 +90,7 @@
               <p class="for-del-button el-icon-circle-close" @click="delImg(imgIndex)"></p>
             </div>
             <el-upload
+              v-if="upFormData.imgDtoList.length<5"
               style="display: inline-block;overflow: hidden"
               class="avatar-uploader"
               :action="uploadImgUrl"
@@ -128,6 +129,7 @@
     },
     data(){
       return{
+        loading:false,
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
           Authorization: "Bearer " + getToken(),
@@ -192,6 +194,7 @@
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res) {
+        this.$set(this,'loading',false);
         if(this.upFormData.imgDtoList.length>4){
           this.msgError('最多只可上传5张')
           return
@@ -221,10 +224,11 @@
             this.msgError('上传图片大小不能超过5M')
             return false
           }
+          this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;
         }else{
-          this.msgError('png/jpeg/gif格式')
+          this.msgError('仅支持jpg/png/bmp/gif格式')
           type = false;
         }
         return type;

src/views/safetyCheck/startInspection/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container startInspection">
+    <div class="app-container startInspection" v-loading.fullscreen.lock="loading">
       <div class="title-max-box">
         <p class="title-p">开展检查</p>
       </div>
@@ -177,6 +177,7 @@
                     <p class="for-del-button el-icon-circle-close" @click="delImg(index,imgIndex)"></p>
                   </div>
                   <el-upload
+                    v-if="item.uploadDtoList.length<5"
                     style="display: inline-block;overflow: hidden"
                     class="avatar-uploader"
                     :action="uploadImgUrl"
@@ -218,6 +219,7 @@
     },
     data(){
       return{
+        loading:false,
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
           Authorization: "Bearer " + getToken(),
@@ -404,6 +406,7 @@
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res,item) {
+        this.$set(this,'loading',false);
         if(item.uploadDtoList.length>4){
           this.msgError('最多只可上传5张')
           return
@@ -435,10 +438,11 @@
             this.msgError('上传图片大小不能超过2M')
             return false
           }
+          this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;
         }else{
-          this.msgError('png/jpeg/gif格式')
+          this.msgError('仅支持jpg/png/bmp/gif格式')
           type = false;
         }
         return type;