Prechádzať zdrojové kódy

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

haojianlong 4 rokov pred
rodič
commit
967c8a6ac4

+ 1 - 1
config/dev.env.js

@@ -10,7 +10,7 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
   // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
   // MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
-  BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+  BASE_URL: '"http://192.168.64.14:8081"', //线上iframe地址
   SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
   MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })

+ 8 - 8
config/index.js

@@ -12,14 +12,14 @@ module.exports = {
 
     proxyTable: {//正式环境
       '/admin': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/admin": "/"
         }
       },
       '/api': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"
@@ -40,7 +40,7 @@ module.exports = {
       },
       '/pointconfig': {
         // 目标 API 地址
-        target: 'http://mbi.sagacloud.cn:8080/',
+        target: ' http://192.168.64.14:8080/',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -64,7 +64,7 @@ module.exports = {
       },
       '/ScanBuilding': {
         // 目标 API 地址
-        target: 'http://mbi.sagacloud.cn:8080/',
+        target: ' http://192.168.64.14:8080/',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -72,7 +72,7 @@ module.exports = {
       },
       '/scanbuilding-2': {
         // 目标 API 地址
-        target: 'http://mbi.sagacloud.cn:8080/',
+        target: ' http://192.168.64.14:8080/',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -87,14 +87,14 @@ module.exports = {
         }
       },
       '/modelapi': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/modelapi": "/revit-algorithm/"
         }
       },
       '/schedulerapi': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/schedulerapi": "/scheduler/"
