diff --git a/public/bim.html b/public/bim.html index 704b6678..00395eac 100644 --- a/public/bim.html +++ b/public/bim.html @@ -51,10 +51,8 @@ Glodon.Bimface.Viewer.Viewer3DEvent.MouseClicked, (data) => { console.log(data); - setTimeout(() => { // 往父级传递 window.parent.postMessage({ msg: data.elementId }); - }, 200); } ); } diff --git a/public/bimBase.html b/public/bimBase.html new file mode 100644 index 00000000..5c25f944 --- /dev/null +++ b/public/bimBase.html @@ -0,0 +1,139 @@ + + + + + My first BIMFACE app + + + +
+ + + + + + diff --git a/public/js/config.js b/public/js/config.js index 0a958e0f..802d4761 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -20,7 +20,7 @@ var COMPANY = '' //通用 // COMPANY = 'shjg'//上海优益（上海建工） // COMPANY = 'syhy'//沈阳和盈 // COMPANY = 'jxwjj'//嘉兴王江泾公用码头项目 -COMPANY = 'gxbs'//广西百色 +// COMPANY = 'gxbs'//广西百色 var PROJECT = { local_test: 'common', // 普通版 diff --git a/src/assets/js/api/project.js b/src/assets/js/api/project.js index 34b9c7fe..747c8822 100644 --- a/src/assets/js/api/project.js +++ b/src/assets/js/api/project.js @@ -54,6 +54,17 @@ export const getJlwTokenApi = data => get('/xmgl/bimface/getViewTokenByFileId', export const getJlwDetailsApi = data => get('/xmgl/bimface/getDetailsByFileIdAndProjectSn', data); // 通过文件标识获取详情(包括ViewToken) export const saveBimfaceConfig = data => post('/xmgl/bimface/edit', data); // 保存BIMFACE相关配置 +// bimBase中心 +export const addBimBaseConfigApi = data => post('/xmgl/gouliPkpmConfig/add', data); // 添加配置 +export const getBimBaseConfigApi = data => get('/xmgl/gouliPkpmConfig/getConfigByProjectSn', data); // 获取项目中bimface配置信息 +export const projectBimBaseListApi = data => get('/xmgl/gouliPkpmModel/list', data); // 配置列表 +export const addBimBaseUploadApi = data => post('/xmgl/gouliPkpmModel/add', data); // 添加新模型 +export const updateBimBaseUploadApi = data => post('/xmgl/gouliPkpmModel/edit', data); // 编辑模型 +export const deleteBimBaseUploadApi = data => post('/xmgl/gouliPkpmModel/delete', data); // 删除模型 +export const startBimBaseApi = data => get('/xmgl/gouliPkpmModel/setEnableMainModel', data); // 启用所对应的bim +export const getBimBaseDetailsApi = data => get('/xmgl/gouliPkpmModel/getBimTokenByProjectSn', data); // 通过文件标识获取ViewToken +export const getBimBaseDetails = data => get('/xmgl/gouliPkpmModel/queryById', data); // 通过文件标识获取详情 + //楼栋管理 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 82d899bb..29b0d1f5 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -82,12 +82,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） - // axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地 + axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 diff --git a/src/router/index.js b/src/router/index.js index 6fae6237..119c2052 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1190,6 +1190,13 @@ const routes2 = [ component: () => import('@/views/projectFront/BIMCenter/BIMManageV3.vue'), }, + //BIMBASE中心 + { + path: '/project/bim/bimBaseManage', + name: 'BIMBASE中心', + component: () => + import('@/views/projectFront/BIMBASECenter/BIMManage.vue'), + }, //施工日志 { path: '/project/buildersDiary/addDiary', diff --git a/src/store/index.js b/src/store/index.js index 0ba1e36d..f11ac667 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,15 +48,15 @@ export default new Vuex.Store({ // FILEURL:'http://192.168.34.221:30001/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - BASEURL: baseUrl - ? baseUrl - : window.location.protocol + "//" + window.location.host + "/", //正式环境 - UPLOADURL: - window.location.protocol + - "//" + - window.location.host + - "/upload/image", //正式环境 - FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/", //正式环境 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/upload/image", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl @@ -104,8 +104,8 @@ export default new Vuex.Store({ // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 - // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 - // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 + UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 + FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 diff --git a/src/views/projectFront/BIMBASECenter/BIMManage.vue b/src/views/projectFront/BIMBASECenter/BIMManage.vue new file mode 100644 index 00000000..4c795202 --- /dev/null +++ b/src/views/projectFront/BIMBASECenter/BIMManage.vue @@ -0,0 +1,534 @@ + + + \ No newline at end of file diff --git a/src/views/projectFront/BIMBASECenter/overviewTwo.vue b/src/views/projectFront/BIMBASECenter/overviewTwo.vue new file mode 100644 index 00000000..fbb0d555 --- /dev/null +++ b/src/views/projectFront/BIMBASECenter/overviewTwo.vue @@ -0,0 +1,258 @@ + + + + + diff --git a/src/views/projectFront/BIMCenter/overviewTwo.vue b/src/views/projectFront/BIMCenter/overviewTwo.vue index 607206b4..2dcba17d 100644 --- a/src/views/projectFront/BIMCenter/overviewTwo.vue +++ b/src/views/projectFront/BIMCenter/overviewTwo.vue @@ -152,7 +152,7 @@ export default { } } else { let dataIndex = null; - dataIndex = this.selectedHideList.find((item) => { + dataIndex = this.selectedColorList.find((item) => { return item.name == e.data.msg; }); if (!dataIndex) {