zc

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -128,7 +128,14 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="添加序号" prop="code">
-          <el-input v-model="addDialogForm.code" placeholder="未选择指标" maxLength="6" disabled style="width:548px;"/>
+          <div class="code-max-box">
+            <el-input v-model="addDialogForm.code" placeholder="未选择指标"
+                      maxLength="6" disabled style="width:500px;"/>
+            <div class="code-button-box">
+              <p class="el-icon-arrow-up" @click="codeButton(1)"></p>
+              <p class="el-icon-arrow-down" @click="codeButton(2)"></p>
+            </div>
+          </div>
         </el-form-item>
         <el-form-item label="检查项目" prop="name">
           <el-input
@@ -219,6 +226,7 @@
             { required: true, message: "请输入检查项目内容", validator: this.spaceJudgment, trigger: "change" },
           ],
         },
+        checkList:[],
       }
     },
     created(){
@@ -257,6 +265,7 @@
       },
       //添加页面开启
       addDialogOpen(type,row){
+        console.log('row',row)
         if(type == 1){
           //新增
           this.$set(this,'addDialogTitle','添加检查项目');
@@ -272,6 +281,7 @@
           //列表新增
           this.$set(this,'addDialogTitle','添加检查项目');
           let obj = this.cascaderCheckData(row.id,this.cascaderDataPrimitive);
+          this.$set(this,'checkList',JSON.parse(JSON.stringify(row.children)));
           this.$set(this,'addDialogLevel',obj.level);
           this.$set(this,'addDialogForm',{
             parentId:row.id,
@@ -291,6 +301,7 @@
             name:row.name,
             mainPoint:row.mainPoint,
           });
+          this.getCodeButton(this.cascaderDataPrimitive,row.parentId,row.id);
           this.$set(this,'addDialogType',true);
         }
       },
@@ -302,6 +313,7 @@
       cascaderCheck(val){
         let obj = this.cascaderCheckData(val,this.cascaderDataPrimitive);
         this.$set(this.addDialogForm,'code',obj.key);
+        this.getCodeButton(this.cascaderDataPrimitive,obj.parentId,val);
         this.$set(this,'addDialogLevel',obj.level);
       },
       //序号自增
@@ -317,7 +329,7 @@
             }
             if(list[i].children){
               if(list[i].children[0]){
-                obj.key = list[i].code ? list[i].code + '.' + self.getChekeListKey(list[i].children) : self.getChekeListKey(list[i].children)
+                obj.key = list[i].code ? list[i].code + '.' + self.getListKey(list[i].children) : self.getListKey(list[i].children)
               }else{
                 obj.key = list[i].code ? list[i].code+'.1':'1'
               }
@@ -340,7 +352,7 @@
         }
       },
       //自动补位计算
