From b244ea805e83c392474271311c3809f4ac2db971 Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Mon, 4 Sep 2023 14:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=83=E5=8F=82=E6=95=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- public/static/bim.html | 2 +- src/App.vue | 19 +- src/api/modules/login.ts | 5 + src/assets/images/dustNoise/jumpIcon.png | Bin 0 -> 613 bytes src/routers/index.ts | 4 +- src/routers/modules/staticRouter.ts | 16 +- src/views/login/index.vue | 6 +- .../distributionMonitoring/bottomRight.vue | 26 +- .../distributionMonitoring/topCenter.vue | 14 +- .../distributionMonitoring/topLeft.vue | 781 +++++++++--------- .../distributionMonitoring/topRight.vue | 34 +- src/views/sevenLargeScreen/indexL.vue | 77 +- .../towerCraneMonitoring/leftCenter.vue | 1 - .../towerCraneMonitoring/right.vue | 121 +-- 15 files changed, 621 insertions(+), 489 deletions(-) create mode 100644 src/assets/images/dustNoise/jumpIcon.png diff --git a/.env.development b/.env.development index 71917fc..e900b3e 100644 --- a/.env.development +++ b/.env.development @@ -3,9 +3,9 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # VITE_API_URL = 'http://121.196.214.246/api' -# VITE_API_URL = 'http://182.90.224.147:100' +VITE_API_URL = 'http://182.90.224.147:100' # VITE_API_URL = 'http://192.168.34.221:12360' -VITE_API_URL = 'http://192.168.34.221:30002' +# VITE_API_URL = 'http://192.168.34.221:30002' # 上传 diff --git a/public/static/bim.html b/public/static/bim.html index 1b1af46..894159e 100644 --- a/public/static/bim.html +++ b/public/static/bim.html @@ -18,7 +18,7 @@ // console.log('取到的token',token); let viewer3D; let app; - let viewToken = "f8b70c0a02244f89be38229da2302f09"; + let viewToken = "29a730ca254548e18d441293f13d5720"; console.log('viewToken',viewToken); let loaderConfig = new BimfaceSDKLoaderConfig(); loaderConfig.viewToken = viewToken; diff --git a/src/App.vue b/src/App.vue index ea05709..668870d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,7 @@ diff --git a/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue b/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue index 5583190..1296111 100644 --- a/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue +++ b/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue @@ -22,16 +22,19 @@
报警时间
报警类型
- -
-
-
{{ item.devName }}
-
{{ item.creatTime }}
-
{{ item.alarmType }}
+ +
+
+
{{ item.devName }}
+
{{ item.creatTime }}
+
{{ item.alarmType }}
+
+
+ +

暂无数据

+
- -
- +
@@ -176,6 +179,19 @@ onMounted(async () => { background: #091f3f; } } + .notoDta { + margin-left: 10%; + margin-top: 8%; + img { + width: 16%; + margin: 6% 36%; + } + p { + color: #fff; + font-size: calc(100vw * 14 / 1920); + margin: -5% 38%; + } + } } } } diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 456e508..3d84ce0 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -39,6 +39,10 @@
{{ adminName }}
+
+
+
项目后台
+
退出登录
@@ -48,11 +52,11 @@
@@ -73,33 +77,57 @@ const store = GlobalStore(); let nowTime = ref("2023-04-16 09:22:12" as any); let showUserBox = ref(false as any); let adminName = ref("" as any); -let menuData = reactive({ - menuList: [ - { moduleName: "扬尘噪声", modulePath: "/headNoise" }, - { moduleName: "劳务管理", modulePath: "/laborManagement" }, - { moduleName: "视频管理", modulePath: "/videoManagement" }, - { moduleName: "配电箱监测", modulePath: "/distributionMonitoring" }, - { moduleName: "车辆管理", modulePath: "/vehicleManagement" }, - { moduleName: "塔吊监测", modulePath: "/towerCraneMonitoring" }, - { moduleName: "升降机监测", modulePath: "/elevatorMonitoring" }, - { moduleName: "BIM模型", modulePath: "/bImModel" } - ], - activeIndex: 0 -}); +let menuList = ref([ + { moduleName: "扬尘噪声", modulePath: "/headNoise" }, + { moduleName: "劳务管理", modulePath: "/laborManagement" }, + { moduleName: "视频管理", modulePath: "/videoManagement" }, + { moduleName: "配电箱监测", modulePath: "/distributionMonitoring" }, + { moduleName: "车辆管理", modulePath: "/vehicleManagement" }, + { moduleName: "塔吊监测", modulePath: "/towerCraneMonitoring" }, + { moduleName: "升降机监测", modulePath: "/elevatorMonitoring" }, + { moduleName: "BIM模型", modulePath: "/bImModel" } +]); +const activeIndex=ref(0) const router = useRouter(); const menuClick = (item, index) => { - menuData.activeIndex = index; + activeIndex.value = index; console.log("点击了tab", item); if (item.modulePath.includes("/")) { router.push(item.modulePath); } }; -onMounted(() => { +const moduleListData = ref([] as any);//动态路由 +onMounted(async () => { + //数据看板跳转免登录 + if (window.location.href.indexOf("token") != -1) { + const token = window.location.href.split("token=")[1]; + const res = await fetch(import.meta.env.VITE_API_URL + "/xmgl/base/getLoginInfoByToken", { + method: "POST", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify({ token: token }) + }); + const data = await res.json(); + console.log("调用免登录接口返回的数据", data); + // let arr = data.result.menuAuthority.moduleList; + // arr.forEach((item: any) => { + // if (item.moduleType == 4) { + // moduleListData.value.push(item); + // return; + // } + // }); + // console.log("当前项目的看板数据：：", moduleListData.value); + store.setSN(data.result.sn); + store.setToken(data.result.token); + store.setAccount(data.result.account); + store.setAccountType(data.result.accountType); + } // console.log("进入页面， "); adminName.value = store.account; // console.log("store数据", store.account); - menuClick(menuData.menuList[0], menuData.activeIndex); + menuClick(menuList.value[0], activeIndex.value); getNowTime(); document.addEventListener("click", bodyCloseMenus); }); @@ -139,6 +167,10 @@ function loginOut() { location.reload(); router.push("/login"); } +//跳转后台 +function jumpBgd() { + window.location.replace("http://192.168.34.226:8081/#/projectIndex"); +}