elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

feature
wxz 2 years ago
parent
908c79ff46 3c7fe24703
commit
2d0c57484c
4 changed files with 238 additions and 191 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      src/assets/scss/modules/index.scss
  2. 10
      src/views/main-navbar.vue
  3. 216
      src/views/modules/home/index.vue
  4. 4
      src/views/modules/shequ/chaxun.vue

71
src/assets/scss/modules/index.scss
View File

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

10
src/views/main-navbar.vue
View File

@ -20,25 +20,25 @@
</el-menu-item> </el-menu-item>
</el-menu> </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"> <el-menu-item index="3" @click="handleCLickNav">
<div class="nav-item"> <div class="nav-item">
<img src="~@/assets/images/main/nav-sjdb.png" /> <img src="~@/assets/images/main/nav-sjdb.png" />
<span>数据看板</span> <span>数据看板</span>
</div> </div>
</el-menu-item> </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"> <div class="nav-item">
<img src="~@/assets/images/main/nav-zntb.png" /> <img src="~@/assets/images/main/nav-zntb.png" />
<span>智能填报</span> <span>智能填报</span>
</div> </div>
</el-menu-item> </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"> <div class="nav-item">
<img src="~@/assets/images/main/nav-sjjy.png" /> <img src="~@/assets/images/main/nav-sjjy.png" />
<span>数据校验</span> <span>数据校验</span>
</div> </div>
</el-menu-item> </el-menu-item> -->
</el-menu> </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: 180px">

216
src/views/modules/home/index.vue
View File

