Browse Source

Merge branch 'master' of http://39.106.8.246:3003/web/ibms

haojianlong 5 years ago
parent
commit
ee1ff8f74a

+ 2 - 2
config/dev.env.js

@@ -6,8 +6,8 @@ module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
     BASE_URL: '"http://192.168.20.215"', //测试iframe地址
     SSO_SERVER: '"http://192.168.20.102:8080"', //(新)测试环境
-    MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp"' //MQ测试环境地址
+    MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp/"' //MQ测试环境地址
     // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
     // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-    // MQTT_SERVICE: '"ws://172.17.11.168:61614/stomp/"' //MQ正式环境地址
+    // MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })

+ 1 - 1
config/prod.env.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"',
     // BASE_URL: '"http://192.168.20.215"', //测试iframe地址
     // SSO_SERVER: '"http://192.168.20.102:8080"', //(新)测试环境
-    // MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp"' //MQ测试环境地址
+    // MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp/"' //MQ测试环境地址
     BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
     SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
     MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址

+ 2 - 0
src/components/config_point/examine_main.vue

@@ -143,6 +143,8 @@
                                 Used: true
                             }
                         },
+                        PageNumber: 1,
+                        PageSize: 1000,
                         type: this.protocolType
                     },
                     width, settings

+ 1 - 1
src/components/config_point/step3_point/dialog_main.vue

@@ -105,7 +105,7 @@
                                 Used: true
                             },
                             PageNumber: 1,
-                            PageSize: 100
+                            PageSize: 1000
                         },
                         type: this.protocolType
                     }, res => {

+ 1 - 1
src/components/config_point/step3_point/steps3_main.vue

@@ -137,7 +137,7 @@
                                     // KeyEquipmentType: '冷机'
                                 },
                                 PageNumber: 1,
-                                PageSize: 100
+                                PageSize: 1000
                             },
                             type: this.protocolType
                         }, res => {