From dfb00fb71e0af11c70e7c27ca021aa20692678f6 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 22 Aug 2023 20:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/index.scss | 44 +++-- src/views/modules/home/index.vue | 262 +++++++++++++---------------- 2 files changed, 152 insertions(+), 154 deletions(-) diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index 9c4fa86b1..bcf4c4bb1 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -2,11 +2,15 @@ @import "../c/function"; .g-row { - padding: 10px 6px; + padding: 5px 6px; display: flex; + height: 100%; .g-row-left { margin-right: auto; width: calc(66%); + display: flex; + flex-direction: column; + justify-content: space-around; } .g-row-right { margin-left: auto; @@ -211,12 +215,19 @@ .m-pan { position: relative; - height: 488px; box-sizing: border-box; - - .cnt { + width: 100%; + height:calc( 100vh - 420px); + overflow: hidden; + .flex_box{ + height:calc(100% - 30px); + width: 100%; + overflow: hidden; + .cnt { margin-top: 20px; display: flex; + overflow: hidden; + height: 100%; .cnt-left { box-sizing: border-box; padding: 16px; @@ -229,7 +240,7 @@ font-weight: 400; color: rgba(0, 0, 0, 0.85); line-height: 24px; - + height: 100%; .subtitle { padding: 4px 0; font-size: 15px; @@ -251,12 +262,8 @@ } } .cnt-right { - // margin-left: auto; - width: 100%; - height: 287px; - overflow-y: auto; - .list { + margin-bottom: 71px; .item { margin-bottom: 30px; display: flex; @@ -311,18 +318,29 @@ } } } + ::v-deep .el-tabs__content { + overflow: scroll !important; + height: 100% !important; + } } + } + } .m-tx { - height: 466px; margin-bottom: 13px; + width: 100%; + height:calc( 100vh - 430px); + overflow: hidden; + padding-right: 5px; + box-sizing: border-box; .cnt { box-sizing: border-box; margin-top: 12px; border-radius: 2px; - overflow: hidden; - + overflow:hidden scroll ; + height: calc(100% - 50px); + .empty { text-align: center; color: #999; diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 221d3a5c8..f6b807f63 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -10,16 +10,10 @@
-
+
查居民
-
+
查房屋
@@ -27,110 +21,101 @@
- - -
- + + +
+
查一下
- +
- -
+
- - 社区总览 -
-

{{ pandectData.deptName }}，划分为{{ pandectData.underCount }}个{{ - pandectData.underName - }}，现有房屋{{ pandectData.homeCount }}间、自住房屋{{ pandectData.selfStay }}间、 - 出租房屋{{ pandectData.rentOut }}间、 - 闲置房屋{{ pandectData.vacantHouse }}间、现有居民{{ - pandectData.resiCount - }}户、{{ - pandectData.totalResidents - }}人、其中常住人口{{ - pandectData.permanentResiCount - }}人，流动人口{{ - pandectData.floatingResiCount - }}人，各类群体分布如下： -

-
- - 居民分类统计 - 智能预测 - -
-
-
-
-
-
- {{ - ("0" + (index + 1)).substr(-2) - }}. -
-
- {{ item.name }} -
-
-
- {{ item.count }}人 -
-
- -
-
- {{ item.per }} % -
-
+ + 社区总览 +
+
+
+
+
+ + 社区简介
+

+ {{ pandectData.deptName }}，划分为{{ + pandectData.underCount }}个{{ + pandectData.underName + }}，现有居民{{ pandectData.homeCount }}户、{{ + pandectData.resiCount +}}人，其中常住人口{{ + pandectData.permanentResiCount +}}人，流动人口{{ + pandectData.floatingResiCount +}}人，各类群体分布如下： +

+ +
+ + 分析结果 +
+ +

+ 根据数据分析结果，建议重点关注 + {{ resiCategory.list[0].name }}、{{ + resiCategory.list[1].name + }}、{{ resiCategory.list[2].name }} + 三类群体，开展相关的社区服务和活动。 +

+ + +
+
+
+
+ {{ + ("0" + (index + 1)).substr(-2) + }}. +
+
+ {{ item.name }} +
+
+
+ {{ item.count }}人 +
+
+ +
+
+ {{ item.per }} % +
+
+
+
+ + + + +
-

- 根据数据分析结果，建议重点关注 - {{ resiCategory.list[0].name }}、{{ - resiCategory.list[1].name - }}、{{ resiCategory.list[2].name }} - 三类群体，开展相关的社区服务和活动。 -

+
-
-
-
@@ -177,10 +161,10 @@
更多>
-
+
-
+
@@ -233,25 +217,29 @@ export default { noticeData: [], - btnSelectA: false, - btnSelectB: true, + activeName: 'resi', - option : { + option: { tooltip: { trigger: 'axis' }, legend: { - data: ['12345不满意数', '省满意调查不满意数', '社区自评不满意数'] + data: ['12345不满意数', '省满意调查不满意数', '社区自评不满意数'], + bottom: '10%', + icon: 'rect', + itemWidth: 20, + itemHeight: 5, + itemGap: 20, }, grid: { left: '3%', right: '4%', - bottom: '8%', + bottom: '25%', containLabel: true }, toolbox: { feature: { - saveAsImage: {} + saveAsImage: {} } }, xAxis: { @@ -264,26 +252,26 @@ export default { }, series: [ { - name: '12345不满意数', - type: 'line', - stack: 'Total', - data: [120, 132, 101, 134, 90, 230, 210] + name: '12345不满意数', + type: 'line', + stack: 'Total', + data: [120, 132, 101, 134, 90, 230, 210] }, { - name: '省满意调查不满意数', - type: 'line', - stack: 'Total', - data: [220, 182, 191, 234, 290, 330, 310] + name: '省满意调查不满意数', + type: 'line', + stack: 'Total', + data: [220, 182, 191, 234, 290, 330, 310] }, { - name: '社区自评不满意数', - type: 'line', - stack: 'Total', - data: [150, 232, 201, 154, 190, 330, 410] + name: '社区自评不满意数', + type: 'line', + stack: 'Total', + data: [150, 232, 201, 154, 190, 330, 410] } ] }, - myChart:{} + myChart: {} } }, computed: { @@ -311,7 +299,7 @@ export default { }, mounted() { this.getApiData(); - this.$nextTick(()=>{ + this.$nextTick(() => { this.initChart() }) console.log( @@ -320,25 +308,17 @@ export default { ); }, methods: { - initChart(){ - this.myChart = echarts.init(document.getElementById('my_chart')); - this.myChart.setOption(this.option) - window.addEventListener('resize', this.handleWindowResize); + initChart() { + this.myChart = echarts.init(document.getElementById('my_chart')); + this.myChart.setOption(this.option) + window.addEventListener('resize', this.handleWindowResize); }, handleWindowResize() { if (this.myChart) { - this.myChart.resize(); + this.myChart.resize(); } }, - handleClickResiCategory() { - this.btnSelectA = false - this.btnSelectB = true - }, - handleClickIntelligentPrediction() { - this.btnSelectA = true - this.btnSelectB = false - }, - searchDataTab(str){ + searchDataTab(str) { this.searchData.type = str; }, handleClickCategory(item) { @@ -350,13 +330,13 @@ export default { }); }, - async readClearOne(item){ - console.log("item",item) + async readClearOne(item) { + console.log("item", item) const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}` - const {data,code,msg} = await requestPost(url) - if(code == 0){ + const { data, code, msg } = await requestPost(url) + if (code == 0) { this.getNoticeData() - }else if(code >= 8000){ + } else if (code >= 8000) { this.$message.error(msg) } }, @@ -380,15 +360,15 @@ export default { this.$router.push({ path: "/main/shequ-chaxun" }); - localStorage.setItem('homeSearchType',type) - localStorage.setItem('homeSearchKey',searchKey) + localStorage.setItem('homeSearchType', type) + localStorage.setItem('homeSearchKey', searchKey) }, handleClickSearchBtn(str) { const { searchData: { type, searchKey }, } = this; - if(str){ + if (str) { this.toSearchPage(type, searchKey); return } @@ -443,7 +423,7 @@ export default { async getNoticeData() { const url = "/message/intelligentMessage/list"; let params = { - last: "6", + last: "10", }; const { data, code, msg } = await requestGet(url, params);