From 1659df625296ef21fa0d53a92a91bd64506c93e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com> Date: Thu, 28 Sep 2023 11:18:52 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=84=B1=E6=95=8F=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/desensitization.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/utils/desensitization.js b/src/utils/desensitization.js index fcb4cbde2..acc5b952d 100644 --- a/src/utils/desensitization.js +++ b/src/utils/desensitization.js @@ -1,4 +1,10 @@ export default function desensitizeSubstring(inputString, start, end) { + if (!inputString) { + return '' + } + if (end >= inputString.length) { + end = inputString.length - 1 + } // 保留部分非敏感信息,将敏感信息部分截取掉 let desensitizedString = inputString.substring(0, start) + "*".repeat(end - start) + inputString.substring(end); return desensitizedString; From a6eb5882460b737b01c6a993054aaf310ddd56ff Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 28 Sep 2023 15:10:46 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=85=AC=E7=9B=8A=E5=B2=97=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publicWelfarePost/addForm.vue | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue index 45e85cd8f..cfc999ab8 100644 --- a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue +++ b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue @@ -105,7 +105,7 @@ + :A="item.value"> @@ -152,7 +152,7 @@
岗位类型: - {{ formData.postTypes }} + {{ formData.postTypeNames || '--' }}
@@ -193,7 +193,7 @@
兴趣特长: - {{ formData.hobbyCodes || "--" }} + {{ formData.hobbyNames || "--" }}
@@ -235,11 +235,11 @@
管理范围: - {{ formData.manageScopes || "--" }} + {{ formData.manageScopesName || "--" }}
+ :options="orgOptions" :props="orgOptionProps" :show-all-levels="false" @change="handleChangeManageScopes" clearable>
@@ -334,6 +334,7 @@ export default { SPECIAL_SKILL: [], idCard_type: [] }, + selArr:[], }; }, @@ -356,10 +357,11 @@ export default { await this.getDetail(this.scopeId); }, async getDetail(categorizedResiId) { - const url = `/actual/base/publicWelfarePost/detail/${categorizedResiId}`; + const url = `/actual/base/resiCategorized/publicWelfarePost/detail/${categorizedResiId}`; const { data, code, msg } = await requestGet(url); if (code === 0) { this.formData = { ...data }; + this.formData.manageScopes = data.manageScopes[0].scopeId await this.setAgencyIdFromLastLayerId(data.agencyId) console.log(this.agencyIdTemp); } else { @@ -375,7 +377,7 @@ export default { this.formType === "edit" ? "/actual/base/resiCategorized/publicWelfarePost/update" : "/actual/base/resiCategorized/publicWelfarePost/create"; - + this.formData.manageScopes = this.selArr const { data, code, msg } = await requestPost(url, this.formData); if (code === 0) { this.$message.success(this.formType == 'add' ? "添加成功" : '修改成功'); @@ -386,6 +388,11 @@ export default { } }); }, + handleChangeManageScopes(val){ + let obj = this.$refs["myCascader"].getCheckedNodes()[0].data + console.log(obj); + this.selArr = [{scopeType:obj.level,scopeId:obj.agencyId}] + }, async getDicts() { try { const requests = [ From 75045b2c856319854772ef4f52dfa42807886879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Sat, 7 Oct 2023 10:35:57 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E9=81=AE=E7=BD=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/desensitization.js | 3 + .../satisfactionEval/dissatisfied/detail.vue | 22 ++----- .../satisfactionEval/dissatisfied/index.vue | 14 +++- .../dissatisfiedPersonnel/index.vue | 40 +++++++----- .../modules/EventSituation/index.vue | 12 +++- .../modules/EventStatistics/index.vue | 35 ++++++---- .../modules/PersonnelPortrait/index.vue | 27 +++++--- .../modules/PotentialPeople/index.vue | 16 +++-- .../modules/RiskStatistics/index.vue | 30 ++++++--- .../modules/SelfTrend/index.vue | 8 ++- .../modules/TypesOfDissatisfaction/index.vue | 12 +++- .../potentialPeople/details/xqwmz.vue | 7 +- .../potentialPeople/details/yxwxfw.vue | 6 +- .../potentialPeople/index.vue | 64 ++++++++++++++----- .../potentialPeople/sjwjj.vue | 10 ++- .../potentialPeople/xqwmz.vue | 20 ++++-- .../potentialPeople/yxwxfw.vue | 37 +++++++---- 17 files changed, 248 insertions(+), 115 deletions(-) diff --git a/src/utils/desensitization.js b/src/utils/desensitization.js index fcb4cbde2..3144ca5b2 100644 --- a/src/utils/desensitization.js +++ b/src/utils/desensitization.js @@ -1,4 +1,7 @@ export default function desensitizeSubstring(inputString, start, end) { + if(!inputString) { + return '' + } // 保留部分非敏感信息,将敏感信息部分截取掉 let desensitizedString = inputString.substring(0, start) + "*".repeat(end - start) + inputString.substring(end); return desensitizedString; diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue index 56e83fc80..9e7acf232 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue @@ -16,9 +16,9 @@

{{unsatisfiedMattersModel.reason}} -

+

a
    -
  • 事项来源:{{unsatisfiedMattersModel.satisfactionSource}}
  • +
  • 事项来源:{{satisfactionSourceOptions[unsatisfiedMattersModel.satisfactionSource]}}
  • 事项类型:{{unsatisfiedMattersModel.satisfactionCategoryName}}
  • 所属月份:{{unsatisfiedMattersModel.satisfactionCategoryName}}
  • 所属社区:{{unsatisfiedMattersModel.organizationName}}
  • @@ -79,19 +79,11 @@ export default { unsatisfiedMattersModel: '', unsatisfiedHisCount: '', followUpRecordDetails: '', - satisfactionSourceOptions: [{ - value: 'satisfaction_12345', - label: '12345投诉', - color: '#FFB73C', - }, { - value: 'satisfaction_province', - label: '省满意度调查', - color: '#64C1FF' - }, { - value: 'satisfaction_community', - label: '社区满意度自查', - color: '#08EBAE' - }] + satisfactionSourceOptions: { + satisfaction_12345: '12345投诉', + satisfaction_province: '省满意度调查', + satisfaction_community: '社区满意度自查', + } }; }, methods: { diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue index 079208b21..c3b789ab3 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue @@ -58,7 +58,12 @@
- + { this.total = data.total this.list = data.list + this.loading = false }) }, getOrg() { diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue index 4fa50bdce..296fd10e2 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue @@ -1,16 +1,21 @@