zc

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

@@ -364,7 +364,7 @@
         },
         upData(){
           let self = this;
-          this.$set(this.form,'content',this.$refs.UEditor.text);
+          // this.$set(this.form,'content',this.$refs.UEditor.text);
           this.$refs["form"].validate(valid => {
             if (valid) {
               self.$confirm('是否确认提交?', "", {

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

@@ -739,11 +739,14 @@ export default {
       let self=this;
       subjectTriggerModes(row.id).then(response => {
         if(response.code==200){
-          row.hardwareTypeEnum.hardwareTypeCode=response.data.hardwareType.hardwareTypeCode
-          row.triggerModes=response.data.triggerModes
           for(let b=0;b<self.fanList.length;b++){
-            if(self.fanList[b].dictValue==row.triggerModes){
-              row.dictLabel=self.fanList[b].dictLabel
+            if(self.fanList[b].dictValue==response.data.triggerModes){
+              for(let i=0;i<self.checkedSubject.VOlist.length;i++){
+                if(row.id == self.checkedSubject.VOlist[i].id){
+                  this.$set(self.checkedSubject.VOlist[i],'dictLabel',self.fanList[b].dictLabel);
+                  this.$set(self.checkedSubject.VOlist[i],'triggerModes',response.data.triggerModes);
+                }
+              }
             }
           }
         }
@@ -860,7 +863,7 @@ export default {
             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
+                  self.$set(self.checkedSubject.VOlist[i],'dictLabel',self.fanList[b].dictLabel);
                 }
               }
             }
@@ -1076,7 +1079,7 @@ 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++) {
@@ -1089,15 +1092,9 @@ 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
-                          self.subjectTriggerModes(self.checkedSubject.VOlist[k])
-                        }
-                      }
+                      self.subjectTriggerModes(self.checkedSubject.VOlist[k])
                     }
                   }
-
                 }
               }
               if(self.newData.labHardwareVOList){