wxz 2 years ago
parent
commit
2d0c57484c
  1. 85
      src/assets/scss/modules/index.scss
  2. 10
      src/views/main-navbar.vue
  3. 330
      src/views/modules/home/index.vue
  4. 4
      src/views/modules/shequ/chaxun.vue

85
src/assets/scss/modules/index.scss

@ -2,21 +2,20 @@
@import "../c/function";
.g-row {
padding: 10px 6px;
section{
padding: 5px 6px;
display: flex;
height: 100%;
.g-row-left {
margin-right: auto;
width: calc(66%);
display: flex;
.g-row-left {
margin-right: auto;
width: calc(34% - 16px);
}
.g-row-right {
margin-left: auto;
width: calc(66%);
}
flex-direction: column;
justify-content: space-around;
}
.g-row-right {
margin-left: auto;
width: calc(34% - 16px);
}
}
.m-box {
@ -30,9 +29,16 @@
padding: 4px 0;
font-size: 15px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
font-weight: 500;
color: rgba(0, 0, 0, 0.85);
line-height: 17px;
> img {
vertical-align: bottom;
margin-right: 5px;
width: 17px;
height: 17px;
}
}
.more {
@ -68,15 +74,12 @@
font-weight: 500;
color: $c1;
line-height: 47px;
text-align: center;
}
.tabs {
margin-top: 24px;
display: flex;
align-items: center;
width: 60%;
margin: 0 auto;
> div {
position: relative;
margin-right: 30px;
@ -129,7 +132,7 @@
border-radius: 4px;
border: 1px solid $c1;
display: flex;
margin: 0 auto;
.input {
position: relative;
width: calc(100% - 100px);
@ -212,12 +215,19 @@
.m-pan {
position: relative;
height: 510px;
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;
@ -230,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;
@ -252,14 +262,10 @@
}
}
.cnt-right {
// margin-left: auto;
width: calc(100%);
height: 320px;
overflow-y: auto;
.list {
margin-bottom: 71px;
.item {
margin-bottom: 19px;
margin-bottom: 30px;
display: flex;
align-items: center;
font-size: 14px;
@ -298,7 +304,7 @@
.item-progress {
margin-right: 15px;
width: 74%;
width: 100%;
height: 24px;
background: #e6f0ff;
border-radius: 1px;
@ -312,18 +318,29 @@
}
}
}
::v-deep .el-tabs__content {
overflow: scroll !important;
height: 100% !important;
}
}
}
}
.m-tx {
height: 250px;
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;
@ -335,7 +352,7 @@
}
.item {
padding: 0px 0 7px;
padding: 16px 0 7px;
border-bottom: 1px dashed #f0f5fa;
&:last-child {
border-bottom: none;
@ -389,7 +406,7 @@
}
}
.m-tb {
height: 247px;
height: 302px;
.cnt {
box-sizing: border-box;

10
src/views/main-navbar.vue

@ -20,25 +20,25 @@
</el-menu-item>
</el-menu>
<el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">
<el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 80px">
<el-menu-item index="3" @click="handleCLickNav">
<div class="nav-item">
<img src="~@/assets/images/main/nav-sjdb.png" />
<span>数据看板</span>
</div>
</el-menu-item>
<el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
<!-- <el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
<div class="nav-item">
<img src="~@/assets/images/main/nav-zntb.png" />
<span>智能填报</span>
</div>
</el-menu-item>
<el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
</el-menu-item> -->
<!-- <el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
<div class="nav-item">
<img src="~@/assets/images/main/nav-sjjy.png" />
<span>数据校验</span>
</div>
</el-menu-item>
</el-menu-item> -->
</el-menu>
<el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">

330
src/views/modules/home/index.vue

@ -2,48 +2,129 @@
<template>
<div>
<div class="g-row">
<div class="m-box m-search">
<div class="wrap">
<div class="title">
<span>社区查询</span>
</div>
<div class="tabs">
<div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">
查居民
<div class="g-row-left">
<div class="m-box m-search">
<div class="wrap">
<div class="title">
<span>社区查询</span>
</div>
<div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">
查房屋
<div class="tabs">
<div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">
查居民
</div>
<div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">
查房屋
</div>
</div>
</div>
<div class="search">
<div class="search-input">
<div class="input">
<input type="text" :placeholder="typePlaceholder[searchData.type]
" v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" />
<div class="search">
<div class="search-input">
<div class="input">
<input type="text" :placeholder="typePlaceholder[searchData.type]
" v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" />
<div class="close-btn" v-if="searchData.searchKey != ''" @click="searchData.searchKey = ''">
<img src="@/assets/img/shequ/close.png" />
<div class="close-btn" v-if="searchData.searchKey != ''"
@click="searchData.searchKey = ''">
<img src="@/assets/img/shequ/close.png" />
</div>
</div>
<div class="btn" @click="handleClickSearchBtn">
查一下
</div>
</div>
<div class="btn" @click="handleClickSearchBtn">
查一下
</div>
</div>
</div>
<div class=" m-pan m-box">
<div class="header">
<img src="@/assets/images/index/title-icon-sqzl.png" />
<span>社区总览</span>
</div>
<div class="flex_box">
<div class="cnt">
<div class="cnt-left">
<div class="subtitle">
<img src="@/assets/images/index/i-sqjj.png" />
<span>社区简介</span>
</div>
<p>
{{ pandectData.deptName }}<span v-if="pandectData.gridCount">划分为{{
pandectData.underCount }}{{
pandectData.underName
}}</span>现有居民{{ pandectData.homeCount }}{{
pandectData.resiCount
}}其中常住人口{{
pandectData.permanentResiCount
}}流动人口{{
pandectData.floatingResiCount
}}各类群体分布如下
</p>
<div class="subtitle">
<img src="@/assets/images/index/i-fxjg.png" />
<span>分析结果</span>
</div>
<p class="hint" v-if="resiCategory.list.length > 0">
根据数据分析结果建议重点关注
<b>{{ resiCategory.list[0].name }}{{
resiCategory.list[1].name
}}{{ resiCategory.list[2].name }}</b>
三类群体开展相关的社区服务和活动
</p>
</div>
<el-tabs v-model="activeName" style="width: calc(100% - 240px - 40px);margin-left: auto;">
<el-tab-pane label="居民分类统计" name="resi">
<div class="cnt-right">
<div class="list">
<div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="(
item, index
) in resiCategory.list">
<div>
{{
("0" + (index + 1)).substr(-2)
}}.
</div>
<div class="item-name">
{{ item.name }}
</div>
<div class="item-div"></div>
<div class="item-count">
{{ item.count }}
</div>
<div class="item-progress">
<b :style="{
width: item.per + '%',
}"></b>
</div>
<div class="item-per">
{{ item.per }} %
</div>
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="智能预测" name="zhineng">
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</div>
<section>
<div class="g-row-left">
<div class="m-box m-tx">
<div class="wrap">
<div class="header">
<span>智能提醒</span>
</div>
<div class="more" @click="toNoticePage">更多></div>
<div class="cnt" v-if="noticeData.length > 0">
<div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index"
<div class="g-row-right">
<div class="m-box m-tx">
<div class="header">
<img
src="@/assets/images/index/title-icon-zntx.png"
/>
<span>智能提醒</span>
</div>
<div class="more" @click="toNoticePage">更多></div>
<div class="cnt" v-if="noticeData.length > 0">
<div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index"
v-for="(item, index) in noticeData">
<div class="item_left">
<i class="i-tag" v-if="item.readFlag == 1">已读</i>
@ -58,97 +139,32 @@
</div>
</div>
</div>
</div>
<div class="cnt" v-else>
<div class="empty">
<img src="~@/assets/images/shuju/renfang/index/empty.png" />
<span>暂无提醒</span>
</div>
</div>
</div>
</div>
<div class="m-box m-tb">
<div class="wrap">
<div class="header">
<span>不满意事项月度趋势分析</span>
<div class="cnt" v-else>
<div class="empty">
<img
src="~@/assets/images/shuju/renfang/index/empty.png"
/>
<span>暂无提醒</span>
</div>
</div>
<div class="cnt">
<!-- 图表 -->
<div id="my_chart" style="width: 500px;height: 200px; position: relative;top:-10px"></div>
</div>
</div>
</div>
<div class="g-row-right">
<!-- -->
<div class="m-box m-pan">
<div class="m-box m-tb">
<div class="wrap">
<div class="header">
<span>当前组织名称概览</span>
</div>
<p>{{ pandectData.deptName }}<span v-if="pandectData.gridCount">划分为{{ pandectData.underCount }}{{
pandectData.underName
}}</span>现有房屋{{ pandectData.homeCount }}自住房屋{{ pandectData.selfStay }}
出租房屋{{ pandectData.rentOut }}
闲置房屋{{ pandectData.vacantHouse }}现有居民{{
pandectData.resiCount
}}{{
pandectData.totalResidents
}}其中常住人口{{
pandectData.permanentResiCount
}}流动人口{{
pandectData.floatingResiCount
}}各类群体分布如下
</p>
<div>
<el-button-group class="btn_group">
<el-button type="primary" :plain="btnSelectA"
@click="handleClickResiCategory">居民分类统计</el-button>
<el-button type="primary" :plain="btnSelectB"
@click="handleClickIntelligentPrediction">智能预测</el-button>
</el-button-group>
<img
src="@/assets/images/index/title-icon-zntb.png"
/>
<span>不满意事项月度趋势分析</span>
</div>
<div class="cnt">
<div class="cnt-right">
<div class="list">
<div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="(
item, index
) in resiCategory.list">
<div>
{{
("0" + (index + 1)).substr(-2)
}}.
</div>
<div class="item-name">
{{ item.name }}
</div>
<div class="item-div"></div>
<div class="item-count">
{{ item.count }}
</div>
<div class="item-progress">
<b :style="{
width: item.per + '%',
}"></b>
</div>
<div class="item-per">
{{ item.per }} %
</div>
</div>
</div>
</div>
</div>
<p class="hint" v-if="resiCategory.list.length > 0">
根据数据分析结果建议重点关注
<b>{{ resiCategory.list[0].name }}{{
resiCategory.list[1].name
}}{{ resiCategory.list[2].name }}</b
>
三类群体开展相关的社区服务和活动
</p>
</div>
<!-- <div class="more">更多></div> -->
<div class="cnt">
<div id="my_chart" style="width: 100%;height: 230px; position: relative;top:-10px"></div>
</div>
</div>
</section>
</div>
</div>
<fastcall ref="fastcall" />
</div>
@ -160,6 +176,7 @@ import { mapGetters } from "vuex";
import nextTick from "dai-js/tools/nextTick";
import fastcall from "@/views/modules/cpts/fastcall";
import * as echarts from 'echarts';
export default {
components: { fastcall },
@ -170,8 +187,7 @@ export default {
type: "jumin",
searchKey: "",
},
btnSelectA: false,
btnSelectB: true,
typePlaceholder: {
jumin: "请输入姓名或联系电话或证件号",
fangwu: "请输入小区名称或楼栋名称",
@ -201,23 +217,30 @@ export default {
noticeData: [],
option : {
activeName: 'resi',
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: {}
}
// feature: {
// saveAsImage: {}
// }
},
xAxis: {
type: 'category',
@ -229,26 +252,27 @@ 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: {}
}
},
computed: {
maxTableHeight() {
@ -275,7 +299,7 @@ export default {
},
mounted() {
this.getApiData();
this.$nextTick(()=>{
this.$nextTick(() => {
this.initChart()
})
console.log(
@ -284,17 +308,15 @@ export default {
);
},
methods: {
initChart(){
var myChart = echarts.init(document.getElementById('my_chart'));
myChart.setOption(this.option)
},
handleClickResiCategory() {
this.btnSelectA = false
this.btnSelectB = true
initChart() {
this.myChart = echarts.init(document.getElementById('my_chart'));
this.myChart.setOption(this.option)
window.addEventListener('resize', this.handleWindowResize);
},
handleClickIntelligentPrediction() {
this.btnSelectA = true
this.btnSelectB = false
handleWindowResize() {
if (this.myChart) {
this.myChart.resize();
}
},
searchDataTab(str) {
this.searchData.type = str;
@ -308,9 +330,19 @@ export default {
});
},
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) {
this.getNoticeData()
} else if (code >= 8000) {
this.$message.error(msg)
}
},
handleClickNotice(item) {
const { msgType, targetId } = item;
this.readClearOne(item)
if (msgType == "community_house") {
this.$refs.fastcall.showHouseInfo(targetId);
} else if (msgType == "resident_base_info") {
@ -391,7 +423,7 @@ export default {
async getNoticeData() {
const url = "/message/intelligentMessage/list";
let params = {
last: "4",
last: "10",
};
const { data, code, msg } = await requestGet(url, params);

4
src/views/modules/shequ/chaxun.vue

@ -45,9 +45,7 @@
</div> -->
</div>
<p v-show="smatrFlag && searchStatus == 'ing'" class="rules_box">
已显示{{ searchData.type == "fangwu" ? "房屋" : "居民" }}状态为{{
searchData.searchKey
}}的搜索结果如不满足需求
已显示{{searchData.searchKey}}的搜索结果如不满足需求
<el-button type="text" @click="handleClickEditRules"
>请点击此处调整</el-button
>

Loading…
Cancel
Save