@@ -167,7 +167,7 @@ module.exports = {
     //     },
     // '/scanbuilding-2': {
     //   // 目标 API 地址
-    //   target: 'http://mbi.sagacloud.cn:8080/',
+    //   target: ' http://192.168.64.14:8080//',
     //   // 如果要代理 websockets
     //   ws: true,
     //   // 将主机标头的原点更改为目标URL

+ 1 - 1
config/prod.env.js

@@ -1,7 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_URL: '"http://192.168.64.148081"', //测试iframe地址
+  BASE_URL: '"http://192.168.64.14:8081"', //测试iframe地址
   // SSO_SERVER: '"http://192.168.12.238:8081"', //测试环境
   // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
   // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境

+ 12 - 5
src/components/ledger/lib/system.vue

@@ -1,16 +1,19 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
-    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
-      <el-option v-for="item in options" :key="item.Category" :label="item.CategoryName" :value="item.Category"></el-option>
+    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'"
+               size="small" @change="changeVal">
+      <el-option v-for="item in options" :key="item.Category" :label="item.CategoryName"
+                 :value="item.Category"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
       @change="changeVal" change-on-select></el-cascader> -->
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
-import { queryLinkSys, queryPhysicsAllType } from "@/api/scan/request";
+import {mapGetters} from 'vuex';
+import {queryLinkSys, queryPhysicsAllType} from "@/api/scan/request";
+
 export default {
   name: "getCode",
   props: {
@@ -82,6 +85,9 @@ export default {
         if (this.value) {
           this.changeVal(this.value)
         }
+        if (res.Content.length < 1) {
+          this.value = ''
+        }
       })
     },
     getAllData() {
@@ -95,7 +101,7 @@ export default {
     changeArr(arr) {
       let data = [];
       arr.forEach(item => {
-        data.push({ Category: item.Code, CategoryName: item.Name });
+        data.push({Category: item.Code, CategoryName: item.Name});
       });
       return data;
     }
@@ -106,6 +112,7 @@ export default {
 #cascaderMap {
   float: left;
   margin-left: 10px;
+
   .buildFloor {
     color: #999999;
     font-size: 14px;

+ 2 - 2
src/components/model/file/addFolder.vue

@@ -11,7 +11,7 @@
           class="demo-ruleForm"
         >
           <el-form-item label="文件夹名称" prop="name">
-            <el-input v-model="ruleForm.name"  @keyup.enter.native="addFolder" focus></el-input>
+            <el-input  v-model.trim="ruleForm.name"  @keyup.enter.native="addFolder" focus></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -81,4 +81,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 1 - 1
src/components/model/file/floorTable.vue

@@ -258,4 +258,4 @@ export default {
 /deep/ .el-progress-bar__inner {
   text-align: center;
 }
-</style>
+</style>

+ 3 - 3
src/components/ready/buildfloor/addBuild.vue

@@ -30,12 +30,12 @@
 
             <el-input
               v-if="item.InputMode == 'B1' || item.InputMode == 'B2'"
-              v-model="form[item.Path]"/>
+              v-model.trim="form[item.Path]"/>
 
             <el-input
               v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
               type="number"
-              v-model="form[item.Path]">
+              v-model.trim="form[item.Path]">
               <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
             </el-input>
 
@@ -77,7 +77,7 @@
 
             <el-input
               v-else-if="item.InputMode == 'L'||item.InputMode == 'L1'||item.InputMode == 'L2'||item.InputMode == 'M'"
-              v-model="form[item.Path]">
+              v-model.trim="form[item.Path]">
               <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
             </el-input>
 

+ 108 - 103
src/components/ready/buildfloor/formItems.vue

@@ -9,13 +9,13 @@
           :class="{FloorTypeSelect:item.InputMode == 'D1'||item.Unit}">
 
           <el-input
-            v-model="form[item.Path]"
+            v-model.trim="form[item.Path]"
             v-if="item.InfoPointCode == 'BIMLocation' || item.InfoPointCode =='ModelID'"
             disabled/>
 
           <!--二维码相关-->
           <span v-else-if="item.InfoPointCode == 'DefaultQRCode' ">
-            <el-input v-if="!form[item.Path]" v-model="form[item.Path]" disabled/>
+            <el-input v-if="!form[item.Path]" v-model.trim="form[item.Path]" disabled/>
             <el-popover v-else placement="right" width="210" trigger="click">
               <div style="overflow:hidden;">
                 <img
@@ -28,7 +28,7 @@
           </span>
 
           <span v-else-if="item.InfoPointCode == 'QRCodePic' ">
-            <el-input v-if="!form[item.Path]" v-model="form[item.Path]" disabled/>
+            <el-input v-if="!form[item.Path]" v-model.trim="form[item.Path]" disabled/>
             <el-popover v-else placement="right" width="210" trigger="click">
               <div style="overflow:hidden;">
                 <img
@@ -42,14 +42,17 @@
 
           <!--/二维码相关-->
           <span v-else-if="item.InputMode == 'B1'">
-            <el-input v-model="form[item.Path]" :placeholder="(item.InputMode === 'B1' && item.Path==='FloorLocalID') ? '填写示例:F1、B1?':'' "/>
-              <div v-if="item.InputMode === 'B1' && item.Path==='FloorLocalID' && isShowTitle" style="color: gray;font-size: 12px" >
+            <el-input v-model.trim="form[item.Path]"
+                      :placeholder="(item.InputMode === 'B1' && item.Path==='FloorLocalID') ? '填写示例:F1、B1?':'' "/>
+              <div v-if="item.InputMode === 'B1' && item.Path==='FloorLocalID' && isShowTitle"
+                   style="color: gray;font-size: 12px">
                 用于楼层平面图切换
               </div>
           </span>
 
-          <el-input v-model="form[item.Path]" v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'" type="number">
-            <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
+          <el-input v-model.trim="form[item.Path]" v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
+                    type="number">
+            <template slot="append" v-if="item.Unit">{{ item.Unit }}</template>
           </el-input>
 
           <el-select v-model="form[item.Path]" placeholder="请选择" v-else-if="item.InputMode == 'D1'">
@@ -57,20 +60,22 @@
           </el-select>
 
           <el-cascader
-              v-else-if="item.InputMode == 'D1L'"
-              placeholder="请选择"
-              :options="item.options"
-              v-model="form[item.Path]"
-              :props="item.props"
-              filterable
-              :show-all-levels="false"
-              clearable
-              style="width: 200px"/>
+            v-else-if="item.InputMode == 'D1L'"
+            placeholder="请选择"
+            :options="item.options"
+            v-model="form[item.Path]"
+            :props="item.props"
+            filterable
+            :show-all-levels="false"
+            clearable
+            style="width: 200px"/>
 
-          <el-input v-else-if="item.InputMode == 'L'||item.InputMode == 'L1'||item.InputMode == 'L2'||item.InputMode == 'M'" v-model="form[item.Path]">
-            <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
+          <el-input
+            v-else-if="item.InputMode == 'L'||item.InputMode == 'L1'||item.InputMode == 'L2'||item.InputMode == 'M'"
+            v-model.trim="form[item.Path]">
+            <template slot="append" v-if="item.Unit">{{ item.Unit }}</template>
           </el-input>
-          <el-input v-model="form[item.Path]" v-else disabled title="暂不支持"></el-input>
+          <el-input v-model.trim="form[item.Path]" v-else disabled title="暂不支持"></el-input>
           <!--                    <div>{{item.InputMode}}{{item.InfoPointCode}}</div>-->
         </el-form-item>
       </div>
@@ -78,99 +83,99 @@
   </div>
 </template>
 <script>
-  import {getDataDictionary} from "@/api/scan/request";
+import {getDataDictionary} from "@/api/scan/request";
 
-  export default {
-    props: {
-      type: {
-        default: 'Floor'
+export default {
+  props: {
+    type: {
+      default: 'Floor'
+    }
+  },
+  data() {
+    let validateId = (rule, value, callback) => {
+      if (!value) {
+        this.isShowTitle = false
+        return callback(new Error('请输入楼层本地编码'));
+      } else {
+        this.isShowTitle = true
+        callback()
       }
-    },
-    data() {
-      let validateId = (rule, value, callback) => {
-        if (!value) {
-          this.isShowTitle = false
-          return callback(new Error('请输入楼层本地编码'));
-        } else {
-          this.isShowTitle = true
-          callback()
-        }
+    }
+    // }
+    return {
+      form: {},
+      isShowTitle: true,
+      InforsList: [],
+      all: true, // 默认显示全部
+      rules: {
+        "FloorLocalID": [
+          {validator: validateId, trigger: 'blur', "required": true}
+        ],
+        "FloorLocalName": [
+          {"required": true, "message": "请输入楼层本地名称", "trigger": "blur"}
+        ],
+        "FloorSequenceID": [
+          {"required": true, "message": "请输入楼层顺序号", "trigger": "blur"}
+        ]
       }
-      // }
-      return {
-        form: {},
-        isShowTitle: true,
-        InforsList: [],
-        all: true, // 默认显示全部
-        rules: {
-          "FloorLocalID": [
-            {validator: validateId, trigger: 'blur', "required": true}
-          ],
-          "FloorLocalName": [
-            {"required": true, "message": "请输入楼层本地名称", "trigger": "blur"}
-          ],
-          "FloorSequenceID": [
-            {"required": true, "message": "请输入楼层顺序号", "trigger": "blur"}
-          ]
-        }
-      };
-    },
+    };
+  },
 
-    created() {
-      this.getInforsPoint()
-    }
-    ,
-    methods: {
+  created() {
+    this.getInforsPoint()
+  }
+  ,
+  methods: {
 
-      getInforsPoint() {
-        let params = {
-          data: {
-            Orders: "sort asc,InfoPointCode asc",
-            PageNumber: 1,
-            PageSize: 1000
-          },
-          type: this.type
-        };
-        getDataDictionary(params, res => {
-          let arr = res.Content.map(item => {
-            if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource) {
-              item.options = JSON.parse(item.DataSource)
-              if (item.options[0] && item.options[0].Content) {
-                item.props = {
-                  value: 'Code',
-                  label: 'Name',
-                  children: 'Content',
-                  checkStrictly: true
-                }
+    getInforsPoint() {
+      let params = {
+        data: {
+          Orders: "sort asc,InfoPointCode asc",
+          PageNumber: 1,
+          PageSize: 1000
+        },
+        type: this.type
+      };
+      getDataDictionary(params, res => {
+        let arr = res.Content.map(item => {
+          if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource) {
+            item.options = JSON.parse(item.DataSource)
+            if (item.options[0] && item.options[0].Content) {
+              item.props = {
+                value: 'Code',
+                label: 'Name',
+                children: 'Content',
+                checkStrictly: true
               }
             }
-            switch (item.InfoPointCode) { //过滤掉待删除的
-              case 'FloorIdentity':
-              case 'RelatedSchedule':
-              case 'OutPeopleFlow':
-              case 'InPeopleFlow':
-              case 'ExsitPeopleNum':
-                break;
-              default:
-                return item
-            }
-          })
-          //手动删除掉数据字典中不存在的字段,等待后台同步
-          this.InforsList = arr.filter(t => t && t.InfoPointCode != 'FloorQRCode')
-        })
-      },
-      submitForm(call) {
-        this.$refs.ruleForm.validate((valid) => {
-          if (valid) {
-            call()
-          } else {
-            return false;
           }
-        });
-      },
+          switch (item.InfoPointCode) { //过滤掉待删除的
+            case 'FloorIdentity':
+            case 'RelatedSchedule':
+            case 'OutPeopleFlow':
+            case 'InPeopleFlow':
+            case 'ExsitPeopleNum':
+              break;
+            default:
+              return item
+          }
+        })
+        //手动删除掉数据字典中不存在的字段,等待后台同步
+        this.InforsList = arr.filter(t => t && t.InfoPointCode != 'FloorQRCode')
+      })
+    },
+    submitForm(call) {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          call()
+        } else {
+          return false;
+        }
+      });
+    },
 
-    }
-  };
+  }
+};
 </script>
 <style lang="scss" scoped>
 #inforsPoint {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 973 - 972
src/views/ready/collectsetting/index.vue