zc

src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -250,9 +250,9 @@
           setStudent:false,
         };
         for(let i=0;i<self.checkDataList.length;i++){
-          if(self.checkDataList[i] == '1'){
+          if(self.checkDataList[i] == '2'){
             obj.setSubjectLead = true;
-          }else if(self.checkDataList[i] == '2'){
+          }else if(self.checkDataList[i] == '1'){
             obj.setSubjectSafety = true;
           }else if(self.checkDataList[i] == '3'){
             obj.setTeacher = true;
@@ -272,11 +272,11 @@
           let list = [];
           if(response.data.setSubjectLead){
             //实验室负责人
-            list.push('1');
+            list.push('2');
           }
           if(response.data.setSubjectSafety){
             //实验室安全责任人
-            list.push('2');
+            list.push('1');
           }
           if(response.data.setTeacher){
             //全部老师

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -621,17 +621,23 @@
             self.download('/zd-security/checkOption/export/', {...self.queryParams}, '项目检查库.xlsx')
           }).catch(() => {})
         }else if(item.command == 2){
-          if(self.ids.length>0) {
+          let list = self.$refs.multipleTable.selection;
+          let ids = [];
+          for(let i=0;i<list.length;i++){
+            ids.push(list[i].id)
+          }
+          console.log('list',list);
+          console.log('ids',ids);
+          if(ids.length>0) {
             self.$confirm(`确认导出选中数据?`, "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning"
             }).then(async () => {
-              let ids = self.ids.join(',');
               let obj = {
-                ids :ids
+                ids :ids.join(',')
               }
-              self.download(`/system/user/teacher/export/`,obj, '教职工信息-'+this.currentDate+'.xlsx')
+              self.download(`/zd-security/checkOption/export/`,obj, '项目检查库.xlsx')
             }).catch(() => {})
           }else {
             Message({

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

@@ -23,7 +23,7 @@
               </el-form-item>
             </div>
             <el-form-item label="检查要求" prop="checkDemand">
-              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;">{{addForm.checkDemand}}</p>
+              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;min-height:40px;">{{addForm.checkDemand}}<span v-if="!addForm.checkDemand" style="color:#999;">未输入</span></p>
               <!--<el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>-->
             </el-form-item>
             <el-form-item label="检查结果" prop="checkResult">
@@ -95,7 +95,14 @@
                   placeholder="请选择检查项"
                   :options="options"
                   :props="{ checkStrictly: false, value: 'id', label: 'labelName',emitPath:false }"
-                  filterable></el-cascader>
+                  filterable>
+                  <template slot-scope="{data}">
+                    <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">
+                      <p style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
+                    </el-tooltip>
+                    <p v-else style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
+                  </template>
+                </el-cascader>
                 <p class="hazard-check-count-p" v-if="hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{hazardCheckCount}}</span> 次隐患</p>
               </el-form-item>
               <el-form-item label="检查要点" label-width="123px">
@@ -375,7 +382,15 @@
         for(let i=0;i<list.length;i++){
           list[i].labelName = list[i].code? list[i].code +' '+ list[i].name:list[i].name
           if(list[i].level == 0 || list[i].level == 1 || list[i].level == 2){
-            self.getCascaderData(list[i].children)
+            if(list[i].children){
+              if(list[i].children[0]){
+                self.getCascaderData(list[i].children)
+              }else{
+                delete list[i]
+              }
+            }else{
+              delete list[i]
+            }
           }else{
             delete list[i].children
           }

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

@@ -86,7 +86,7 @@
         </div>
         <div class="text-box-box">
           <p>检查要求</p>
-          <p>{{infoDialogData.checkDemand}}</p>
+          <p>{{infoDialogData.checkDemand}}<span v-if="!infoDialogData.checkDemand" style="color:#999;">未输入</span></p>
         </div>
         <div class="text-box-two-box">
           <div>
@@ -232,7 +232,7 @@
           <div class="button-box" v-if="item.examineResult == 1">
             <p>整改报告书</p>
             <p class="inquire-button-one" @click="lookDocument(2,item.dataL)">查看</p>
-            <p class="add-button-one-90">下载</p>
+            <p class="add-button-one-90" @click="downloadButton(infoDialogData)">下载</p>
           </div>
         </div>
       </div>
@@ -537,6 +537,10 @@
           this.imgIndex++
         }
       },
+      // 单个下载按钮
+      downloadButton(row){
+        this.download('/zd-security/checkRectify/genReport/'+row.id, {}, row.title+'(整改报告).docx')
+      },
       /*==========上传相关==========*/
       handleAvatarSuccess(res,item) {
         this.$set(this,'loading',false);

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -23,7 +23,7 @@
               </el-form-item>
             </div>
             <el-form-item label="检查要求" prop="checkDemand">
-              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;">{{addForm.checkDemand}}</p>
+              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;min-height:40px;">{{addForm.checkDemand}}<span v-if="!addForm.checkDemand" style="color:#999;">未输入</span></p>
               <!--<el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>-->
             </el-form-item>
             <el-form-item label="检查结果" prop="checkResult">

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

@@ -102,7 +102,7 @@
                   <p>{{item.fileName}}</p>
                   <p @click="dialogClickType(5,item)">查看</p>
                   <p @click="delUpData(index)" v-if="!lookInfoType">删除</p>
-                  <p v-if="lookInfoType">下载</p>
+                  <p v-if="lookInfoType" @click="downloadButton(item)">下载</p>
                 </div>
                 <p class="dialog-material-list-null" v-if="!dialogForm.uploadDtoList[0]">未上传</p>
               </div>
@@ -134,7 +134,7 @@
               <p class="inquire-button-one" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select="deptChange" :row-key="getDeptRowKeys">
+          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select-all="deptChange" @select="deptChange" :row-key="getDeptRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
           </el-table>
@@ -693,6 +693,7 @@
       dialogClickType(type,item){
         let self = this;
         if(type == 5){
+          console.log('item',item);
           this.$set(this,'iframeSrc',this.urlJudge(item.fileUrl));
           this.$set(this,'addDialogBoxType',type);
         }else if(type == 2){
@@ -959,6 +960,10 @@
         }
       },
       /*===================================弹窗相关结束===================================*/
+      // 单个下载按钮
+      downloadButton(item){
+        this.download(item.fileUrl, {}, item.fileName+'.docx')
+      },
       /*==========上传相关==========*/
       handleAvatarSuccess(res) {
         this.$set(this,'loading',false);

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

@@ -158,8 +158,11 @@
           if(type == 2){
             this.$set(this,'propsListPageData',data);
             this.$set(this,'pageType',type);
-          }else{
+          }else if(type == 1){
             this.$set(this,'pageType',type);
+          }else if(type == 3){
+            this.$set(this,'pageType',1);
+            this.getList();
           }
         }
       },

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

@@ -174,7 +174,7 @@
     methods:{
       //返回按钮
       outButton(){
-        this.$parent.goPage(1);
+        this.$parent.goPage(3);
       },
       //开始检查
       goAddPage(type,id){
@@ -209,8 +209,8 @@
       },
       //范围选择
       topLeftClickType(type){
-        if(this.queryParams.buttonType != type){
-          this.$set(this.queryParams,'buttonType',type);
+        if(this.queryParams.manageStatus != type){
+          this.$set(this.queryParams,'manageStatus',type);
           this.handleQuery();
         }
       },

src/views/safetyCheck/rectificationReport/index.vue

@@ -147,7 +147,7 @@
       },
       // 单个下载按钮
       downloadButton(row){
-        this.download('/zd-security/checkRectify/genReport/'+row.id, {}, row.title+'.docx')
+        this.download('/zd-security/checkRectify/genReport/'+row.id, {}, row.title+'(整改报告).docx')
       },
       //开关详情页面
       goPage(type,data){

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

@@ -102,7 +102,7 @@
                   <p>{{item.fileName}}</p>
                   <p @click="dialogClickType(5,item)">查看</p>
                   <p @click="delUpData(index)" v-if="!lookInfoType">删除</p>
-                  <p v-if="lookInfoType">下载</p>
+                  <p v-if="lookInfoType" @click="downloadButton(item)">下载</p>
                 </div>
                 <p class="dialog-material-list-null" v-if="!dialogForm.uploadDtoList[0]">未上传</p>
               </div>
@@ -170,7 +170,7 @@
               <p class="inquire-button-one" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select="deptChange" :row-key="getDeptRowKeys">
+          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select-all="deptChange" @select="deptChange" :row-key="getDeptRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
           </el-table>
@@ -927,6 +927,7 @@
       dialogClickType(type,item){
         let self = this;
         if(type == 5){
+          console.log('item',item);
           this.$set(this,'iframeSrc',this.urlJudge(item.fileUrl));
           this.$set(this,'addDialogBoxType',type);
         }else if(type == 4){
@@ -1325,6 +1326,10 @@
         }
       },
       /*===================================弹窗相关结束===================================*/
+      // 单个下载按钮
+      downloadButton(item){
+        this.download(item.fileUrl, {}, item.fileName+'.docx')
+      },
       /*==========上传相关==========*/
       handleAvatarSuccess(res) {
         this.$set(this,'loading',false);

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

@@ -158,8 +158,11 @@
           if(type == 2){
             this.$set(this,'propsListPageData',data);
             this.$set(this,'pageType',type);
-          }else{
+          }else if(type == 1){
             this.$set(this,'pageType',type);
+          }else if(type == 3){
+            this.$set(this,'pageType',1);
+            this.getList();
           }
         }
       },

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

@@ -174,7 +174,7 @@
     methods:{
       //返回按钮
       outButton(){
-        this.$parent.goPage(1);
+        this.$parent.goPage(3);
       },
       //开始检查
       goAddPage(type,id){

src/views/safetyCheck/startInspection/index.vue

@@ -144,7 +144,14 @@
                     placeholder="请选择检查项"
                     :options="options"
                     :props="{ checkStrictly: false, value: 'id', label: 'labelName',emitPath:false }"
-                    filterable></el-cascader>
+                    filterable>
+                    <template slot-scope="{data}">
+                      <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">
+                        <p style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
+                      </el-tooltip>
+                      <p v-else style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
+                    </template>
+                  </el-cascader>
                   <p class="hazard-check-count-p" v-if="hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{hazardCheckCount}}</span> 次隐患</p>
                 </el-form-item>
                 <el-form-item label="检查要点" label-width="123px">
@@ -460,7 +467,15 @@
         for(let i=0;i<list.length;i++){
           list[i].labelName = list[i].code? list[i].code +' '+ list[i].name:list[i].name
           if(list[i].level == 0 || list[i].level == 1 || list[i].level == 2){
-            self.getCascaderData(list[i].children)
+            if(list[i].children){
+              if(list[i].children[0]){
+                self.getCascaderData(list[i].children)
+              }else{
+                delete list[i]
+              }
+            }else{
+              delete list[i]
+            }
           }else{
             delete list[i].children
           }

src/views/safetyCheck/worktable/index.vue

@@ -7,8 +7,8 @@
           <img src="@/assets/ZDimages/safetyCheck/icon_gzt_xyxc.png">
           <div>
             <p>校院巡查</p>
-            <el-tooltip class="item" effect="dark" :content="'校院巡查总数：'+schoolWorkData.subCount" placement="top">
-              <p>{{schoolWorkData.subCount}}</p>
+            <el-tooltip class="item" effect="dark" :content="'校院巡查总数：'+schoolWorkData.xcCount" placement="top">
+              <p>{{schoolWorkData.xcCount}}</p>
             </el-tooltip>
           </div>
         </div>
@@ -21,8 +21,8 @@
           </div>
           <div>
             <img src="@/assets/ZDimages/safetyCheck/icon_gzt_yjcsys.png">
-            <el-tooltip class="item" effect="dark" :content="'涉及实验室数：'+schoolWorkData.xcCount" placement="top">
-              <p>{{schoolWorkData.xcCount}}</p>
+            <el-tooltip class="item" effect="dark" :content="'涉及实验室数：'+schoolWorkData.subCount" placement="top">
+              <p>{{schoolWorkData.subCount}}</p>
             </el-tooltip>
           </div>
         </div>
@@ -33,22 +33,22 @@
           <img src="@/assets/ZDimages/safetyCheck/icon_gzt_syszc.png">
           <div>
             <p>实验室自查</p>
-            <el-tooltip class="item" effect="dark" :content="'实验室自查总数：'+schoolWorkSubData.subCount" placement="top">
-              <p>{{schoolWorkSubData.subCount}}</p>
+            <el-tooltip class="item" effect="dark" :content="'实验室自查总数：'+schoolWorkSubData.zcCount" placement="top">
+              <p>{{schoolWorkSubData.zcCount}}</p>
             </el-tooltip>
           </div>
         </div>
         <div class="right-min-box">
           <div>
             <img src="@/assets/ZDimages/safetyCheck/icon_gzt_aqyh.png">
-            <el-tooltip class="item" effect="dark" :content="'发现隐患数：'+schoolWorkSubData.zcCount" placement="top">
-              <p>{{schoolWorkSubData.zcCount}}</p>
+            <el-tooltip class="item" effect="dark" :content="'发现隐患数：'+schoolWorkSubData.yhCount" placement="top">
+              <p>{{schoolWorkSubData.yhCount}}</p>
             </el-tooltip>
           </div>
           <div>
             <img src="@/assets/ZDimages/safetyCheck/icon_gzt_yjcsys.png">
-            <el-tooltip class="item" effect="dark" :content="'涉及实验室数：'+schoolWorkSubData.yhCount" placement="top">
-              <p>{{schoolWorkSubData.yhCount}}</p>
+            <el-tooltip class="item" effect="dark" :content="'涉及实验室数：'+schoolWorkSubData.subCount" placement="top">
+              <p>{{schoolWorkSubData.subCount}}</p>
             </el-tooltip>
           </div>
         </div>