From 71bec30c1a7de83e689cb7af732b966144b5fabc Mon Sep 17 00:00:00 2001
From: tianqian <277562116@qq.com>
Date: Fri, 31 Mar 2023 19:30:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=83=A8=E5=88=86=E5=89=A9?=
=?UTF-8?q?=E4=B8=8B=E7=9A=84mock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/sida/zy/gexingDetail.vue | 4 +-
src/views/dataBoard/sida/zy/gexingList.vue | 67 +-
.../dataBoard/sida/zy/gonggongDetail.vue | 4 +-
src/views/dataBoard/sida/zy/gonggongList.vue | 70 +-
.../dataBoard/sida/zy/lianjianDetail.vue | 11 +-
src/views/dataBoard/sida/zy/lianjianList.vue | 26 +-
.../dataBoard/sida/zy/peopleRes-detail.vue | 113 ++-
src/views/dataBoard/sida/zy/peopleResList.vue | 4 +-
.../dataBoard/sida/zy/placeRes-detail.vue | 875 +-----------------
src/views/dataBoard/sida/zy/placeResList.vue | 2 +-
10 files changed, 188 insertions(+), 988 deletions(-)
diff --git a/src/views/dataBoard/sida/zy/gexingDetail.vue b/src/views/dataBoard/sida/zy/gexingDetail.vue
index 63852eed3..641e10eb4 100644
--- a/src/views/dataBoard/sida/zy/gexingDetail.vue
+++ b/src/views/dataBoard/sida/zy/gexingDetail.vue
@@ -99,7 +99,7 @@ export default {
return {
progress: [],
info: {},
- title: '事件',
+ title: '个性服务详情',
currentTabIndex: 0,
startTabIndex: 0,
currentTabIndex2: 0,
@@ -135,7 +135,7 @@ export default {
user_demand_id: this.detailId
},
{
- // mockId: 60235478,
+ mockId: 69964568,
}
);
if (code === 0) {
diff --git a/src/views/dataBoard/sida/zy/gexingList.vue b/src/views/dataBoard/sida/zy/gexingList.vue
index ceaa75fa0..56f38cce6 100644
--- a/src/views/dataBoard/sida/zy/gexingList.vue
+++ b/src/views/dataBoard/sida/zy/gexingList.vue
@@ -24,7 +24,7 @@ import getQueryPara from 'dai-js/modules/getQueryPara';
export default {
name: 'event-list',
props: {
- detailId: {
+ id: {
type: String,
default: ''
},
@@ -35,7 +35,7 @@ export default {
},
components: {
cptTb,
- cptBread,
+
detail
},
@@ -43,10 +43,8 @@ export default {
return {
detailId: '',
searchDate: '',
-
org_id: '',
listType: '', // 流动 常驻 全部
-
loading: true,
page_size: parseInt(localStorage.getItem('dataBoard_page_size')) || 20,
@@ -57,27 +55,23 @@ export default {
colList: [
{
- align: 'left',
- width: '5%'
+ align: 'left'
},
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
{
align: 'left'
},
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
+
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
{
@@ -88,14 +82,7 @@ export default {
header: ['序号', '服务时间', '需求类型', '需求内容', '满意度', '状态', '操作']
};
},
-
- activated() {
- this.org_id = getQueryPara('org_id');
- this.listType = getQueryPara('type');
- this.type2 = getQueryPara('type2');
- this.searchDate = [getQueryPara('start_date'), getQueryPara('end_date')];
- this.page_num = 1;
- // this.getDate();
+ created() {
this.init();
},
@@ -105,9 +92,9 @@ export default {
},
showInfo(index) {
- // let item = this.srcTableData[index];
- // this.detailType = item.peop_child_type;
- // this.detailId = item.user_demand_id;
+ let item = this.srcTableData[index];
+ this.detailType = item.peop_child_type;
+ this.detailId = item.user_demand_id;
// ceshi
// this.detailType = '志愿者';
// this.detailId = '1501821704551272449';
@@ -125,9 +112,8 @@ export default {
},
async getList() {
+ console.log('this.srcTableData 444444444444564743534');
const { org_id, listType, page_num, page_size, searchDate } = this;
- const start_date = searchDate[0];
- const end_date = searchDate[1];
let peop_type = this.type2;
@@ -142,7 +128,7 @@ export default {
}
},
{
- // mockId: 60068051,
+ mockId: 69844538
}
);
@@ -150,9 +136,8 @@ export default {
if (code === 0) {
this.srcTableData = data;
- console.log('this.srcTableData ', this.srcTableData);
- // this.total = data.total;
- // service_num avg_satisfaction
+ console.log('this.srcTableData 4444444444444', this.srcTableData);
+
this.list = data.map((item, index) => {
return [
index + 1,
@@ -162,7 +147,7 @@ export default {
item.content ? item.content : '--',
item.score ? item.score : '--',
item.demand_status ? item.demand_status : '--',
-// 待处理:pending;已取消canceled;已派单:assigned;已接单:have_order;已完成:finished;
+ // 待处理:pending;已取消canceled;已派单:assigned;已接单:have_order;已完成:finished;
{ type: 'operate', list: ['查看'] }
];
});
@@ -171,18 +156,6 @@ export default {
} else {
this.$message.error(msg);
}
- this.list = [
- {
- index: 1,
- peop_name: '置南于可',
- peop_child_type: 'in nostrud commodo dolore',
- service_num: 57,
- service_ratio: 94,
- avg_satisfaction: 65,
- sum_point: 63,
- '': { type: 'operate', list: ['查看'] }
- }
- ];
},
async getCount() {
@@ -195,10 +168,8 @@ export default {
url,
{
queryParam: {
- org_id,
- start_date,
- end_date,
- peop_type
+ user_demand_id: this.id,
+ service_type: this.detailType
}
},
{
diff --git a/src/views/dataBoard/sida/zy/gonggongDetail.vue b/src/views/dataBoard/sida/zy/gonggongDetail.vue
index 8db55cfb3..e8da5c8d8 100644
--- a/src/views/dataBoard/sida/zy/gonggongDetail.vue
+++ b/src/views/dataBoard/sida/zy/gonggongDetail.vue
@@ -76,7 +76,7 @@ export default {
return {
progress: [],
info: {},
- title: '事件',
+ title: '公共服务详情',
currentTabIndex: 0,
startTabIndex: 0,
currentTabIndex2: 0,
@@ -112,7 +112,7 @@ export default {
service_record_id: this.detailId
},
{
- // mockId: 60235478,
+ mockId: 69980718,
}
);
if (code === 0) {
diff --git a/src/views/dataBoard/sida/zy/gonggongList.vue b/src/views/dataBoard/sida/zy/gonggongList.vue
index 446fde9d9..c83f5f803 100644
--- a/src/views/dataBoard/sida/zy/gonggongList.vue
+++ b/src/views/dataBoard/sida/zy/gonggongList.vue
@@ -24,7 +24,7 @@ import getQueryPara from 'dai-js/modules/getQueryPara';
export default {
name: 'event-list',
props: {
- detailId: {
+ id: {
type: String,
default: ''
},
@@ -35,7 +35,7 @@ export default {
},
components: {
cptTb,
- cptBread,
+
detail
},
@@ -54,30 +54,25 @@ export default {
total: 0,
srcTableData: [],
list: [],
- sourceName: '0',//0公共服务,1共性需求,2政策找人 3服务找人
+ sourceName: '0', //0公共服务,1共性需求,2政策找人 3服务找人
colList: [
{
- align: 'left',
- width: '5%'
+ align: 'left'
},
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
{
align: 'left'
},
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
{
- align: 'left',
- width: '10%'
+ align: 'left'
},
{
@@ -88,15 +83,8 @@ export default {
header: ['序号', '服务时间', '服务名称', '服务范围', '满意度', '状态', '操作']
};
},
-
- activated() {
- this.org_id = getQueryPara('org_id');
- this.listType = getQueryPara('type');
- this.type2 = getQueryPara('type2');
- this.searchDate = [getQueryPara('start_date'), getQueryPara('end_date')];
- this.page_num = 1;
- // this.getDate();
- this.init();
+ created() {
+ this.init()
},
methods: {
@@ -105,10 +93,10 @@ export default {
},
showInfo(index) {
- // let item = this.srcTableData[index];
- // this.detailType = item.peop_child_type;
- // this.detailId = item.service_record_id;
- // ceshi
+ let item = this.srcTableData[index];
+ this.detailType = item.peop_child_type;
+ this.detailId = item.service_record_id;
+
// this.detailType = '志愿者';
// this.detailId = '1501821704551272449';
},
@@ -137,13 +125,13 @@ export default {
url,
{
queryParam: {
- service_org_id: this.detailId,
+ service_org_id: this.id,
service_org_type: this.detailType,
- source_name: this.sourceName
+ source_name: '0'
}
},
{
- // mockId: 60068051,
+ mockId: 69852161
}
);
@@ -152,39 +140,25 @@ export default {
if (code === 0) {
this.srcTableData = data;
console.log('this.srcTableData ', this.srcTableData);
- // this.total = data.total;
- // service_num avg_satisfaction
+
this.list = data.map((item, index) => {
return [
index + 1,
- // item.service_record_id ? item.service_record_id : '--',
- // item.user_demand_id ? item.user_demand_id : '--',
+ // service_record_id
item.service_time ? item.service_time : '--',
item.service_name ? item.service_name : '--',
item.scope_name ? item.scope_name : '--',
+ item.score ? item.score : '--',
item.demand_status ? item.demand_status : '--',
-
// 待处理:pending;已取消canceled;已派单:assigned;已接单:have_order;已完成:finished;
{ type: 'operate', list: ['查看'] }
];
});
- console.log('this.list', this.list);
+ console.log('公共', this.list);
} else {
this.$message.error(msg);
}
- this.list = [
- {
- index: 1,
- peop_name: '置南于可',
- peop_child_type: 'in nostrud commodo dolore',
- service_num: 57,
- service_ratio: 94,
- avg_satisfaction: 65,
- sum_point: 63,
- '': { type: 'operate', list: ['查看'] }
- }
- ];
},
async getCount() {
@@ -204,7 +178,7 @@ export default {
}
},
{
- // mockId: 63070189,
+ mockId: 63070189
}
);
diff --git a/src/views/dataBoard/sida/zy/lianjianDetail.vue b/src/views/dataBoard/sida/zy/lianjianDetail.vue
index 6fca65578..3613bf777 100644
--- a/src/views/dataBoard/sida/zy/lianjianDetail.vue
+++ b/src/views/dataBoard/sida/zy/lianjianDetail.vue
@@ -59,10 +59,12 @@
+
+
@@ -92,7 +94,7 @@ export default {
return {
progress: [],
info: {},
- title: '事件',
+ title: '联建活动详情',
currentTabIndex: 0,
startTabIndex: 0,
currentTabIndex2: 0,
@@ -123,7 +125,8 @@ export default {
map: new GaodeMap({
pitch: 35.210526315789465,
style: 'dark',
- center: [this.info.latitude, this.info.longitude],
+ // center: [this.info.latitude, this.info.longitude],
+ center: [120.11,36.555],
zoom: 4.4
})
});
@@ -138,7 +141,7 @@ export default {
service_record_id: this.detailId
},
{
- // mockId: 60235478,
+ mockId: 69994184,
}
);
if (code === 0) {
diff --git a/src/views/dataBoard/sida/zy/lianjianList.vue b/src/views/dataBoard/sida/zy/lianjianList.vue
index 483ee61d9..bf383bebb 100644
--- a/src/views/dataBoard/sida/zy/lianjianList.vue
+++ b/src/views/dataBoard/sida/zy/lianjianList.vue
@@ -24,7 +24,7 @@ import getQueryPara from 'dai-js/modules/getQueryPara';
export default {
name: 'event-list',
props: {
- detailId: {
+ id: {
type: String,
default: ''
},
@@ -35,7 +35,7 @@ export default {
},
components: {
cptTb,
- cptBread,
+
detail
},
@@ -88,16 +88,10 @@ export default {
header: ['序号', '服务时间', '网格', '活动地址', '活动标题', '人数', '操作']
};
},
-
- activated() {
- this.org_id = getQueryPara('org_id');
- this.listType = getQueryPara('type');
- this.type2 = getQueryPara('type2');
- this.searchDate = [getQueryPara('start_date'), getQueryPara('end_date')];
- this.page_num = 1;
- // this.getDate();
- this.init();
- },
+created() {
+ this.init()
+},
+
methods: {
init() {
@@ -105,9 +99,9 @@ export default {
},
showInfo(index) {
- // let item = this.srcTableData[index];
+ let item = this.srcTableData[index];
// this.detailType = item.peop_child_type;
- // this.detailId = item.service_record_id;
+ this.detailId = item.service_record_id;
// ceshi
// this.detailType = '志愿者';
// this.detailId = '1501821704551272449';
@@ -139,11 +133,11 @@ export default {
queryParam: {
service_org_id: this.detailId,
service_org_type: this.detailType,
- source_name: this.sourceName
+ source_name:'0'
}
},
{
- // mockId: 60068051,
+ mockId: 69950764,
}
);
diff --git a/src/views/dataBoard/sida/zy/peopleRes-detail.vue b/src/views/dataBoard/sida/zy/peopleRes-detail.vue
index 09b3e609a..f57c401e4 100644
--- a/src/views/dataBoard/sida/zy/peopleRes-detail.vue
+++ b/src/views/dataBoard/sida/zy/peopleRes-detail.vue
@@ -48,6 +48,86 @@
+
+
+
+ 基本信息
+
+
+
+
+
组织名称:
+
{{ info.organization_name }}
+
+
+
组织人数:
+
{{ info.organization_person_count }}
+
+
+
服务事项:
+
{{ info.service_item }}
+
+
+
联系人:
+
{{ info.principal_name }}
+
+
+
联系电话:
+
{{ info.principal_phone }}
+
+
+
+
+
+
+ 基本信息
+
+
+
+
+
单位名称:
+
{{ info.unit_name }}
+
+
+
组织:
+
{{ info.agency }}
+
+
+
服务事项 :
+
{{ info.service_matter }}
+
+
+
地址:
+
{{ info.address }}
+
+
+
联系人:
+
{{ info.contact }}
+
+
+
联系电话:
+
{{ info.contact_mobile }}
+
+
+
+
+
+
+ 更多信息
+
+
+
+
+
+
+
+
+
+
@@ -57,7 +137,9 @@ import { Scene } from '@antv/l7';
import popup from '@/views/dataBoard/cpts/popup';
import { GaodeMap, Map } from '@antv/l7-maps';
import { requestPostBi } from '@/js/dai/request-bipass';
-
+import lianjianList from './lianjianList.vue';
+import gexingList from './gexingList.vue';
+import gonggongList from './gonggongList.vue';
export default {
name: 'eventdetail',
props: {
@@ -71,30 +153,31 @@ export default {
}
},
- components: { popup },
+ components: { popup, lianjianList, gexingList, gonggongList },
created() {},
data() {
return {
progress: [],
info: {},
title: '人资源详情',
+ currentTab:"个性服务",
currentTabIndex: 0,
startTabIndex: 0,
currentTabIndex2: 0,
startTabIndex2: 0,
- tabList: [],
+ tabList: ['个性服务', '公共服务', '联建活动'],
tabList2: [],
userArray: [],
userList: {},
loading: true,
page_size: parseInt(localStorage.getItem('dataBoard_page_size')) || 20,
-
+
page_num: 1,
total: 0,
srcTableData: [],
list: [],
-
+
colList: [
{
align: 'left',
@@ -119,7 +202,7 @@ export default {
align: 'left',
width: '10%'
},
-
+
{
align: 'left',
width: '10%'
@@ -164,23 +247,21 @@ export default {
async getInfo() {
let url = '';
let queryParam = {};
- let mockId=0;
+ let mockId = 0;
console.log('this.detailId', this.detailId);
+ this.title = this.detailType + '详情';
if (this.detailType == '志愿者') {
url = 'resident_info';
- this.title = '志愿者详情';
queryParam.resident_id = this.detailId;
- mockId=0;
+ mockId = 0;
} else if (this.detailType == '社区自组织') {
url = 'self_org';
- this.title = '社区自组织详情';
queryParam.self_org_id = this.detailId;
- mockId=69828071;
+ mockId = 69828071;
} else if (this.detailType == '联建单位') {
url = 'party_unit';
- this.title = '联建单位详情';
queryParam.party_unit_id = this.detailId;
- mockId=69802377;
+ mockId = 69802377;
}
const { data, code, msg } = await requestPostBi(
@@ -189,7 +270,7 @@ export default {
queryParam: queryParam
},
{
- mockId: mockId,
+ mockId: mockId
}
);
if (code === 0) {
@@ -198,9 +279,7 @@ export default {
} else {
this.$message.error(msg);
}
- },
-
-
+ }
}
};
diff --git a/src/views/dataBoard/sida/zy/peopleResList.vue b/src/views/dataBoard/sida/zy/peopleResList.vue
index 6f9a068a8..28f24a5aa 100644
--- a/src/views/dataBoard/sida/zy/peopleResList.vue
+++ b/src/views/dataBoard/sida/zy/peopleResList.vue
@@ -175,9 +175,9 @@ export default {
showInfo(index) {
let item = this.srcTableData[index];
// this.detailType = item.peop_child_type;
- this.detailType = this.type2
+ this.detailType = this.type2;
this.detailId = item.peop_id;
- console.log("item",item)
+ console.log('item', item);
// this.detailType = '志愿者';
// this.detailId = '1501821704551272449';
},
diff --git a/src/views/dataBoard/sida/zy/placeRes-detail.vue b/src/views/dataBoard/sida/zy/placeRes-detail.vue
index 4dd8f124e..9c40b800f 100644
--- a/src/views/dataBoard/sida/zy/placeRes-detail.vue
+++ b/src/views/dataBoard/sida/zy/placeRes-detail.vue
@@ -1,736 +1,54 @@
-
+
场所名称:
-
{{ info.place_org_name }}
+
{{ info.place_name }}
-
占地面积:
-
{{ info.area_covered }}
+
场所规模 :
+
{{ info.place_code }}
-
-
-
场所规模:
-
{{ info.scale_total }}
-
-
-
-
所属组织:
-
{{ info.grid }}
-
-
-
-
场所类别:
-
{{ info.place_category }}
-
-
-
-
场所类型:
-
{{ info.place_type }}
-
-
负责人:
-
{{ info.person_in_charge }}
+
{{ info.user_name }}
联系电话:
-
{{ info.mobile }}
+
{{ info.telephone }}
-
场所地址:
-
{{ info.mobile }}
-
-
-
-
-
{{ info.longitude }}{{ info.latitude }}
-
-
-
-
-
-
-
隐患场所:
-
{{ info.danger_place_name }}
-
-
-
-
隐患内容:
-
{{ info.danger_content }}
-
-
-
所属组织:
-
{{ info.grid }}
-
-
-
-
上报人:
-
{{ info.report_person }}
-
-
-
-
联系电话:
-
{{ info.mobile }}
-
-
-
-
上报时间:
-
{{ info.report_time }}
-
-
-
-
-
-
- 基本信息
-
-
-
-
-
房屋名称:
-
+
所处位置:
+
{{ info.location }}
-
房屋类型:
-
{{ info.parent_category }} {{ info.category }}
+
所属组织 :
+
{{ info.agency_name }}
-
房屋用途:
-
{{ info.house_type }}
-
-
-
房屋状态:
-
{{ info.house_state }}
-
-
-
房主姓名:
-
{{ info.homeowner }}
-
-
-
联系电话:
-
{{ info.homeowner_telep }}
-
-
-
证件号:
-
{{ info.homeowner_idcard }}
-
-
-
-
- 人员信息
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
姓名:
-
{{ userList.name }}
-
-
-
联系电话:
-
{{ userList.telephoneidcard }}
-
-
-
证件号:
-
{{ userList.idcard }}
-
-
-
本地户籍:
-
{{ userList.content }}
-
-
-
性别:
-
{{ userList.gender }}
+
场所类型 :
+
{{ info.place_category }}
-
出生日期:
-
{{ userList.birthday }}
+
场所类别:
+
{{ info.child_place_type }}
-
民族:
-
{{ userList.ethnic }}
+
占地面积 :
+
{{ info.place_area }}
-
备注:
-
{{ userList.resident_remark }}
-
-
-
-
- 分类信息
-
-
-
-
-
-
居民分类:
-
-
- 党员
- 低保人员
- 保障房人员
- 失业人员
- 育龄妇女
- 退役军人
- 统战人员
- 信访人员
- 志愿者
- 特扶人员
- 租户
- 流动人口
- 特殊人群
- 独居老人
- 空巢老人
- 失能老人
- 失智老人
- 残疾
- 大病
- 慢病
-
-
-
-
-
-
-
- 其他信息
-
-
-
-
-
-
-
-
-
文化程度:
-
{{ userList.education }}
-
-
-
备注:
-
{{ userList.education_remark }}
-
-
-
-
-
-
-
-
兴趣:
-
{{ userList.hobby }}
-
-
-
备注:
-
{{ userList.hobby_remark }}
-
-
-
-
-
-
-
-
宗教:
-
{{ userList.belief }}
-
-
-
备注:
-
{{ userList.belief_remark }}
-
-
-
-
-
-
-
-
残疾类别:
-
{{ userList.disable_type }}
-
-
-
残疾等级:
-
{{ userList.disable_degree }}
-
-
-
残疾证号:
-
{{ userList.disable_idcard }}
-
-
-
残疾说明:
-
{{ userList.disable_remark }}
-
-
-
监护人:
-
{{ userList.guardian }}
-
-
-
劳动能力:
-
{{ userList.skill }}
-
-
-
非义务教育阶段助学:
-
{{ userList.voluntaryEducationFlag }}
-
-
-
所患大病:
-
{{ userList.voluntaryEducationFlag }}
-
-
-
大病患病时间:
-
{{ userList.illnessCode }}
-
-
-
所患慢性病:
-
{{ userList.chronicDiseaseCode }}
-
-
-
慢病患病时间:
-
{{ userList.chronicDiseaseTime }}
-
-
-
是否参保:
-
{{ userList.chronicDiseaseTime }}
-
-
-
自付金额:
-
{{ userList.selfPayAmount }}
-
-
-
救助金额:
-
{{ userList.selfPayAmount }}
-
-
-
救助时间:
-
{{ userList.deliveranceAmount }}
-
-
-
享受救助明细序号:
-
{{ userList.deliveranceTime }}
-
-
-
备注:
-
{{ userList.deliveranceNum }}
-
-
-
-
-
-
-
-
工作单位:
-
{{ userList.workunit }}
-
-
-
职业:
-
{{ userList.career }}
-
-
-
离退休时间:
-
{{ userList.retire_date }}
-
-
-
备注:
-
{{ userList.retire_remark }}
-
-
-
-
-
-
-
-
退休金额:
-
{{ userList.retire_income }}
-
-
-
月收入:
-
{{ userList.income }}
-
-
-
-
-
-
-
-
籍贯:
-
{{ userList.native }}
-
-
-
户籍所在地:
-
{{ userList.native_place }}
-
-
-
现居住地:
-
{{ userList.residence_current }}
-
-
-
人户状况:
-
{{ userList.household }}
-
-
-
备注:
-
{{ userList.household_remark }}
-
-
-
-
-
-
-
-
与户主关系:
-
{{ userList.holdingrel }}
-
-
-
居住情况:
-
{{ userList.residence }}
-
-
-
婚姻状况:
-
{{ userList.marital }}
-
-
-
配偶状况:
-
{{ userList.spouse }}
-
-
-
有无赡养人:
-
{{ userList.supporters }}
-
-
-
与赡养人关系:
-
{{ userList.supporters_relation }}
-
-
-
赡养人联系电话:
-
{{ userList.dependantMobile }}
-
-
-
备注:
-
{{ userList.familyInfoRemark }}
-
-
-
-
-
-
-
-
入党时间:
-
{{ userList.joinTime }}
-
-
-
转正时间:
-
{{ userList.positiveTime }}
-
-
-
所属支部:
-
{{ userList.branchId }}
-
-
-
是否流动党员:
-
{{ userList.flowFlag }}
-
-
-
流动党员活动证号:
-
{{ userList.flowActNum }}
-
-
-
职务:
-
{{ userList.partyJob }}
-
-
-
是否退休:
-
{{ userList.retiredFlag }}
-
-
-
是否党员中心户:
-
{{ userList.centerFlag }}
-
-
-
入党时所在党支部:
-
{{ userList.joinBranchName }}
-
-
-
组织关系转入社区时间:
-
{{ userList.joinCommunityTime }}
-
-
-
是否请长假:
-
{{ userList.longHolidayFlag }}
-
-
-
-
-
-
-
-
住房性质:
-
{{ userList.housingNature }}
-
-
-
保障类型:
-
{{ userList.securityType }}
-
-
-
发证日期:
-
{{ userList.certificateDate }}
-
-
-
补贴编号:
-
{{ userList.subsidyNum }}
-
-
-
补贴金额:
-
{{ userList.subsidyAmount }}
-
-
-
-
-
-
-
-
原工作单位:
-
{{ userList.originWorkUnit }}
-
-
-
失业时间:
-
{{ userList.unemploymentTime }}
-
-
-
失业证号:
-
{{ userList.unemploymentTime }}
-
-
-
再就业优惠证号:
-
{{ userList.employmentNum }}
-
-
-
技术特长:
-
{{ userList.specialSkill }}
-
-
-
失业原因:
-
{{ userList.unemploymentReason }}
-
-
-
是否就业困难对象:
-
{{ userList.employmentHardFlag }}
-
-
-
劳动能力就业愿望:
-
{{ userList.employmentWish }}
-
-
-
-
-
-
-
-
入伍时间:
-
{{ userList.joinArmyTime }}
-
-
-
退伍时间:
-
{{ userList.leaveArmyTime }}
-
-
-
服役单位:
-
{{ userList.serviceUnit }}
-
-
-
接收单位:
-
{{ userList.receiveUnit }}
-
-
-
待安置补助金:
-
{{ userList.settlementAmount }}
-
-
-
培训状况:
-
{{ userList.trainDesc }}
-
-
-
参战时间开始日期:
-
{{ userList.joinWarStartTime }}
-
-
-
参战时间截止日期:
-
{{ userList.joinWarEndTime }}
-
-
-
现就业状况:
-
{{ userList.employmentSituation }}
-
-
-
是否办理公益性岗位:
-
{{ userList.pubWelfareJobFlag }}
-
-
-
-
-
-
-
-
职务:
-
{{ userList.duty }}
-
-
-
探亲情况:
-
{{ userList.visitation }}
-
-
-
-
-
-
-
-
志愿者类别:
-
{{ userList.volunteerCategory }}
-
-
-
备注:
-
{{ userList.volunteerRemark }}
-
-
-
-
-
-
-
-
高龄补助:
-
{{ userList.volunteerRemark }}
-
-
-
-
-
-
-
-
特殊人群类别:
-
{{ userList.specialCategoryCode }}
-
-
-
-
-
-
-
-
出生地:
-
{{ userList.birthplace }}
-
-
-
父亲姓名:
-
{{ userList.father }}
-
-
-
母亲姓名:
-
{{ userList.mother }}
-
-
-
胎次:
-
{{ userList.count }}
-
-
-
申报日期:
-
{{ userList.reportDate }}
-
-
-
-
-
-
-
-
死亡时间:
-
{{ userList.deathDate }}
-
-
-
加入原因:
-
{{ userList.deathReason }}
-
-
-
移除时间:
-
{{ userList.removeDate }}
-
-
-
移除原因:
-
{{ userList.removeReason }}
-
-
-
-
-
-
-
-
迁出信息:
-
{{ userList.outOfTime }}
-
-
-
迁出类别:
-
{{ userList.type }}
-
-
-
迁出原因:
-
{{ userList.reason }}
-
-
-
迁出至组织:
-
{{ userList.deptId }}
-
-
-
小区:
-
{{ userList.villageName }}
-
-
-
楼号:
-
{{ userList.buildName }}
-
-
-
单元:
-
{{ userList.unitName }}
-
-
-
房屋:
-
{{ userList.homeName }}
-
-
-
外迁地址:
-
{{ userList.address }}
-
+
{{ info.remark }}
+
@@ -764,17 +82,12 @@ export default {
currentTabIndex: 0,
startTabIndex: 0,
currentTabIndex2: 0,
- startTabIndex2: 0,
- BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
- tabList: [],
- tabList2: [],
- userArray: [],
- userList: {}
+ startTabIndex2: 0
};
},
mounted() {
- this.getApiData();
+ this.getInfo();
},
computed: {
currentTab() {
@@ -785,45 +98,14 @@ export default {
}
},
methods: {
- addStartTabIndex() {
- const { startTabIndex, tabList } = this;
- if (startTabIndex < tabList.length - 7) {
- this.startTabIndex = startTabIndex + 1;
- } else {
- this.startTabIndex = tabList.length - 7;
- }
- },
- subStartTabIndex() {
- const { startTabIndex, tabList } = this;
- if (startTabIndex > 0) {
- this.startTabIndex = startTabIndex - 1;
- } else {
- this.startTabIndex = 0;
- }
- },
- addStartTabIndex2() {
- const { startTabIndex2, tabList2 } = this;
- if (startTabIndex2 < tabList2.length - 7) {
- this.startTabIndex2 = startTabIndex2 + 1;
- } else {
- this.startTabIndex2 = tabList2.length - 7;
- }
- },
- subStartTabIndex2() {
- const { startTabIndex2, tabList2 } = this;
- if (startTabIndex2 > 0) {
- this.startTabIndex2 = startTabIndex2 - 1;
- } else {
- this.startTabIndex2 = 0;
- }
- },
iniMap() {
const scene = new Scene({
id: 'map',
map: new GaodeMap({
pitch: 35.210526315789465,
style: 'dark',
- center: [this.info.latitude, this.info.longitude],
+ // center: [this.info.latitude, this.info.longitude],
+ center: [120.00, 36.00],
zoom: 4.4
})
});
@@ -832,129 +114,26 @@ export default {
this.$emit('close');
},
- async getApiData() {
- this.getInfo();
- },
-
- gettab() {
- this.info.group_rental.forEach(item => {
- this.getUserInfo(item.user_id);
- });
- },
-
- getUserInfo(id) {
- const url = 'resident_info';
-
- requestPostBi(
- url,
- {
- queryParam: {
- resident_id: id
- }
- },
- {
- // mockId: 61172054,
- }
- ).then(res => {
- console.log(res);
- if (res.code === 0) {
- this.userArray.push(res.data[0]);
- if (this.userArray.length == 1) {
- this.gettab2(this.userArray[0]);
- }
- }
- });
- },
-
- gettab2(item) {
- this.userList = { ...item };
- console.log("当前人员信息",this.userList)
- let tabList = this.BaseTabList;
- this.userList.crowd && tabList.push('党员');
- this.userList.srs && tabList.push('保障房');
- this.userList.unemployed && tabList.push('失业');
- this.userList.exs && tabList.push('退役军人');
- this.userList.ufs && tabList.push('统战人员');
- this.userList.volunteer && tabList.push('志愿者');
- this.userList.aged && tabList.push('老年人');
- this.userList.special_popu && tabList.push('特殊人群');
- tabList.push('出生信息');
- tabList.push('死亡信息');
- tabList.push('迁出');
- this.tabList = tabList;
- },
// 根据房屋id获取详情
async getInfo() {
let url = '';
let queryParam = {};
-
- if (this.detailType == '生产隐患') {
- url = 'enterprise_info';
- this.title = '安全生产巡查详情';
- queryParam.enterprise_id = this.detailId;
- } else if (this.detailType == '群租房') {
- url = 'group_tenant_info';
- this.title = '群租房详情';
- queryParam.room_id = this.detailId;
- } else if (this.detailType == '发现问题') {
- url = 'group_tenant_info';
- this.title = '发现问题详情';
- queryParam.hidden_danger_id = this.detailId;
- }
-
+ this.title = this.detailType + '详情';
+ queryParam.place_id = this.detailId;
+ queryParam.parent_place_type = this.detailType;
const { data, code, msg } = await requestPostBi(
url,
{
queryParam: queryParam
},
{
- // mockId: 60235478,
+ mockId: 70051004,
}
);
if (code === 0) {
this.info = { ...this.info, ...data[0] };
console.log('this.info', this.info);
- // this.info = {
- // group_rental: [
- // {
- // user_id: '1501821708368089090'
- // },
- // {
- // user_id: '1501821708569415681'
- // },
- // {
- // user_id: '1501821708368089090'
- // },
- // {
- // user_id: '1501821708569415681'
- // },
- // {
- // user_id: '1501821708368089090'
- // },
- // {
- // user_id: '1501821708569415681'
- // },
- // {
- // user_id: '1501821708368089090'
- // },
- // {
- // user_id: '1501821708569415681'
- // }
- // ],
- // house_state: null,
- // homeowner_idcard: '53',
- // homeowner: 'elit',
- // room_id: '52',
- // house_usage: 'ullamco culpa dolor',
- // homeowner_telep: 'sed',
- // house_type: 'mollit est eu commodo in'
- // };
-
- if (this.detailType == '生产隐患') {
- this.iniMap();
- } else if (this.detailType == '群租房') {
- this.gettab();
- }
+ this.iniMap();
} else {
this.$message.error(msg);
}
diff --git a/src/views/dataBoard/sida/zy/placeResList.vue b/src/views/dataBoard/sida/zy/placeResList.vue
index f97ce20bd..9cbab8ef3 100644
--- a/src/views/dataBoard/sida/zy/placeResList.vue
+++ b/src/views/dataBoard/sida/zy/placeResList.vue
@@ -10,7 +10,7 @@
安全生产场所
城市管理场所
- 应急场所
+ 应急处置场所