From d14f4a823402a91f8d15cd536708d1540c1c369b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A5=E5=B1=A5=E4=B8=8D=E5=81=9C?= <1873501479@qq.com> Date: Fri, 8 Jul 2022 13:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/index.css | 39 ++--- src/router/index.js | 2 +- src/utils/config.js | 3 +- src/views/Login.vue | 2 +- src/views/NewMainPage.vue | 93 +++++++---- .../NewMainPageComponents/LeftCenter.vue | 148 ++++++++++++++---- src/views/NewMainPageComponents/LeftTop.vue | 30 ++-- src/views/NewMainPageComponents/LowerLeft.vue | 8 +- .../NewMainPageComponents/RightBottom.vue | 110 +++++++++---- .../NewMainPageComponents/RightMiddle.vue | 54 ++++--- src/views/NewMainPageComponents/RightTop.vue | 28 +++- 11 files changed, 357 insertions(+), 160 deletions(-) diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 308a9ac..a699426 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -710,22 +710,23 @@ body { z-index: 1; background: rgba(15, 31, 33, 0.8); } -/*表格透明*/ - .table-wrapper .el-table .el-table__cell { - padding: 2px!important; - } - .table-wrapper .el-table .cell { - white-space: nowrap!important; - overflow: hidden; - text-overflow: ellipsis; - padding: 0 5px!important; -} - .table-wrapper .el-table tr:hover { - background-color: #20a0ff; - } - .table-wrapper .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf { - border-bottom: 0 solid!important; - } - .table-wrapper .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { - background-color: rgba(30, 144, 255, 0.26) !important; - } +.table-wrapper .el-table .el-table__cell { + padding: 2px!important; +} +.table-wrapper .el-table .cell { + white-space: nowrap!important; + overflow: hidden; + text-overflow: ellipsis; + padding: 0 5px!important; +} +.table-wrapper .el-table tr:hover { + background-color: #20a0ff; +} +.table-wrapper .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf { + border-bottom: 0px solid!important; +} +.table-wrapper .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { + background-color: rgba(30, 144, 255, 0.26) !important; +} + + diff --git a/src/router/index.js b/src/router/index.js index f2ce336..8f96980 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -19,7 +19,7 @@ const routes = [ component: () => import('../views/Login') }, { - path: '/home', + path: '/home', // 后台 component: () => import('../views/Home'), meta: { requireAuth: true // 该路由项需要权限校验 diff --git a/src/utils/config.js b/src/utils/config.js index ec572f2..dd929b5 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,3 +1,4 @@ module.exports = { - baseUrl: 'localhost:2011' + // baseUrl: 'localhost:2011', + baseUrl: '49.234.81.196:2011' } diff --git a/src/views/Login.vue b/src/views/Login.vue index 8e7e73a..6abb328 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -68,7 +68,7 @@ export default { window.localStorage.setItem('userName', JSON.stringify(res.data.userName)) window.localStorage.setItem('staffNumber', JSON.stringify(this.loginForm.staffNumber)) } - await this.$router.replace('/mainPage') + await this.$router.replace('/NewMainPage') }, 2000) } else { this.$message.error('请正确输入用户名或密码') diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue index 1e266ef..39a13d9 100644 --- a/src/views/NewMainPage.vue +++ b/src/views/NewMainPage.vue @@ -3,33 +3,48 @@
-
-
+
+
安检门 -
-
+
+
+
x射线机 -
-
+
+
+
炸探/液探 -
-
- 设备管理 -
-
- 系统设置 -
-
- 后台 -
+
+ + +
+ +
+ 后台 +
+ + +
+ +
+ 系统设置 +
+ + +
+ +
+ 设备管理 +
+ - +
-
+
-
+
@@ -37,6 +52,9 @@
+
+ 系统总体拓扑结构 +
1
@@ -89,7 +107,7 @@ export default { } #new-mainpage-header { width: 100%; - height: 90px!important; + height: 80px!important; background-image: url("../assets/images/header-bg.png"); background-repeat: no-repeat; background-size:100% 100% ; @@ -106,12 +124,21 @@ export default { background-repeat: no-repeat; background-size:100% 100% ; } + .btn:hover { + color: #ffde00; + } + .btn-one-left { + float: left; + } + .btn-one-right { + float: right; + } } .el-main { font-size: 0px; vertical-align: top; width: 100%; - height: cale(100%-90px); + height: cale(100%-80px); background-image: url("../assets/images/main-bg.png"); background-repeat: no-repeat; background-size: 100% 100%; @@ -130,15 +157,15 @@ export default { background-size: 100% 100%; .left-top { height: 33%; - border: 1px solid #000000; + //border: 1px solid #000000; } .left-center { height: 31%; - border: 1px solid #000000; + //border: 1px solid #000000; } .left-bottom { height: 35%; - border: 1px solid #000000; + //border: 1px solid #000000; } } @@ -148,8 +175,8 @@ export default { height: 98%; .center-top { margin: 0 50px; - height: 50%; - border: 1px solid #000000; + height: 40%; + //border: 1px solid #000000; background-image: url("../assets/images/center-box-bg.png"); background-repeat: no-repeat; background-size: 100% 100%; @@ -157,32 +184,32 @@ export default { .center-center, .center-bottom { height: 25%; - border: 1px solid #000000; + //border: 1px solid #000000; } } .right-box { vertical-align: top; - width: 26%; + width: 27%; height: 98%; background-image: url("../assets/images/right-box-bg.png"); background-repeat: no-repeat; background-size: 100% 100%; .right-top{ - height: 33%; - border: 1px solid #000000; + height: 34%; + //border: 1px solid #000000; } .right-center { position: relative; - height: 37%; - border: 1px solid #000000; + height: 36%; + //border: 1px solid #000000; } .right-bottom { height: 30%; - border: 1px solid #000000; + //border: 1px solid #000000; } } } diff --git a/src/views/NewMainPageComponents/LeftCenter.vue b/src/views/NewMainPageComponents/LeftCenter.vue index 21dc881..3681368 100644 --- a/src/views/NewMainPageComponents/LeftCenter.vue +++ b/src/views/NewMainPageComponents/LeftCenter.vue @@ -1,20 +1,24 @@