diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss index 60055cec..fff1af83 100644 --- a/src/assets/scss/modules/visual/distributionAnalyze.scss +++ b/src/assets/scss/modules/visual/distributionAnalyze.scss @@ -1,9 +1,10 @@ -@import '../../c/config'; -@import '../../c/function'; -@import './c/common'; +@import "../../c/config"; +@import "../../c/function"; +@import "./c/common"; .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; @@ -37,7 +38,7 @@ color: #fff; } .second-title-label::after { - content: ''; + content: ""; position: absolute; top: 50%; left: 20px; @@ -63,7 +64,7 @@ } .el-icon-arrow-up:before { - content: '\e78f'; + content: "\e78f"; } // .el-select__caret:before { // content: '\E790' diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index 0d566ab6..34732393 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -38,10 +38,10 @@ .div_map { box-sizing: border-box; - width: 100%; + width: 1920px - 630px - 20px; // padding: 10px 5px 13px; // margin-top: 8px; - height: calc(840px - 15px); + height: calc(810px); color: #fff; // background: url('../../../img/modules/visual/warning-box.png') no-repeat // center; @@ -50,7 +50,7 @@ } .div_data { - flex: 0 0 610px; + width: 630px; margin-left: 12px; .div_tips{ @@ -58,9 +58,6 @@ width: 100%; height: 302px; color: #fff; - background: url('../../../img/modules/visual/warning-box.png') no-repeat - center; - background-size: 100% 100%; .div_coverage{ padding: 30px 10px 32px 10px; @@ -90,9 +87,12 @@ } .div_category { + @include scrollBar; box-sizing: border-box; - height:238px; - padding:0 10px 20px; + height:178px; + padding:0 10px 0; + overflow-y: auto; + overflow-x: hidden; .category_item { @@ -160,17 +160,13 @@ box-sizing: border-box; width: 100%; margin-top:10px; - height: calc(840px - 302px - 10px); + height: calc(810px - 302px - 10px); color: #fff; - background: url('../../../img/modules/visual/warning-box.png') no-repeat - center; - background-size: 100% 100%; - padding: 32px 21px 20px 20px; .div_search_list { - margin: 0 auto; + margin: 10px auto; text-align: center; - width: 559px; + width: 590px; height: 48px; background-color: #011168; border-radius: 4px; @@ -211,14 +207,14 @@ .tb { - height: calc(840px - 302px - 10px - 150px); + height: calc(810px - 302px - 10px - 150px); overflow-y: auto; @include scrollBar; margin-top:20px; } .m-pagination { - position: absolute; + // position: absolute; box-sizing: border-box; right: 5px; bottom: 5px; @@ -256,7 +252,7 @@ flex: 0 0 calc(1919px - 620px); // width: calc(1919px - 560px); - height: calc(840px - 10px); + height: calc(810px - 10px); color: #fff; background: url('../../../img/modules/visual/warning-box.png') no-repeat center; @@ -298,11 +294,11 @@ box-sizing: border-box; margin-top: 9px; - height: calc(840px - 120px); + height: calc(810px - 120px); } .div_room { - // height: calc(840px - 40px); + // height: calc(810px - 40px); // margin-top: 9px; display: flex; flex-wrap: wrap; diff --git a/src/assets/scss/modules/visual/heart.scss b/src/assets/scss/modules/visual/heart.scss index 5e31774f..536a22b3 100644 --- a/src/assets/scss/modules/visual/heart.scss +++ b/src/assets/scss/modules/visual/heart.scss @@ -47,7 +47,8 @@ .m-tb { width: 33%; .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index 5ae5c1e5..f8910483 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -11,6 +11,9 @@ display: flex; align-items: center; cursor: pointer; + margin-bottom: 10px; + padding: 4px 2px; + .title-icon { display: block; width: 46px; @@ -60,7 +63,7 @@ } } .title-label { - font-size: 20px; + font-size: 22px; font-weight: 800; ::v-deep .el-input { width: 180px; @@ -107,23 +110,25 @@ flex-grow:0; flex-shrink:0; width:50%; - height: 100%; + .div-chart{ display: flex; width: 100%; + flex-wrap: wrap; .echart-wr{ + position: relative; flex-shrink: 0; height: 420px; width: 70%; } .div-tip{ flex-shrink: 0; - width: 30%; + width: 25%; display: flex; flex-direction: column; justify-content: center; - margin-left:20px; + margin-left:5%; margin-top: -23px; display: flex; @@ -151,11 +156,11 @@ .div-tip2{ flex-shrink: 0; - width: 30%; + width: 25%; display: flex; flex-direction: column; justify-content: center; - margin-left:20px; + margin-left:5%; margin-top: -23px; display: flex; diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index f9379e7f..747b9218 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -24,7 +24,8 @@ position: relative; .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; @@ -187,7 +188,8 @@ width: 1180px; .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; @@ -294,7 +296,8 @@ margin-top: 10px; .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; @@ -447,7 +450,8 @@ .m-tb { .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; @@ -479,7 +483,8 @@ width: calc(50% - 3px); .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; diff --git a/src/assets/scss/modules/visual/search_1.scss b/src/assets/scss/modules/visual/search_1.scss index ffb46b67..b7606f26 100644 --- a/src/assets/scss/modules/visual/search_1.scss +++ b/src/assets/scss/modules/visual/search_1.scss @@ -3,7 +3,8 @@ @import './c/common'; .title { - padding: 10px; + margin-bottom: 10px; + padding: 4px 2px; font-size: 22px; font-family: PingFang SC; font-weight: 800; diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 534ad5c0..3f98ac65 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -695,8 +695,9 @@ export default { box-sizing: border-box; margin-right: 3px; } - .title-label { - font-size: 20px; + .title-label { + font-size: 22px; + font-family: PingFang SC; font-weight: 800; ::v-deep .el-input { diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 35664c13..a131e9c4 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -27,7 +27,7 @@