-      getChekeListKey(dataList){
+      getListKey(dataList){
         let num = 0;
         for(let i=0;i<dataList.length;i++){
           let list = dataList[i].code.split('.');
@@ -356,6 +368,106 @@
         }
         return num+1
       },
+      //序号调整按钮
+      codeButton(type){
+        let obj = this.getListCode(this.addDialogForm.code,type,this.checkList);
+        if(obj.type){
+          this.$set(this.addDialogForm,'code',obj.value);
+        }
+      },
+      getListCode(code,type,list){
+        let codeList = code.split('.');
+        let codeNum = parseInt(codeList[codeList.length-1]);
+        let codeText = '';
+        let obj = {type:false,value:""}
+        if(!list[0]){
+          return obj
+        }
+        if(type == 1){
+          if(codeNum==1 || !list[0]){
+            return obj
+          }
+        }else if(type == 2){
+          let maxList = list[list.length-1].code.split('.')
+          let maxCode = parseInt(maxList[maxList.length-1]);
+          if(codeNum > maxCode){
+            return obj
+          }
+        }
+        for(let i=0;i<codeList.length-1;i++){
+          if(i===0){
+            codeText = codeText + codeList[i]
+          }else{
+            codeText = codeText +'.'+ codeList[i]
+          }
+        }
+        let age = parseInt(codeNum);
+        if(type == 1){
+          age--
+          for(age;age>0;age--){
+            let counter = 0;
+            for(let o=0;o<list.length;o++){
+              let codeList = list[o].code.split('.');
+              let code = parseInt(codeList[codeList.length-1]);
+              if(code == age){
+                counter++
+              }
+            }
+            if(counter == 0){
+              return {
+                type:true,
+                value:codeText?codeText+'.'+age:age+''
+              }
+            }
+          }
+          return obj;
+        }else if(type == 2){
+          age++
+          for(age;age<999;age++){
+            let counter = 0;
+            for(let o=0;o<list.length;o++){
+              let codeList = list[o].code.split('.');
+              let code = parseInt(codeList[codeList.length-1]);
+              if(code == age){
+                counter++
+              }
+            }
+            if(counter == 0){
+              return {
+                type:true,
+                value:codeText?codeText+'.'+age:age+''
+              }
+            }
+          }
+          return obj;
+        }
+      },
+      //选中同级数据
+      getCodeButton(list,parentId,id){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          if(list[i].id == parentId){
+            if(list[i].children){
+              let newList = JSON.parse(JSON.stringify(list[i].children))
+              for(let o=0;o<newList.length;o++){
+                if(newList[o].id == id){
+                  newList.splice(o,1)
+                }
+              }
+              this.$set(this,'checkList',newList);
+              return
+            }
+          }else{
+            if (list[i].level<3){
+              if(list[i].children){
+                if(list[i].children[0]){
+                  self.getCodeButton(list[i].children,parentId,id)
+                }
+              }
+            }
+          }
+        }
+      },
       //删除
       delItem(row){
         let self = this;
@@ -453,6 +565,10 @@
         let type = false;
         console.log('file',file);
         if (file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' || file.type == 'application/vnd.ms-excel') {
+          if(file.size> 5250000){
+            this.msgError('上传大小不能超过5M')
+            return false
+          }
           this.getImportData.textName = file.name;
           type = true;
           this.loading = true;
@@ -502,7 +618,7 @@
             cancelButtonText: "取消",
             type: "warning"
           }).then(async () => {
-            self.download('/system/user/teacher/export/', {...self.queryParams}, '教职工信息-'+this.currentDate+'.xlsx')
+            self.download('/zd-security/checkOption/export/', {...self.queryParams}, '项目检查库.xlsx')
           }).catch(() => {})
         }else if(item.command == 2){
           if(self.ids.length>0) {
@@ -717,5 +833,37 @@
       background: rgba(255,255,255,0.4);
       border-radius:20px;
     }
+    .code-max-box{
+      display: flex;
+      .code-button-box{
+        display: flex;
+        flex-direction: column;
+        margin-left:8px;
+        p{
+          width:40px;
+          text-align: center;
+          line-height:19px;
+          font-size:14px;
+          cursor: pointer;
+          color:#d8d8d8;
+        }
+        p:nth-child(1){
+          border:1px solid #d8d8d8;
+          border-top-left-radius: 4px;
+          border-top-right-radius: 4px;
+        }
+        p:nth-child(2){
+          border-bottom:1px solid #d8d8d8;
+          border-left:1px solid #d8d8d8;
+          border-right:1px solid #d8d8d8;
+          border-bottom-left-radius: 4px;
+          border-bottom-right-radius: 4px;
+        }
+        p:hover{
+          color:#fff;
+          background-color: #d8d8d8;
+        }
+      }
+    }
   }
 </style>

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

@@ -349,7 +349,7 @@
         }
         let type = false;
         if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif' || file.type == 'image/bmp') {
-          if(file.size> 2000000){
+          if(file.size> 2100000){
             this.msgError('上传图片大小不能超过2M')
             return false
           }

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

@@ -560,13 +560,14 @@
         this.$forceUpdate()
       },
       beforeAvatarUpload(file,item) {
+        console.log('file',file)
         if(item.uploadDtoList.length>4){
           this.msgError('最多只可上传5张')
           return false
         }
         let type = false;
         if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif' || file.type == 'image/bmp') {
-          if(file.size> 2000000){
+          if(file.size> 2100000){
             this.msgError('上传图片大小不能超过2M')
             return false
           }

src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -83,6 +83,9 @@
   import { dataStatisticsItemsList,dataStatisticsItemsListTop } from "@/api/safetyCheck/index";
   export default {
     name: 'checkIndexStatistics',
+    props:{
+      propsData:{},
+    },
     data(){
       return{
         deptSelectList:[],
@@ -100,12 +103,13 @@
         tableList:[{}],
         total:0,
         currentDate:'',
+        jumpType:false,
       }
     },
     created(){
-
     },
     mounted(){
+      this.$set(this,'jumpType',this.propsData.jumpType);
       this.initializationInterface();
       this.getList();
     },
@@ -129,13 +133,18 @@
         }else{
           obj.endTime = "";
         }
-        dataStatisticsItemsList(obj).then(response => {
-          this.total = response.total;
-          this.tableList = response.rows;
-        });
-        dataStatisticsItemsListTop(obj).then(response => {
-          this.$set(this,'numData',response.data);
-        });
+        if(this.jumpType){
+          //已跳转
+        }else{
+          //未跳转
+          dataStatisticsItemsList(obj).then(response => {
+            this.total = response.total;
+            this.tableList = response.rows;
+          });
+          dataStatisticsItemsListTop(obj).then(response => {
+            this.$set(this,'numData',response.data);
+          });
+        }
       },
       /** 搜索按钮操作 */
       handleQuery() {

src/views/safetyCheck/dataStatistics/index.vue

@@ -16,7 +16,7 @@
     </div>
     <laboratoryStatistics v-if="pageType == 1"></laboratoryStatistics>
     <safetyHazardStatistics v-if="pageType == 2"></safetyHazardStatistics>
-    <checkIndexStatistics v-if="pageType == 3"></checkIndexStatistics>
+    <checkIndexStatistics v-if="pageType == 3" :propsData="propsData"></checkIndexStatistics>
   </div>
 </template>
 
@@ -34,10 +34,18 @@
     data(){
       return{
         pageType:1,
+        propsData:{
+          jumpType:false,
+        }
       }
     },
     created(){
-
+      if(this.$route.query.type){
+        this.$set(this.propsData,'jumpType',true);
+        this.$set(this,'pageType',3);
+      }else{
+        this.$set(this.propsData,'jumpType',false);
+      }
     },
     mounted(){
 

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}}，<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/selfInspectionManagement/index.vue

@@ -100,8 +100,9 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>

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

@@ -985,6 +985,10 @@
       beforeAvatarUpload(file) {
         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') {
+          if(file.size> 5250000){
+            this.msgError('上传大小不能超过5M')
+            return false
+          }
           this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;

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

@@ -95,8 +95,9 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -78,17 +78,17 @@
           <el-table-column label="实验室" align="center" prop="subRoom" show-overflow-tooltip width="170"/>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>
           <el-table-column label="整改人" align="center" prop="rectifyName" show-overflow-tooltip width="90"/>
-          <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
-          <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
+          <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="180">
             <template slot-scope="scope">
-              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2||scope.row.rectifyStatus==3?'rectifyStatusColorB':'')">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
+              <p>{{scope.row.rectifyDeadline}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
             </template>
           </el-table-column>
-          <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
+          <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
             <template slot-scope="scope">
-              <p>{{scope.row.rectifyTime}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
+              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2||scope.row.rectifyStatus==3?'rectifyStatusColorB':'')">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
             </template>
           </el-table-column>
+          <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="170"/>
           <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80">
             <template slot-scope="scope">
               {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 0?'已驳回':(scope.row.examineResult == 2?'待审核':''))}}

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -78,17 +78,17 @@
           <el-table-column label="实验室" align="center" prop="subRoom" show-overflow-tooltip width="170"/>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>
           <el-table-column label="整改人" align="center" prop="rectifyName" show-overflow-tooltip width="90"/>
