zc

src/api/system/user.js

@@ -18,7 +18,13 @@ export function selectListUser(query) {
     params: query
   })
 }
-
+//指纹-查询用户指纹录取数量
+export const fingerprintQuantity  = (data) => {
+  return request({
+    url: `/laboratory/haikang/userFinger/queryCount/`+data,
+    method: 'GET',
+  })
+};
 // 查询教职工列表-下拉列表
 export function selectTeacherList(query) {
   return request({

src/utils/LodopFuncs.js

@@ -63,7 +63,7 @@ export function getLodop(oOBJECT,oEMBED){
         var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
         if (needCLodop()) {
             try{ LODOP=getCLodop();} catch(err) {};
-            if (!LODOP && document.readyState!=="complete") {alert("C-Lodop没准备好，请稍后再试！"); return;};
+            if (!LODOP && document.readyState!=="complete") {console.log("C-Lodop没准备好，请稍后再试！"); return;};
             if (!LODOP) {
                 // if (isIE) document.write(strCLodopInstall); else
                 // document.documentElement.innerHTML=strCLodopInstall+document.documentElement.innerHTML;
@@ -117,6 +117,6 @@ export function getLodop(oOBJECT,oEMBED){
 
         //===========================================================
         return LODOP;
-    } catch(err) {alert("getLodop出错:"+err);};
+    } catch(err) {console.log("getLodop出错:"+err);};
 };
 

src/views/comprehensive/laboratoryManagement/building/buildingDetails.vue

@@ -58,8 +58,9 @@
                      :style="'line-height:'+(item.w>item.h?item.h-4:item.w-4)+'px;'"
                      @contextmenu="(contextmenu)=>boxRightClick(contextmenu,item,index)"
                      @mousedown.stop="(MouseEvent)=>dragDown(MouseEvent,index)">
-                  {{item.roomNum&&item.type == 1?item.roomNum:(!item.roomNum&&item.type == 1?'配置房间':'')}}
+                  {{item.roomNum&&item.type == 1?item.roomNum:(!item.roomNum&&item.type == 1?'右键配置':'')}}
                 </div>
+                <!--这里要改找志蔚-->
                 <p class="center-right-p"
                    @mousedown.stop="(MouseEvent)=>zoomDownX(MouseEvent,index,2)"></p>
               </div>

src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -344,6 +344,10 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      if(row.onOff == 1){
+        this.msgError("修改检测门前请先关闭设备");
+        return
+      }
       let _this=this;
       this.open = true;
       this.title = "修改识别器";
@@ -390,7 +394,7 @@ export default {
           if (this.form.id != null) {
             this.form.senseState = null
             recognizerAnew(this.form).then(response => {
-              this.msgSuccess("修改成功");
+              this.msgSuccess("修改成功,请重新开启设备");
               this.open = false;
               this.getList();
             });

src/views/gasManage_syd/manage/infoRecord/alarmRecord.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="姓名/联系方式"
+            placeholder="识别码"
             clearable
             maxLength="30"
             size="small"

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue

@@ -95,7 +95,7 @@
     data() {
       return {
         //操作方式
-        optionsList:[{id:1,name:"入库"},{id:2,name:"出库"},{id:3,name:"领用"},{id:4,name:"归还"},{id:5,name:"系统"}],
+        optionsList:[{id:1,name:"入库"},{id:2,name:"出库"},{id:3,name:"领用"},{id:4,name:"归还"},{id:0,name:"系统"}],
         // 搜索数据
         queryParamsData:{
           pageNum:1,

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue

@@ -41,9 +41,9 @@
         <el-table-column label="化学品编号" align="center" prop="joinNum"  show-overflow-tooltip/>
         <el-table-column label="容量规格" align="center" prop="chemicalAmountUnit"  show-overflow-tooltip/>
         <el-table-column label="容器规格" align="center" prop="tare"  show-overflow-tooltip/>
-        <el-table-column label="过期时间" align="center" prop="expireTime"  show-overflow-tooltip>
-          <template slot-scope="scope">{{scope.row.expireTime?scope.row.expireTime:'未设定'}}</template>
-        </el-table-column>
+        <!--<el-table-column label="过期时间" align="center" prop="expireTime"  show-overflow-tooltip>-->
+          <!--<template slot-scope="scope">{{scope.row.expireTime?scope.row.expireTime:'未设定'}}</template>-->
+        <!--</el-table-column>-->
         <el-table-column label="化学品柜" align="center" prop="cabinetName"  show-overflow-tooltip/>
         <el-table-column label="柜锁名称" align="center" prop="lockName"  show-overflow-tooltip v-if="$store.state.settings.smartAlarmType == 1"/>
         <el-table-column label="化学品柜位置" align="center" prop="posi"  show-overflow-tooltip/>

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/msds/addPage.vue

@@ -36,16 +36,16 @@
         // 表单校验
         rules: {
           name:[
-            {required: true, message: '请输入危险品名称', trigger: 'blur'},
-            { required: true, message: "请输入危险品名称", validator: this.spaceJudgment, trigger: "blur" }
+            {required: true, message: '请输入化学品名称', trigger: 'blur'},
+            { required: true, message: "请输入化学品名称", validator: this.spaceJudgment, trigger: "blur" }
           ],
           code:[
-            {required: true, message: '请输入编号', trigger: 'blur'},
-            { required: true, message: "请输入危险品名称", validator: this.spaceJudgment, trigger: "blur" }
+            {required: true, message: '请输入化学品编号', trigger: 'blur'},
+            { required: true, message: "请输入化学品编号", validator: this.spaceJudgment, trigger: "blur" }
           ],
           content:[
-            {required: true, message: '请输入详情', trigger: 'blur'},
-            { required: true, message: "请输入危险品名称", validator: this.spaceJudgmentHTML, trigger: "blur" }
+            {required: true, message: '请输入化学品详情', trigger: 'blur'},
+            { required: true, message: "请输入化学品详情", validator: this.spaceJudgmentHTML, trigger: "blur" }
           ],
         },
       };

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/approvalProcess/index.vue

@@ -83,7 +83,8 @@
           <p class="title-p">已选:</p>
           <div class="big-box scrollbar-box">
             <div class="user-for-box" v-for="(item,index) in userDialogRightList.actAudituserInfo" :key="index">
-              <img :src="item.avatar">
+              <img v-if="item.avatar" :src="item.avatar">
+              <img v-if="!item.avatar" src="@/assets/ZDimages/tx_cion.png">
               <p>{{item.nickName}}</p>
               <p class="el-icon-circle-close" @click="delRightUser(index)"></p>
             </div>

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/approvalPage.vue

@@ -98,8 +98,8 @@
             <div class="approval-for-box-min">
               <div class="left-max-box">
                 <div class="left-top-box">
-                  <img src="">
-                  <!--<img src="">-->
+                  <img v-if="dataInfo.avatar" :src="dataInfo.avatar">
+                  <img v-if="!dataInfo.avatar" src="@/assets/ZDimages/tx_cion.png">
                   <div class="left-top-text-box">
                     <p>发起申请</p>
                     <p>{{dataInfo.applyUserName}}</p>
@@ -118,7 +118,8 @@
               <div class="left-max-box">
                 <div class="left-top-box" v-if="item.auditType == 1">
                   <img v-if="item.actApplytaskNodeList[1]" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ycsp.png">
-                  <img v-if="!item.actApplytaskNodeList[1]" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[1]&&item.actApplytaskNodeList[0].applyUserList[0].avatar" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[1]&&!item.actApplytaskNodeList[0].applyUserList[0].avatar" src="@/assets/ZDimages/tx_cion.png">
                   <div class="left-top-text-box">
                     <p>{{item.actApplytaskNodeList[1]?'依次审批':item.actApplytaskNodeList[0].applyUserList[0].postName}}</p>
                     <p>{{item.approvalName}}</p>
@@ -126,7 +127,8 @@
                 </div>
                 <div class="left-top-box" v-if="item.auditType == 2">
                   <img v-if="item.actApplytaskNodeList[0].applyUserList[1]" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ycsp.png">
-                  <img v-if="!item.actApplytaskNodeList[0].applyUserList[1]" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[0].applyUserList[1]&&item.actApplytaskNodeList[0].applyUserList[0].avatar" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[0].applyUserList[1]&&!item.actApplytaskNodeList[0].applyUserList[0].avatar" src="@/assets/ZDimages/tx_cion.png">
                   <div class="left-top-text-box">
                     <p>{{item.actApplytaskNodeList[0].applyUserList[1]?'或签':item.actApplytaskNodeList[0].applyUserList[0].postName}}</p>
                     <p>{{item.approvalName}}</p>
@@ -140,7 +142,8 @@
               <div class="right-max-box" v-if="item.auditType == 1">
                 <div class="right-for-name-box" v-for="(minItem,minIndex) in item.actApplytaskNodeList" :key="minIndex">
                   <div class="right-for-name-box-min">
-                    <img :src="minItem.applyUserList[0].avatar">
+                    <img v-if="minItem.applyUserList[0].avatar" :src="minItem.applyUserList[0].avatar">
+                    <img v-if="!minItem.applyUserList[0].avatar" src="@/assets/ZDimages/tx_cion.png">
                     <p>{{minItem.applyUserList[0].id==userId?'我':minItem.applyUserList[0].name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="minItem.nodeStatus == 1&&minIndex!=item.actApplytaskNodeList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="!minItem.nodeStatus == 1&&minIndex!=item.actApplytaskNodeList.length-1">
@@ -153,7 +156,8 @@
               <div class="right-max-box" v-if="item.auditType == 2">
                 <div class="right-for-name-box" v-for="(minItem,minIndex) in item.actApplytaskNodeList[0].applyUserList" :key="minIndex">
                   <div class="right-for-name-box-min">
-                    <img :src="minItem.avatar">
+                    <img v-if="minItem.avatar" :src="minItem.avatar">
+                    <img v-if="!minItem.avatar" src="@/assets/ZDimages/tx_cion.png">
                     <p>{{minItem.id==userId?'我':minItem.name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="item.actApplytaskNodeList[0].applyUserid != minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/index.vue

@@ -259,6 +259,7 @@
                 let obj = {
                   chemicalId:parseInt(response.data.actHxpapplyDetailList[i].chemicalId),
                   chemicalName:response.data.actHxpapplyDetailList[i].chemicalName,
+                  applyUnit:response.data.actHxpapplyDetailList[i].applyUnit,
                   list:[],
                 }
                 maxObj.maxList.push(obj);

src/views/newEvacuationBigData.vue

@@ -206,7 +206,7 @@
               <div class="radio-button-box scrollbar-box">
                 <p class="horn-for-p" @click="checkTrumpet(index)" :class="item.type?'check-p':''"
                    v-for="(item,index) in trumpetList" :key="index">{{item.name}}</p>
-                <p v-if="!trumpetList[0]" style="line-height:180px;font-size:16px;color:#fff;text-align: center">暂无数据</p>
+                <p v-if="!trumpetList[0]" style="line-height:60px;font-size:16px;color:#fff;text-align: center">暂无数据</p>
               </div>
               <div class="radio-text-box scrollbar-box">
                 <div v-for="(item,index) in radioTextList" :key="index">
@@ -282,7 +282,7 @@
               <div class="horn-max-big-box-two-left scrollbar-box">
                 <p class="horn-for-p" @click="checkTrumpet(index)" :class="item.type?'check-p':''"
                    v-for="(item,index) in trumpetList" :key="index">{{item.name}}</p>
-                <p v-if="!trumpetList[0]" style="line-height:180px;font-size:16px;color:#fff;text-align: center">暂无数据</p>
+                <p v-if="!trumpetList[0]" style="line-height:60px;font-size:16px;color:#fff;text-align: center">暂无数据</p>
               </div>
               <div class="horn-max-big-box-two-right">
                 <div class="radio-text-box scrollbar-box">
@@ -1064,9 +1064,10 @@
       //喇叭操作
       checkTrumpet(index){
         let self = this;
-        for(let i=0;i<self.trumpetList.length;i++){
-          self.trumpetList[i].type = i == index;
-        }
+        self.trumpetList[index].type = !self.trumpetList[index].type
+        // for(let i=0;i<self.trumpetList.length;i++){
+        //   self.trumpetList[i].type = i == index;
+        // }
       },
       //发送消息到喇叭
       addHxpChemical(){
@@ -1074,11 +1075,25 @@
         let obj = {
           floorId:this.floorId,
           messageContext:this.inputText,
+          playVo:[],
         };
         let num = 0;
         for(let i=0;i<self.trumpetList.length;i++){
           if(self.trumpetList[i].type){
-            obj.playVo=[{
+            // obj.playVo=[{
+            //   sn:self.trumpetList[i].deviceSn,
+            //   port:self.trumpetList[i].port,
+            //   deviceIp:self.trumpetList[i].deviceIp,
+            //   type:"",
+            //   name:"",
+            //   speed:"",
+            //   params:{
+            //     tid:"",
+            //     vol:self.trumpetList[i].deviceVol,
+            //     urls:[]
+            //   }
+            // }];
+            obj.playVo.push({
               sn:self.trumpetList[i].deviceSn,
               port:self.trumpetList[i].port,
               deviceIp:self.trumpetList[i].deviceIp,
@@ -1090,7 +1105,7 @@
                 vol:self.trumpetList[i].deviceVol,
                 urls:[]
               }
-            }];
+            })
             num++
           }
         }

src/views/securityCheck/release/checkRecordInfoPage.vue

@@ -1,153 +1,7 @@
 <!--检查记录详情-->
 <template>
   <div class="checkRecordInfoPage" v-if="pageType">
-    <!--<div class="top-steps-box">-->
-      <!--<el-steps :active="active">-->
-        <!--<el-step :title="textOne" icon="el-icon-circle-check"></el-step>-->
-        <!--<el-step :title="textTwo" :class="newData.zgStatus == 2?'zgStatusColor':''" :icon="newData.zgStatus == 2?'el-icon-circle-close':'el-icon-circle-check'"></el-step>-->
-        <!--<el-step :title="textTree" icon="el-icon-circle-check"></el-step>-->
-      <!--</el-steps>-->
-    <!--</div>-->
-    <!--<div class="top-text-steps-box">-->
-      <!--<div class="top-text-steps-left">-->
-        <!--<p>检查时间：{{newData.createTime}}</p>-->
-        <!--<p>截止整改时间：{{newData.zgjzTime}}</p>-->
-        <!--<p v-if="newData.firstTime">首次查看报告时间：{{newData.firstTime}}</p>-->
-      <!--</div>-->
-      <!--<div class="top-text-steps-center">-->
-        <!--<p v-if="newData.zgqrTime">整改时间：{{newData.zgqrTime}}</p>-->
-        <!--<p v-if="newData.zgbhTime">驳回时间：{{newData.zgbhTime}}</p>-->
-      <!--</div>-->
-    <!--</div>-->
-    <!--<div class="center-info-box scrollbar-box">-->
-      <!--<div class="center-info-top-box">-->
-        <!--<div class="center-left-box">-->
-          <!--<img src="@/assets/newImages/icon_7.png">-->
-          <!--<div>-->
-            <!--<p>{{newData.zgType == 0?'一般整改':(newData.zgType == 1?'重大整改':'')}}</p>-->
-            <!--<p>{{newData.jcDwName}}</p>-->
-          <!--</div>-->
-        <!--</div>-->
-        <!--<div class="center-center-box">-->
-          <!--<img src="@/assets/newImages/icon_8.png">-->
-          <!--<div>-->
-            <!--<p>{{newData.laboratoryName}}</p>-->
-            <!--<p>{{newData.buildingName}}{{newData.fjNumber}}</p>-->
-          <!--</div>-->
-        <!--</div>-->
-        <!--<div class="center-right-box">-->
-          <!--<img src="@/assets/newImages/icon_9.png">-->
-          <!--<div>-->
-            <!--<p>{{newData.fzrName}}</p>-->
-            <!--<p>{{newData.fzrLxfs}}</p>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
-      <!--<div class="text-box" v-if="newData.zgStatus == 2 || newData.zgStatus == 4">-->
-        <!--<p>{{newData.zgStatus == 2?'驳回原因':(newData.zgStatus == 4?'整改结果':'')}}：</p>-->
-        <!--<p>{{newData.zgStatus == 2?newData.fbYy:(newData.zgStatus == 4?newData.zgJg:'')}}</p>-->
-      <!--</div>-->
-      <!--<p class="center-info-title" v-if="newData.zgStatus==0">隐患信息</p>-->
-      <!--<p class="center-info-title" v-if="newData.zgStatus==1 || newData.zgStatus==2">整改信息</p>-->
-      <!--<p class="center-info-title" v-if="newData.zgStatus==3 || newData.zgStatus==4">已整改信息</p>-->
-      <!--<div class="center-for-box" v-for="(item,index) in newData.detailsList" :key="index" v-if="item.isZg != 1">-->
-        <!--<div class="center-for-left-box">-->
-          <!--<p class="for-title-p">{{item.jcxName}}</p>-->
-          <!--<div class="for-text-box" v-if="item.isLingshi == 1">-->
-            <!--<p>条款：</p>-->
-            <!--<p>临时检查项</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isLingshi == 0">-->
-            <!--<p>条款：</p>-->
-            <!--<p>{{item.allCheckOptionName}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box">-->
-            <!--<p>隐患描述：</p>-->
-            <!--<p>{{item.yhMs}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 0 && newData.zgType == 0">-->
-            <!--<p>整改描述：</p>-->
-            <!--<p>{{item.zgMs}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">-->
-            <!--<p>原因分析：</p>-->
-            <!--<p>{{item.zgYyfx}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">-->
-            <!--<p>整改措施：</p>-->
-            <!--<p>{{item.zgCs}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 1">-->
-            <!--<p>证明信息：</p>-->
-            <!--<p>{{item.zmClMs}}</p>-->
-          <!--</div>-->
-        <!--</div>-->
-        <!--<div class="center-for-right-box">-->
-          <!--<div class="for-img-max-box">-->
-            <!--<p class="for-img-max-title-p" v-if="!item.yhImg[0]">未上传隐患照片</p>-->
-            <!--<p class="for-img-max-title-p" v-if="item.yhImg[0]">整改前照片：</p>-->
-            <!--<div class="for-img-box">-->
-              <!--<img v-for="(itemImg,imgIndex) in item.yhImg" :key="imgIndex" :src="itemImg" @click="lockImg(1,itemImg)">-->
-            <!--</div>-->
-          <!--</div>-->
-          <!--<div class="for-img-max-box" v-if="item.yhZghImg">-->
-            <!--<p class="for-img-max-title-p">整改后照片：</p>-->
-            <!--<div class="for-img-box">-->
-              <!--<img v-for="(itemImg,imgIndex) in item.yhZghImg" :key="imgIndex" :src="itemImg" @click="lockImg(2,itemImg)">-->
-            <!--</div>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
-      <!--<p class="center-info-title" v-if="newData.zgStatus==3">未整改信息</p>-->
-      <!--<div class="center-for-box" v-for="(item,index) in newData.detailsList" :key="index" v-if="item.isZg == 1">-->
-        <!--<div class="center-for-left-box">-->
-          <!--<p class="for-title-p">{{item.jcxName}}</p>-->
-          <!--<div class="for-text-box" v-if="item.isLingshi == 1">-->
-            <!--<p>条款：</p>-->
-            <!--<p>临时检查项</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isLingshi == 0">-->
-            <!--<p>条款：</p>-->
-            <!--<p>{{item.allCheckOptionName}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box">-->
-            <!--<p>隐患描述：</p>-->
-            <!--<p>{{item.yhMs}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 0 && newData.zgType == 0">-->
-            <!--<p>整改描述：</p>-->
-            <!--<p>{{item.zgMs}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">-->
-            <!--<p>原因分析：</p>-->
-            <!--<p>{{item.zgYyfx}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">-->
-            <!--<p>整改措施：</p>-->
-            <!--<p>{{item.zgCs}}</p>-->
-          <!--</div>-->
-          <!--<div class="for-text-box" v-if="item.isZg == 1">-->
-            <!--<p>证明信息：</p>-->
-            <!--<p>{{item.zmClMs}}</p>-->
-          <!--</div>-->
-        <!--</div>-->
-        <!--<div class="center-for-right-box">-->
-          <!--<div class="for-img-max-box">-->
-            <!--<p class="for-img-max-title-p" v-if="!item.yhImg[0]">未上传隐患照片</p>-->
-            <!--<p class="for-img-max-title-p" v-if="item.yhImg[0]">整改前照片：</p>-->
-            <!--<div class="for-img-box">-->
-              <!--<img v-for="(itemImg,imgIndex) in item.yhImg" :key="imgIndex" :src="itemImg" @click="lockImg(1,itemImg)">-->
-            <!--</div>-->
-          <!--</div>-->
-          <!--<div class="for-img-max-box" v-if="item.zmClImg">-->
-            <!--<p class="for-img-max-title-p">证明材料：</p>-->
-            <!--<div class="for-img-box">-->
-              <!--<img v-for="(itemImg,imgIndex) in item.zmClImg" :key="imgIndex" :src="itemImg" @click="lockImg(3,itemImg)">-->
-            <!--</div>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
-    <!--</div>--><!--标题部分-->
+    <!--标题部分-->
     <div class="top-title-box">
       <p class="title-p">发布详情</p>
       <p class="button-p reset-button-one" @click="backPage">返回</p>
@@ -232,7 +86,7 @@
                 <div class="center-info-for-big-flex-left-box">
                   <p class="center-info-for-big-flex-left-title">隐患照片：</p>
                   <div class="center-info-for-big-flex-left-img-box" v-if="item.yhImg[0]">
-                    <img :src="item" v-for="(item,index) in item.yhImg" :key="index" @click="lockImg(item)">
+                    <img :src="item" v-for="(item,index) in item.yhImg" :key="index" @click="lockImg(1,item)">
                   </div>
                   <p v-if="!item.yhImg[0]">未上传照片</p>
                 </div>
@@ -251,7 +105,7 @@
                   </div>
                 </div>
               </div>
-              <div class="center-info-for-min-box" :class="" v-if="item.detailslogList[0]">
+              <div class="center-info-for-min-box" v-if="item.detailslogList[0]">
                 <!--整改循环-->
                 <div class="center-info-for-min" v-for="(minItme,minIndex) in item.detailslogList" :key="minIndex" v-if="minIndex == 0 || item.allDataType">
                   <div class="center-info-for-min-left-box">
@@ -274,7 +128,7 @@
                     <div class="for-min-img-box">
                       <p class="for-min-img-box-left-title">整改照片：</p>
                       <div class="for-min-img-box-left-img-box" v-if="minItme.yhZghImg[0]">
-                        <img :src="minItemMin" v-for="(minItemMin,minIndexMin) in item.yhZghImg" :key="minIndexMin" @click="lockImg(minItemMin)">
+                        <img :src="minItemMin" v-for="(minItemMin,minIndexMin) in item.yhZghImg" :key="minIndexMin" @click="lockImg(2,minItemMin)">
                       </div>
                       <p v-if="!item.yhZghImg[0]">未上传照片</p>
                     </div>
@@ -330,7 +184,7 @@
                 <div class="center-info-for-big-flex-left-box">
                   <p class="center-info-for-big-flex-left-title">隐患照片：</p>
                   <div class="center-info-for-big-flex-left-img-box" v-if="item.yhImg[0]">
-                    <img :src="item" v-for="(item,index) in item.yhImg" :key="index" @click="lockImg(item)">
+                    <img :src="item" v-for="(item,index) in item.yhImg" :key="index" @click="lockImg(1,item)">
                   </div>
                   <p v-if="!item.yhImg[0]">未上传照片</p>
                 </div>
@@ -372,7 +226,7 @@
                     <div class="for-min-img-box">
                       <p class="for-min-img-box-left-title">整改照片：</p>
                       <div class="for-min-img-box-left-img-box" v-if="minItme.yhZghImg[0]">
-                        <img :src="minItemMin" v-for="(minItemMin,minIndexMin) in minItme.yhZghImg" :key="minIndexMin" @click="lockImg(minItemMin)">
+                        <img :src="minItemMin" v-for="(minItemMin,minIndexMin) in minItme.yhZghImg" :key="minIndexMin" @click="lockImg(2,minItemMin)">
                       </div>
                       <p v-if="!minItme.yhZghImg[0]">未上传照片</p>
                     </div>
@@ -428,7 +282,7 @@
                 <div class="center-info-for-big-flex-left-box">
                   <p class="center-info-for-big-flex-left-title">隐患照片：</p>
                   <div class="center-info-for-big-flex-left-img-box" v-if="item.yhImg[0]">
-                    <img :src="item" v-for="(item,index) in item.yhImg" :key="index" @click="lockImg(item)">
+                    <img :src="item" v-for="(item,index) in item.yhImg" :key="index" @click="lockImg(1,item)">
                   </div>
                   <p v-if="!item.yhImg[0]">未上传照片</p>
                 </div>
@@ -470,7 +324,7 @@
                     <div class="for-min-img-box">
                       <p class="for-min-img-box-left-title">整改照片：</p>
                       <div class="for-min-img-box-left-img-box" v-if="minItme.yhZghImg[0]">
-                        <img :src="minItemMin" v-for="(minItemMin,minIndexMin) in item.yhZghImg" :key="minIndexMin" @click="lockImg(minItemMin)">
+                        <img :src="minItemMin" v-for="(minItemMin,minIndexMin) in item.yhZghImg" :key="minIndexMin" @click="lockImg(2,minItemMin)">
                       </div>
                       <p v-if="!item.yhZghImg[0]">未上传照片</p>
                     </div>
@@ -740,6 +594,8 @@
       },
       //查看图片
       lockImg(type,url){
+        console.log(type)
+        console.log(url)
         if(type == 1){
           this.imgTitle = "整改前照片";
         }else if(type == 2){

src/views/securityCheck/release/listPage.vue

@@ -66,8 +66,8 @@
           <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" border :data="checkRecordList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"/>
+      <el-table v-loading="loading" border :data="checkRecordList">
+<!--        <el-table-column type="selection" width="55" align="center"/>-->
         <!--<el-table-column type="selection" width="55" align="center" />-->
         <!--<el-table-column label="创建人id" align="center" prop="id" />-->
         <el-table-column label="整改状态" align="left" prop="zgStatus" width="120">

src/views/studentViews/chemicalManagement/studentChemicalInfo/index.vue

@@ -39,9 +39,9 @@
         <el-table-column label="化学品名" align="center" prop="chemicalName" width="130px" show-overflow-tooltip/>
         <el-table-column label="容量规格" align="center" prop="chemicalAmountUnit" width="150px" show-overflow-tooltip/>
         <el-table-column label="容器规格" align="center" prop="tare" width="150px" show-overflow-tooltip/>
-        <el-table-column label="过期时间" align="center" prop="expireTime" width="150px" show-overflow-tooltip>
-          <template slot-scope="scope">{{scope.row.expireTime?scope.row.expireTime:'未设定'}}</template>
-        </el-table-column>
+        <!--<el-table-column label="过期时间" align="center" prop="expireTime" width="150px" show-overflow-tooltip>-->
+          <!--<template slot-scope="scope">{{scope.row.expireTime?scope.row.expireTime:'未设定'}}</template>-->
+        <!--</el-table-column>-->
         <el-table-column label="化学品柜" align="center" prop="cabinetName" width="130px" show-overflow-tooltip/>
         <el-table-column label="柜锁名称" align="center" prop="lockName" width="150px" show-overflow-tooltip v-if="$store.state.settings.smartAlarmType == 1"/>
         <el-table-column label="位置" align="center" prop="posi" show-overflow-tooltip/>

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/approvalPage.vue

@@ -62,8 +62,8 @@
             <div class="approval-for-box-min">
               <div class="left-max-box">
                 <div class="left-top-box">
-                  <img src="">
-                  <!--<img src="">-->
+                  <img v-if="dataInfo.avatar" :src="dataInfo.avatar">
+                  <img v-if="!dataInfo.avatar" src="@/assets/ZDimages/tx_cion.png">
                   <div class="left-top-text-box">
                     <p>发起申请</p>
                     <p>{{dataInfo.applyUserName}}</p>
@@ -82,7 +82,8 @@
               <div class="left-max-box">
                 <div class="left-top-box" v-if="item.auditType == 1">
                   <img v-if="item.actApplytaskNodeList[1]" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ycsp.png">
-                  <img v-if="!item.actApplytaskNodeList[1]" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[1]&&item.actApplytaskNodeList[0].applyUserList[0].avatar" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[1]&&!item.actApplytaskNodeList[0].applyUserList[0].avatar" src="@/assets/ZDimages/tx_cion.png">
                   <div class="left-top-text-box">
                     <p>{{item.actApplytaskNodeList[1]?'依次审批':item.actApplytaskNodeList[0].applyUserList[0].postName}}</p>
                     <p>{{item.approvalName}}</p>
@@ -90,7 +91,8 @@
                 </div>
                 <div class="left-top-box" v-if="item.auditType == 2">
                   <img v-if="item.actApplytaskNodeList[0].applyUserList[1]" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ycsp.png">
-                  <img v-if="!item.actApplytaskNodeList[0].applyUserList[1]" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[0].applyUserList[1]&&item.actApplytaskNodeList[0].applyUserList[0].avatar" :src="item.actApplytaskNodeList[0].applyUserList[0].avatar">
+                  <img v-if="!item.actApplytaskNodeList[0].applyUserList[1]&&!item.actApplytaskNodeList[0].applyUserList[0].avatar" src="@/assets/ZDimages/tx_cion.png">
                   <div class="left-top-text-box">
                     <p>{{item.actApplytaskNodeList[0].applyUserList[1]?'或签':item.actApplytaskNodeList[0].applyUserList[0].postName}}</p>
                     <p>{{item.approvalName}}</p>
@@ -104,7 +106,8 @@
               <div class="right-max-box" v-if="item.auditType == 1">
                 <div class="right-for-name-box" v-for="(minItem,minIndex) in item.actApplytaskNodeList" :key="minIndex">
                   <div class="right-for-name-box-min">
-                    <img :src="minItem.applyUserList[0].avatar">
+                    <img v-if="minItem.applyUserList[0].avatar" :src="minItem.applyUserList[0].avatar">
+                    <img v-if="!minItem.applyUserList[0].avatar" src="@/assets/ZDimages/tx_cion.png">
                     <p>{{minItem.applyUserList[0].name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="minItem.nodeStatus == 1&&minIndex!=item.actApplytaskNodeList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="!minItem.nodeStatus == 1&&minIndex!=item.actApplytaskNodeList.length-1">
@@ -117,7 +120,8 @@
               <div class="right-max-box" v-if="item.auditType == 2">
                 <div class="right-for-name-box" v-for="(minItem,minIndex) in item.actApplytaskNodeList[0].applyUserList" :key="minIndex">
                   <div class="right-for-name-box-min">
-                    <img :src="minItem.avatar">
+                    <img v-if="minItem.avatar" :src="minItem.avatar">
+                    <img v-if="!minItem.avatar" src="@/assets/ZDimages/tx_cion.png">
                     <p>{{minItem.name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="item.actApplytaskNodeList[0].applyUserid != minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/index.vue

@@ -214,6 +214,7 @@
                 let obj = {
                   chemicalId:parseInt(response.data.actHxpapplyDetailList[i].chemicalId),
                   chemicalName:response.data.actHxpapplyDetailList[i].chemicalName,
+                  applyUnit:response.data.actHxpapplyDetailList[i].applyUnit,
                   list:[],
                 }
                 maxObj.maxList.push(obj);