Shannon_mu 3 years ago
parent
commit
1ce83306a3

+ 1 - 1
accessControlSystem/src/views/deviceManagement/accessControlMachineManagement/popups/add.vue

@@ -272,7 +272,7 @@ export default {
                     var loading = this.$loading();
                     var loading = this.$loading();
                     let installData = JSON.parse(JSON.stringify(this.formData));
                     let installData = JSON.parse(JSON.stringify(this.formData));
                     installData.deviceType = _.last(installData.deviceType);
                     installData.deviceType = _.last(installData.deviceType);
-                    if (installData.gateType == 2) {
+                    if (installData.gateType == 1) {
                         delete installData.gateUnitDtoList;
                         delete installData.gateUnitDtoList;
                     }
                     }
                     this.$http
                     this.$http

+ 10 - 1
operationSupport/src/views/newWorkBench/index.vue

@@ -10,8 +10,17 @@ export default {};
 .workbench {
 .workbench {
     background: #2c354a;
     background: #2c354a;
     height: 100%;
     height: 100%;
-    .list_1x2 {
+    .list_1x1 {
         width: calc(100% - #{rem(60)});
         width: calc(100% - #{rem(60)});
+        height: rem(238);
+    }
+    .list_1x2 {
+        width: calc(100% - #{rem(20)});
+        height: rem(238);
+    }
+    .list_2x2 {
+        width: calc(100% - #{rem(20)});
+      height: rem(794);
     }
     }
 }
 }
 </style>
 </style>