heyang

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

@@ -1030,6 +1030,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){