-          <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
-          <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
+          <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="180">
             <template slot-scope="scope">
-              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2||scope.row.rectifyStatus==3?'rectifyStatusColorB':'')">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
+              <p>{{scope.row.rectifyDeadline}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
             </template>
           </el-table-column>
-          <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
+          <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
             <template slot-scope="scope">
-              <p>{{scope.row.rectifyTime}}<span v-if="scope.row.overdueStatus==1" style="margin-left:10px;color:#EE0606;">已逾期</span></p>
+              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2||scope.row.rectifyStatus==3?'rectifyStatusColorB':'')">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
             </template>
           </el-table-column>
+          <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="170"/>
           <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80">
             <template slot-scope="scope">
               {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 0?'已驳回':(scope.row.examineResult == 2?'待审核':''))}}

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -100,8 +100,9 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>

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

@@ -1351,6 +1351,10 @@
       beforeAvatarUpload(file) {
         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') {
+          if(file.size> 5250000){
+            this.msgError('上传大小不能超过5M')
+            return false
+          }
           this.$set(this,'loading',true);
           this.upDataName = file.name;
           type = true;

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

@@ -95,8 +95,9 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                <p class="table-button-p" style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>

src/views/safetyCheck/snapshotManagement/index.vue

@@ -360,8 +360,8 @@
         }
         let type = false;
         if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif' || file.type == 'image/bmp') {
-          if(file.size> 5000000){
-            this.msgError('上传图片大小不能超过5M')
+          if(file.size> 2100000){
+            this.msgError('上传图片大小不能超过2M')
             return false
           }
           this.$set(this,'loading',true);

src/views/safetyCheck/snapshotManagement/infoPage.vue

@@ -220,8 +220,8 @@
         }
         let type = false;
         if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif' || file.type == 'image/bmp') {
-          if(file.size> 5000000){
-            this.msgError('上传图片大小不能超过5M')
+          if(file.size> 2100000){
+            this.msgError('上传图片大小不能超过2M')
             return false
           }
           this.$set(this,'loading',true);

src/views/safetyCheck/startInspection/index.vue

@@ -434,7 +434,7 @@
         }
         let type = false;
         if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif' || file.type == 'image/bmp') {
-          if(file.size> 2000000){
+          if(file.size> 2100000){
             this.msgError('上传图片大小不能超过2M')
             return false
           }

src/views/safetyCheck/worktable/index.vue

@@ -239,7 +239,12 @@
       //去数据统计页面
       goPage(){
         if(this.goDataStatistics){
-          this.$router.push({ path: '/safetyCheck/dataStatistics' });
+          this.$router.push({
+            path: '/safetyCheck/dataStatistics',
+            query:{
+              type:true
+            }
+          });
         }else{
           this.msgError('没有相关权限,请联系管理员')
         }