heyang

src/api/laboratory/subject.js

@@ -231,15 +231,6 @@ export function subjectInfo(id,type) {
     method: 'get',
   })
 }
-// 查询实验室排风扇人工还是预案
-export function subjectTriggerModes(id) {
-  return request({
-    url: '/laboratory/control/newMsg/'+id,
-    method: 'get',
-  })
-}
-
-
 //查询实验室门禁
 export function getDetalis(query) {
   return request({

src/views/comprehensive/laboratoryManagement/subject/addSubject.vue

@@ -100,7 +100,7 @@
       </div>
       <div class="bottom-form-box">
         <div class="top-form-box">
-          <el-form-item label="实验室负责人" prop="adminId" class="form-item">
+          <el-form-item label="实验室负责人" prop="adminId" class="form-item" label-width="180px">
             <el-select
               style="width:500px;"
               v-model="form.adminId"
@@ -119,7 +119,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="安全责任人" prop="safeUserId" class="form-item">
+          <el-form-item label="安全责任人" prop="safeUserId" class="form-item" label-width="180px">
             <el-select
               style="width:500px;"
               v-model="form.safeUserId"
@@ -142,7 +142,7 @@
           </el-form-item>
         </div>
         <div class="bottom-form-box">
-          <el-form-item :label="item.classifyName" prop="safeSigns" class="form-item" v-for="(item,index) in  safetyInfoList">
+          <el-form-item :label="item.classifyName" prop="safeSigns" class="form-item" v-for="(item,index) in  safetyInfoList" label-width="180px">
             <el-select v-model="item.privateList" multiple  placeholder="请选择安全警示标识" style="width:500px;">
               <el-option
                 v-for="dict in item.publicList"

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -288,7 +288,7 @@ import {
   updateSubject,
   mangerVoice,
   startUrl,
-  queryHardByTypeList, getHaikangUserList, subjectTriggerModes
+  queryHardByTypeList,
 } from '@/api/laboratory/subject'
 import { listData} from "@/api/system/dict/data";
 import { filterDept } from "@/api/medicUniversity-3_1/index";
@@ -403,8 +403,6 @@ export default {
       //字典排风扇数组
       fanList:[],
       selectTriggerList:[],//预案触发下,预案数据存储
-      hardwareTypeCode:'',
-      triggerModes:'',
     }
   },
   created() {
@@ -692,29 +690,12 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(async () => {
-        //如果是开启的时候调用
-        if(row.state.code==4 && row.hardwareTypeEnum.hardwareTypeCode==2){
-          self.subjectTriggerModes(row)
-        }else{
-          self.switchChange(row)
-        }
+        self.switchChange(row)
 
       }).catch(() => {
 
       })
     },
-
-    //点击开关按钮开启的时候充电调用硬件状态
-    subjectTriggerModes(row){
-      let self=this;
-      subjectTriggerModes(row.id).then(response => {
-        if(response.code==200){
-          self.hardwareTypeCode=response.data.hardwareType.hardwareTypeCode
-          self.triggerModes=response.data.triggerModes
-          self.switchChange(row)
-        }
-      });
-    },
     //开关按钮
     switchChange(row){
       let self=this;
@@ -724,16 +705,6 @@ export default {
       };
       hardWareControl(switchData).then(response => {
         if(response.code==200){
-          row.state.code = row.state.code==3?4:(row.state.code==4?3:'')
-          if(self.hardwareTypeCode){
-            row.hardwareTypeEnum.hardwareTypeCode=self.hardwareTypeCode
-            row.triggerModes=self.triggerModes
-            for(let b=0;b<self.fanList.length;b++){
-              if(self.fanList[b].dictValue==row.triggerModes){
-                row.dictLabel=self.fanList[b].dictLabel
-              }
-            }
-          }
           this.msgSuccess("操作成功")
         }
       });

src/views/safetyInfo/safetyInfoCategory/safetyInfoCategory.vue

@@ -83,7 +83,7 @@
     </div>
     <info-Config v-if="pageType == 2"></info-Config>
     <!-- 添加或修改安全分级对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="closeDialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="类目名称" prop="classifyName">
           <el-input v-model="form.classifyName" maxlength="10" placeholder="请输入类目名称" />
@@ -100,7 +100,7 @@
             <el-radio :label="2">是</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="颜色" prop="showColour">
+        <el-form-item label="类目颜色" prop="showColour">
           <el-color-picker v-model="form.showColour"></el-color-picker>
         </el-form-item>
       </el-form>
@@ -173,9 +173,14 @@ export default {
 
   },
   methods: {
+      closeDialog(){
+        this.$refs['form'].clearValidate()
+        this.open=false
+      },
       handleClick(index,row,doType){
         let _this=this;
         if(doType=='add'){//添加
+          this.title='新增安全信息类目';
           this.open = true;
           delete this.form.id
           this.form.classifyName='';
@@ -183,6 +188,7 @@ export default {
           this.form.isSpecial='';
           this.form.showColour='';
         }else if(doType=='edit'){//编辑
+          this.title='编辑安全信息类目';
           this.form.id=row.id
           this.form.classifyName=row.classifyName
           this.form.classifyType=row.classifyType

src/views/safetyInfo/safetyInfoConfig/safetyInfoConfig.vue

@@ -62,8 +62,8 @@
     </div>
     <safety-Info-Config v-if="pageType == 2"></safety-Info-Config>
     <!-- 添加或修改安全分级对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="closeDialog">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
         <el-form-item label="信息名称" prop="infoName">
           <el-input v-model="form.infoName" maxlength="10" placeholder="请输入名称" style="width:320px;"/>
         </el-form-item>
@@ -81,7 +81,7 @@
           <el-input v-model="form.infoTypeName"   placeholder="" disabled style="width:320px;"/>
         </el-form-item>
         <el-form-item label="信息内容" prop="infoContent" v-if="form.infoType==1">
-          <el-input type="textarea" v-model="form.infoContent"   placeholder="请输入内容" style="width:320px;"/>
+          <el-input type="textarea" v-model="form.infoContent"  maxlength="200" placeholder="请输入内容" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="信息内容" prop="infoContent" v-if="form.infoType==2">
           <el-upload
@@ -97,6 +97,7 @@
             </div>
           </el-upload>
         </el-form-item>
+        <P v-if="form.infoType==2" style="margin-left: 80px">图片最大上传78*630，建议尺寸78*58</P>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -172,6 +173,10 @@ export default {
 
   },
   methods: {
+      closeDialog(){
+        this.$refs['form'].clearValidate()
+        this.open=false
+      },
       handleTabClick(tab){
         this.queryParams.infoClassifyId=tab.name;
         this.getList()
@@ -179,6 +184,7 @@ export default {
       handleClick(index,row,doType){
         let self=this;
         if(doType=='add'){//添加
+          this.title='新增安全信息';
           delete this.form.id
           this.form.infoName='';
           this.form.infoClassifyId='';
@@ -187,6 +193,7 @@ export default {
           this.form.infoContent='';
           this.open = true;
         }else if(doType=='edit'){//编辑
+          this.title='编辑安全信息';
           this.form.id=row.id
           this.form.infoName=row.infoName
           this.form.infoClassifyId=row.infoClassifyId
@@ -274,14 +281,30 @@ export default {
         this.$forceUpdate()
       },
       beforeAvatarUpload(file) {
-        let type = false;
-        if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif') {
-          type = true;
-        }else{
-          this.$message.error('只能上传png/jpeg/gif格式图片');
-          type = false;
-        }
-        return type;
+        return new Promise((resolve, reject) => {
+          if (file.type == 'image/png') {
+            let reader = new FileReader()
+            reader.readAsDataURL(file) // 必须用file.raw
+            reader.onload = e => { // 让页面中的img标签的src指向读取的路径
+              let img = e.target.result;
+              const image = new Image()
+              image.src=img
+              image.onload = _=>{
+                console.log(image.width)
+                console.log(image.height)
+                if(image.width <= 78 && image.height <= 630){
+                  resolve()
+                }else{
+                  this.$message.error('尺寸限制为最大78*630px，支持PNG格式')
+                  reject();
+                }
+              }
+            }
+          }else{
+            this.$message.error('请上传PNG格式');
+            reject();
+          }
+        })
       },
       //获取危险源列表
       getCategory(){