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 0000000..c5879a6 Binary files /dev/null and b/src/assets/images/site/sdgl_bjtq.png differ 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 @@