From d769d353be4581bad6ec99024526b19025e906ef Mon Sep 17 00:00:00 2001
From: Hcat1314 <2768237203@qq.com>
Date: Sun, 17 Dec 2023 21:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=B7=AF=E7=94=B1=EF=BC=8C?=
=?UTF-8?q?=E7=AE=80=E5=8D=95=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F=E5=AE=9E?=
=?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../content/tunnelScene/sceneClass/demo.js | 5 +-
src/router/index.js | 47 +++--
src/views/tunnel/preview.vue | 169 ++++++++++++++++++
3 files changed, 200 insertions(+), 21 deletions(-)
create mode 100644 src/views/tunnel/preview.vue
diff --git a/src/components/content/tunnelScene/sceneClass/demo.js b/src/components/content/tunnelScene/sceneClass/demo.js
index 36c8421..b66276b 100644
--- a/src/components/content/tunnelScene/sceneClass/demo.js
+++ b/src/components/content/tunnelScene/sceneClass/demo.js
@@ -370,8 +370,8 @@ export default class Demo {
// 初始化风机颜色
this.equMap.get("equ_fan").traverse((v) => {
- // v.material = new this.THREE.MeshBasicMaterial();
- // v.material.color = new this.THREE.Color("#191a05");
+ v.material = new this.THREE.MeshBasicMaterial();
+ v.material.color = new this.THREE.Color(0xC0C0C0);
if (/^leaf/.test(v.name) || /^roller/.test(v.name)) {
group.add(v.clone());
v.visible = false;
@@ -513,6 +513,7 @@ export default class Demo {
for (const item of this.tunnelConfigEquipment) {
//使用api取拿到附着点
let pointmodel = this.scene.getObjectByName(item.pointName)
+ // pointmodel.hasDevice = true;
let formInfo = {
equipmentType: item.equipmentType, //设备类型
chooseEquipment: item.equipmentName, //设备选择(设备名称)
diff --git a/src/router/index.js b/src/router/index.js
index c752b69..eaa1354 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,7 +8,7 @@ const routes = [
{
path: '/login',
name: 'login',
- component: ()=>import('@/views/login/index.vue'),
+ component: () => import('@/views/login/index.vue'),
meta: {
hidden: true,
title: '登录'
@@ -23,6 +23,15 @@ const routes = [
breadcrumb: true
}
},
+ {
+ path: '/preview',
+ name: 'tunnelpreview',
+ component: () => import('@/views/tunnel/preview.vue'),
+ meta: {
+ title: '预览首页',
+ breadcrumb: true
+ }
+ },
{
path: '/debug',
name: 'debug',
@@ -65,26 +74,26 @@ const router = createRouter({
history: createWebHashHistory(),
routes,
});
-router.beforeEach( (to,form,next)=>{
- NProgress.start()
- if(!getToken()) {
- if (to.path === '/login') {
- next()
- NProgress.done()
- } else {
- next({path: '/login'})
- }
- }else {
- console.log('有token')
- if(to.path === '/login') {
- next('/')
- NProgress.done()
- }else {
- next()
- }
+router.beforeEach((to, form, next) => {
+ NProgress.start()
+ if (!getToken()) {
+ if (to.path === '/login') {
+ next()
+ NProgress.done()
+ } else {
+ next({ path: '/login' })
}
+ } else {
+ console.log('有token')
+ if (to.path === '/login') {
+ next('/')
+ NProgress.done()
+ } else {
+ next()
+ }
+ }
})
-router.afterEach(()=>{
+router.afterEach(() => {
NProgress.done()
})
diff --git a/src/views/tunnel/preview.vue b/src/views/tunnel/preview.vue
new file mode 100644
index 0000000..383a19c
--- /dev/null
+++ b/src/views/tunnel/preview.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+ 当前站点:
{{ currentSite }}
+
+
+
+ 上午好:
{{ currentUser }}
+
今天是:{{ currentDate }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file