@ -2,6 +2,7 @@
<template> <template>
<div> <div>
<div class="g-row"> <div class="g-row">
<div class="g-row-left">
<div class="m-box m-search"> <div class="m-box m-search">
<div class="wrap"> <div class="wrap">
<div class="title"> <div class="title">
@ -23,7 +24,8 @@
<input type="text" :placeholder="typePlaceholder[searchData.type] <input type="text" :placeholder="typePlaceholder[searchData.type]
" v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" /> " v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" />
<div class="close-btn" v-if="searchData.searchKey != ''" @click="searchData.searchKey = ''"> <div class="close-btn" v-if="searchData.searchKey != ''"
@click="searchData.searchKey = ''">
<img src="@/assets/img/shequ/close.png" /> <img src="@/assets/img/shequ/close.png" />
</div> </div>
</div> </div>
@ -31,84 +33,50 @@
查一下 查一下
</div> </div>
</div> </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"
v-for="(item, index) in noticeData">
<div class="item_left">
<i class="i-tag" v-if="item.readFlag == 1">已读</i>
<i class="i-tag" v-else>未读</i>
</div>
<div class="item_right">
<div class="item-date">
{{ item.createdTime }}
</div>
<div class="item-title">
{{ item.content }}
</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>
</div> </div>
<div class="m-box m-tb"> <div class=" m-pan m-box">
<div class="wrap">
<div class="header"> <div class="header">
<span>不满意事项月度趋势分析</span> <img src="@/assets/images/index/title-icon-sqzl.png" />
</div> <span>社区总览</span>
</div> </div>
<div class="flex_box">
<div class="cnt"> <div class="cnt">
<!-- 图表 --> <div class="cnt-left">
<div id="my_chart" style="width: 500px;height: 200px; position: relative;top:-10px"></div> <div class="subtitle">
</div> <img src="@/assets/images/index/i-sqjj.png" />
</div> <span>社区简介</span>
</div> </div>
<div class="g-row-right"> <p>
<!-- --> {{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为{{
<div class="m-box m-pan"> pandectData.underCount }}个{{
<div class="header">
<span>当前组织名称概览</span>
</div>
<p>{{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为{{ pandectData.underCount }}个{{
pandectData.underName pandectData.underName
}}，</span>现有房屋{{ pandectData.homeCount }}间、自住房屋{{ pandectData.selfStay }}间、 }}，</span>现有居民{{ pandectData.homeCount }}户、{{
出租房屋{{ pandectData.rentOut }}间、
闲置房屋{{ pandectData.vacantHouse }}间、现有居民{{
pandectData.resiCount pandectData.resiCount
}}户、{{ }}人，其中常住人口{{
pandectData.totalResidents
}}人、其中常住人口{{
pandectData.permanentResiCount pandectData.permanentResiCount
}}人，流动人口{{ }}人，流动人口{{
pandectData.floatingResiCount pandectData.floatingResiCount
}}人，各类群体分布如下： }}人，各类群体分布如下：
</p> </p>
<div>
<el-button-group class="btn_group"> <div class="subtitle">
<el-button type="primary" :plain="btnSelectA" <img src="@/assets/images/index/i-fxjg.png" />
@click="handleClickResiCategory">居民分类统计</el-button> <span>分析结果</span>
<el-button type="primary" :plain="btnSelectB"
@click="handleClickIntelligentPrediction">智能预测</el-button>
</el-button-group>
</div> </div>
<div class="cnt">
<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="cnt-right">
<div class="list"> <div class="list">
<div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="( <div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="(
@ -137,18 +105,66 @@
</div> </div>
</div> </div>
</div> </div>
</el-tab-pane>
<el-tab-pane label="智能预测" name="zhineng">
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</div>
<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>
<i class="i-tag" v-else>未读</i>
</div>
<div class="item_right">
<div class="item-date">
{{ item.createdTime }}
</div>
<div class="item-title">
{{ item.content }}
</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 class="m-box m-tb">
<div class="wrap">
<div class="header">
<img
src="@/assets/images/index/title-icon-zntb.png"
/>
<span>不满意事项月度趋势分析</span>
</div>
</div>
<!-- <div class="more">更多></div> -->
<div class="cnt">
<div id="my_chart" style="width: 100%;height: 230px; position: relative;top:-10px"></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>
</div> </div>
</section>
</div> </div>
<fastcall ref="fastcall" /> <fastcall ref="fastcall" />
</div> </div>
@ -160,6 +176,7 @@ import { mapGetters } from "vuex";
import nextTick from "dai-js/tools/nextTick"; import nextTick from "dai-js/tools/nextTick";
import fastcall from "@/views/modules/cpts/fastcall"; import fastcall from "@/views/modules/cpts/fastcall";
import * as echarts from 'echarts'; import * as echarts from 'echarts';
export default { export default {
components: { fastcall }, components: { fastcall },
@ -170,8 +187,7 @@ export default {
type: "jumin", type: "jumin",
searchKey: "", searchKey: "",
}, },
btnSelectA: false,
btnSelectB: true,
typePlaceholder: { typePlaceholder: {
jumin: "请输入姓名或联系电话或证件号", jumin: "请输入姓名或联系电话或证件号",
fangwu: "请输入小区名称或楼栋名称", fangwu: "请输入小区名称或楼栋名称",
@ -201,23 +217,30 @@ export default {
noticeData: [], noticeData: [],
activeName: 'resi',
option: { option: {
tooltip: { tooltip: {
trigger: 'axis' trigger: 'axis'
}, },
legend: { legend: {
data: ['12345不满意数', '省满意调查不满意数', '社区自评不满意数'] data: ['12345不满意数', '省满意调查不满意数', '社区自评不满意数'],
bottom: '10%',
icon: 'rect',
itemWidth: 20,
itemHeight: 5,
itemGap: 20,
}, },
grid: { grid: {
left: '3%', left: '3%',
right: '4%', right: '4%',
bottom: '8%', bottom: '25%',
containLabel: true containLabel: true
}, },
toolbox: { toolbox: {
feature: { // feature: {
saveAsImage: {} // saveAsImage: {}
} // }
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
@ -248,7 +271,8 @@ export default {
} }
] ]
}, },
}; myChart: {}
}
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight() {
@ -285,16 +309,14 @@ export default {
}, },
methods: { methods: {
initChart() { initChart() {
var myChart = echarts.init(document.getElementById('my_chart')); this.myChart = echarts.init(document.getElementById('my_chart'));
myChart.setOption(this.option) this.myChart.setOption(this.option)
window.addEventListener('resize', this.handleWindowResize);
}, },
handleClickResiCategory() { handleWindowResize() {
this.btnSelectA = false if (this.myChart) {
this.btnSelectB = true this.myChart.resize();
}, }
handleClickIntelligentPrediction() {
this.btnSelectA = true
this.btnSelectB = false
}, },
searchDataTab(str) { searchDataTab(str) {
this.searchData.type = 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) { handleClickNotice(item) {
const { msgType, targetId } = item; const { msgType, targetId } = item;
this.readClearOne(item)
if (msgType == "community_house") { if (msgType == "community_house") {
this.$refs.fastcall.showHouseInfo(targetId); this.$refs.fastcall.showHouseInfo(targetId);
} else if (msgType == "resident_base_info") { } else if (msgType == "resident_base_info") {
@ -391,7 +423,7 @@ export default {
async getNoticeData() { async getNoticeData() {
const url = "/message/intelligentMessage/list"; const url = "/message/intelligentMessage/list";
let params = { let params = {
last: "4", last: "10",
}; };
const { data, code, msg } = await requestGet(url, params); const { data, code, msg } = await requestGet(url, params);

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

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

Write Preview
Loading…
Cancel
Save