diff --git a/src/assets/img/avatar.jpg b/src/assets/img/avatar.jpg deleted file mode 100644 index 150c17b..0000000 Binary files a/src/assets/img/avatar.jpg and /dev/null differ diff --git a/src/assets/img/bar_chart_bg.png b/src/assets/img/bar_chart_bg.png deleted file mode 100644 index b47614f..0000000 Binary files a/src/assets/img/bar_chart_bg.png and /dev/null differ diff --git a/src/assets/img/close/bo.png b/src/assets/img/close/bo.png deleted file mode 100644 index ebc689f..0000000 Binary files a/src/assets/img/close/bo.png and /dev/null differ diff --git a/src/assets/img/eme/eme_Fireaxe.png b/src/assets/img/eme/eme_Fireaxe.png deleted file mode 100644 index 7e91926..0000000 Binary files a/src/assets/img/eme/eme_Fireaxe.png and /dev/null differ diff --git a/src/assets/img/eme/eme_extinguisher.png b/src/assets/img/eme/eme_extinguisher.png deleted file mode 100644 index 9e91088..0000000 Binary files a/src/assets/img/eme/eme_extinguisher.png and /dev/null differ diff --git a/src/assets/img/eme/eme_medicinebag.png b/src/assets/img/eme/eme_medicinebag.png deleted file mode 100644 index 2336af2..0000000 Binary files a/src/assets/img/eme/eme_medicinebag.png and /dev/null differ diff --git a/src/assets/img/eme/fuzi.png b/src/assets/img/eme/fuzi.png deleted file mode 100644 index 9e04bb0..0000000 Binary files a/src/assets/img/eme/fuzi.png and /dev/null differ diff --git a/src/assets/img/eme/mhq.png b/src/assets/img/eme/mhq.png deleted file mode 100644 index 80358b9..0000000 Binary files a/src/assets/img/eme/mhq.png and /dev/null differ diff --git a/src/assets/img/eme/wz.png b/src/assets/img/eme/wz.png deleted file mode 100644 index bf5a03a..0000000 Binary files a/src/assets/img/eme/wz.png and /dev/null differ diff --git a/src/assets/img/energy/dian.png b/src/assets/img/energy/dian.png deleted file mode 100644 index 1fed5df..0000000 Binary files a/src/assets/img/energy/dian.png and /dev/null differ diff --git a/src/assets/img/energy/energyCardBg.png b/src/assets/img/energy/energyCardBg.png deleted file mode 100644 index 37b0ff6..0000000 Binary files a/src/assets/img/energy/energyCardBg.png and /dev/null differ diff --git a/src/assets/img/energy/energyTitle.png b/src/assets/img/energy/energyTitle.png deleted file mode 100644 index c23cbd8..0000000 Binary files a/src/assets/img/energy/energyTitle.png and /dev/null differ diff --git a/src/assets/img/energy/green-arr.png b/src/assets/img/energy/green-arr.png deleted file mode 100644 index 709dac3..0000000 Binary files a/src/assets/img/energy/green-arr.png and /dev/null differ diff --git a/src/assets/img/energy/mei.png b/src/assets/img/energy/mei.png deleted file mode 100644 index 402b05e..0000000 Binary files a/src/assets/img/energy/mei.png and /dev/null differ diff --git a/src/assets/img/energy/red-arr.png b/src/assets/img/energy/red-arr.png deleted file mode 100644 index 27338f8..0000000 Binary files a/src/assets/img/energy/red-arr.png and /dev/null differ diff --git a/src/assets/img/energy/shui.png b/src/assets/img/energy/shui.png deleted file mode 100644 index f0a40bc..0000000 Binary files a/src/assets/img/energy/shui.png and /dev/null differ diff --git a/src/assets/img/energy/zq.png b/src/assets/img/energy/zq.png deleted file mode 100644 index eaa99ab..0000000 Binary files a/src/assets/img/energy/zq.png and /dev/null differ diff --git a/src/assets/img/env/BenzeneExceedance.png b/src/assets/img/env/BenzeneExceedance.png deleted file mode 100644 index 7082b14..0000000 Binary files a/src/assets/img/env/BenzeneExceedance.png and /dev/null differ diff --git a/src/assets/img/env/EthanolExceedance.png b/src/assets/img/env/EthanolExceedance.png deleted file mode 100644 index ba7fe4a..0000000 Binary files a/src/assets/img/env/EthanolExceedance.png and /dev/null differ diff --git a/src/assets/img/env/HCLExceedance.png b/src/assets/img/env/HCLExceedance.png deleted file mode 100644 index 1a7f1d9..0000000 Binary files a/src/assets/img/env/HCLExceedance.png and /dev/null differ diff --git a/src/assets/img/env/NOExceedance.png b/src/assets/img/env/NOExceedance.png deleted file mode 100644 index a7a7530..0000000 Binary files a/src/assets/img/env/NOExceedance.png and /dev/null differ diff --git a/src/assets/img/env/clean-count.png b/src/assets/img/env/clean-count.png deleted file mode 100644 index ef59223..0000000 Binary files a/src/assets/img/env/clean-count.png and /dev/null differ diff --git a/src/assets/img/env/clean-year.png b/src/assets/img/env/clean-year.png deleted file mode 100644 index 542eb7b..0000000 Binary files a/src/assets/img/env/clean-year.png and /dev/null differ diff --git a/src/assets/img/env/clean.png b/src/assets/img/env/clean.png deleted file mode 100644 index 7ef15a5..0000000 Binary files a/src/assets/img/env/clean.png and /dev/null differ diff --git a/src/assets/img/env/count.png b/src/assets/img/env/count.png deleted file mode 100644 index 5575c7a..0000000 Binary files a/src/assets/img/env/count.png and /dev/null differ diff --git a/src/assets/img/env/cycle-bg.png b/src/assets/img/env/cycle-bg.png deleted file mode 100644 index 2befa6e..0000000 Binary files a/src/assets/img/env/cycle-bg.png and /dev/null differ diff --git a/src/assets/img/env/formaldehydeExcessRate.png b/src/assets/img/env/formaldehydeExcessRate.png deleted file mode 100644 index b1863f8..0000000 Binary files a/src/assets/img/env/formaldehydeExcessRate.png and /dev/null differ diff --git a/src/assets/img/env/gas-year.png b/src/assets/img/env/gas-year.png deleted file mode 100644 index fa14e6e..0000000 Binary files a/src/assets/img/env/gas-year.png and /dev/null differ diff --git a/src/assets/img/env/gas.png b/src/assets/img/env/gas.png deleted file mode 100644 index b95cd17..0000000 Binary files a/src/assets/img/env/gas.png and /dev/null differ diff --git a/src/assets/img/env/methanolExceedance.png b/src/assets/img/env/methanolExceedance.png deleted file mode 100644 index 9248362..0000000 Binary files a/src/assets/img/env/methanolExceedance.png and /dev/null differ diff --git a/src/assets/img/env/waste-year.png b/src/assets/img/env/waste-year.png deleted file mode 100644 index 487a4f3..0000000 Binary files a/src/assets/img/env/waste-year.png and /dev/null differ diff --git a/src/assets/img/env/waste.png b/src/assets/img/env/waste.png deleted file mode 100644 index d0fb1da..0000000 Binary files a/src/assets/img/env/waste.png and /dev/null differ diff --git a/src/assets/img/env/waterImg.png b/src/assets/img/env/waterImg.png deleted file mode 100644 index 15a6df2..0000000 Binary files a/src/assets/img/env/waterImg.png and /dev/null differ diff --git a/src/assets/img/view/game.png b/src/assets/img/view/game.png new file mode 100644 index 0000000..18ac093 Binary files /dev/null and b/src/assets/img/view/game.png differ diff --git a/src/assets/style/pageCommon.component.scss b/src/assets/style/pageCommon.component.scss index 57bad92..a475689 100644 --- a/src/assets/style/pageCommon.component.scss +++ b/src/assets/style/pageCommon.component.scss @@ -174,53 +174,7 @@ padding-top: 30px; } - .right-cycle-box-con { - margin-bottom: 30px; - .right-cycle-box { - background: url("~@/assets/img/env/cycle-bg.png") 50% 50% no-repeat; - width: 65px; - height: 65px; - background-size: cover; - text-align: center; - margin-right: 67px; - margin-bottom: 14px; - - .con-style-top { - height: 50%; - line-height: 2.4; - font-size: 16px; - font-weight: bold; - } - - .con-style-bottom { - height: 50%; - line-height: 2; - color: #BBBBBB; - } - - } - - &:nth-child(3n) { - .right-cycle-box { - margin-right: 0; - } - } - - &:nth-child(n+4) { - margin-bottom: 0; - } - - .word-ellipsis { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - width: 64px; - color: #BBBBBB; - font-size: 12px; - } - - } } .box-content { @@ -351,43 +305,6 @@ } -@mixin imgStyle { - width: 28px; - height: 22px; - background-size: cover; - margin: 5px auto; -} - -.formaldehydeExcessRate { - background: url("~@/assets/img/env/formaldehydeExcessRate.png") 50% 50% no-repeat; - @include imgStyle -} - -.methanolExceedance { - background: url("~@/assets/img/env/methanolExceedance.png") 50% 50% no-repeat; - @include imgStyle -} - -.NOExceedance { - background: url("~@/assets/img/env/NOExceedance.png") 50% 50% no-repeat; - @include imgStyle -} - - -.HCLExceedance { - background: url("~@/assets/img/env/HCLExceedance.png") 50% 50% no-repeat; - @include imgStyle -} - -.BenzeneExceedance { - background: url("~@/assets/img/env/BenzeneExceedance.png") 50% 50% no-repeat; - @include imgStyle -} - -.EthanolExceedance { - background: url("~@/assets/img/env/EthanolExceedance.png") 50% 50% no-repeat; - @include imgStyle -} .env-left, .env-right { .card-box { @@ -479,15 +396,7 @@ flex: 1; } -.right-pie-chart { - height: 230px; - background: url('~@/assets/img/bar_chart_bg.png') 35% 50% no-repeat; -} -.right-pie-chart-water { - height: 230px; - background: url('~@/assets/img/bar_chart_bg.png') 35% 50% no-repeat; -} .margin-top-23 { margin-top: 23px; @@ -1492,15 +1401,6 @@ margin-top: 10px; } -.energyRightTitle { - width: 332px; - height: 42px; - background: url("~@/assets/img/energy/energyTitle.png") no-repeat 50% 50%; - line-height: 42px; - font-size: 14px; - padding: 0 12px; - -} .center-box { position: absolute; @@ -1508,13 +1408,6 @@ display: flex; top: 0; - &-card-bg { - width: 264px; - height: 148px; - background: url("~@/assets/img/energy/energyCardBg.png") no-repeat 50% 50%; - padding: 8px 16px; - } - &-card-title { font-size: 14px; text-align: center; @@ -2243,12 +2136,6 @@ svg.loading-icon { height: 10px; } -.person-icon { - width: 32px; - height: 32px; - background: url("~@/assets/img/env/count.png") no-repeat; - margin-right: 14px; -} .radio-box { display: flex; @@ -2785,12 +2672,14 @@ svg.loading-icon { } .tree-box{ width: 330px; - height: 300px; + max-height: 300px; + overflow-y: auto; padding: 14px; background: rgba(0,0,0,0.5); box-shadow: 0 10px 20px -10px #000000; border-radius: 6px; border: 1px solid; + //flex: 1; border-image: linear-gradient(165deg, rgba(255, 255, 255, 0.94), rgba(255, 255, 255, 0)) 1 1; } diff --git a/src/components/title.component.vue b/src/components/title.component.vue index 645c342..c1af86f 100644 --- a/src/components/title.component.vue +++ b/src/components/title.component.vue @@ -9,7 +9,7 @@