From c0c6daa826b3d977e3250f9f14eb6766b08e3fb5 Mon Sep 17 00:00:00 2001 From: wangqiujuan0808 <578331299@qq.com> Date: Fri, 1 Dec 2023 18:31:13 +0800 Subject: [PATCH] .. --- src/components/Qmviewer/index.vue | 9 +++++---- src/store/modules/permission.js | 5 +++++ src/views/index.vue | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/Qmviewer/index.vue b/src/components/Qmviewer/index.vue index 756b42e..236dd61 100644 --- a/src/components/Qmviewer/index.vue +++ b/src/components/Qmviewer/index.vue @@ -1260,7 +1260,7 @@ export default { curQmodel: null, }; }, - created() { + mounted() { console.log("create"); console.log(QModelX); let _this = this; @@ -1281,7 +1281,8 @@ export default { this.curQmodel = qmodelobj; _this.$emit("callFather_before", this.curQmodel); var viewerDemo = new QMViewer(this.curQmodel, this.forGis); - // this._data.viewerDemo = viewerDemo; + // 修改12.1 + this.viewerDemo = viewerDemo; qmodelobj.viewerDemo = viewerDemo; this.updateClientRects(false); if (this.forGis) { @@ -1325,7 +1326,7 @@ export default { leftBarControl.addEventListener("click", this.delayResize); }); }, - mounted() {}, + // mounted() {}, beforeRouteLeave(to, form, next) { // var pnt= document.getElementById('qmodel-div').parentNode; window.removeEventListener("resize", this.handleResize, false); @@ -1365,7 +1366,7 @@ export default { modelRect.top = modelRect.top + padding; modelRect.width = modelRect.width - padding; modelRect.height = modelRect.height - padding; - // this._data.viewerDemo.updateClientRects(modelRect, updateCanvas); + this.viewerDemo.updateClientRects(modelRect, updateCanvas); }, handleResize() { this.updateClientRects(true); diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 958fe63..a4b3ba8 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -2,6 +2,7 @@ import auth from '@/plugins/auth' import router, { constantRoutes, dynamicRoutes } from '@/router' import { getRouters } from '@/api/menu' import Layout from '@/layout/index' +import LayoutMain from '@/layoutMain/index' import ParentView from '@/components/ParentView' import InnerLink from '@/layout/components/InnerLink' @@ -73,6 +74,10 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { route.component = loadView(route.component) } } + // 特殊修改,BIM模块风格 + if(route.path === '/bim') { + route.component = LayoutMain; + } if (route.children != null && route.children && route.children.length) { route.children = filterAsyncRouter(route.children, route, type) } else { diff --git a/src/views/index.vue b/src/views/index.vue index 3991721..df0c208 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -13,7 +13,7 @@