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

Revert "首页样式更改" 

This reverts commit 1691f5d002.
feature
mk 2 years ago
parent
083d1fdc28
commit
13697d2bd0
2 changed files with 284 additions and 248 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. 66
      src/assets/scss/modules/index.scss
  2. 354
      src/views/modules/home/index.vue

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

@ -3,20 +3,15 @@
.g-row { .g-row {
padding: 10px 6px; padding: 10px 6px;
section{
display: flex; display: flex;
.g-row-left { .g-row-left {
margin-right: auto; margin-right: auto;
width: calc(34% - 16px); width: calc(66%);
} }
.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 +25,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 +70,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 +128,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,7 +211,7 @@
.m-pan { .m-pan {
position: relative; position: relative;
height: 510px; height: 488px;
box-sizing: border-box; box-sizing: border-box;
.cnt { .cnt {
@ -252,14 +251,14 @@
} }
} }
.cnt-right { .cnt-right {
// margin-left: auto; margin-left: auto;
width: calc(100%); width: calc(100% - 240px - 40px);
height: 320px; height: 402px;
overflow-y: auto; overflow-y: auto;
.list { .list {
.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 +297,7 @@
.item-progress { .item-progress {
margin-right: 15px; margin-right: 15px;
width: 74%; width: 60%;
height: 24px; height: 24px;
background: #e6f0ff; background: #e6f0ff;
border-radius: 1px; border-radius: 1px;
@ -316,7 +315,7 @@
} }
.m-tx { .m-tx {
height: 250px; height: 466px;
margin-bottom: 13px; margin-bottom: 13px;
.cnt { .cnt {
box-sizing: border-box; box-sizing: border-box;
@ -335,15 +334,11 @@
} }
.item { .item {
padding: 0px 0 7px; padding: 16px 0 12px;
border-bottom: 1px dashed #f0f5fa; border-bottom: 1px dashed #f0f5fa;
&:last-child { &:last-child {
border-bottom: none; border-bottom: none;
} }
display: flex;
align-items: center;
.item_right{
flex: 1;
.item-title { .item-title {
@include toe; @include toe;
height: 22px; height: 22px;
@ -365,31 +360,10 @@
line-height: 17px; line-height: 17px;
} }
} }
.item_left{
width: 40px;
margin-right:15px;
.i-tag{
display: block;
margin-right: 15px;
width: 40px;
height: 22px;
border-radius: 4px;
border: 1px solid rgba(0, 0, 0, 0.15);
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0, 0, 0, 0.88);
line-height: 20px;
font-style: normal;
text-align: center;
}
}
}
} }
} }
.m-tb { .m-tb {
height: 247px; height: 302px;
.cnt { .cnt {
box-sizing: border-box; box-sizing: border-box;

354
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">
@ -9,10 +10,16 @@
</div> </div>
<div class="tabs"> <div class="tabs">
<div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')"> <div
:class="{ 'z-on': searchData.type == 'jumin' }"
@click="searchDataTab('jumin')"
>
查居民 查居民
</div> </div>
<div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')"> <div
:class="{ 'z-on': searchData.type == 'fangwu' }"
@click="searchDataTab('fangwu')"
>
查房屋 查房屋
</div> </div>
</div> </div>
@ -20,36 +27,145 @@
<div class="search"> <div class="search">
<div class="search-input"> <div class="search-input">
<div class="input"> <div class="input">
<input type="text" :placeholder="typePlaceholder[searchData.type] <input
" v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" /> type="text"
:placeholder="
typePlaceholder[searchData.type]
"
v-model="searchData.searchKey"
@keyup.enter="handleClickSearchBtn"
/>
<div class="close-btn" v-if="searchData.searchKey != ''" @click="searchData.searchKey = ''"> <div
<img src="@/assets/img/shequ/close.png" /> class="close-btn"
v-if="searchData.searchKey != ''"
@click="searchData.searchKey = ''"
>
<img
src="@/assets/img/shequ/close.png"
/>
</div> </div>
</div> </div>
<div class="btn" @click="handleClickSearchBtn"> <div class="btn" @click="handleClickSearchBtn">
查一下 查一下
</div> </div>
</div> </div>
<!-- <div class="btn2" @click="handleClickSearchBtn('smart')">
<img src="@/assets/images/index/i-search.png" />
智能查询
</div> -->
</div> </div>
</div> </div>
</div> </div>
<section>
<div class="g-row-left"> <div class="m-box m-pan">
<div class="wrap">
<div class="header">
<img
src="@/assets/images/index/title-icon-sqzl.png"
/>
<span>社区总览</span>
</div>
<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>
<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>
</div>
</div>
</div>
<div class="g-row-right">
<div class="m-box m-tx"> <div class="m-box m-tx">
<div class="wrap"> <div class="wrap">
<div class="header"> <div class="header">
<img
src="@/assets/images/index/title-icon-zntx.png"
/>
<span>智能提醒</span> <span>智能提醒</span>
</div> </div>
<div class="more" @click="toNoticePage">更多></div> <div class="more" @click="toNoticePage">更多></div>
<div class="cnt" v-if="noticeData.length > 0"> <div class="cnt" v-if="noticeData.length > 0">
<div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index" <div
v-for="(item, index) in noticeData"> @click="handleClickNotice(item)"
<div class="item_left"> class="item"
<i class="i-tag" v-if="item.readFlag == 1">已读</i> :key="'notice' + item.targetId + index"
<i class="i-tag" v-else>未读</i> v-for="(item, index) in noticeData"
</div> >
<div class="item_right">
<div class="item-date"> <div class="item-date">
{{ item.createdTime }} {{ item.createdTime }}
</div> </div>
@ -58,11 +174,12 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="cnt" v-else> <div class="cnt" v-else>
<div class="empty"> <div class="empty">
<img src="~@/assets/images/shuju/renfang/index/empty.png" /> <img
src="~@/assets/images/shuju/renfang/index/empty.png"
/>
<span>暂无提醒～</span> <span>暂无提醒～</span>
</div> </div>
</div> </div>
@ -71,84 +188,93 @@
<div class="m-box m-tb"> <div class="m-box m-tb">
<div class="wrap"> <div class="wrap">
<div class="header"> <div class="header">
<span>不满意事项月度趋势分析</span> <img
src="@/assets/images/index/title-icon-zntb.png"
/>
<span>智能填报</span>
</div> </div>
</div> </div>
<div class="more">更多></div>
<div class="cnt"> <div class="cnt">
<!-- 图表 --> <div class="item">
<div id="my_chart" style="width: 500px;height: 200px; position: relative;top:-10px"></div> <img
class="item-tag"
src="@/assets/images/index/i-zntb.png"
/>
<div class="item-name">
《80-90周岁高龄老人生活补助申请表》
</div> </div>
<div class="item-btns">
<div class="item-btn">
<img src="@/assets/images/index/i-tx.png" />
<span>填写</span>
</div> </div>
<div class="item-btn">
<img src="@/assets/images/index/i-xz.png" />
<span>下载</span>
</div> </div>
<div class="g-row-right">
<!-- -->
<div class="m-box m-pan">
<div class="header">
<span>当前组织名称概览</span>
</div> </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>
</div> </div>
<div class="cnt"> <div class="item">
<div class="cnt-right"> <img
<div class="list"> class="item-tag"
<div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="( src="@/assets/images/index/i-zntb.png"
item, index />
) in resiCategory.list"> <div class="item-name">
<div> 《80-90周岁高龄老人生活补助申请表》
{{ </div>
("0" + (index + 1)).substr(-2) <div class="item-btns">
}}. <div class="item-btn">
<img src="@/assets/images/index/i-tx.png" />
<span>填写</span>
</div> </div>
<div class="item-btn">
<img src="@/assets/images/index/i-xz.png" />
<span>下载</span>
</div>
</div>
</div>
<div class="item">
<img
class="item-tag"
src="@/assets/images/index/i-zntb.png"
/>
<div class="item-name"> <div class="item-name">
{{ item.name }} 《80-90周岁高龄老人生活补助申请表》
</div> </div>
<div class="item-div"></div> <div class="item-btns">
<div class="item-count"> <div class="item-btn">
{{ item.count }}人 <img src="@/assets/images/index/i-tx.png" />
<span>填写</span>
</div> </div>
<div class="item-progress"> <div class="item-btn">
<b :style="{ <img src="@/assets/images/index/i-xz.png" />
width: item.per + '%', <span>下载</span>
}"></b>
</div> </div>
<div class="item-per">
{{ item.per }} %
</div> </div>
</div> </div>
<div class="item">
<img
class="item-tag"
src="@/assets/images/index/i-zntb.png"
/>
<div class="item-name">
《80-90周岁高龄老人生活补助申请表》
</div>
<div class="item-btns">
<div class="item-btn">
<img src="@/assets/images/index/i-tx.png" />
<span>填写</span>
</div>
<div class="item-btn">
<img src="@/assets/images/index/i-xz.png" />
<span>下载</span>
</div>
</div> </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>
</div> </div>
</section>
</div> </div>
<fastcall ref="fastcall" /> <fastcall ref="fastcall" />
</div> </div>
@ -159,7 +285,7 @@ import resiCategoryMap from "@/views/business/resi-category-map.js";
import { mapGetters } from "vuex"; 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';
export default { export default {
components: { fastcall }, components: { fastcall },
@ -170,8 +296,7 @@ export default {
type: "jumin", type: "jumin",
searchKey: "", searchKey: "",
}, },
btnSelectA: false,
btnSelectB: true,
typePlaceholder: { typePlaceholder: {
jumin: "请输入姓名或联系电话或证件号", jumin: "请输入姓名或联系电话或证件号",
fangwu: "请输入小区名称或楼栋名称", fangwu: "请输入小区名称或楼栋名称",
@ -200,54 +325,6 @@ export default {
}, },
noticeData: [], noticeData: [],
option : {
tooltip: {
trigger: 'axis'
},
legend: {
data: ['12345不满意数', '省满意调查不满意数', '社区自评不满意数']
},
grid: {
left: '3%',
right: '4%',
bottom: '8%',
containLabel: true
},
toolbox: {
feature: {
saveAsImage: {}
}
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月']
},
yAxis: {
type: 'value'
},
series: [
{
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: [150, 232, 201, 154, 190, 330, 410]
}
]
},
}; };
}, },
computed: { computed: {
@ -275,28 +352,13 @@ export default {
}, },
mounted() { mounted() {
this.getApiData(); this.getApiData();
this.$nextTick(()=>{
this.initChart()
})
console.log( console.log(
"dynamicMenuRoutes----------------------------", "dynamicMenuRoutes----------------------------",
this.$store.state.sidebarMenuList this.$store.state.sidebarMenuList
); );
}, },
methods: { methods: {
initChart(){ searchDataTab(str){
var myChart = echarts.init(document.getElementById('my_chart'));
myChart.setOption(this.option)
},
handleClickResiCategory() {
this.btnSelectA = false
this.btnSelectB = true
},
handleClickIntelligentPrediction() {
this.btnSelectA = true
this.btnSelectB = false
},
searchDataTab(str) {
this.searchData.type = str; this.searchData.type = str;
}, },
handleClickCategory(item) { handleClickCategory(item) {
@ -328,15 +390,15 @@ export default {
this.$router.push({ this.$router.push({
path: "/main/shequ-chaxun" path: "/main/shequ-chaxun"
}); });
localStorage.setItem('homeSearchType', type) localStorage.setItem('homeSearchType',type)
localStorage.setItem('homeSearchKey', searchKey) localStorage.setItem('homeSearchKey',searchKey)
}, },
handleClickSearchBtn(str) { handleClickSearchBtn(str) {
const { const {
searchData: { type, searchKey }, searchData: { type, searchKey },
} = this; } = this;
if (str) { if(str){
this.toSearchPage(type, searchKey); this.toSearchPage(type, searchKey);
return return
} }
@ -391,7 +453,7 @@ export default {
async getNoticeData() { async getNoticeData() {
const url = "/message/intelligentMessage/list"; const url = "/message/intelligentMessage/list";
let params = { let params = {
last: "4", last: "6",
}; };
const { data, code, msg } = await requestGet(url, params); const { data, code, msg } = await requestGet(url, params);

Write Preview
Loading…
Cancel
Save