From 8109ba26b407e0232fc1a4fd4d9216e514877937 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 8 Jul 2022 13:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=99=AE=E9=80=82=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/modules/visual/fenlei-box.png | Bin 0 -> 9592 bytes src/assets/scss/main-shuju.scss | 7 ++-- .../scss/modules/visual/basicInfoMain.scss | 38 ++++++++---------- .../modules/visual/distributionAnalyze.scss | 8 ++-- .../scss/modules/visual/duoyuanfenxi.scss | 10 ++--- .../scss/modules/visual/fiveLayerMap.scss | 21 +++++----- src/assets/scss/modules/visual/heart.scss | 2 +- .../scss/modules/visual/houseStatic.scss | 2 +- .../scss/modules/visual/personCategory.scss | 4 +- .../scss/modules/visual/processAnalyze.scss | 12 +++--- src/assets/scss/modules/visual/resibuzz.scss | 10 ++--- .../modules/visual/shijianchulifenxi.scss | 12 +++--- .../modules/visual/shijianfenleifenxi.scss | 12 +++--- .../scss/modules/visual/typeAnalyze.scss | 10 ++--- src/assets/scss/modules/visual/warning.scss | 2 +- src/views/main-shuju/main-content.vue | 2 +- src/views/main-shuju/main.vue | 2 +- .../modules/visual/basicinfo/peopleList.vue | 6 +-- .../communityGovern/distributionAnalyze.vue | 2 +- .../duoyuanfuwu/duoyuanfuwufenxi.vue | 2 +- .../visual/communityGovern/resibuzz.vue | 2 +- .../shijianchuli/shijianchulifenxi.vue | 2 +- .../shijianfenlei/shijianfenleifenxi.vue | 2 +- .../visual/communityGovern/typeAnalyze.vue | 2 +- .../visual/communityParty/community.vue | 2 +- .../modules/visual/measure/volunteer.vue | 1 - .../visual/plugin/power/organization.vue | 19 +-------- 27 files changed, 86 insertions(+), 108 deletions(-) create mode 100644 src/assets/img/modules/visual/fenlei-box.png diff --git a/src/assets/img/modules/visual/fenlei-box.png b/src/assets/img/modules/visual/fenlei-box.png new file mode 100644 index 0000000000000000000000000000000000000000..531f8a811ce503ddf6f8e55d1aed715a6df3350d GIT binary patch literal 9592 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 literal 0 HcmV?d00001 diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss index 5b90e6d0..51be5f9c 100644 --- a/src/assets/scss/main-shuju.scss +++ b/src/assets/scss/main-shuju.scss @@ -4,16 +4,15 @@ @import "./c/function"; @import "./modules/visual/c/common.scss"; -// $navbar--height: 60px; -body { +.g-main { + padding: 10px 20px 0; } .m-iframe { position: relative; box-sizing: content-box; width: calc(100% + 20px); - // height: calc(100vh - 55px); - margin: -10px; + margin: -10px -20px 0; z-index: 100; } diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 819f2df3..e31559bb 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -3,7 +3,8 @@ @import "./c/common"; .div_top { margin-left: 10px; - height: 35px; + height: 40px; + line-height: 35px; .router_line { width: 212px; height: 1px; @@ -12,8 +13,8 @@ /* opacity: 0.09; */ } .div_router { - margin-top: 5px; font-size: 16px; + font-weight: bold; .router_parents { color: #a0c3d9; @@ -40,7 +41,7 @@ width: 100%; // padding: 10px 5px 13px; // margin-top: 8px; - height: calc(88vh - 15px); + height: calc(840px - 15px); color: #fff; // background: url('../../../img/modules/visual/warning-box.png') no-repeat // center; @@ -109,10 +110,9 @@ box-sizing: border-box; width: 100%; - height: calc(88vh - 10px); + height: calc(840px - 10px); color: #fff; - background: url('../../../img/modules/visual/warning-box.png') no-repeat - center; + background: url("../../../img/modules/visual/fenlei-box.png") no-repeat center; background-size: 100% 100%; // padding: 45px 21px 35px 24px; @@ -208,13 +208,12 @@ .div_community_info { box-sizing: border-box; - flex: 0 0 calc(100vw - 620px); - // width: calc(100vw - 560px); + flex: 0 0 calc(1919px - 620px); + // width: calc(1919px - 560px); - height: calc(88vh - 10px); + height: calc(840px - 10px); color: #fff; - background: url('../../../img/modules/visual/warning-box.png') no-repeat - center; + background: url("../../../img/modules/visual/warning-box.png") no-repeat center; background-size: 100% 100%; .div_select { @@ -253,11 +252,11 @@ box-sizing: border-box; margin-top: 9px; - height: calc(88vh - 120px); + height: calc(840px - 120px); } .div_room { - // height: calc(88vh - 40px); + // height: calc(840px - 40px); // margin-top: 9px; display: flex; flex-wrap: wrap; @@ -317,19 +316,18 @@ justify-content: flex-start; // margin-left: 7px; - .div_icon_item{ - .icon_img{ + .div_icon_item { + .icon_img { margin-left: 5px; width: 21px; height: 20px; } - .icon_name{ + .icon_name { text-align: center; display: flex; justify-content: center; } } - } .div_user:hover { cursor: pointer; @@ -362,7 +360,7 @@ } .div_room::after { - content: ''; + content: ""; flex: 1; } } @@ -443,7 +441,7 @@ width: 320px; height: 470px; color: #fff; - background: url('../../../img/modules/visual/box-2.png') no-repeat center; + background: url("../../../img/modules/visual/box-2.png") no-repeat center; background-size: 100% 100%; padding: 45px 20px 35px 20px; @@ -578,7 +576,5 @@ } } } - - } } diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss index e341f70f..60055cec 100644 --- a/src/assets/scss/modules/visual/distributionAnalyze.scss +++ b/src/assets/scss/modules/visual/distributionAnalyze.scss @@ -117,11 +117,11 @@ flex-direction: row; // flex-wrap: wrap; justify-content: space-between; - height: calc(100vh - 190px); + height: calc(988px - 190px); .g-l { width: 40%; - height: calc(100vh - 200px); + height: calc(988px - 200px); .echart-line { margin-left: 30px; @@ -149,11 +149,11 @@ .g-r { width: 55%; - height: calc(100vh - 210px); + height: calc(988px - 210px); .r-map { position: relative; - height: calc(100vh - 210px - 50px); + height: calc(988px - 210px - 50px); width: 100%; .map { diff --git a/src/assets/scss/modules/visual/duoyuanfenxi.scss b/src/assets/scss/modules/visual/duoyuanfenxi.scss index 12032815..da5ae4d1 100644 --- a/src/assets/scss/modules/visual/duoyuanfenxi.scss +++ b/src/assets/scss/modules/visual/duoyuanfenxi.scss @@ -6,12 +6,12 @@ .g-cpt-resi { display: flex; flex-direction: row; - height: calc(100vh - 180px); + height: calc(988px - 180px); .g-l { flex-shrink: 0; width: 700px; - height: calc(100vh - 230px); + height: calc(988px - 230px); .l_top { height: 385px; @@ -21,7 +21,7 @@ } .l_bottom { - height: calc(100vh - 230px - 385px); + height: calc(988px - 230px - 385px); margin-top: 40px; } } @@ -29,8 +29,8 @@ .g-r { text-align: center; margin: 20px 10px 20px; - width: calc(100vw - 700px); - height: calc(100vh - 180px - 20px); + width: calc(1919px - 700px); + height: calc(988px - 180px - 20px); } } diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index ed0ffedd..0d566ab6 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -3,7 +3,8 @@ @import "./c/common"; .div_top { margin-left: 10px; - height: 35px; + height: 40px; + line-height: 35px; .router_line { width: 212px; height: 1px; @@ -12,8 +13,8 @@ /* opacity: 0.09; */ } .div_router { - margin-top: 5px; font-size: 16px; + font-weight: bold; .router_parents { color: #a0c3d9; @@ -40,7 +41,7 @@ width: 100%; // padding: 10px 5px 13px; // margin-top: 8px; - height: calc(88vh - 15px); + height: calc(840px - 15px); color: #fff; // background: url('../../../img/modules/visual/warning-box.png') no-repeat // center; @@ -159,7 +160,7 @@ box-sizing: border-box; width: 100%; margin-top:10px; - height: calc(88vh - 302px - 10px); + height: calc(840px - 302px - 10px); color: #fff; background: url('../../../img/modules/visual/warning-box.png') no-repeat center; @@ -210,7 +211,7 @@ .tb { - height: calc(88vh - 302px - 10px - 150px); + height: calc(840px - 302px - 10px - 150px); overflow-y: auto; @include scrollBar; margin-top:20px; @@ -252,10 +253,10 @@ .div_community_info { box-sizing: border-box; - flex: 0 0 calc(100vw - 620px); - // width: calc(100vw - 560px); + flex: 0 0 calc(1919px - 620px); + // width: calc(1919px - 560px); - height: calc(88vh - 10px); + height: calc(840px - 10px); color: #fff; background: url('../../../img/modules/visual/warning-box.png') no-repeat center; @@ -297,11 +298,11 @@ box-sizing: border-box; margin-top: 9px; - height: calc(88vh - 120px); + height: calc(840px - 120px); } .div_room { - // height: calc(88vh - 40px); + // height: calc(840px - 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 f0c964cb..5e31774f 100644 --- a/src/assets/scss/modules/visual/heart.scss +++ b/src/assets/scss/modules/visual/heart.scss @@ -64,7 +64,7 @@ } } .tb { - height: calc(100vh - 230px); + height: calc(988px - 230px); overflow-y: auto; @include scrollBar; } diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index fb6f31ae..5ae5c1e5 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -1,5 +1,5 @@ .warning-box{ - padding: 0 21px 20px 24px + padding: 0 ; } .no-data{ margin-top:50px; diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index a756b8c1..77d9988f 100644 --- a/src/assets/scss/modules/visual/personCategory.scss +++ b/src/assets/scss/modules/visual/personCategory.scss @@ -8,7 +8,7 @@ color: #fff; // background: url("../../../img/modules/visual/warning-box.png") no-repeat center; background-size: 100% 100%; - padding: 15px 21px 15px 24px; + // padding: 15px 21px 15px 24px; @@ -159,7 +159,7 @@ &-bottom { box-sizing: border-box; width: 100%; - // height: calc(100vh - 535px); + // height: calc(988px - 535px); min-height: 300px; margin-top: 60px; } diff --git a/src/assets/scss/modules/visual/processAnalyze.scss b/src/assets/scss/modules/visual/processAnalyze.scss index ba44dbfa..1a4b3f3d 100644 --- a/src/assets/scss/modules/visual/processAnalyze.scss +++ b/src/assets/scss/modules/visual/processAnalyze.scss @@ -6,12 +6,12 @@ .g-cpt-resi { display: flex; flex-direction: row; - height: calc(100vh - 180px); + height: calc(988px - 180px); .g-l { flex-shrink: 0; width: 700px; - height: calc(100vh - 230px); + height: calc(988px - 230px); .l_top { height: 385px; @@ -24,7 +24,7 @@ } } .l_bottom { - height: calc(100vh - 230px - 385px); + height: calc(988px - 230px - 385px); margin-top: 20px; } } @@ -32,8 +32,8 @@ .g-r { text-align: center; margin: 20px 10px 20px; - width: calc(100vw - 700px); - height: calc(100vh - 180px - 20px); + width: calc(1919px - 700px); + height: calc(988px - 180px - 20px); } } @@ -119,7 +119,7 @@ .g-r { .r-map { position: relative; - height: calc(100vh - 180px - 20px - 70px); + height: calc(988px - 180px - 20px - 70px); width: 100%; .map { diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss index 6d43913e..049be180 100644 --- a/src/assets/scss/modules/visual/resibuzz.scss +++ b/src/assets/scss/modules/visual/resibuzz.scss @@ -9,19 +9,19 @@ flex-direction: row; // flex-wrap: wrap; // justify-content: center; - height: calc(100vh - 180px); + height: calc(988px - 180px); .g-l { flex-shrink: 0; width: 600px; - height: calc(100vh - 180px); + height: calc(988px - 180px); } .g-r { text-align: center; margin: 40px 0 0 19px; - width: calc(100vw - 60px - 600px); - // height: calc(100vh - 170px - 20px); + width: calc(1919px - 60px - 600px); + // height: calc(988px - 170px - 20px); } } @@ -30,7 +30,7 @@ position: relative; height: 100%; .tb { - height: calc(100vh - 170px - 50px - 50px); + height: calc(988px - 170px - 50px - 50px); overflow-y: auto; @include scrollBar; } diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss index ca099bed..79dfe912 100644 --- a/src/assets/scss/modules/visual/shijianchulifenxi.scss +++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss @@ -6,12 +6,12 @@ .g-cpt-resi { display: flex; flex-direction: row; - height: calc(100vh - 180px); + height: calc(988px - 180px); .g-l { flex-shrink: 0; width: 700px; - height: calc(100vh - 230px); + height: calc(988px - 230px); .l_top { height: 355px; @@ -21,7 +21,7 @@ } .l_bottom { - height: calc(100vh - 200px - 365px); + height: calc(988px - 200px - 365px); margin-top: 0; } } @@ -29,8 +29,8 @@ .g-r { text-align: center; margin: 20px 10px 20px; - width: calc(100vw - 700px); - height: calc(100vh - 180px - 20px); + width: calc(1919px - 700px); + height: calc(988px - 180px - 20px); } } @@ -74,7 +74,7 @@ position: relative; height: 100%; .tb { - height: calc(100vh - 170px - 50px - 50px); + height: calc(988px - 170px - 50px - 50px); overflow-y: auto; @include scrollBar; } diff --git a/src/assets/scss/modules/visual/shijianfenleifenxi.scss b/src/assets/scss/modules/visual/shijianfenleifenxi.scss index c4f19da3..6d0bcedc 100644 --- a/src/assets/scss/modules/visual/shijianfenleifenxi.scss +++ b/src/assets/scss/modules/visual/shijianfenleifenxi.scss @@ -6,12 +6,12 @@ .g-cpt-resi { display: flex; flex-direction: row; - height: calc(100vh - 180px); + height: calc(988px - 180px); .g-l { flex-shrink: 0; width: 700px; - height: calc(100vh - 230px); + height: calc(988px - 230px); .l_top { height: 385px; @@ -21,7 +21,7 @@ } .l_bottom { - height: calc(100vh - 230px - 385px); + height: calc(988px - 230px - 385px); margin-top: 20px; } } @@ -29,8 +29,8 @@ .g-r { text-align: center; margin: 20px 10px 20px; - width: calc(100vw - 700px); - height: calc(100vh - 180px - 20px); + width: calc(1919px - 700px); + height: calc(988px - 180px - 20px); } } @@ -80,7 +80,7 @@ position: relative; height: 100%; .tb { - height: calc(100vh - 170px - 50px - 50px); + height: calc(988px - 170px - 50px - 50px); overflow-y: auto; @include scrollBar; } diff --git a/src/assets/scss/modules/visual/typeAnalyze.scss b/src/assets/scss/modules/visual/typeAnalyze.scss index 0d1accf7..f1f31dff 100644 --- a/src/assets/scss/modules/visual/typeAnalyze.scss +++ b/src/assets/scss/modules/visual/typeAnalyze.scss @@ -8,19 +8,19 @@ flex-direction: row; // flex-wrap: wrap; // justify-content: center; - height: calc(100vh - 180px); + height: calc(988px - 180px); .g-l { flex-shrink: 0; width: 600px; - height: calc(100vh - 180px); + height: calc(988px - 180px); } .g-r { text-align: center; margin: 40px 0 0 19px; - width: calc(100vw - 60px - 600px); - // height: calc(100vh - 140px - 20px); + width: calc(1919px - 60px - 600px); + // height: calc(988px - 140px - 20px); } } @@ -29,7 +29,7 @@ position: relative; height: 100%; .tb { - height: calc(100vh - 170px - 50px - 50px); + height: calc(988px - 170px - 50px - 50px); overflow-y: auto; @include scrollBar; } diff --git a/src/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss index 265c3889..fddf565a 100644 --- a/src/assets/scss/modules/visual/warning.scss +++ b/src/assets/scss/modules/visual/warning.scss @@ -8,7 +8,7 @@ color: #fff; // background: url("../../../img/modules/visual/warning-box.png") no-repeat center; background-size: 100% 100%; - padding: 45px 21px 35px 24px; + padding-top: 40px; &-top { display: flex; diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue index 6f3b1c52..b9914005 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -1,5 +1,5 @@