From 1003b4ea23797139ed716c25a74cf7fb54e46c50 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 31 May 2025 13:21:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=BC=AB=E6=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/src/components/header.vue | 73 ++- yanzhu-ui-vue3/src/api/bim/bim.js | 33 + yanzhu-ui-vue3/src/utils/public.js | 93 +++ .../views/bim/bimSetting/PersonRoaming.vue | 617 +++++++++--------- .../bim/bimSetting/PersonRoaming_副本.vue | 417 ++++++++++++ .../src/views/bim/bimSetting/index.vue | 23 +- yanzhu-ui-vue3/src/views/index.vue | 2 +- 7 files changed, 928 insertions(+), 330 deletions(-) create mode 100644 yanzhu-ui-vue3/src/api/bim/bim.js create mode 100644 yanzhu-ui-vue3/src/utils/public.js create mode 100644 yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming_副本.vue diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index 5a86ceb7..d706eb14 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -79,14 +79,14 @@ - {{ selProject?.setting?.orgName || '数字建安施工管理平台' }} + {{ selProject?.setting?.orgName ||selProject?.projectName|| '数字建安施工管理平台' }}
绿碳中心
@@ -45,7 +45,6 @@ import { listBimModel } from '@/api/bim/bimModel' import ModelFloorTree from './ModelFloorTree.vue' import PersonRoaming from './PersonRoaming.vue' -import { h } from 'vue' export default { components: { ModelFloorTree, @@ -85,21 +84,27 @@ export default { this.showModels = api.m_model.keys().toArray() console.log('--change--') }, + resetScene() { + if (this.$refs.personRoaming) { + this.$refs.personRoaming.isRoaming = false + } + api.Camera.stopImmersiveRoam() + api.Model.location(api.m_model.keys().toArray()[0]) + api.Plugin.deleteMiniMap() + }, doMenu(n) { if (n == this.activeMenu) { + if (n == 0) { + this.resetScene() + } return } this.activeMenu = n if (n == 0) { - api.Model.location(api.m_model.keys().toArray()[0]) + this.resetScene() } if (n == 1) { - this.NotificationPopup({ - title: '第一人称漫游', - //id: 'PersonRoaming', - //description: h('p', null, [h('span', null, 'Message can be '), h('i', { style: 'color: teal' }, 'VNode')]), - //description: h('p', null, [h(PersonRoaming)]), - }) + this.param.title = '第一人称漫游' } }, NotificationPopup(parameter) { diff --git a/yanzhu-ui-vue3/src/views/index.vue b/yanzhu-ui-vue3/src/views/index.vue index ec9e25bf..b11b061e 100644 --- a/yanzhu-ui-vue3/src/views/index.vue +++ b/yanzhu-ui-vue3/src/views/index.vue @@ -11,7 +11,7 @@ function goTarget(url) { window.open(url, '__blank') } request.get('/manage/api/menu/list').then((d) => { - debugger + console.log('服务就绪') }) From 7a90768240f24ab5700657a996ae798eb16c9cf8 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 31 May 2025 13:29:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=BC=AB=E6=B8=B8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yanzhu/manage/hasor/HasorModule.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/hasor/HasorModule.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/hasor/HasorModule.java index 48b35011..1459ff91 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/hasor/HasorModule.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/hasor/HasorModule.java @@ -1,5 +1,7 @@ package com.yanzhu.manage.hasor; +import com.yanzhu.common.security.utils.SecurityUtils; +import com.yanzhu.system.api.domain.SysUser; import net.hasor.core.ApiBinder; import net.hasor.core.DimModule; import net.hasor.dataql.DataQL; @@ -33,13 +35,16 @@ public class HasorModule implements SpringModule { public void loadModule(ApiBinder apiBinder) throws Throwable { // .DataSource form Spring boot into Hasor apiBinder.installModule(new JdbcModule(Level.Full, this.dataSource)); - InterfaceApiFilter f; apiBinder.bindSpiListener(PreExecuteChainSpi.class, (apiInfo, future) -> { try{ - Method method = apiInfo.getClass().getMethod("getObj"); - Map obj=(Map)method.invoke(apiInfo); - Object a=obj; + + SysUser user = SecurityUtils.getLoginUser().getSysUser(); + if(user!=null) { + apiInfo.getParameterMap().put("currentUser", user.getUserName() + " " + user.getPhonenumber()); + }else{ + apiInfo.getParameterMap().put("currentUser", "system"); + } }catch (Exception ex){ } @@ -55,7 +60,7 @@ public class HasorModule implements SpringModule { apiBinder.bindSpiListener(CompilerSpiListener.class, new CompilerSpiListener() { @Override public QIL compiler(ApiInfo apiInfo, String query, DataQL dataQL) throws IOException { - query = "hint FRAGMENT_SQL_COLUMN_CASE=\"hump\"\n hint FRAGMENT_SQL_QUERY_BY_PAGE_NUMBER_OFFSET = 1 \n" + query; + query = "hint FRAGMENT_SQL_COLUMN_CASE=\"hump\"\n hint FRAGMENT_SQL_QUERY_BY_PAGE_NUMBER_OFFSET = 1 \n hint FRAGMENT_SQL_OPEN_PACKAGE = 'off' \n" + query; return CompilerSpiListener.super.compiler(apiInfo, query, dataQL); } }); From a706dadaf8dcc66663fced6b38c0a3d22d4a14d5 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 31 May 2025 13:30:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bim/bimSetting/PersonRoaming_副本.vue | 417 ------------------ 1 file changed, 417 deletions(-) delete mode 100644 yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming_副本.vue diff --git a/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming_副本.vue b/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming_副本.vue deleted file mode 100644 index a894a729..00000000 --- a/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming_副本.vue +++ /dev/null @@ -1,417 +0,0 @@ - - - - \ No newline at end of file