diff --git a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
index 6e0503b79..6f8b23010 100644
--- a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
+++ b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
@@ -13,7 +13,7 @@
{{ data.gridName }}
- {{ $sensitive(data.idNum, 6, 16) }}
+ {{ $sensitive(data.idNum, 0, 14) }}
{{ $sensitive(data.mobile, 3, 7) }}
diff --git a/src/views/dataBoard/cpts/personnel/modules/PointsRecord.vue b/src/views/dataBoard/cpts/personnel/modules/PointsRecord.vue
index 8cdf3d803..ab728ad39 100644
--- a/src/views/dataBoard/cpts/personnel/modules/PointsRecord.vue
+++ b/src/views/dataBoard/cpts/personnel/modules/PointsRecord.vue
@@ -1,6 +1,6 @@
-
+
+
+

+
暂无数据
@@ -31,13 +35,11 @@ export default {
methods: {
getData() {
this.data = [];
- this.$http
- .get("/actual/base/peopleRoomOverview/recorHistory")
- .then(({ data: res }) => {
- if (res.code == 0) {
- this.data = res.data;
- }
- });
+ this.$http.get("/actual/base/peopleRoomOverview/recorHistory").then(({ data: res }) => {
+ if (res.code == 0) {
+ this.data = res.data;
+ }
+ });
},
},
};
diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue
index 1c80be287..1bf43f4c0 100644
--- a/src/views/dataBoard/cpts/resi-details.vue
+++ b/src/views/dataBoard/cpts/resi-details.vue
@@ -11,52 +11,52 @@
所属网格:
- {{ info.community }}
- - {{ info.grid }}
+ {{ info.community ? info.community : "" }}
+ - {{ info.grid ? info.grid : "" }}
所属房屋:
- {{ info.village }}
- - {{ info.building }}
- - {{ info.unit }}
- - {{ info.room }}
+ {{ info.village ? info.village : "" }}
+ - {{ info.building ? info.building : "" }}
+ - {{ info.unit ? info.unit : "" }}
+ - {{ info.room ? info.room : "" }}
本地户籍:
-
{{ info.census_type }}
+
{{ info.census_type ? info.census_type : "" }}
居民姓名:
-
{{ info.name }}
+
{{ info.name ? info.name : "" }}
出生日期:
-
{{ info.birthday }}
+
{{ info.birthday ? info.birthday : "" }}
性别:
-
{{ info.gender }}
+
{{ info.gender ? info.gender : "" }}
民族:
-
{{ info.ethnic }}
+
{{ info.ethnic ? info.ethnic : "" }}
联系电话:
-
{{ info.telephone }}
+
{{ info.telephone ? info.telephone : "" }}
证件号:
-
{{ info.idcard }}
+
{{ info.idcard ? info.idcard : "" }}
备注:
-
{{ info.resident_remark }}
+
{{ info.resident_remark ? info.resident_remark : "" }}
@@ -103,28 +103,13 @@
-
+
-
+
{{ item }}
-
@@ -133,11 +118,11 @@
文化程度:
-
{{ info.education }}
+
{{ info.education ? info.education : "" }}
备注:
-
{{ info.education_remark }}
+
{{ info.education_remark ? info.education_remark : "" }}
@@ -146,11 +131,11 @@
兴趣:
-
{{ info.hobby }}
+
{{ info.hobby ? info.hobby : "" }}
备注:
-
{{ info.hobby_remark }}
+
{{ info.hobby_remark ? info.hobby_remark : "" }}
@@ -159,11 +144,11 @@
宗教:
-
{{ info.belief }}
+
{{ info.belief ? info.belief : "" }}
备注:
-
{{ info.belief_remark }}
+
{{ info.belief_remark ? info.belief_remark : "" }}
@@ -172,83 +157,83 @@
残疾类别:
-
{{ info.disable_type }}
+
{{ info.disable_type ? info.disable_type : "" }}
残疾等级:
-
{{ info.disable_degree }}
+
{{ info.disable_degree ? info.disable_degree : "" }}
残疾证号:
-
{{ info.disable_idcard }}
+
{{ info.disable_idcard ? info.disable_idcard : "" }}
残疾说明:
-
{{ info.disable_remark }}
+
{{ info.disable_remark ? info.disable_remark : "" }}
监护人:
-
{{ info.guardian }}
+
{{ info.guardian ? info.guardian : "" }}
劳动能力:
-
{{ info.skill }}
+
{{ info.skill ? info.skill : "" }}
非义务教育阶段助学:
- {{ info.voluntaryEducationFlag }}
+ {{ info.voluntaryEducationFlag ? info.voluntaryEducationFlag : "" }}
所患大病:
- {{ info.voluntaryEducationFlag }}
+ {{ info.voluntaryEducationFlag ? info.voluntaryEducationFlag : "" }}
大病患病时间:
-
{{ info.illnessCode }}
+
{{ info.illnessCode ? info.illnessCode : "" }}
所患慢性病:
- {{ info.chronicDiseaseCode }}
+ {{ info.chronicDiseaseCode ? info.chronicDiseaseCode : "" }}
慢病患病时间:
- {{ info.chronicDiseaseTime }}
+ {{ info.chronicDiseaseTime ? info.chronicDiseaseTime : "" }}
是否参保:
- {{ info.chronicDiseaseTime }}
+ {{ info.chronicDiseaseTime ? info.chronicDiseaseTime : "" }}
自付金额:
-
{{ info.selfPayAmount }}
+
{{ info.selfPayAmount ? info.selfPayAmount : "" }}
救助金额:
-
{{ info.selfPayAmount }}
+
{{ info.selfPayAmount ? info.selfPayAmount : "" }}
救助时间:
- {{ info.deliveranceAmount }}
+ {{ info.deliveranceAmount ? info.deliveranceAmount : "" }}
享受救助明细序号:
-
{{ info.deliveranceTime }}
+
{{ info.deliveranceTime ? info.deliveranceTime : "" }}
备注:
-
{{ info.deliveranceNum }}
+
{{ info.deliveranceNum ? info.deliveranceNum : "" }}
@@ -257,19 +242,19 @@
工作单位:
-
{{ info.workunit }}
+
{{ info.workunit ? info.workunit : "" }}
职业:
-
{{ info.career }}
+
{{ info.career ? info.career : "" }}
离退休时间:
-
{{ info.retire_date }}
+
{{ info.retire_date ? info.retire_date : "" }}
备注:
-
{{ info.retire_remark }}
+
{{ info.retire_remark ? info.retire_remark : "" }}
@@ -278,11 +263,11 @@
退休金额:
-
{{ info.retire_income }}
+
{{ info.retire_income ? info.retire_income : "" }}
月收入:
-
{{ info.income }}
+
{{ info.income ? info.income : "" }}
@@ -291,25 +276,25 @@
籍贯:
-
{{ info.native }}
+
{{ info.native ? info.native : "" }}
户籍所在地:
-
{{ info.native_place }}
+
{{ info.native_place ? info.native_place : "" }}
现居住地:
- {{ info.residence_current }}
+ {{ info.residence_current ? info.residence_current : "" }}
人户状况:
-
{{ info.household }}
+
{{ info.household ? info.household : "" }}
备注:
-
{{ info.household_remark }}
+
{{ info.household_remark ? info.household_remark : "" }}
@@ -318,39 +303,39 @@
与户主关系:
-
{{ info.holdingrel }}
+
{{ info.holdingrel ? info.holdingrel : "" }}
居住情况:
-
{{ info.residence }}
+
{{ info.residence ? info.residence : "" }}
婚姻状况:
-
{{ info.marital }}
+
{{ info.marital ? info.marital : "" }}
配偶状况:
-
{{ info.spouse }}
+
{{ info.spouse ? info.spouse : "" }}
有无赡养人:
-
{{ info.supporters }}
+
{{ info.supporters ? info.supporters : "" }}
与赡养人关系:
- {{ info.supporters_relation }}
+ {{ info.supporters_relation ? info.supporters_relation : "" }}
赡养人联系电话:
- {{ info.dependantMobile }}
+ {{ info.dependantMobile ? info.dependantMobile : "" }}
备注:
-
{{ info.familyInfoRemark }}
+
{{ info.familyInfoRemark ? info.familyInfoRemark : "" }}
@@ -359,49 +344,49 @@
入党时间:
-
{{ info.joinTime }}
+
{{ info.joinTime ? info.joinTime : "" }}
转正时间:
-
{{ info.positiveTime }}
+
{{ info.positiveTime ? info.positiveTime : "" }}
所属支部:
-
{{ info.branchId }}
+
{{ info.branchId ? info.branchId : "" }}
是否流动党员:
-
{{ info.flowFlag }}
+
{{ info.flowFlag ? info.flowFlag : "" }}
流动党员活动证号:
-
{{ info.flowActNum }}
+
{{ info.flowActNum ? info.flowActNum : "" }}
职务:
-
{{ info.partyJob }}
+
{{ info.partyJob ? info.partyJob : "" }}
是否退休:
-
{{ info.retiredFlag }}
+
{{ info.retiredFlag ? info.retiredFlag : "" }}
是否党员中心户:
-
{{ info.centerFlag }}
+
{{ info.centerFlag ? info.centerFlag : "" }}
入党时所在党支部:
-
{{ info.joinBranchName }}
+
{{ info.joinBranchName ? info.joinBranchName : "" }}
组织关系转入社区时间:
- {{ info.joinCommunityTime }}
+ {{ info.joinCommunityTime ? info.joinCommunityTime : "" }}
是否请长假:
-
{{ info.longHolidayFlag }}
+
{{ info.longHolidayFlag ? info.longHolidayFlag : "" }}
@@ -410,23 +395,23 @@
住房性质:
-
{{ info.housingNature }}
+
{{ info.housingNature ? info.housingNature : "" }}
保障类型:
-
{{ info.securityType }}
+
{{ info.securityType ? info.securityType : "" }}
发证日期:
-
{{ info.certificateDate }}
+
{{ info.certificateDate ? info.certificateDate : "" }}
补贴编号:
-
{{ info.subsidyNum }}
+
{{ info.subsidyNum ? info.subsidyNum : "" }}
补贴金额:
-
{{ info.subsidyAmount }}
+
{{ info.subsidyAmount ? info.subsidyAmount : "" }}
@@ -435,39 +420,39 @@
原工作单位:
-
{{ info.originWorkUnit }}
+
{{ info.originWorkUnit ? info.originWorkUnit : "" }}
失业时间:
-
{{ info.unemploymentTime }}
+
{{ info.unemploymentTime ? info.unemploymentTime : "" }}
失业证号:
-
{{ info.unemploymentTime }}
+
{{ info.unemploymentTime ? info.unemploymentTime : "" }}
再就业优惠证号:
-
{{ info.employmentNum }}
+
{{ info.employmentNum ? info.employmentNum : "" }}
技术特长:
-
{{ info.specialSkill }}
+
{{ info.specialSkill ? info.specialSkill : "" }}
失业原因:
- {{ info.unemploymentReason }}
+ {{ info.unemploymentReason ? info.unemploymentReason : "" }}
是否就业困难对象:
- {{ info.employmentHardFlag }}
+ {{ info.employmentHardFlag ? info.employmentHardFlag : "" }}
劳动能力就业愿望:
-
{{ info.employmentWish }}
+
{{ info.employmentWish ? info.employmentWish : "" }}
@@ -476,46 +461,46 @@
入伍时间:
-
{{ info.joinArmyTime }}
+
{{ info.joinArmyTime ? info.joinArmyTime : "" }}
退伍时间:
-
{{ info.leaveArmyTime }}
+
{{ info.leaveArmyTime ? info.leaveArmyTime : "" }}
服役单位:
-
{{ info.serviceUnit }}
+
{{ info.serviceUnit ? info.serviceUnit : "" }}
接收单位:
-
{{ info.receiveUnit }}
+
{{ info.receiveUnit ? info.receiveUnit : "" }}
待安置补助金:
-
{{ info.settlementAmount }}
+
{{ info.settlementAmount ? info.settlementAmount : "" }}
培训状况:
-
{{ info.trainDesc }}
+
{{ info.trainDesc ? info.trainDesc : "" }}
参战时间开始日期:
-
{{ info.joinWarStartTime }}
+
{{ info.joinWarStartTime ? info.joinWarStartTime : "" }}
参战时间截止日期:
-
{{ info.joinWarEndTime }}
+
{{ info.joinWarEndTime ? info.joinWarEndTime : "" }}
现就业状况:
- {{ info.employmentSituation }}
+ {{ info.employmentSituation ? info.employmentSituation : "" }}
是否办理公益性岗位:
- {{ info.pubWelfareJobFlag }}
+ {{ info.pubWelfareJobFlag ? info.pubWelfareJobFlag : "" }}
@@ -525,11 +510,11 @@
职务:
-
{{ info.duty }}
+
{{ info.duty ? info.duty : "" }}
探亲情况:
-
{{ info.visitation }}
+
{{ info.visitation ? info.visitation : "" }}
@@ -539,12 +524,12 @@
志愿者类别:
- {{ info.volunteerCategory }}
+ {{ info.volunteerCategory ? info.volunteerCategory : "" }}
备注:
-
{{ info.volunteerRemark }}
+
{{ info.volunteerRemark ? info.volunteerRemark : "" }}
@@ -553,7 +538,7 @@
高龄补助:
-
{{ info.volunteerRemark }}
+
{{ info.volunteerRemark ? info.volunteerRemark : "" }}
@@ -563,7 +548,7 @@
特殊人群类别:
- {{ info.specialCategoryCode }}
+ {{ info.specialCategoryCode ? info.specialCategoryCode : "" }}
@@ -573,23 +558,23 @@
出生地:
-
{{ info.birthplace }}
+
{{ info.birthplace ? info.birthplace : "" }}
父亲姓名:
-
{{ info.father }}
+
{{ info.father ? info.father : "" }}
母亲姓名:
-
{{ info.mother }}
+
{{ info.mother ? info.mother : "" }}
胎次:
-
{{ info.count }}
+
{{ info.count ? info.count : "" }}
申报日期:
-
{{ info.reportDate }}
+
{{ info.reportDate ? info.reportDate : "" }}
@@ -598,19 +583,19 @@
死亡时间:
-
{{ info.deathDate }}
+
{{ info.deathDate ? info.deathDate : "" }}
加入原因:
-
{{ info.deathReason }}
+
{{ info.deathReason ? info.deathReason : "" }}
移除时间:
-
{{ info.removeDate }}
+
{{ info.removeDate ? info.removeDate : "" }}
移除原因:
-
{{ info.removeReason }}
+
{{ info.removeReason ? info.removeReason : "" }}
@@ -619,39 +604,39 @@
迁出信息:
-
{{ info.outOfTime }}
+
{{ info.outOfTime ? info.outOfTime : "" }}
迁出类别:
-
{{ info.type }}
+
{{ info.type ? info.type : "" }}
迁出原因:
-
{{ info.reason }}
+
{{ info.reason ? info.reason : "" }}
迁出至组织:
-
{{ info.deptId }}
+
{{ info.deptId ? info.deptId : "" }}
小区:
-
{{ info.villageName }}
+
{{ info.villageName ? info.villageName : "" }}
楼号:
-
{{ info.buildName }}
+
{{ info.buildName ? info.buildName : "" }}
单元:
-
{{ info.unitName }}
+
{{ info.unitName ? info.unitName : "" }}
房屋:
-
{{ info.homeName }}
+
{{ info.homeName ? info.homeName : "" }}
外迁地址:
-
{{ info.address }}
+
{{ info.address ? info.address : "" }}
@@ -827,16 +812,7 @@ export default {
currentTabIndex: 0,
startTabIndex: 0,
- BaseTabList: [
- "教育信息",
- "兴趣爱好",
- "宗教",
- "健康",
- "工作",
- "经济状况",
- "居住",
- "家庭",
- ],
+ BaseTabList: ["教育信息", "兴趣爱好", "宗教", "健康", "工作", "经济状况", "居住", "家庭"],
tabList: [],
};
},
diff --git a/src/views/dataBoard/organizational/microgrid/components/popDetails.vue b/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
index 3f61089f8..c73df5330 100644
--- a/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
+++ b/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
@@ -52,7 +52,7 @@
证件号:
-
{{ $sensitive(info.idcard, 6, 16) }}
+
{{ $sensitive(info.idcard, 0, 14) }}
备注:
diff --git a/src/views/dataBoard/organizational/microgrid/index.vue b/src/views/dataBoard/organizational/microgrid/index.vue
index 7d2fbfda6..522ab8759 100644
--- a/src/views/dataBoard/organizational/microgrid/index.vue
+++ b/src/views/dataBoard/organizational/microgrid/index.vue
@@ -42,7 +42,7 @@
- {{ $sensitive(scope.row.idNum, 6, 16) }}
+ {{ $sensitive(scope.row.idNum, 0, 14) }}
diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue
index b3b307f24..8e0661f03 100644
--- a/src/views/dataBoard/renfang/resi/classNew.vue
+++ b/src/views/dataBoard/renfang/resi/classNew.vue
@@ -635,7 +635,7 @@ export default {
item.gridName ? item.gridName : "--",
item.fullName ? item.fullName : "--",
item.mobile ? $sensitive(item.mobile, 3, 7) : "--",
- item.idNum ? $sensitive(item.idNum, 6, 16) : "--",
+ item.idNum ? $sensitive(item.idNum, 0, 14) : "--",
item.gender ? gender[item.gender] : "--",
item.birthday ? item.birthday : "--",
{ type: "operate", list: ["查看"] },
diff --git a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
index deee9d4c7..c1e470667 100644
--- a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
@@ -139,9 +139,17 @@ export default {
let max = Math.max(...datavaule, ...datavaule2);
var datamax = new Array(datavaule.length).fill(max);
for (var i = 0; i < dataname.length; i++) {
+ console.log("i:", 1);
indicator.push({
name: dataname[i],
max: datamax[i],
+ axisLabel: {
+ show: i === 0,
+ color:'rgba(255,255,255,1)',
+ formatter: function (value) {
+ return Math.floor(value);
+ },
+ },
});
}
let legendName = ["省满意度调查各项不满意人数", "社区满意度自查各项不满意人数"];