Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

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

@@ -74,6 +74,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="房间号" prop="room" class="form-item">
+        <el-input
+          style="width:320px;"
+          maxlength="30"
+          v-model="form.room"
+          placeholder="请输房间号"
+          clearable
+          size="small"
+        />
+      </el-form-item>
       <!--<el-form-item label="详细位置" prop="layoutId" class="form-item">-->
         <!--<el-select v-model="form.layoutId"  placeholder="请选择详细位置" style="width:320px;">-->
           <!--<el-option-->
@@ -173,6 +183,13 @@
           </el-form-item>
         </div>
       </div>
+      <div class="title-box">
+        <p class="left-title">实验室简介</p>
+      </div>
+      <div class="rich-text">
+        <UEditor ref="UEditor" :content="form.content" :min-height="192" />
+      </div>
+
       <div class="bottom-button-box">
         <p class="reset-button-one left-button" @click="backPage">取消</p>
         <p class="inquire-button-one right-button" @click="upData">提交</p>
@@ -214,7 +231,9 @@
           riskMeasure:[],
           //灭火要点
           extinguishingKeyPoints:[],
-          form:{},
+          form:{
+            content:"",
+          },
           // 表单校验
           rules: {
             name:[
@@ -239,9 +258,13 @@
             floorId:[
               {required: true, message: '请选择层数', trigger: 'blur'}
             ],
+            room:[
+              {required: true, message: '请输入房间号', trigger: 'blur'}
+            ],
             layoutId:[
               {required: true, message: '请选择详细位置', trigger: 'blur'}
             ],
+
           },
           labMoldList:[],
         }
@@ -341,6 +364,7 @@
         },
         upData(){
           let self = this;
+          this.$set(this.form,'content',this.$refs.UEditor.text);
           this.$refs["form"].validate(valid => {
             if (valid) {
               self.$confirm('是否确认提交?', "", {
@@ -374,6 +398,7 @@
         },
         //新增实验室
         addSubject(){
+          this.form.content = escape(this.form.content);
           addSubject(this.form).then(response => {
             this.msgSuccess("新增成功");
             this.$parent.clickPage(1);
@@ -381,6 +406,7 @@
         },
         //修改实验室
         updateSubject(){
+          this.form.content = escape(this.form.content);
           updateSubject(this.form).then(response => {
             this.msgSuccess("修改成功");
             this.$parent.clickPage(1);
@@ -518,6 +544,9 @@
         margin-bottom:30px;
       }
     }
+    .rich-text{
+      margin: 20px;
+    }
     .bottom-button-box{
       display: flex;
       width:400px;

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

@@ -288,7 +288,7 @@ import {
   updateSubject,
   mangerVoice,
   startUrl,
-  queryHardByTypeList, getHaikangUserList
+  queryHardByTypeList, getHaikangUserList, subjectTriggerModes
 } from '@/api/laboratory/subject'
 import { listData} from "@/api/system/dict/data";
 import { filterDept } from "@/api/medicUniversity-3_1/index";
@@ -691,18 +691,47 @@ export default {
         type: "warning"
       }).then(async () => {
         self.switchChange(row)
+        if(row.state.code==4){
+          this.subjectTriggerModes(row.id)
+        }
       }).catch(() => {
 
       })
     },
+    //点击开关按钮开启的时候充电调用硬件状态
+    subjectTriggerModes(id){
+      let self=this;
+      console.log(self.checkedSubject.VOlist)
+      subjectTriggerModes(id).then(response => {
+        if(response.code==200){
+          if (self.checkedSubject.VOlist) {
+            for (let k = 0; k < self.checkedSubject.VOlist.length; k++) {
+              if(self.checkedSubject.VOlist[k].id==response.data.hardwareId){
+                self.checkedSubject.VOlist[k].triggerModes=response.data.triggerModes
+                self.checkedSubject.VOlist[k].hardwareTypeEnum.hardwareTypeCode=response.data.hardwareType.hardwareTypeCode
+              }
+            }
+            for (let i = 0; i < self.checkedSubject.VOlist.length; i++) {
+              if(self.checkedSubject.VOlist[i].hardwareTypeEnum.hardwareTypeCode == '2'){
+                for(let b=0;b<self.fanList.length;b++){
+                  if(self.fanList[b].dictValue==self.checkedSubject.VOlist[i].triggerModes){
+                    self.checkedSubject.VOlist[i].dictLabel=self.fanList[b].dictLabel
+                  }
+                }
+              }
+            }
+          }
+        }
+      });
+    },
     //开关按钮
     switchChange(row){
+
       let switchData = {
         id:row.id,
         switchVal:row.state.code==3?'close':(row.state.code==4?'open':'')
       };
       hardWareControl(switchData).then(response => {
-        console.log(response);
         if(response.code==200){
           row.state.code = row.state.code==3?4:(row.state.code==4?3:'')
           this.msgSuccess("操作成功")
@@ -733,7 +762,6 @@ export default {
               let urlText = window.location.href;
               if(urlText.indexOf(localStorage.getItem('ipIdentify')) != -1){
                 startUrl(obj).then(res => {
-                  console.log('res',res)
                   if(res.code == 200){
                     if(!res.data[0]){
                       this.msgError("视频配置异常请联系管理员")
@@ -760,7 +788,6 @@ export default {
                 });
               }else{
                 startUrl(obj).then(res => {
-                  console.log('res',res)
                   if(res.code == 200){
                     if(!res.data[0]){
                       this.msgError("视频配置异常请联系管理员")
@@ -992,7 +1019,7 @@ export default {
         // console.log('message',message)
         if (message){
           let data = JSON.parse(message)
-          // console.log("MQTT----message",data)
+           //console.log("MQTT----message",data)
           if(data.data.subId){
             //传感器
             // console.log("传感器",data.data.subId,'---------',data);
@@ -1016,8 +1043,9 @@ export default {
               }
             }
           }else{
+
             //硬件
-            // console.log("硬件",data);
+             //console.log("硬件",data);
             for (let i = 0; i < data.data.length; i++) {
               if (self.checkedSubject.VOlist) {
                 for (let k = 0; k < self.checkedSubject.VOlist.length; k++) {
@@ -1030,6 +1058,14 @@ export default {
                       self.checkedSubject.VOlist[k].state.code = 0;
                     }
                   }
+                  if(self.checkedSubject.VOlist[k].hardwareTypeEnum.hardwareTypeCode == '2'){
+                    for(let b=0;b<self.fanList.length;b++){
+                      if(self.fanList[b].dictValue==self.checkedSubject.VOlist[k].triggerModes){
+                        self.checkedSubject.VOlist[k].dictLabel=self.fanList[b].dictLabel
+                      }
+                    }
+                  }
+
                 }
               }
               if(self.newData.labHardwareVOList){