diff --git a/dist.zip b/dist.zip new file mode 100644 index 00000000..b9df4a6d Binary files /dev/null and b/dist.zip differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index e8a57ffe..accf5392 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -76,8 +76,8 @@ if (process.env.NODE_ENV == 'development') { axios.defaults.baseURL = 'https://www.ceshi.com' } else if (process.env.NODE_ENV == 'production') { let host = window.location.host - // axios.defaults.baseURL = window.location.protocol + '//' + host + '/' - axios.defaults.baseURL ='http://192.168.34.216:6023/' + axios.defaults.baseURL = window.location.protocol + '//' + host + '/' + // axios.defaults.baseURL ='http://192.168.34.216:6023/' // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" // axios.defaults.baseURL = 'http://zhgd.loganwy.com/' } diff --git a/src/views/projectAdmin/zjsj/security/centerTop.vue b/src/views/projectAdmin/zjsj/security/centerTop.vue index fdad6889..aa881ec4 100644 --- a/src/views/projectAdmin/zjsj/security/centerTop.vue +++ b/src/views/projectAdmin/zjsj/security/centerTop.vue @@ -1,14 +1,89 @@ - + diff --git a/src/views/projectFront/BIMCenter/BIMManageV3.vue b/src/views/projectFront/BIMCenter/BIMManageV3.vue index b96ab59d..a2a493c6 100644 --- a/src/views/projectFront/BIMCenter/BIMManageV3.vue +++ b/src/views/projectFront/BIMCenter/BIMManageV3.vue @@ -85,7 +85,7 @@ class="uploadBtn" ref="upload" name="files" - action="http://182.90.224.237:7000/upload/image" + action="http://47.97.202.104:6023/upload/image" :show-file-list="true" :data="uploadParams" :on-change="changeUpload" @@ -322,13 +322,14 @@ export default { getJlwConfigApi({ projectSn: this.$store.state.projectSn, }).then(res => { - // console.log('-----有吗',res) - // if (res.result) { - // this.configForm = res.result; - // this.loadData(); - // } else { - // this.configDialog = true; - // } + console.log('-----有吗',res) + if (res.result) { + this.configForm = res.result.bimfaceConfig; + // this.configForm.appKey = res.result.bimfaceConfig + this.loadData(); + } else { + this.configDialog = true; + } }); },