diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index f86d332f9..abf63be8b 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -46,7 +46,7 @@ position: relative; // position: fixed; padding-left: 14px; - height: 30px; + height: 16px; margin-right: 10px; font-size: 15px; z-index: 1; @@ -109,13 +109,12 @@ } .header { - padding: 4px 0; font-size: 15px; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: rgba(0, 0, 0, 0.85); line-height: 17px; - margin-top: 10px; + margin-top: 16px; margin-left: 10px; >img { @@ -128,7 +127,7 @@ .newqsa { border-left: 4px solid #2683DB; - height: 70%; + height: 100%; // width: 4px; margin-left: -10px; padding-left: 8px; @@ -155,28 +154,26 @@ .m-search { box-sizing: border-box; - padding: 40px 80px; + padding: 0px 16px; margin-bottom: 10px; - height: 200px; + height: 220px; + display: flex; + flex-direction: column; // background-image: url("../../images/index/chaxun-bg.png"); background-size: cover; position: relative; .wrap { - position: absolute; - top: 0; - left: 0; + width: 100%; } .mewq { // background-color: #333; + margin-top: 24px; width: inherit; - margin-left: -69px; height: 64px; - margin-top: 85px; box-sizing: border-box; - margin-right: -68px; display: grid; grid-template-columns: repeat(7, 1fr); gap: 5px; @@ -249,13 +246,12 @@ margin-top: 15px; display: flex; align-items: center; - margin-left: 10px; .search-input { position: relative; left: 0; right: 0; - width: 98%; + width: 100%; height: 48px; background: #ffffff; border-radius: 4px; @@ -353,7 +349,7 @@ overflow: hidden; .flex_box { - height: calc(100% - 30px); + height: 100%; width: 100%; overflow: hidden; display: flex; @@ -562,8 +558,9 @@ } .m-tb { - height: 260px; - + height: 238px; + display: flex; + flex-direction: column; .cnt { box-sizing: border-box; margin-top: 20px; @@ -674,4 +671,6 @@ .update-settings { margin-right: 25px; + display: flex; + align-items: center; } \ No newline at end of file diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index b7f71809f..90cc3a5fa 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -22,7 +22,7 @@ -
查一下
+
查询
@@ -82,16 +82,11 @@ -
- -
+
+
居民分类信息不完整数量统计
-
@@ -102,15 +97,13 @@
-
不满意事项(月度)趋势分析
-
-
+
@@ -151,11 +144,11 @@
-
居民信息更新情况 更新设置 +
居民信息更新情况
更新设置
- + +
@@ -358,7 +352,7 @@ export default { }, legend: { data: data.series.map((item) => item.name), - bottom: "-5", + bottom: 0, icon: "rect", itemWidth: 20, itemHeight: 5, @@ -367,7 +361,8 @@ export default { grid: { left: "3%", right: "4%", - bottom: "15%", + bottom: "13%", + top:'5', containLabel: true, }, toolbox: { @@ -728,13 +723,17 @@ export default { legend: { x: 'center', bottom: '8%', - data: ['分类信息完整数', '分类信息不完整数'] + data: ['分类信息完整数', '分类信息不完整数'], + icon: "rect", + itemWidth: 20, + itemHeight: 5, + itemGap: 20, }, grid: { //图表的位置 - top: '5%', + top: '3%', left: '3%', right: '4%', - bottom: '20%', + bottom: '10%', containLabel: true }, yAxis: [{ @@ -800,3 +799,8 @@ export default { +