From c143cc6075e2fdc96d37dd33dc3d8ae26c45639d Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 2 Jul 2024 11:38:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8C=87?= =?UTF-8?q?=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=E7=9B=AE=E5=BD=95=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routers/modules/staticRouter.ts | 7 +- .../commandScreen/commandCenter/centerTop.vue | 2 +- .../commandScreen/commandCenter/index.vue | 119 +++++++++--------- 3 files changed, 66 insertions(+), 62 deletions(-) diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 9fd9b66..f6ec076 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -26,9 +26,9 @@ export const staticRouter: RouteRecordRaw[] = [ name: "大屏", // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 - // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 + component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 - component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 + // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { @@ -310,7 +310,8 @@ export const staticRouter: RouteRecordRaw[] = [ } ], meta: { - title: "智慧工厂安全生产监管平台" + // title: "数字化项目监管平台" + title: "智慧工厂安全生产监管平台" //指挥部大屏 } } diff --git a/src/views/commandScreen/commandCenter/centerTop.vue b/src/views/commandScreen/commandCenter/centerTop.vue index 08bbe76..d9610d1 100644 --- a/src/views/commandScreen/commandCenter/centerTop.vue +++ b/src/views/commandScreen/commandCenter/centerTop.vue @@ -80,7 +80,7 @@
-
+
危大工程  {{ statsDirectorateBigScreen.dangerousEngineeringRecordNum }}
diff --git a/src/views/commandScreen/commandCenter/index.vue b/src/views/commandScreen/commandCenter/index.vue index a43b2e7..e852a12 100644 --- a/src/views/commandScreen/commandCenter/index.vue +++ b/src/views/commandScreen/commandCenter/index.vue @@ -12,25 +12,27 @@
-
-
-
-
-
- -
- {{ item.name }} +
+
+
+
+
+
-
- - 收回 +
+
+
+
+ +
+ {{ item.name }} +
+
- - - 目录展开 +
@@ -117,7 +119,8 @@ function goBackend(item: any){ if(item.url != ''){ // window.location.replace('http://localhost:8080/#/login?command=1&pathItem='+ item.url +'&token=' + store.token); console.log(BASEURL) - window.open(BASEURL + '/#/login?command=1&pathItem='+ item.url +'&token=' + store.token, '_blank'); + // window.open(BASEURL + '/#/login?command=1&pathItem='+ item.url +'&token=' + store.token, '_blank'); + window.open('http://10.0.1.77:8080' + '/#/login?command=1&pathItem='+ item.url +'&token=' + store.token, '_blank'); } } const show = ref(false as any) @@ -253,54 +256,53 @@ onMounted(() => { position: fixed; top: 1px; left: 0px; - width: 15%; - height: calc(100% - 1px); - background: #0a1334; + width: 15.3%; + height: 100%; // padding-top: 10px; - transition: left 0.5s; /* 添加过渡效果 */ - .listItem{ - color: #fff; + // transition: left 0.5s; /* 添加过渡效果 */ + .topBox{ + height: 3.7%; width: 100%; - height: 50px; - // background-color: darkred; + background-color: rgba($color: #000000, $alpha: 0); display: flex; - justify-content: flex-start; + justify-content: space-between; align-items: center; - cursor: pointer; - .itemIcon{ - margin-left: 10px; - width: 60px; - height: 45px; - // background-color: darkblue; - display: flex; - justify-content: center; - align-items: center; - } - .itemText{ - margin-left: 10px; - font-size: 16px; + .retract{ + cursor: pointer; } } - .retract{ - cursor: pointer; - color: #fff; - position: absolute; - width: 100%; - height: 50px; - bottom:0; - background-color: #061f51; - display: flex; - justify-content: flex-start; - align-items: center; - font-size: 18px; - margin-bottom: 5px; - // margin-left: 10px; + .bottomBox{ + height: 96.3%; + width: 93%; + background: #0a1334; + .listItem{ + color: #fff; + height: 40px; + // background-color: darkred; + display: flex; + justify-content: flex-start; + align-items: center; + cursor: pointer; + .itemIcon{ + margin-left: 10px; + width: 60px; + height: 35px; + // background-color: darkblue; + display: flex; + justify-content: center; + align-items: center; + } + .itemText{ + margin-left: 10px; + font-size: 16px; + } + } } } - .hidden-dialog{ + .hiddenDialog{ left: -1000px; } - .open-dialog{ + .openDialog{ left: 0; } .expandBtn{ @@ -308,15 +310,16 @@ onMounted(() => { color: #fff; position: fixed; width: auto; - height: 50px; + height: 3.7%; + top:0; left: 0; - bottom:0; - background-color: #061f51; + // background-color: #061f51; + background-color: rgba($color: #000000, $alpha: 0); display: flex; justify-content: flex-start; align-items: center; - font-size: 18px; - margin-bottom: 5px; + font-size: 14px; + // margin-bottom: 5px; // margin-left: 10px; } }