Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

yangjunjing 5 years ago
parent
commit
7849209058

+ 6 - 6
config/prod.env.js

@@ -1,10 +1,10 @@
 'use strict'
 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测试环境地址
-    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-    SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
-    MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
+    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测试环境地址
+    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+    // MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 }

+ 4 - 2
src/components/ledger/handsontables/device.vue

@@ -411,7 +411,6 @@ export default {
         },
         //获取所以主体数据---用于维护信息
         getAllData() {
-            this.loading = true
             if (!!this.mess.deviceId) {
                 //   查询step2
                 let params = {
@@ -1126,11 +1125,14 @@ export default {
         //选择型号修改
         firmChange(data, type) {
             if (type === 'dialog') { // 如果是批量信息维护
+                let venderName = data.venderName ? data.venderName : '空'
+                let brandName = data.brandName ? data.brandName : '空'
+                let name = data.name ? data.name : '空'
                 let firm = {
                     ...data,
                     num: 2,
                     Specification: data.name,
-                    name: `${data.venderName}/${data.brandName}/${data.name}`
+                    name: `${venderName}/${brandName}/${name}`
                 }
                 this.firmName = firm //批量维护dialog显示对象的字段
             } else {  //如果是表格操作

+ 1 - 0
src/views/data_admin/buildGraphy/locationPointMsg.vue

@@ -52,6 +52,7 @@ export default {
     clearImg(){
       this.choImg = [];
       this.isIndeterminate = false;
+      this.checkAll = false;
     }
   }
 }