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 00000000..531f8a81 Binary files /dev/null and b/src/assets/img/modules/visual/fenlei-box.png differ 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 @@