Browse Source

modify scan building

haojianlong 5 years ago
parent
commit
242a3acf24
3 changed files with 3 additions and 4 deletions
  1. 1 2
      config/dev.env.js
  2. 0 1
      config/prod.env.js
  3. 2 1
      src/views/data_admin/buildData/index-2.vue

+ 1 - 2
config/dev.env.js

@@ -5,8 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
     BASE_URL: '"http://192.168.20.215"', //测试iframe地址
-    SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
-    // SSO_SERVER: '"http://192.168.20.102:8080"' //(新)测试环境
+    SSO_SERVER: '"http://192.168.20.102:8080"' //(新)测试环境
     // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
     // BASE_URL: '"http://mbi.sagacloud.cn"' //线上iframe地址
 })

+ 0 - 1
config/prod.env.js

@@ -2,7 +2,6 @@
 module.exports = {
     NODE_ENV: '"production"',
     // BASE_URL: '"http://192.168.20.215"', //测试iframe地址
-    // SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
     // SSO_SERVER: '"http://192.168.20.102:8080"' //(新)测试环境
     BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
     SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境

+ 2 - 1
src/views/data_admin/buildData/index-2.vue

@@ -841,8 +841,9 @@ export default {
       let pa = {
         PageNumber: this.currentPage[this.tabChecked],
         PageSize: this.pageSizeArr[this.tabChecked],
-        Filters: `CreateTime>='${this.checkTimeArr[0]}';CreateTime<='${this.checkTimeArr[1]}';BuildingId='${this.buildId}';Family='${this.code}';code_type IN (-1,-2,-3,0,2)`
+        Filters: `CreateTime>='${this.checkTimeArr[0]}';CreateTime<='${this.checkTimeArr[1]}';BuildingId='${this.buildId}';Family='${this.code}'`
       }
+      //;codeType in [ -1,-2,-3,0,2]
       // 添加建筑条件
       if (this.floorId == 'noKnow') {
         pa.Filters += `;FloorId isNull`