From 64b3052348c3b54e5fab8aaa1a745ab2772f56b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Thu, 28 Dec 2023 16:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 59 +++-- src/router/index.js | 6 +- src/store/modelSceneStore.js | 15 +- src/views/device-manage/index.vue | 24 +- src/views/edit/edit.vue | 367 +++++++++++++++++------------- src/views/site/index.vue | 57 ++++- src/views/tunnel-manage/index.vue | 140 +++++++++--- src/views/tunnel/index.vue | 90 ++++---- 8 files changed, 479 insertions(+), 279 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index aaeb918..a1f808e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -86,6 +86,23 @@ body, } } + .top-length { + z-index: 2; + position: absolute; + top: 190px; + width: 100%; + display: flex; + justify-content: center; + font-size: 50px; + //font-weight: bold; + color: #0BE9FA; + + > span:last-child { + margin-left: 40px; + } + + } + .top-right { z-index: 2; position: absolute; @@ -487,43 +504,53 @@ body, background: #072247 !important; border: 1px solid #0F82AF !important; } + .el-popper { max-width: 200px !important; box-sizing: border-box; } + .el-popper__arrow::before { display: none; } -.el-select-dropdown{ - width: 200px!important; + +.el-select-dropdown { + width: 200px !important; } -.el-select-dropdown__item{ - >span{ + +.el-select-dropdown__item { + > span { color: #FFFFFF; } } + .el-select .el-input .el-select__caret { - font-size: 35px!important; + font-size: 35px !important; } -.el-select-dropdown__item.hover,.el-select-dropdown__item:hover{ - background-color: #064B66!important; - width:198px!important; + +.el-select-dropdown__item.hover, .el-select-dropdown__item:hover { + background-color: #064B66 !important; + width: 198px !important; } -.el-select-dropdown.is-multiple .el-select-dropdown__item.selected{ - background-color: #064B66!important; - width:200px!important; + +.el-select-dropdown.is-multiple .el-select-dropdown__item.selected { + background-color: #064B66 !important; + width: 200px !important; } -.el-select-tags-wrapper{ - .el-tag{ - padding: 28px 20px!important; + +.el-select-tags-wrapper { + .el-tag { + padding: 28px 20px !important; font-size: 35px; - .el-icon{ + + .el-icon { width: 40px; height: 40px; - font-size: 40px!important; + font-size: 40px !important; } } } + .current-site { .el-select-dropdown { width: 200px !important; diff --git a/src/router/index.js b/src/router/index.js index 77e02de..a66b61a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,7 +24,7 @@ const routes = [ }, }, { - path: '/edit/:tunnelId(\\d+)', + path: '/edit/:tunnelId(\\d+)/:type', name: 'tunneledit', component: () => import('@/views/edit/edit.vue'), meta: { @@ -60,7 +60,7 @@ const routes = [ } }, { - path: '/tunnel/:siteId(\\d+)', + path: '/tunnel/:siteId(\\d+)/:type', name: 'tunnel', component: () => import('@/views/tunnel-manage/index.vue'), meta: { @@ -69,7 +69,7 @@ const routes = [ } }, { - path: '/device/:tunnelId(\\d+)', + path: '/device/:tunnelId(\\d+)/:type', name: 'device', component: () => import('@/views/device-manage/index.vue'), meta: { diff --git a/src/store/modelSceneStore.js b/src/store/modelSceneStore.js index 3767c9b..9b101ef 100644 --- a/src/store/modelSceneStore.js +++ b/src/store/modelSceneStore.js @@ -44,24 +44,11 @@ export const useModelSceneStore = defineStore("modelSceneData", () => { }); }); } - function getTunnelEditAllList(tunnelId = 1) { - return new Promise((resolve, reject) => { - initSceneData(tunnelId) - .then((res) => { - allEditList.value = res.data; - resolve(JSON.parse(allEditList.value)); - }) - .catch((Error) => { - reject(); - }); - }); - } return { equipmentList, initData, saveSceneData, deleteEquipment, - getEquipmentList, - getTunnelEditAllList, + getEquipmentList }; }); diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue index 2ff313d..7ff26c7 100644 --- a/src/views/device-manage/index.vue +++ b/src/views/device-manage/index.vue @@ -1,12 +1,12 @@