zc

src/views/emergencyManagement/performEvacuation/performEvacuationData.vue

@@ -1000,11 +1000,16 @@
           response.data.forEach((item)=>{
             item.exceptionIcon = item.exceptionIcon?localStorage.getItem('fileBrowseEnvironment')+item.exceptionIcon:null;
             if(item.hardwareTypeKey == 'airConditioner'){
-              if(item.reservedThree.indexOf('-') != -1){
+              if(item.reservedThree == 0){
+                item.switchType = 0;
+              }else if(item.reservedThree == 2){
+                item.switchType = 1;
+                item.functionType = 2;
+              }else if(item.reservedThree.indexOf('-') != -1){
                 let list = item.reservedThree.split('-');
-                item.switchType = list[0]?list[0]:'';
-                item.functionType = list[1]?list[1]:'';
-                item.orderType = list[2]?list[2]:'';
+                item.switchType = 1;
+                item.functionType = list[0]==3?1:(list[0]==4?2:'');
+                item.orderType = list[1]?list[1]:'';
               }else{
                 item.switchType = '';
                 item.functionType = '';
@@ -1577,10 +1582,24 @@
             list.forEach((item)=>{
               if(item.hardwareNo == data.hardwareNo){
                 if(item.hardwareTypeKey == 'airConditioner'){
-                  let list = data.command.split('-');
-                  item.switchType = list[0]?list[0]:'';
-                  item.functionType = list[1]?list[1]:'';
-                  item.orderType = list[2]?list[2]:'';
+                  if(data.command == 0){
+                    item.switchType = 0;
+                    item.functionType = '';
+                    item.orderType = '';
+                  }else if(data.command == 2){
+                    item.switchType = 1;
+                    item.functionType = 3;
+                    item.orderType = '';
+                  }else if(data.command.indexOf('-') != -1){
+                    let list = data.command.split('-');
+                    item.switchType = 1;
+                    item.functionType = list[0]==3?1:(list[0]==4?2:'');
+                    item.orderType = list[1]?list[1]:'';
+                  }else{
+                    item.switchType = '';
+                    item.functionType = '';
+                    item.orderType = '';
+                  }
                 }else{
                   item.operatingState = data.operatingState;
                 }

src/views/emergencyManagement/plan/addPlan.vue

@@ -178,6 +178,7 @@
                   <el-cascader
                     style="width:130px;"
                     v-model="item.startOperate"
+                    :props="{ emitPath:false }"
                     :options="options">
                   </el-cascader>
                 </el-form-item>
@@ -185,6 +186,7 @@
                   <el-cascader
                     style="width:130px;"
                     v-model="item.endOperate"
+                    :props="{ emitPath:false }"
                     :options="options">
                   </el-cascader>
                 </el-form-item>
@@ -305,70 +307,71 @@
         options: [{
           value: '1',
           label: '开启',
-          children: [{
+          children: [
+            {
             value: '1',
             label: '制冷',
             children: [{
-              value: '18',
+              value: '3-18',
               label: '18°C'
             }, {
-              value: '19',
+              value: '3-19',
               label: '19°C'
             }, {
-              value: '21',
+              value: '3-21',
               label: '21°C'
             }, {
-              value: '22',
+              value: '3-22',
               label: '22°C'
             }, {
-              value: '23',
+              value: '3-23',
               label: '23°C'
             }, {
-              value: '24',
+              value: '3-24',
               label: '24°C'
             }, {
-              value: '25',
+              value: '3-25',
               label: '25°C'
             }, {
-              value: '26',
+              value: '3-26',
               label: '26°C'
             }, {
-              value: '27',
+              value: '3-27',
               label: '27°C'
             },]
           }, {
             value: '2',
             label: '制热',
             children: [{
-              value: '18',
+              value: '4-18',
               label: '18°C'
             }, {
-              value: '19',
+              value: '4-19',
               label: '19°C'
             }, {
-              value: '21',
+              value: '4-21',
               label: '21°C'
             }, {
-              value: '22',
+              value: '4-22',
               label: '22°C'
             }, {
-              value: '23',
+              value: '4-23',
               label: '23°C'
             }, {
-              value: '24',
+              value: '4-24',
               label: '24°C'
             }, {
-              value: '25',
+              value: '4-25',
               label: '25°C'
             }, {
-              value: '26',
+              value: '4-26',
               label: '26°C'
             }, {
-              value: '27',
+              value: '4-27',
               label: '27°C'
             },]
           }, {
-            value: '3',
+            value: '2',
             label: '通风'
           }]
         }, {

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

@@ -9,6 +9,7 @@
                 v-model="queryParams.searchValue"
                 placeholder="实验室/房间号"
                 clearable
+                maxlength="10"
                 style="width:150px;"
               />
             </el-form-item>

src/views/integratedManagement/laboratoryManagement/subject/indexRightPage/hardwarePage.vue

@@ -170,10 +170,12 @@
       dialogSubmit(){
         let text = '';
         if(this.infraredControllerForm.switchType == 1){
-          if(this.infraredControllerForm.functionType != 3){
-            text = '1-' + this.infraredControllerForm.functionType + '-' + this.infraredControllerForm.orderType;
-          }else {
-            text = '1-3';
+          if(this.infraredControllerForm.functionType == 1){
+            text = '3-' + this.infraredControllerForm.orderType;
+          }else if(this.infraredControllerForm.functionType == 2){
+            text = '4-' + this.infraredControllerForm.orderType;
+          }else if(this.infraredControllerForm.functionType == 3){
+            text = '2';
           }
         }else if(this.infraredControllerForm.switchType == 0){
           text = '0';
@@ -215,11 +217,16 @@
         iotHardwareFindByType({subjectId:this.$parent.subId}).then(response => {
           response.data.forEach((item)=>{
             if(item.hardwareTypeKey == 'airConditioner'){
-              if(item.reservedThree.indexOf('-') != -1){
+              if(item.reservedThree == 0){
+                item.switchType = 0;
+              }else if(item.reservedThree == 2){
+                item.switchType = 1;
+                item.functionType = 2;
+              }else if(item.reservedThree.indexOf('-') != -1){
                 let list = item.reservedThree.split('-');
-                item.switchType = list[0]?list[0]:'';
-                item.functionType = list[1]?list[1]:'';
-                item.orderType = list[2]?list[2]:'';
+                item.switchType = 1;
+                item.functionType = list[0]==3?1:(list[0]==4?2:'');
+                item.orderType = list[1]?list[1]:'';
               }else{
                 item.switchType = '';
                 item.functionType = '';
@@ -284,10 +291,24 @@
             list.forEach((item)=>{
               if(item.hardwareNo == data.hardwareNo){
                 if(item.hardwareTypeKey == 'airConditioner'){
-                  let list = data.command.split('-');
-                  item.switchType = list[0]?list[0]:'';
-                  item.functionType = list[1]?list[1]:'';
-                  item.orderType = list[2]?list[2]:'';
+                  if(data.command == 0){
+                    item.switchType = 0;
+                    item.functionType = '';
+                    item.orderType = '';
+                  }else if(data.command == 2){
+                    item.switchType = 1;
+                    item.functionType = 3;
+                    item.orderType = '';
+                  }else if(data.command.indexOf('-') != -1){
+                    let list = data.command.split('-');
+                    item.switchType = 1;
+                    item.functionType = list[0]==3?1:(list[0]==4?2:'');
+                    item.orderType = list[1]?list[1]:'';
+                  }else{
+                    item.switchType = '';
+                    item.functionType = '';
+                    item.orderType = '';
+                  }
                 }else{
                   item.operatingState = data.operatingState;
                   item.online = data.online;

src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue

@@ -417,11 +417,16 @@
           iotHardwareFindByType({subjectId:this.subjectData.subId}).then(response => {
             response.data.forEach((item)=>{
               if(item.hardwareTypeKey == 'airConditioner'){
-                if(item.reservedThree.indexOf('-') != -1){
+                if(item.reservedThree == 0){
+                  item.switchType = 0;
+                }else if(item.reservedThree == 2){
+                  item.switchType = 1;
+                  item.functionType = 2;
+                }else if(item.reservedThree.indexOf('-') != -1){
                   let list = item.reservedThree.split('-');
-                  item.switchType = list[0]?list[0]:'';
-                  item.functionType = list[1]?list[1]:'';
-                  item.orderType = list[2]?list[2]:'';
+                  item.switchType = 1;
+                  item.functionType = list[0]==3?1:(list[0]==4?2:'');
+                  item.orderType = list[1]?list[1]:'';
                 }else{
                   item.switchType = '';
                   item.functionType = '';
@@ -602,10 +607,24 @@
               list.forEach((item)=>{
                 if(item.hardwareNo == data.hardwareNo){
                   if(item.hardwareTypeKey == 'airConditioner'){
-                    let list = data.command.split('-');
-                    item.switchType = list[0]?list[0]:'';
-                    item.functionType = list[1]?list[1]:'';
-                    item.orderType = list[2]?list[2]:'';
+                    if(data.command == 0){
+                      item.switchType = 0;
+                      item.functionType = '';
+                      item.orderType = '';
+                    }else if(data.command == 2){
+                      item.switchType = 1;
+                      item.functionType = 3;
+                      item.orderType = '';
+                    }else if(data.command.indexOf('-') != -1){
+                      let list = data.command.split('-');
+                      item.switchType = 1;
+                      item.functionType = list[0]==3?1:(list[0]==4?2:'');
+                      item.orderType = list[1]?list[1]:'';
+                    }else{
+                      item.switchType = '';
+                      item.functionType = '';
+                      item.orderType = '';
+                    }
                   }else{
                     item.operatingState = data.operatingState;
                     item.online = data.online;
@@ -658,10 +677,12 @@
         dialogSubmit(){
           let text = '';
           if(this.infraredControllerForm.switchType == 1){
-            if(this.infraredControllerForm.functionType != 3){
-              text = '1-' + this.infraredControllerForm.functionType + '-' + this.infraredControllerForm.orderType;
-            }else {
-              text = '1-3';
+            if(this.infraredControllerForm.functionType == 1){
+              text = '3-' + this.infraredControllerForm.orderType;
+            }else if(this.infraredControllerForm.functionType == 2){
+              text = '4-' + this.infraredControllerForm.orderType;
+            }else if(this.infraredControllerForm.functionType == 3){
+              text = '2';
             }
           }else if(this.infraredControllerForm.switchType == 0){
             text = '0';