From 41bfdd51940eeb864a3bc065338d2b267aeb0eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Sat, 16 Dec 2023 01:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/site.js | 7 +- src/assets/images/site/sdgl_bjtq.png | Bin 0 -> 12609 bytes src/assets/styles/index.scss | 43 ++++++++++- src/router/index.js | 2 +- src/views/site/index.vue | 108 +++++++++++++++++++-------- src/views/tunnel-manage/index.vue | 1 + 6 files changed, 124 insertions(+), 37 deletions(-) create mode 100644 src/assets/images/site/sdgl_bjtq.png diff --git a/src/api/site.js b/src/api/site.js index 10db576..4c5844e 100644 --- a/src/api/site.js +++ b/src/api/site.js @@ -1,9 +1,10 @@ import request from '@/utils/request.js' -export const getSiteList = () => { +export const getSiteList = (params) => { return request({ - url: '/tunnel/site', - method: 'get' + url: '/tunnel/site/screenlist', + method: 'get', + params }) } export const getSiteDetail = (siteId) => { diff --git a/src/assets/images/site/sdgl_bjtq.png b/src/assets/images/site/sdgl_bjtq.png new file mode 100644 index 0000000000000000000000000000000000000000..c5879a62b7993dc97b6f0f6cb633bd3ef640b13b GIT binary patch literal 12609 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 literal 0 HcmV?d00001 diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 79d08ee..d574bf0 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -377,4 +377,45 @@ html, body, #app, .el-container, .el-aside, .el-main { } } } -} \ No newline at end of file +} +.el-overlay-message-box{ + .el-message-box{ + width: 500px; + height: 230px; + background: rgba(7,35,72,0.79); + border-radius: 20px; + border: 2px solid #0F82AF; + .el-message-box__title{ + display: none; + } + .el-message-box__content{ + .el-icon{ + display: none; + } + .el-message-box__message{ + //width: 315px; + height: 80px; + font-size: 32px; + font-weight: bold; + color: #08B7B8; + letter-spacing: 3px; + } + } + .el-message-box__btns{ + display: flex; + justify-content: space-around; + .el-button{ + width: 130px; + height: 50px; + border: 2px solid #0F82AF; + font-size: 28px; + background-color: #072348; + color: #08B7B8; + } + .el-button--primary{ + background: #08B7B8; + color: #FFFFFF; + } + } + } +} diff --git a/src/router/index.js b/src/router/index.js index adc128a..2ddaef2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,7 +42,7 @@ const routes = [ } }, { - path: '/tunnel', + path: '/tunnel/:siteId(\\d+)', name: 'tunnel', component: () => import('@/views/tunnel-manage/index.vue'), meta: { diff --git a/src/views/site/index.vue b/src/views/site/index.vue index 5e2fa10..b134c0f 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -7,6 +7,9 @@
+
+ 添加 +
全选
@@ -16,7 +19,7 @@
-
+
站点名称：{{ item.siteName }} @@ -24,19 +27,21 @@
-
隧道数量：{{ item.num }}条
+
隧道数量：{{ item.info.tunnelNum }}条 +
-
-
{{ item.sortTunnel }}
+
+
{{ item.info.tunnelName }}
-
施工长度{{ item.constructionLength }}米
-
实现长度{{ item.implementationLength }}公里
+
施工长度{{ item.info.constructionLength }}米
+
实现长度{{ item.info.implementationLength }}公里 +
-
+
-
+
更多
@@ -47,7 +52,7 @@
站点编辑
-
+
添加站点
@@ -82,7 +87,9 @@
@@ -91,14 +98,28 @@ @@ -376,9 +418,9 @@ const handleMoreDelete = () => { .box-content { display: flex; flex-wrap: wrap; - padding-left: 100px; - padding-right: 100px; - justify-content: space-between; + padding-left: 70px; + padding-right: 70px; + //justify-content: space-between; .add-box { cursor: pointer; @@ -400,7 +442,7 @@ const handleMoreDelete = () => { .site-box { margin-top: 122px; - //margin-right: 122px; + margin-right: 60px; padding: 40px 50px; width: 1250px; height: 750px; @@ -408,7 +450,7 @@ const handleMoreDelete = () => { //box-sizing: border-box; position: relative; - &:nth-child(3) { + &:nth-child(3n) { margin-right: 0; } @@ -456,6 +498,7 @@ const handleMoreDelete = () => { margin-top: 29px; .tunnel { + margin-right: 20px; width: 280px; height: 350px; background: #3FBED1; @@ -488,7 +531,6 @@ const handleMoreDelete = () => { } .tunnel-add { - margin-left: 20px; width: 280px; height: 350px; background: #1891A3; @@ -559,10 +601,12 @@ const handleMoreDelete = () => { font-weight: bold; > span:first-child { + cursor: pointer; margin-right: 60px; } > span:last-child { + cursor: pointer; margin-left: 71px; } diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue index 7c25ead..11994d2 100644 --- a/src/views/tunnel-manage/index.vue +++ b/src/views/tunnel-manage/index.vue @@ -83,6 +83,7 @@