diff --git a/src/api/index.js b/src/api/index.js index 8cf3096..bb12498 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -69,12 +69,12 @@ export function login(data) { }) } // 污染治理效果折线图 - export function getIndexSummry(stationCode) { + export function getIndexSummry(data) { return requests({ - url: '/zh-applet-admin/appmana/bigScreen/getIndexSummry?stationCode='+stationCode, + url: '/zh-applet-admin/appmana/bigScreen/getIndexSummry', method: 'post', - headers: {}, - stationCode + headers: { 'content-type': 'application/json; charset=UTF-8' }, + data: data? data : {} }) } diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 53425f9..9e0ede0 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -556,6 +556,49 @@ margin-left: 3%; font-family: douyuFont; } +.dataTypeEchart{ + width: 53px; + height: 31px; + color: #fff; + margin-top: 15px; + line-height: 32px; + background: rgb(14 44 63); + border-radius: 0.4vw; + border: 1px solid #4b677c; + cursor: pointer; + float: left; + margin-left: 15px; + padding: 0px; + text-align: center; + z-index: 500; + position: absolute; +} +.dataTypeEchart2{ + width: 66px; + height: 32px; + color: #fff; + margin-top: 15px; + line-height: 32px; + background: rgb(14 44 63); + border-radius: 0.4vw; + border: 1px solid #4b677c; + cursor: pointer; + float: left; + margin-left: 15px; + padding: 0px; + text-align: center; + z-index: 500; + position: absolute; + left: 13px; + top: 30px; + .el-input__inner{ + height:30px; + background: #0e2e4f; + } + .el-input__icon{ + height:36px; + } +} .zywr_titrt{ width: 25%; height: 3vw; @@ -608,48 +651,17 @@ } #chart1{height:12vw;} .scdlist{ - width: 9vw; + width: 7vw; height: 2vw; + margin-top: 0.4vw; line-height: 2vw; background: rgba(0,0,0,0.8); border-radius: 0.4vw; border: 1px solid #4b677c; - position: absolute; + /*position: absolute;*/ bottom: 16vw; left: 24%; -} -.scdlist2{ - width: 9vw; - height: 2vw; - line-height: 2vw; - background: rgba(0,0,0,0.8); - border-radius: 0.4vw; - border: 1px solid #4b677c; - position: absolute; - bottom: 19vw; - left: 24%; -} -.scdlist3{ - width: 9vw; - height: 2vw; - line-height: 2vw; - background: rgba(0,0,0,0.8); - border-radius: 0.4vw; - border: 1px solid #4b677c; - position: absolute; - bottom: 22vw; - left: 24%; -} -.scdlist4{ - width: 9vw; - height: 2vw; - line-height: 2vw; - background: rgba(0,0,0,0.8); - border-radius: 0.4vw; - border: 1px solid #4b677c; - position: absolute; - bottom: 25vw; - left: 24%; + cursor: pointer; } .scdlistpos{ width: 9vw; @@ -697,13 +709,7 @@ } .xcdimg{ width: 0.9vw; - /* margin-top: 0.4vw; */ - margin-left: 0.4vw; - margin-right: 0.4vw; -} -.xcd2img{ - width: 0.7vw; - /* margin-top: 0.1vw; */ + margin-top: 0.4vw; margin-left: 0.4vw; margin-right: 0.4vw; } diff --git a/src/assets/image/icon-blue.png b/src/assets/image/icon-blue.png new file mode 100644 index 0000000..5f834ae Binary files /dev/null and b/src/assets/image/icon-blue.png differ diff --git a/src/assets/image/icon-yellow.png b/src/assets/image/icon-yellow.png new file mode 100644 index 0000000..83df458 Binary files /dev/null and b/src/assets/image/icon-yellow.png differ diff --git a/src/assets/image/xcd2.png b/src/assets/image/xcd2.png index 1538dcc..f4281ce 100644 Binary files a/src/assets/image/xcd2.png and b/src/assets/image/xcd2.png differ diff --git a/src/assets/image/xcd22.png b/src/assets/image/xcd22.png new file mode 100644 index 0000000..1538dcc Binary files /dev/null and b/src/assets/image/xcd22.png differ diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue index c7b3855..be6c3e5 100644 --- a/src/pages/Home/index.vue +++ b/src/pages/Home/index.vue @@ -5,7 +5,7 @@ bgc="transparent" :delay="100" :isFlat="true" - @scaleChange ="scaleChange" + @scaleChange ="scaleChange" >
{{ nowTime }} -
@@ -42,38 +41,17 @@ -
- - - - - - - - - - - - - - - - - - - - - - - -
-
- + + + + +
+ -