dedsudiyu 10 months ago
parent
commit
73723d1a1a

+ 7 - 5
src/views/emergencyManagement/performEvacuation/performEvacuationData.vue

@@ -1004,7 +1004,7 @@
                 item.switchType = 0;
               }else if(item.reservedThree == 2){
                 item.switchType = 1;
-                item.functionType = 2;
+                item.functionType = 3;
               }else if(item.reservedThree.indexOf('-') != -1){
                 let list = item.reservedThree.split('-');
                 item.switchType = 1;
@@ -1810,10 +1810,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';

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/subject/indexRightPage/hardwarePage.vue

@@ -221,7 +221,7 @@
                 item.switchType = 0;
               }else if(item.reservedThree == 2){
                 item.switchType = 1;
-                item.functionType = 2;
+                item.functionType = 3;
               }else if(item.reservedThree.indexOf('-') != -1){
                 let list = item.reservedThree.split('-');
                 item.switchType = 1;

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue

@@ -421,7 +421,7 @@
                   item.switchType = 0;
                 }else if(item.reservedThree == 2){
                   item.switchType = 1;
-                  item.functionType = 2;
+                  item.functionType = 3;
                 }else if(item.reservedThree.indexOf('-') != -1){
                   let list = item.reservedThree.split('-');
                   item.switchType = 1;