Explorar o código

Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into test

yusheng hai 7 meses
pai
achega
8a95969d54
Modificáronse 2 ficheiros con 7 adicións e 3 borrados
  1. 4 1
      src/views/workOrder/components/order-search.vue
  2. 3 2
      vue.config.js

+ 4 - 1
src/views/workOrder/components/order-search.vue

@@ -303,7 +303,10 @@
     mounted() {
       this.getFactoryarea();
       this.$nextTick(() => {
-        this.where.factoryId = this.$store.state.user.info.factoryId;
+        this.where.factoryId =
+          this.$store.state.user.info.factoryId == 1
+            ? ''
+            : this.$store.state.user.info.factoryId;
       });
     },
     created() {},

+ 3 - 2
vue.config.js

@@ -38,9 +38,10 @@ module.exports = {
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.211:18086',
-        target: 'http://192.168.1.102:18086',
+        // target: 'http://192.168.1.251:18186',
+        // target: 'http://192.168.1.102:18086',
 
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
 
         // target: 'http://192.168.1.116:18086',