elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

党员风采，党员统计面包屑，居民信息显示，行程关注（未完待续）

shibei_master
13176889840 3 years ago
parent
2f46af47b9
commit
25ff33b716
7 changed files with 455 additions and 343 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. 2
      src/router/index.js
  2. 4
      src/views/modules/base/epidemic/travel.vue
  3. 14
      src/views/modules/base/resi.vue
  4. 2
      src/views/modules/communityParty/elegant/index.vue
  5. 730
      src/views/modules/visual/basicinfo/people.vue
  6. 18
      src/views/modules/visual/communityParty/party.vue
  7. 28
      src/views/modules/visual/measure/service.vue

2
src/router/index.js
View File

@ -221,7 +221,7 @@ router.beforeEach((to, from, next) => {
children: [ children: [
{ {
url: "/visual/basicinfo/basicInfoMain", url: "/visual/basicinfo/basicInfoMain",
name: "基础信息", name: "人房信息统计",
id: "5feawfwaefwa5", id: "5feawfwaefwa5",
}, },
{ {

4
src/views/modules/base/epidemic/travel.vue
View File

@ -116,11 +116,11 @@
<el-button style="margin-left:15px" <el-button style="margin-left:15px"
class="diy-button--more" class="diy-button--more"
size="small" size="small"
@click="handleAttention">加入关注</el-button> @click="handleAttention">加入核酸检测关注</el-button>
<el-button style="margin-left:15px" <el-button style="margin-left:15px"
class="diy-button--more" class="diy-button--more"
size="small" size="small"
@click="handleDeletes">取消关注</el-button> @click="handleDeletes">取消核酸检测关注</el-button>
</div> </div>
<el-table class="table" <el-table class="table"

14
src/views/modules/base/resi.vue
View File

@ -92,7 +92,7 @@
<el-button @click="handleTransfer(scope.row)" <el-button @click="handleTransfer(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">调动</el-button> class="div-table-button--detail">变动</el-button>
<el-button @click="handleChangeRecord(scope.row)" <el-button @click="handleChangeRecord(scope.row)"
type="text" type="text"
size="small" size="small"
@ -240,7 +240,7 @@
<el-dialog :visible.sync="tranferShow" <el-dialog :visible.sync="tranferShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="'人员调动'" :title="'人员变动'"
width="950px" width="950px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@ -497,7 +497,9 @@ export default {
item.options.forEach((n) => { item.options.forEach((n) => {
if (n.value === row[item.columnName]) _val = n.label if (n.value === row[item.columnName]) _val = n.label
}) })
if (row[item.columnName] == '0') _val = '--'
} }
return _val || row[item.columnName] return _val || row[item.columnName]
}, },
handleSearch (val) { handleSearch (val) {
@ -1146,14 +1148,14 @@ export default {
.tabs-other-info { .tabs-other-info {
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
// width: 50px; // width: 50px;
height: 20px; height: 24px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 7px; margin-right: 7px;
padding: 0 10px !important; padding: 0 10px !important;
font-size: 8px; font-size: 16px;
font-weight: 500; font-weight: 400;
color: #666666; color: #666666;
line-height: 20px; line-height: 24px;
background: #ebecf1; background: #ebecf1;
border-radius: 2px; border-radius: 2px;
} }

2
src/views/modules/communityParty/elegant/index.vue
View File

@ -186,7 +186,7 @@
<el-input v-model="form.name" placeholder="请输入" :disabled="disabled" class="input-width" clearable></el-input> <el-input v-model="form.name" placeholder="请输入" :disabled="disabled" class="input-width" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="主要事迹" prop="mainDeed"> <el-form-item label="主要事迹" prop="mainDeed">
<el-input v-model="form.mainDeed" :autosize="{ minRows: 2, maxRows: 10}" :disabled="disabled" type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input> <el-input v-model="form.mainDeed" :autosize="{ minRows: 10, maxRows: 10}" :disabled="disabled" type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态"> <!-- <el-form-item label="状态">
<el-switch v-model="form.usableFlag"></el-switch> <el-switch v-model="form.usableFlag"></el-switch>

730
src/views/modules/visual/basicinfo/people.vue
View File

@ -1,387 +1,399 @@
<template> <template>
<div class="g-cpt"> <div class="g-wrr">
<div class="g-l"> <div class="g-bread">
<div class="m-people"> <el-breadcrumb separator-class="el-icon-arrow-right">
<cpt-card> <el-breadcrumb-item v-for="item in breadList" :key="item.path" :to="{ path: item.path }">
<div class="title"> {{ item.meta.title }}
<img src="@/assets/img/shuju/title-tip.png" /> </el-breadcrumb-item>
<span>人员情况</span>
</div> </el-breadcrumb>
<div class="more" </div>
@click="showedMoreInfo = true">查看更多</div>
<div class="ren"> <div class="g-cpt">
<img class="pic-ren"
src="@/assets/img/shuju/people/ren.png" /> <div class="g-l">
<div class="ren-name"> <div class="m-people">
<span>{{ info.name }}</span> <cpt-card>
<img src="@/assets/img/shuju/people/arrow.png" /> <div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>人员情况</span>
</div> </div>
<div class="ren-prop z-1"> <div class="more"
<img src="@/assets/img/shuju/people/ren-prop-1.png" /> @click="showedMoreInfo = true">查看更多</div>
<span>所属网格</span> <div class="ren">
<img class="pic-ren"
<div class="ren-cnt"> src="@/assets/img/shuju/people/ren.png" />
<h5>所属网格：</h5> <div class="ren-name">
<p> <span>{{ info.name }}</span>
{{ info.gridName }} <img src="@/assets/img/shuju/people/arrow.png" />
</p> </div>
<div class="ren-prop z-1">
<img src="@/assets/img/shuju/people/ren-prop-1.png" />
<span>所属网格</span>
<div class="ren-cnt">
<h5>所属网格：</h5>
<p>
{{ info.gridName }}
</p>
</div>
</div> </div>
</div>
<div class="ren-prop z-2"> <div class="ren-prop z-2">
<img src="@/assets/img/shuju/people/ren-prop-2.png" /> <img src="@/assets/img/shuju/people/ren-prop-2.png" />
<span>人员类别</span> <span>人员类别</span>
<div class="ren-cnt"> <div class="ren-cnt">
<h5>人员类别：</h5> <h5>人员类别：</h5>
<p> <p>
{{ {{
info.personCategory.length == 0 info.personCategory.length == 0
? "--" ? "--"
: info.personCategory.join("、") : info.personCategory.join("、")
}} }}
</p> </p>
</div>
</div> </div>
</div>
<div class="ren-prop z-3"> <div class="ren-prop z-3">
<img src="@/assets/img/shuju/people/ren-prop-3.png" /> <img src="@/assets/img/shuju/people/ren-prop-3.png" />
<span>工作单位</span> <span>工作单位</span>
<div class="ren-cnt"> <div class="ren-cnt">
<h5>工作单位：</h5> <h5>工作单位：</h5>
<p> <p>
{{ info.workUnit || "--" }} {{ info.workUnit || "--" }}
</p> </p>
</div>
</div> </div>
</div>
<div class="ren-prop z-4"> <div class="ren-prop z-4">
<img src="@/assets/img/shuju/people/ren-prop-4.png" /> <img src="@/assets/img/shuju/people/ren-prop-4.png" />
<span>志愿者类别</span> <span>志愿者类别</span>
<div class="ren-cnt"> <div class="ren-cnt">
<h5>志愿者类别：</h5> <h5>志愿者类别：</h5>
<p> <p>
{{ {{
info.volunteerCategory.length == 0 info.volunteerCategory.length == 0
? "--" ? "--"
: info.volunteerCategory.join("、") : info.volunteerCategory.join("、")
}} }}
</p> </p>
</div>
</div> </div>
</div>
<div class="ren-prop z-5"> <div class="ren-prop z-5">
<img src="@/assets/img/shuju/people/ren-prop-5.png" /> <img src="@/assets/img/shuju/people/ren-prop-5.png" />
<span>房屋信息</span> <span>房屋信息</span>
<div class="ren-cnt"> <div class="ren-cnt">
<h5>房屋信息：</h5> <h5>房屋信息：</h5>
<p> <p>
{{ {{
info.houseInfo.length == 0 info.houseInfo.length == 0
? "--" ? "--"
: info.houseInfo.join("、") : info.houseInfo.join("、")
}} }}
</p> </p>
</div>
</div> </div>
</div>
<div class="ren-prop z-6"> <div class="ren-prop z-6">
<img src="@/assets/img/shuju/people/ren-prop-6.png" /> <img src="@/assets/img/shuju/people/ren-prop-6.png" />
<span>经济状况</span> <span>经济状况</span>
<div class="ren-cnt"> <div class="ren-cnt">
<h5>经济状况：</h5> <h5>经济状况：</h5>
<p> <p>
月薪: 月薪:
{{ {{
info.financialSituation.monthlyIncome || "--" info.financialSituation.monthlyIncome || "--"
}}，退休金：{{ }}，退休金：{{
info.financialSituation.retirementAmount || "--" info.financialSituation.retirementAmount || "--"
}} }}
</p> </p>
</div>
</div> </div>
</div> </div>
</div> </cpt-card>
</cpt-card> </div>
</div>
<people-more v-show="showedMoreInfo" <people-more v-show="showedMoreInfo"
v-if="userId" v-if="userId"
:userId="userId" :userId="userId"
:gridName="info.gridName" :gridName="info.gridName"
@close="showedMoreInfo = false" /> @close="showedMoreInfo = false" />
<div class="m-relation">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>家庭关系</span>
</div>
<div class="info">
<div class="huzhu">
<img class="huzhu-bg"
src="@/assets/img/shuju/people/huzhu.png" />
<img class="huzhu-ico"
src="@/assets/img/shuju/people/huzhu-home.png" />
<div class="huzhu-name">{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}</div>
<p>（户主）</p>
</div>
<div class="rel z-zuo-2" <div class="m-relation">
@click="toUserInfo(houseInfo.userList[0].userId)" <cpt-card>
v-if="houseInfo.userList[0]"> <div class="title">
<img class="rel-bg" <img src="@/assets/img/shuju/title-tip.png" />
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" /> <span>家庭关系</span>
<img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
<div class="rel-text"
:class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
<div class="rel-call">{{ houseInfo.userList[0].relation }}</div>
<div class="rel-name">{{ houseInfo.userList[0].userName }}</div>
</div>
</div> </div>
<div class="info">
<div class="huzhu">
<img class="huzhu-bg"
src="@/assets/img/shuju/people/huzhu.png" />
<img class="huzhu-ico"
src="@/assets/img/shuju/people/huzhu-home.png" />
<div class="huzhu-name">{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}</div>
<p>（户主）</p>
</div>
<div class="rel z-you-2" <div class="rel z-zuo-2"
@click="toUserInfo(houseInfo.userList[1].userId)" @click="toUserInfo(houseInfo.userList[0].userId)"
v-if="houseInfo.userList[1]"> v-if="houseInfo.userList[0]">
<img class="rel-bg" <img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" /> src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
<img class="rel-line" <img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you2.png" /> src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
<div class="rel-text" <div class="rel-text"
:class="houseInfo.userList[1].isSelf == '1' ? 'z-on' : ''"> :class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
<div class="rel-call">{{ houseInfo.userList[1].relation }}</div> <div class="rel-call">{{ houseInfo.userList[0].relation }}</div>
<div class="rel-name">{{ houseInfo.userList[1].userName }}</div> <div class="rel-name">{{ houseInfo.userList[0].userName }}</div>
</div>
</div> </div>
</div>
<div class="rel z-zuo-1" <div class="rel z-you-2"
@click="toUserInfo(houseInfo.userList[2].userId)" @click="toUserInfo(houseInfo.userList[1].userId)"
v-if="houseInfo.userList[2]"> v-if="houseInfo.userList[1]">
<img class="rel-bg" <img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" /> src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
<img class="rel-line" <img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo1.png" /> src="@/assets/img/shuju/people/huzhu-line/you2.png" />
<div class="rel-text" <div class="rel-text"
:class="houseInfo.userList[2].isSelf == '1' ? 'z-on' : ''"> :class="houseInfo.userList[1].isSelf == '1' ? 'z-on' : ''">
<div class="rel-call">{{ houseInfo.userList[2].relation }}</div> <div class="rel-call">{{ houseInfo.userList[1].relation }}</div>
<div class="rel-name">{{ houseInfo.userList[2].userName }}</div> <div class="rel-name">{{ houseInfo.userList[1].userName }}</div>
</div>
</div> </div>
</div>
<div class="rel z-you-1" <div class="rel z-zuo-1"
@click="toUserInfo(houseInfo.userList[3].userId)" @click="toUserInfo(houseInfo.userList[2].userId)"
v-if="houseInfo.userList[3]"> v-if="houseInfo.userList[2]">
<img class="rel-bg" <img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" /> src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
<img class="rel-line" <img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you1.png" /> src="@/assets/img/shuju/people/huzhu-line/zuo1.png" />
<div class="rel-text" <div class="rel-text"
:class="houseInfo.userList[3].isSelf == '1' ? 'z-on' : ''"> :class="houseInfo.userList[2].isSelf == '1' ? 'z-on' : ''">
<div class="rel-call">{{ houseInfo.userList[3].relation }}</div> <div class="rel-call">{{ houseInfo.userList[2].relation }}</div>
<span class="rel-name">{{ houseInfo.userList[3].userName }}</span> <div class="rel-name">{{ houseInfo.userList[2].userName }}</div>
</div>
</div> </div>
</div>
<div class="rel z-zuo-3" <div class="rel z-you-1"
@click="toUserInfo(houseInfo.userList[4].userId)" @click="toUserInfo(houseInfo.userList[3].userId)"
v-if="houseInfo.userList[4]"> v-if="houseInfo.userList[3]">
<img class="rel-bg" <img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" /> src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
<img class="rel-line" <img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo3.png" /> src="@/assets/img/shuju/people/huzhu-line/you1.png" />
<div class="rel-text" <div class="rel-text"
:class="houseInfo.userList[4].isSelf == '1' ? 'z-on' : ''"> :class="houseInfo.userList[3].isSelf == '1' ? 'z-on' : ''">
<div class="rel-call">{{ houseInfo.userList[4].relation }}</div> <div class="rel-call">{{ houseInfo.userList[3].relation }}</div>
<div class="rel-name">{{ houseInfo.userList[4].userName }}</div> <span class="rel-name">{{ houseInfo.userList[3].userName }}</span>
</div>
</div> </div>
</div>
<div class="rel z-you-3" <div class="rel z-zuo-3"
@click="toUserInfo(houseInfo.userList[5].userId)" @click="toUserInfo(houseInfo.userList[4].userId)"
v-if="houseInfo.userList[5]"> v-if="houseInfo.userList[4]">
<img class="rel-bg" <img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" /> src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
<img class="rel-line" <img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you3.png" /> src="@/assets/img/shuju/people/huzhu-line/zuo3.png" />
<div class="rel-text" <div class="rel-text"
:class="houseInfo.userList[5].isSelf == '1' ? 'z-on' : ''"> :class="houseInfo.userList[4].isSelf == '1' ? 'z-on' : ''">
<div class="rel-call">{{ houseInfo.userList[5].relation }}</div> <div class="rel-call">{{ houseInfo.userList[4].relation }}</div>
<div class="rel-name">{{ houseInfo.userList[5].userName }}</div> <div class="rel-name">{{ houseInfo.userList[4].userName }}</div>
</div>
</div> </div>
</div>
</div>
</cpt-card>
</div>
</div>
<div class="g-r">
<div class="m-tb">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>居民需求</span>
</div>
<div class="tb"> <div class="rel z-you-3"
<cpt-tb :col-list="demand.colList" @click="toUserInfo(houseInfo.userList[5].userId)"
:loading="demand.loading" v-if="houseInfo.userList[5]">
:header="demand.header" <img class="rel-bg"
:list="demand.list" src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
@operate="handleOperateDemandList"></cpt-tb> <img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you3.png" />
<div class="m-pagination" <div class="rel-text"
v-if="demand.total > demand.pageSize"> :class="houseInfo.userList[5].isSelf == '1' ? 'z-on' : ''">
<el-pagination :current-page="demand.pageNo" <div class="rel-call">{{ houseInfo.userList[5].relation }}</div>
:page-size="demand.pageSize" <div class="rel-name">{{ houseInfo.userList[5].userName }}</div>
:total="demand.total" </div>
background </div>
layout="prev, pager, next"
@current-change="handlePageNoChangeDemand">
</el-pagination>
</div> </div>
</div> </cpt-card>
</cpt-card> </div>
</div> </div>
<div class="g-r">
<div class="m-row"> <div class="m-tb">
<div class="m-list">
<cpt-card> <cpt-card>
<div class="title"> <div class="title">
<img src="@/assets/img/shuju/title-tip.png" /> <img src="@/assets/img/shuju/title-tip.png" />
<a :class="{ 'z-on': showedIncidentOrTopic == 'incident' }" <span>居民需求</span>
@click="showedIncidentOrTopic = 'incident'">上报事件</a>
<a :class="{ 'z-on': showedIncidentOrTopic == 'topic' }"
@click="showedIncidentOrTopic = 'topic'">发布话题</a>
</div> </div>
<div class="list-wrap"
v-show="showedIncidentOrTopic == 'incident'"> <div class="tb">
<div class="list"> <cpt-tb :col-list="demand.colList"
<div class="item" :loading="demand.loading"
:key="'incident' + index" :header="demand.header"
v-for="(item, index) in incident.list" :list="demand.list"
@click="handleClickIncident(index)"> @operate="handleOperateDemandList"></cpt-tb>
<div class="item-title">{{ item.eventContent }}</div>
<div class="item-date">{{ item.reportTime }}</div>
</div>
</div>
<div class="m-pagination" <div class="m-pagination"
v-if="incident.total > incident.pageSize"> v-if="demand.total > demand.pageSize">
<el-pagination :current-page="incident.pageNo" <el-pagination :current-page="demand.pageNo"
:page-size="incident.pageSize" :page-size="demand.pageSize"
:total="incident.total" :total="demand.total"
background background
layout="prev, pager, next" layout="prev, pager, next"
@current-change="handlePageNoChangeIncident"> @current-change="handlePageNoChangeDemand">
</el-pagination> </el-pagination>
</div> </div>
</div>
</cpt-card>
</div>
<div v-if="incident.list.length == 0" <div class="m-row">
class="m-hint"> <div class="m-list">
<img src="@/assets/img/modules/visual/noData.png" <cpt-card>
class="no-data-img" /> <div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<a :class="{ 'z-on': showedIncidentOrTopic == 'incident' }"
@click="showedIncidentOrTopic = 'incident'">上报事件</a>
<a :class="{ 'z-on': showedIncidentOrTopic == 'topic' }"
@click="showedIncidentOrTopic = 'topic'">发布话题</a>
</div> </div>
</div> <div class="list-wrap"
v-show="showedIncidentOrTopic == 'incident'">
<div class="list">
<div class="item"
:key="'incident' + index"
v-for="(item, index) in incident.list"
@click="handleClickIncident(index)">
<div class="item-title">{{ item.eventContent }}</div>
<div class="item-date">{{ item.reportTime }}</div>
</div>
</div>
<div class="list-wrap" <div class="m-pagination"
v-show="showedIncidentOrTopic == 'topic'"> v-if="incident.total > incident.pageSize">
<div class="list"> <el-pagination :current-page="incident.pageNo"
<div class="item" :page-size="incident.pageSize"
:key="'topic' + index" :total="incident.total"
v-for="(item, index) in topic.list" background
@click="handleClickTopic(index)"> layout="prev, pager, next"
<div class="item-title">{{ item.topicContent }}</div> @current-change="handlePageNoChangeIncident">
<div class="item-date">{{ item.releaseTime }}</div> </el-pagination>
</div> </div>
</div>
<div class="m-pagination" <div v-if="incident.list.length == 0"
v-if="topic.total > topic.pageSize"> class="m-hint">
<el-pagination :current-page="topic.pageNo" <img src="@/assets/img/modules/visual/noData.png"
:page-size="topic.pageSize" class="no-data-img" />
:total="topic.total" </div>
background
layout="prev, pager, next"
@current-change="handlePageNoChangeTopic">
</el-pagination>
</div> </div>
<div v-if="topic.list.length == 0" <div class="list-wrap"
class="m-hint"> v-show="showedIncidentOrTopic == 'topic'">
<img src="@/assets/img/modules/visual/noData.png" <div class="list">
class="no-data-img" /> <div class="item"
:key="'topic' + index"
v-for="(item, index) in topic.list"
@click="handleClickTopic(index)">
<div class="item-title">{{ item.topicContent }}</div>
<div class="item-date">{{ item.releaseTime }}</div>
</div>
</div>
<div class="m-pagination"
v-if="topic.total > topic.pageSize">
<el-pagination :current-page="topic.pageNo"
:page-size="topic.pageSize"
:total="topic.total"
background
layout="prev, pager, next"
@current-change="handlePageNoChangeTopic">
</el-pagination>
</div>
<div v-if="topic.list.length == 0"
class="m-hint">
<img src="@/assets/img/modules/visual/noData.png"
class="no-data-img" />
</div>
</div> </div>
</div> </cpt-card>
</cpt-card> </div>
</div>
<div class="m-list"> <div class="m-list">
<cpt-card> <cpt-card>
<div class="title"> <div class="title">
<img src="@/assets/img/shuju/title-tip.png" /> <img src="@/assets/img/shuju/title-tip.png" />
<span>积分记录</span> <span>积分记录</span>
</div> </div>
<div class="list-wrap"> <div class="list-wrap">
<div class="list"> <div class="list">
<div class="item" <div class="item"
:key="'point' + index" :key="'point' + index"
v-for="(item, index) in point.list" v-for="(item, index) in point.list"
@click="handleClickPoint(index)"> @click="handleClickPoint(index)">
<div class="item-row"> <div class="item-row">
<div class="item-l"> <div class="item-l">
<div class="item-point">{{ item.point }}</div> <div class="item-point">{{ item.point }}</div>
</div> </div>
<div class="item-r"> <div class="item-r">
<div class="item-title">{{ item.title }}</div> <div class="item-title">{{ item.title }}</div>
<div class="item-date">{{ item.dateTime }}</div> <div class="item-date">{{ item.dateTime }}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="m-pagination" <div class="m-pagination"
v-if="point.total > point.pageSize"> v-if="point.total > point.pageSize">
<el-pagination :current-page="point.pageNo" <el-pagination :current-page="point.pageNo"
:page-size="point.pageSize" :page-size="point.pageSize"
:total="point.total" :total="point.total"
background background
layout="prev, pager, next" layout="prev, pager, next"
@current-change="handlePageNoChangePoint"> @current-change="handlePageNoChangePoint">
</el-pagination> </el-pagination>
</div> </div>
<div v-if="point.list.length == 0" <div v-if="point.list.length == 0"
class="m-hint"> class="m-hint">
<img src="@/assets/img/modules/visual/noData.png" <img src="@/assets/img/modules/visual/noData.png"
class="no-data-img" /> class="no-data-img" />
</div>
</div> </div>
</div> </cpt-card>
</cpt-card> </div>
</div> </div>
</div> </div>
</div>
<demand-info v-if="demand.list.length > 0 && showedDemandInfo" <demand-info v-if="demand.list.length > 0 && showedDemandInfo"
:userId="userId" :userId="userId"
queryOrigin="personal-data" queryOrigin="personal-data"
:demandId="demand.srcList[demand.currentIndex].demandRecId" :demandId="demand.srcList[demand.currentIndex].demandRecId"
@close="showedDemandInfo = false" /> @close="showedDemandInfo = false" />
<incident-info v-if="incident.list.length > 0 && incident.showedInfo" <incident-info v-if="incident.list.length > 0 && incident.showedInfo"
:resiEventId="incident.list[incident.currentIndex].resiEventId" :resiEventId="incident.list[incident.currentIndex].resiEventId"
:epmetUserIdList="info.epmetUserIdList" :epmetUserIdList="info.epmetUserIdList"
:icResiUserId="userId" :icResiUserId="userId"
@close="incident.showedInfo = false" /> @close="incident.showedInfo = false" />
<topic-info v-if="topic.list.length > 0 && topic.showedInfo" <topic-info v-if="topic.list.length > 0 && topic.showedInfo"
:topicId="topic.list[topic.currentIndex].topicId" :topicId="topic.list[topic.currentIndex].topicId"
:epmetUserIdList="info.epmetUserIdList" :epmetUserIdList="info.epmetUserIdList"
:icResiUserId="userId" :icResiUserId="userId"
@close="topic.showedInfo = false" /> @close="topic.showedInfo = false" />
</div>
</div> </div>
</template> </template>
@ -399,6 +411,7 @@ export default {
name: "HomeMap", name: "HomeMap",
data () { data () {
return { return {
breadList: [],
showedMoreInfo: false, showedMoreInfo: false,
showedDemandInfo: false, showedDemandInfo: false,
@ -516,7 +529,12 @@ export default {
incidentInfo, incidentInfo,
topicInfo, topicInfo,
}, },
beforeRouteEnter(to, from, next) {
const arr = [ {...from }, { ...to, meta: { title: '人员图谱'}}]
next((vm) =>{
vm.breadList = [ ...arr ]
})
},
watch: { watch: {
uid (id) { uid (id) {
this.userId = id; this.userId = id;
@ -525,14 +543,52 @@ export default {
this.getApiData(); this.getApiData();
window.scrollTo(0, 0); window.scrollTo(0, 0);
}, },
$route(route) {
// if you go to the redirect page, do not update the breadcrumbs
if (route.path.startsWith('/redirect/')) {
return
}
// this.getBreadcrumb()
},
}, },
async mounted () { async mounted () {
this.userId = this.uid; this.userId = this.uid;
this.getApiData(); this.getApiData();
}, },
deactivated() {
this.breadList = []
console.log('breadList-----', this.breadList)
},
destroyed() {
this.breadList = []
console.log('breadList-----', this.breadList)
},
methods: { methods: {
getBreadcrumb() {
// only show routes with meta.title
console.log('routest----', this.$route)
let matched = this.$route.matched.filter(
(item) => item.meta && item.meta.title
)
const first = matched[0]
if (!this.isDashboard(first)) {
matched = [{ path: '/home', meta: { title: '首页' } }].concat(matched)
}
this.breadList = matched.filter(
(item) => item.meta && item.meta.title && item.meta.breadcrumb !== false
)
},
isDashboard(route) {
const name = route && route.name
if (!name) {
return false
}
return name.trim().toLocaleLowerCase() === 'Home'.toLocaleLowerCase()
},
handleSearch () { }, handleSearch () { },
async getApiData () { async getApiData () {
@ -722,5 +778,19 @@ export default {
<style <style
lang="scss" lang="scss"
src="@/assets/scss/modules/visual/people.scss" src="@/assets/scss/modules/visual/people.scss"
scoped scoped>
></style> </style>
<style
lang="scss"
scoped>
.g-bread {
padding: 10px 20px;
::v-deep .el-breadcrumb__item {
font-size: 16px;
.el-breadcrumb__inner {
color: #fff;
}
}
}
</style>

18
src/views/modules/visual/communityParty/party.vue
View File

@ -46,6 +46,8 @@
<screen-table <screen-table
:headerList="headerList" :headerList="headerList"
:tableData="ageList" :tableData="ageList"
:headerStyle="headerStyle"
:tableContentStyle="headerStyle"
:visibleLoading="visibleAgeLoading" :visibleLoading="visibleAgeLoading"
:operate="false" :operate="false"
@row="handleClickRow" @row="handleClickRow"
@ -88,6 +90,8 @@
<screen-table <screen-table
:headerList="headerEduList" :headerList="headerEduList"
:tableData="eduList" :tableData="eduList"
:headerStyle="headerStyle"
:tableContentStyle="headerStyle"
:visibleLoading="visibleLoading" :visibleLoading="visibleLoading"
:operate="false" :operate="false"
@row="handleClickRow" @row="handleClickRow"
@ -137,6 +141,20 @@ export default {
{ title: "年龄", coulmn: 'age' }, { title: "年龄", coulmn: 'age' },
{ title: "手机号码", coulmn: 'mobile' } { title: "手机号码", coulmn: 'mobile' }
], ],
headerStyle: [
{
width: '50px'
},
{
'min-width': '100px'
},
{
'min-width': '100px'
},
{
'min-width': '160px'
}
],
headerEduList: [ headerEduList: [
{ title: "序号", coulmn: 'index' }, { title: "序号", coulmn: 'index' },
{ title: "姓名", coulmn: 'name' }, { title: "姓名", coulmn: 'name' },

28
src/views/modules/visual/measure/service.vue
View File

@ -113,10 +113,11 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<div class="card-left-title mt30">需求和资源匹配分析</div>
<div class="echarts-container"> <div class="echarts-container">
<div id="echartsBox" class="echarts-boxs"></div> <div id="echartsBox" class="echarts-boxs"></div>
</div> </div>
<div class="card-left-title mt30">服务清单</div>
<div class="ecahrts-button"> <div class="ecahrts-button">
<el-button type="warning" size="small" @click="handleExport">导出</el-button> <el-button type="warning" size="small" @click="handleExport">导出</el-button>
</div> </div>
@ -254,7 +255,7 @@ export default {
if (item.legendCode == 'unfinished') { if (item.legendCode == 'unfinished') {
desc += `<div><span>尚有 ${item.serviceDemandTotal} 个需求未完成</span></div>` desc += `<div><span>尚有 ${item.serviceDemandTotal} 个需求未完成</span></div>`
}else { }else {
desc += `<div><span>共 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个</span></div>` desc += `<div><span>共有 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个</span></div>`
} }
}) })
@ -645,6 +646,25 @@ export default {
} }
} }
} }
.card-left-title {
position: relative;
padding-left: 40px;
font-size: 16px;
font-weight: 500;
color: #fff;
}
.card-left-title::after {
content: '';
position: absolute;
top: 50%;
left: 20px;
width: 12px;
height: 12px;
box-sizing: border-box;
margin-top: -6px;
background: #2865FA;
border-radius: 50%;
}
.second-select { .second-select {
margin: 0 10px 0 0; margin: 0 10px 0 0;
::v-deep .el-input { ::v-deep .el-input {
@ -799,5 +819,7 @@ export default {
border: 0; border: 0;
} }
} }
.mt30 {
margin-top: 30px;
}
</style> </style>

Write Preview
Loading…
Cancel
Save