diff --git a/dist.zip b/dist.zip new file mode 100644 index 00000000..02b1a3e5 Binary files /dev/null and b/dist.zip differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index b63be555..02e690e1 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,8 +40,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 -// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL = 'http://192.168.34.246:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 +// axios.defaults.baseURL = 'http://192.168.34.246:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 diff --git a/src/pages/index/index.html b/src/pages/index/index.html index 16fcad70..d7f8ddbd 100644 --- a/src/pages/index/index.html +++ b/src/pages/index/index.html @@ -1,12 +1,13 @@ + - + @@ -38,7 +39,7 @@ type="text/css"> --> - + - + - + @@ -75,4 +77,32 @@ document.title = '智慧工地云平台' - + + + \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 5a4b21cd..54ac5d88 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -53,11 +53,11 @@ export default new Vuex.Store({ // FILEURL: 'http://124.71.178.44:100/image/', /* 2022-06-06 */ // BASEURL:'http://192.168.34.174:6023/', - // UPLOADURL: 'http://192.168.34.125:6023/upload/image', - // FILEURL: 'http://192.168.34.125:6023/image/', + UPLOADURL: 'http://192.168.34.125:6023/upload/image', + FILEURL: 'http://192.168.34.125:6023/image/', - UPLOADURL:'http://192.168.34.246:6023/upload/image', - FILEURL:'http://192.168.34.246:6023/image', + // UPLOADURL:'http://192.168.34.246:6023/upload/image', + // FILEURL:'http://192.168.34.246:6023/image', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 ACCOUNTTYPE: ['系统管理员', '企业一级管理员', '企业二级管理员', '企业三级管理员', '项目管理员'], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号 diff --git a/src/views/projectAdmin/jlw/digitalSite/index.vue b/src/views/projectAdmin/jlw/digitalSite/index.vue index d6484a1d..0f35ace5 100644 --- a/src/views/projectAdmin/jlw/digitalSite/index.vue +++ b/src/views/projectAdmin/jlw/digitalSite/index.vue @@ -240,7 +240,7 @@ export default { height: 100%; margin-right: 15px; .centerTop { - height: 100%; + height: 98.5%; margin-bottom: 15px; } } diff --git a/src/views/projectAdmin/jlw/envirManage/index.vue b/src/views/projectAdmin/jlw/envirManage/index.vue index bb401cf3..3f531837 100644 --- a/src/views/projectAdmin/jlw/envirManage/index.vue +++ b/src/views/projectAdmin/jlw/envirManage/index.vue @@ -85,7 +85,7 @@ export default { height: 100%; margin-right: 15px; .centerTop { - height: 66%; + height: 66.5%; margin-bottom: 15px; } .centerBottom { diff --git a/src/views/projectAdmin/jlw/laborManage/index.vue b/src/views/projectAdmin/jlw/laborManage/index.vue index a092cb1c..d9ed4f90 100644 --- a/src/views/projectAdmin/jlw/laborManage/index.vue +++ b/src/views/projectAdmin/jlw/laborManage/index.vue @@ -86,7 +86,7 @@ export default { height: 100%; margin-right: 15px; .centerTop { - height: 66%; + height: 66.5%; margin-bottom: 15px; } .centerBottom { diff --git a/src/views/projectAdmin/jlw/planProgress/index.vue b/src/views/projectAdmin/jlw/planProgress/index.vue index 5743acbd..1d2c0a11 100644 --- a/src/views/projectAdmin/jlw/planProgress/index.vue +++ b/src/views/projectAdmin/jlw/planProgress/index.vue @@ -68,7 +68,7 @@ export default { height: 100%; margin-right: 15px; .centerTop { - height: 66%; + height: 66.5%; margin-bottom: 15px; } .centerBottom { diff --git a/src/views/projectAdmin/jlw/projectHuli/index.vue b/src/views/projectAdmin/jlw/projectHuli/index.vue index c2cf5216..9258f02c 100644 --- a/src/views/projectAdmin/jlw/projectHuli/index.vue +++ b/src/views/projectAdmin/jlw/projectHuli/index.vue @@ -127,7 +127,7 @@ export default { height: 100%; margin-right: 15px; .centerTop { - height: 66%; + height: 66.5%; margin-bottom: 15px; } .centerBottom { diff --git a/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue b/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue index 31e400db..b57dffc3 100644 --- a/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue +++ b/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue @@ -135,6 +135,7 @@ export default { projectSn: this.$store.state.projectSn, showType: 3 }).then(res => { + console.log('------获取图片',res) this.imgUrl = res.result.configValue; }); }, @@ -241,8 +242,10 @@ export default { display: block; } .imgStyle{ - width:80%; - height: 80%; + // width:80%; + width:700px; + height:470px; + // height: 80%; margin-left: 10%; } } diff --git a/src/views/projectFront/BIMCenter/BIMManageV3.vue b/src/views/projectFront/BIMCenter/BIMManageV3.vue index 05732f4d..b96ab59d 100644 --- a/src/views/projectFront/BIMCenter/BIMManageV3.vue +++ b/src/views/projectFront/BIMCenter/BIMManageV3.vue @@ -313,7 +313,7 @@ export default { projectSn: this.$store.state.projectSn, id: item.id }).then(res => { - // this.loadData(); + this.loadData(); }); }, @@ -392,7 +392,6 @@ export default { item.isEnable = true; this.activeBuildIndex = index this.fileId = item.fileId - console.log('-------默认第一个',this.fileId) } }); diff --git a/src/views/projectFront/BIMCenter/overviewTwo.vue b/src/views/projectFront/BIMCenter/overviewTwo.vue index 769b3da2..411140e4 100644 --- a/src/views/projectFront/BIMCenter/overviewTwo.vue +++ b/src/views/projectFront/BIMCenter/overviewTwo.vue @@ -1,63 +1,130 @@ \ No newline at end of file