Browse Source

党员风采,党员统计面包屑,居民信息显示,行程关注(未完待续)

shibei_master
13176889840 3 years ago
parent
commit
25ff33b716
  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. 76
      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

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

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

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

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

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

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

@ -186,7 +186,7 @@
<el-input v-model="form.name" placeholder="请输入" :disabled="disabled" class="input-width" clearable></el-input>
</el-form-item>
<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 label="状态">
<el-switch v-model="form.usableFlag"></el-switch>

76
src/views/modules/visual/basicinfo/people.vue

@ -1,5 +1,16 @@
<template>
<div class="g-wrr">
<div class="g-bread">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item v-for="item in breadList" :key="item.path" :to="{ path: item.path }">
{{ item.meta.title }}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="g-cpt">
<div class="g-l">
<div class="m-people">
<cpt-card>
@ -383,6 +394,7 @@
:icResiUserId="userId"
@close="topic.showedInfo = false" />
</div>
</div>
</template>
<script>
@ -399,6 +411,7 @@ export default {
name: "HomeMap",
data () {
return {
breadList: [],
showedMoreInfo: false,
showedDemandInfo: false,
@ -516,7 +529,12 @@ export default {
incidentInfo,
topicInfo,
},
beforeRouteEnter(to, from, next) {
const arr = [ {...from }, { ...to, meta: { title: '人员图谱'}}]
next((vm) =>{
vm.breadList = [ ...arr ]
})
},
watch: {
uid (id) {
this.userId = id;
@ -525,14 +543,52 @@ export default {
this.getApiData();
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 () {
this.userId = this.uid;
this.getApiData();
},
deactivated() {
this.breadList = []
console.log('breadList-----', this.breadList)
},
destroyed() {
this.breadList = []
console.log('breadList-----', this.breadList)
},
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 () { },
async getApiData () {
@ -722,5 +778,19 @@ export default {
<style
lang="scss"
src="@/assets/scss/modules/visual/people.scss"
scoped
></style>
scoped>
</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

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

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

@ -113,10 +113,11 @@
</div>
</div>
</div> -->
<div class="card-left-title mt30">需求和资源匹配分析</div>
<div class="echarts-container">
<div id="echartsBox" class="echarts-boxs"></div>
</div>
<div class="card-left-title mt30">服务清单</div>
<div class="ecahrts-button">
<el-button type="warning" size="small" @click="handleExport">导出</el-button>
</div>
@ -254,7 +255,7 @@ export default {
if (item.legendCode == 'unfinished') {
desc += `<div><span>尚有 ${item.serviceDemandTotal} 个需求未完成</span></div>`
}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 {
margin: 0 10px 0 0;
::v-deep .el-input {
@ -799,5 +819,7 @@ export default {
border: 0;
}
}
.mt30 {
margin-top: 30px;
}
</style>

Loading…
Cancel
Save