From 9638ceccc9ae1256a11ea9213852284363a17d2c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 13 Oct 2023 15:47:42 +0800 Subject: [PATCH 01/45] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=A5?= =?UTF-8?q?=E5=85=A5=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/residentManagement/volunteer/volunteer.vue | 2 +- src/views/modules/base/smartImport.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/modules/base/residentManagement/volunteer/volunteer.vue b/src/views/modules/base/residentManagement/volunteer/volunteer.vue index fe2fdbd9c..f511c8489 100644 --- a/src/views/modules/base/residentManagement/volunteer/volunteer.vue +++ b/src/views/modules/base/residentManagement/volunteer/volunteer.vue @@ -358,7 +358,7 @@ export default { .post("/actual/base/importExcelData/extractExcelHead", formData) .then((res) => { const { metaListData, fileCode, msg } = res.data.data; - this.dataList = metaListData; + this.dataList = {"所属网格":"所属网格","所属小区":"所属小区","所属楼栋":"所属楼栋","所属单元":"所属单元","所属房屋":"所属房屋","本地户籍":"本地户籍","居民姓名":"居民姓名","联系电话":"联系电话","国籍":"国籍","证件类型":"证件类型","证件号":"证件号","民族":"民族","备注":"备注","文化程度":"文化程度","治安巡逻":"治安巡逻","人民调解":"人民调解","民情采集":"民情采集","文体辅导":"文体辅导","结对帮扶":"结对帮扶","应急处理":"应急处理","义务理发":"义务理发","家电维修":"家电维修","其他":"其他","兴趣":"兴趣爱好","工作单位":"工作单位","职业":"职业","户籍地址":"户籍所在地","居住地址":"现居住地址","文化队伍":"文化队伍","楼委会":"楼委会","能人达人":"能人达人","老友俱乐部":"老友俱乐部","代办员":"代办员","调解员":"调解员","采集员":"采集员","治安巡逻员":"治安巡逻员"}; // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。 this.importCode = fileCode; this.handleComfirmUpload() diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue index d2945d6b7..0d78e5d5a 100644 --- a/src/views/modules/base/smartImport.vue +++ b/src/views/modules/base/smartImport.vue @@ -203,7 +203,6 @@ export default { //选择人员信息第一列下拉框 async handleSelGroup (index, item, change) { console.log(index, item, change); - console.log("让我看看返回的什么"); const url = "/oper/customize/icformitem/getItemListV2"; // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree' let params = { From 36cbda9558970da26c47dca4504d3a4b46936a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com> Date: Fri, 13 Oct 2023 16:26:39 +0800 Subject: [PATCH 02/45] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/family/modules/EnjoyService.vue | 2 +- .../dataBoard/cpts/family/modules/businessTables/community.vue | 2 +- .../dataBoard/cpts/family/modules/businessTables/complaint.vue | 2 +- .../dataBoard/cpts/family/modules/businessTables/economize.vue | 2 +- .../cpts/family/modules/businessTables/give-service.vue | 2 +- .../cpts/family/modules/businessTables/reporting-events.vue | 2 +- .../dataBoard/cpts/family/modules/businessTables/resident.vue | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue index 06868b2fa..ce020c199 100644 --- a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue +++ b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue @@ -10,7 +10,7 @@ -
+
暂无数据
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/community.vue b/src/views/dataBoard/cpts/family/modules/businessTables/community.vue index 42a128e61..0873ad13b 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/community.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/community.vue @@ -12,7 +12,7 @@ -
+
暂无数据
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue b/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue index 8c1bec5c7..9f2b27a9a 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue @@ -13,7 +13,7 @@ -
+
暂无数据
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue b/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue index aec28a7dc..f0880995b 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue @@ -12,7 +12,7 @@ -
+
暂无数据
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/give-service.vue b/src/views/dataBoard/cpts/family/modules/businessTables/give-service.vue index 859cf7e73..bd1f27e79 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/give-service.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/give-service.vue @@ -12,7 +12,7 @@ -
+
暂无数据
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue b/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue index f3fc0ced6..493ad3932 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue @@ -12,7 +12,7 @@ -
+
暂无数据
diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/resident.vue b/src/views/dataBoard/cpts/family/modules/businessTables/resident.vue index 456b3e4a6..095d9047a 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/resident.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/resident.vue @@ -12,7 +12,7 @@ -
+
暂无数据
From 17d224bb274c3cb0749204c17e485cf591997172 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 13 Oct 2023 18:14:42 +0800 Subject: [PATCH 03/45] =?UTF-8?q?=E5=A4=B1=E4=B8=9A=E4=BA=BA=E5=91=98,?= =?UTF-8?q?=E6=AE=8B=E7=96=BE=E4=BA=BA=E6=8E=A5=E5=85=A5=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E5=AF=BC=E5=85=A5,=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resiDisability/resiDisability.vue | 30 +- .../unemployment/unemployment.vue | 30 +- .../modules/shequzhili/eventOld/cpts/add.vue | 1210 +++++++------ .../shequzhili/eventOld/cpts/event-detail.vue | 711 +++++--- .../shequzhili/eventOld/cpts/event-info.vue | 1198 +++++++------ .../eventOld/cpts/process-form-designate.vue | 126 +- .../eventOld/cpts/process-form-project.vue | 579 +++--- .../eventOld/cpts/process-form-replay.vue | 436 +++-- .../eventOld/cpts/process-form-urban.vue | 175 ++ .../shequzhili/eventOld/cpts/process-form.vue | 406 +++-- .../modules/shequzhili/eventOld/eventList.vue | 1585 +++++++++-------- vue.config.js | 9 - 12 files changed, 3720 insertions(+), 2775 deletions(-) create mode 100644 src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue diff --git a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue index 2abfe6810..c8177e0f6 100644 --- a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue +++ b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue @@ -542,21 +542,43 @@ export default { }); const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 formData.append("file", file.file); //添加文件对象 + formData.append("fileMode", 'DISABILITY'); await this.$http - .post("/actual/base/resiCategorized/disability/import", formData) + .post("/actual/base/importExcelData/extractExcelHead", formData) + .then((res) => { + const { fileCode, msg } = res.data.data; + this.dataList = {"所属网格":"所属网格","所属小区":"所属小区","所属楼栋":"所属楼栋","所属单元":"所属单元","所属房屋":"所属房屋","本地户籍":"本地户籍","居民姓名":"居民姓名","联系电话":"联系电话","国籍":"国籍","证件类型":"证件类型","证件号":"证件号","民族":"民族","备注":"备注","残疾类别":"残疾类别","残疾等级":"残疾等级","残疾证号":"残疾证号","退休金额":"退休金额","月收入":"月收入","赡养人联系电话":"赡养人联系电话"}; + // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。 + this.importCode = fileCode; + this.handleComfirmUpload() + }) + .catch((err) => { + console.log("失败", err); + file.onError(); //上传失败的文件会从文件列表中删除 + // this.$message.error('导入失败') + });// + }, + async handleComfirmUpload() { + this.importLoading = true; + this.importBtnTitle = "正在上传中..."; + const { importOption, importCode, dataList } = this; + const formData = new FormData(); + formData.append("columnMateJson", JSON.stringify(dataList)); + formData.append("fileCode", importCode); + await this.$http + .post("/actual/base/importExcelData/importResiHouseExcel", formData) .then((res) => { console.log("res-up", res); if (res.data.code == 0 && res.data.msg == "success") { - this.$message.success("导入成功"); this.getTableData(); - this.$refs.upload.clearFiles(); } else this.$message.error(res.data.msg); }) .catch((err) => { console.log("失败", err); file.onError(); //上传失败的文件会从文件列表中删除 - // this.$message.error('导入失败') }); + this.importLoading = false; + this.importBtnTitle = "导入"; }, // 分页 handleSizeChange(val) { diff --git a/src/views/modules/base/residentManagement/unemployment/unemployment.vue b/src/views/modules/base/residentManagement/unemployment/unemployment.vue index 9b9670603..0ec83f089 100644 --- a/src/views/modules/base/residentManagement/unemployment/unemployment.vue +++ b/src/views/modules/base/residentManagement/unemployment/unemployment.vue @@ -429,21 +429,43 @@ export default { }); const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 formData.append("file", file.file); //添加文件对象 + formData.append("fileMode", 'UNEMPLOYED'); await this.$http - .post("/actual/base/resiUnemployment/import", formData) + .post("/actual/base/importExcelData/extractExcelHead", formData) + .then((res) => { + const { fileCode, msg } = res.data.data; + this.dataList = {"所属网格":"所属网格","所属小区":"所属小区","所属楼栋":"所属楼栋","所属单元":"所属单元","所属房屋":"所属房屋","本地户籍":"本地户籍","居民姓名":"居民姓名","联系电话":"联系电话","国籍":"国籍","证件类型":"证件类型","证件号":"证件号","民族":"民族","备注":"备注","文化程度":"文化程度","残疾类别":"残疾类别","残疾等级":"残疾等级","户籍地址":"户籍所在地","居住地址":"现居住地址","健康状况":"健康状况","原工作单位":"原工作单位","解除合同日期":"解除合同日期","失业时间":"失业时间","失业证号":"失业证号","失业原因":"失业原因","再就业优惠证号":"再就业优惠证号","技术特长":"技能特长","是否领取失业金":"是否领取失业金","是否就业困难对象":"是否就业困难对象","劳动能力就业愿望":"劳动就业愿望"}; + // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。 + this.importCode = fileCode; + this.handleComfirmUpload() + }) + .catch((err) => { + console.log("失败", err); + file.onError(); //上传失败的文件会从文件列表中删除 + // this.$message.error('导入失败') + });// + }, + async handleComfirmUpload() { + this.importLoading = true; + this.importBtnTitle = "正在上传中..."; + const { importOption, importCode, dataList } = this; + const formData = new FormData(); + formData.append("columnMateJson", JSON.stringify(dataList)); + formData.append("fileCode", importCode); + await this.$http + .post("/actual/base/importExcelData/importResiHouseExcel", formData) .then((res) => { console.log("res-up", res); if (res.data.code == 0 && res.data.msg == "success") { - this.$message.success("导入成功"); this.getTableData(); - this.$refs.upload.clearFiles(); } else this.$message.error(res.data.msg); }) .catch((err) => { console.log("失败", err); file.onError(); //上传失败的文件会从文件列表中删除 - // this.$message.error('导入失败') }); + this.importLoading = false; + this.importBtnTitle = "导入"; }, // 搜索事件 handleSearch(val) { diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue index 4e063fd7a..575d9367d 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/add.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue @@ -1,559 +1,705 @@ - - - - - + + + } + + \ No newline at end of file diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue index 773f769f5..e79d6c436 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue @@ -1,283 +1,496 @@ diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index 3b0283f1b..3ad7a4c57 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -1,205 +1,297 @@ diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue index f1ebf59f9..0c3af3a14 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue @@ -28,15 +28,6 @@ placeholder="请输入转办意见，不超过500字" v-model="formData.content">
- - - 点击上传 -
支持图片、word、pdf
- -
@@ -64,8 +55,7 @@ export default { categoryId: "",//事件分类 deptId: "", //指派部门 deptName: "", - categoryList: [], - files: [] //附件 + categoryList: [] }, orgOptions: [], orgOptionProps: { @@ -81,14 +71,12 @@ export default { eventDetailCopy: {}, selCategoryArray: [], casOptions: [], - fileList: [], - uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile", iscascaderShow: 0, optionProps: { multiple: false, value: "id", - label: "categoryName", - children: "children", + label: "name", + children: "subCategory", }, dataRule: { content: [ @@ -104,8 +92,8 @@ export default { { required: true, message: "办结时限不能为空", trigger: "blur" }, ] }, - selCateObj: { - id: "" + selCateObj:{ + id:"" }, }; }, @@ -138,6 +126,7 @@ export default { this.getCategoryList(); if (this.eventId) { this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); + console.log(this.eventDetailCopy); // 这一步接收到eventDetailCopy在这里回填 if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { this.selCateObj.id = this.eventDetailCopy.categoryId @@ -163,11 +152,12 @@ export default { } }, async getCategoryList() { - const url = '/governance/icEvent/getCategoryTree'; + const url = "/governance/issueprojectcategorydict/list"; let params = {}; const { data, code, msg } = await requestPost(url, params); if (code === 0) { - let treeDataNew = this.deepTree(data, "children"); + let treeDataNew = this.filterTree(data); + //组织级联数据 ++this.iscascaderShow; this.casOptions = []; this.casOptions = treeDataNew; @@ -181,6 +171,7 @@ export default { this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency' this.formData.deptId = obj.agencyId this.formData.deptName = obj.agencyName + } else { this.form.orgType = '' this.form.orgId = '' @@ -190,25 +181,24 @@ export default { if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) { this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data this.formData.categoryId = this.selCateObj.id - console.log(this.formData.categoryId, 'this.formData.categoryId'); + console.log(this.formData.categoryId,'this.formData.categoryId'); } else { this.selCateObj = {} } }, //重构树，去除网格 - deepTree(arr, children) { - if (Array.isArray(arr) && arr.length > 0) { - return arr.map((item) => { - return { - ...item, - [children]: - (item[children] && - item[children].length > 0 && - this.deepTree(item[children], children)) || - null, - }; - }); + filterTree(arr) { + let childs = arr; + for (let i = childs.length; i--; i > 0) { + if (childs[i].subCategory) { + if (childs[i].subCategory.length) { + this.filterTree(childs[i].subCategory); + } else { + delete childs[i].subCategory; + } + } } + return arr; }, async getReplayInfo() { this.okflag = false; @@ -216,13 +206,11 @@ export default { if (!valid) { app.util.validateRule(messageObj); } else { + console.log(this.selCateObj); if (!this.selCateObj || !this.selCateObj.id) { this.$message.error("请选择事件分类"); return false; } - if(this.fileList){ - this.formData.files = this.fileList - } this.formData.status = "processing"; this.formData.categoryId = this.selCateObj.id; this.formData.categoryList = []; @@ -234,74 +222,6 @@ export default { resetData() { this.agencyIdArray = [] }, - beforeUpload(file) { - const array = file.name.split("."); - const extension = array[array.length - 1]; - const formatarray = [ - "jpg", - "png", - "jpeg", - "bmp", - "mp4", - "wma", - "m4a", - "mp3", - "doc", - "docx", - "xls", - "xlsx", - "pdf", - ]; - if (formatarray.indexOf(extension) === -1) { - this.$message.error("只支持图片、word、pdf"); - return false; - } - }, - handleFileRemove(file) { - if (file && file.status === "success") { - this.fileList.splice( - this.fileList.findIndex((item) => item.uid === file.uid), - 1 - ); - } - }, - handleFileSuccess(res, file) { - if (res.code === 0 && res.msg === "success") { - const array = file.name.split("."); - const fileType = array[array.length - 1]; - const picArray = ["jpg", "png", "jpeg", "bmp"]; - const videoarray = ["mp4", "wma", "m4a"]; - const docArray = ["doc", "docx", "xls", "xlsx", "pdf"]; - const mp3Array = ["mp3"]; - - if (picArray.indexOf(fileType) > -1) { - file.attachmentFormat = "image"; - } else if (videoarray.indexOf(fileType) > -1) { - file.attachmentFormat = "video"; - } else if (docArray.indexOf(fileType) > -1) { - file.attachmentFormat = "doc"; - } else if (mp3Array.indexOf(fileType) > -1) { - file.attachmentFormat = "voice"; - } - - file.url = res.data.url; - file.type = fileType; - - file.attachmentName = file.name; - file.attachmentType = file.type; - file.attachmentUrl = file.url; - - this.fileList.push(file); - } else this.$message.error(res.msg); - }, - //下载 - handleFileDownload(file) { - var a = document.createElement("a"); - var event = new MouseEvent("click"); - a.download = file.name; - a.href = file.url; - a.dispatchEvent(event); - }, // 开启加载动画 startLoading() { loading = Loading.service({ diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue index 7dbabcd01..925550fae 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-project.vue @@ -1,105 +1,76 @@ @@ -258,64 +211,64 @@ import { requestPost } from "@/js/dai/request"; import selectStaff from "@/views/components/selectStaff"; import formVltHelper from "dai-js/tools/formVltHelper"; import foldText from "@/views/components/foldText"; -import myCascader from "./myCascader.vue"; + import { isCard } from "@/utils/validate"; let loading; // 加载动画 -function iniFmData() { +function iniFmData () { return { - operationType: "1", //处理方式[0:已回复 1:已转项目 2:已转需求] - publicReply: "", //项目方案 1000 - internalRemark: "", // 内部备注 1000 - gridId: "", // - assistanceUnitIndex: "", - assistanceUnitId: "", // 协办单位Id - assistanceUnitType: "", // 协办单位类型，1社区自组织，2联建单位 - staffList: [], // 勾选人员信息 - categoryList: [], // - tagList: [], // - - internalFile: [], // - title: "", // - - publicFile: [], // - locateAddress: "", // - locateLongitude: "", // - locateDimension: "", // - eventId: "", // + operationType: '1',//处理方式[0:已回复 1:已转项目 2:已转需求] + publicReply: '',//项目方案 1000 + internalRemark: '',// 内部备注 1000 + gridId: '',// + assistanceUnitIndex: '', + assistanceUnitId: '',// 协办单位Id + assistanceUnitType: '',// 协办单位类型，1社区自组织，2联建单位 + staffList: [],// 勾选人员信息 + categoryList: [],// + tagList: [],// + + internalFile: [],// + title: '',// + + publicFile: [],// + locateAddress: '',// + locateLongitude: '',// + locateDimension: '',// + eventId: '',// }; } export default { - data() { + data () { return { btnDisable: false, customerId: localStorage.getItem("customerId"), - gridList: [], //所属网格list--场所区域 - myDepartmentList: [], //部门数组 + gridList: [],//所属网格list--场所区域 + myDepartmentList: [],//部门数组 visibleStaffPanel: false, - assistanceUnitList: [], //协办单位数组 - tagList: [], //标签数组 + assistanceUnitList: [],//协办单位数组 + tagList: [],//标签数组 tagOptions: [], visibleTagPanel: false, selectedTagData: [], casOptions: [], - // iscascaderShow: 0, + iscascaderShow: 0, selCategoryArray: [], selCateObj: {}, optionProps: { multiple: false, - value: "id", - label: "name", - children: "subCategory", + value: 'id', + label: 'name', + children: 'subCategory', }, formData: iniFmData(), formDataTemp: { assistanceUnitIndex: 0, - assistanceUnitId: "", // 协办单位Id - assistanceUnitType: "", // 协办单位类型，1社区自组织，2联建单位 + assistanceUnitId: '',// 协办单位Id + assistanceUnitType: '',// 协办单位类型，1社区自组织，2联建单位 eventId: "", gridId: "63d5ff92ea981b1c58e4914ac894c610", @@ -327,34 +280,38 @@ export default { internalFile: [], staffList: [], - tagList: [ - { - id: "46294b3c9f96ee4d0b00e997e06c8f97", - isDisable: "enable", - name: "车行道、人行道、盲道、无障碍通道、路名牌", - }, - { - id: "953bafc1191f784841d9b8da61ec7b9b", - isDisable: "enable", - name: "城市广场管理", - }, - ], + tagList: [{ + id: "46294b3c9f96ee4d0b00e997e06c8f97", + isDisable: "enable", + name: "车行道、人行道、盲道、无障碍通道、路名牌", + }, + { + id: "953bafc1191f784841d9b8da61ec7b9b", + isDisable: "enable", + name: "城市广场管理", + }], + + }, okflag: false, uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2", - eventDetailCopy: {}, + eventDetailCopy: {} + }; }, - components: { selectStaff, foldText, myCascader }, + components: { selectStaff, foldText }, computed: { - dataRule() { + dataRule () { + return { categoryList: [ - { required: true, message: "事件分类不能为空", trigger: "blur" }, + { required: true, message: "请填写事件分类", trigger: "blur" }, + ], + title: [ + { required: true, message: "标题不能为空", trigger: "blur" }, ], - title: [{ required: true, message: "标题不能为空", trigger: "blur" }], gridId: [ { required: true, message: "所属网格不能为空", trigger: "blur" }, ], @@ -364,12 +321,14 @@ export default { publicReply: [ { required: true, message: "项目方案不能为空", trigger: "blur" }, ], + }; }, + + }, props: { - gridId: { - //新增是选择的网格id + gridId: {//新增是选择的网格id type: String, default: "", }, @@ -379,21 +338,23 @@ export default { }, eventDetailData: { type: Object, - default() { - return {}; - }, + default () { + return {} + } }, - source: { - //展示来源：manage 管理平台 visiual 可视化平台 + source: {//展示来源：manage 管理平台 visiual 可视化平台 type: String, - default: "manage", - }, + default: 'manage' + } }, watch: { gridId: function (val) { - this.formData.gridId = val; + + this.formData.gridId = val + }, "formData.assistanceUnitIndex": function (val) { + if (val === "" || this.assistanceUnitList.length === 0) { this.formData.assistanceUnitId = ""; this.formData.assistanceUnitType = ""; @@ -405,7 +366,7 @@ export default { } }, - async selectedTagData(val) { + async selectedTagData (val) { const { tagOptions } = this; this.tagList = await Promise.all( val.map(async (id) => { @@ -432,112 +393,115 @@ export default { ); this.tagList = this.tagList.filter((item) => item.id); - console.log(this.tagList); + console.log(this.tagList) }, }, - created() {}, + created () { + - async mounted() { - const { user } = this.$store.state; - this.agencyId = user.agencyId; + + }, + + async mounted () { + const { user } = this.$store.state + this.agencyId = user.agencyId this.getCategoryList(); this.loadGrid(); this.getMyDepartmentList(); // this.getAssistanceUnitList(); - this.getTagList(); + this.getTagList() // this.formData = { ...this.formDataTemp } if (this.eventId) { this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); - this.formData.gridId = this.eventDetailCopy.gridId; + this.formData.gridId = this.eventDetailCopy.gridId - if ( - this.eventDetailCopy.parentCategoryId && - this.eventDetailCopy.categoryId - ) { - this.selCategoryArray = []; - this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId); - this.selCategoryArray.push(this.eventDetailCopy.categoryId); + if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { + this.selCategoryArray = [] + this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId) + this.selCategoryArray.push(this.eventDetailCopy.categoryId) this.selCateObj = { name: this.eventDetailCopy.categoryName, - id: this.eventDetailCopy.categoryId, - }; + id: this.eventDetailCopy.categoryId + } - this.formData.categoryList = []; - this.formData.categoryList.push(this.selCateObj); + this.formData.categoryList = [] + this.formData.categoryList.push(this.selCateObj) } } else { - this.formData.gridId = this.gridId; + this.formData.gridId = this.gridId + } }, methods: { - async getCategoryList() { - const url = "/governance/issueprojectcategorydict/list"; + async getCategoryList () { + const url = "/governance/issueprojectcategorydict/list" - let params = {}; + let params = {} - const { data, code, msg } = await requestPost(url, params); + const { data, code, msg } = await requestPost(url, params) if (code === 0) { - let treeDataNew = this.filterTree(data); + let treeDataNew = this.filterTree(data) //组织级联数据 - // ++this.iscascaderShow; - this.casOptions = []; - this.casOptions = treeDataNew; + ++this.iscascaderShow + this.casOptions = [] + this.casOptions = treeDataNew + } else { - this.$message.error(msg); + this.$message.error(msg) } + }, - handleChangeCate(obj) { - // console.log(this.$refs["myCascader"].getCheckedNodes()[0].data); - // this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data; - this.selCateObj = obj - this.formData.categoryList = []; - let flag = JSON.stringify(obj) == '{}' - if(flag) this.formData.categoryList = [] - else this.formData.categoryList.push(this.selCateObj); + handleChangeCate () { + console.log(this.$refs["myCascader"].getCheckedNodes()[0].data) + this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data + this.formData.categoryList = [] + this.formData.categoryList.push(this.selCateObj) }, //重构树，去除网格 - filterTree(arr) { - let childs = arr; + filterTree (arr) { + let childs = arr for (let i = childs.length; i--; i > 0) { if (childs[i].subCategory) { if (childs[i].subCategory.length) { - this.filterTree(childs[i].subCategory); + this.filterTree(childs[i].subCategory) } else { - delete childs[i].subCategory; + delete childs[i].subCategory } } } - return arr; + return arr }, - async loadGrid() { - const url = "/gov/org/customergrid/gridoption"; + async loadGrid () { + const url = "/gov/org/customergrid/gridoption" let params = { - agencyId: this.agencyId, - }; + agencyId: this.agencyId + } - const { data, code, msg } = await requestPost(url, params); + const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.gridList = data; + this.gridList = data + } else { - this.$message.error(msg); + this.$message.error(msg) } + }, //加载处理部门数据 - async getMyDepartmentList() { + async getMyDepartmentList () { const url = "/governance/trace/approvalagencylist"; const { data, code, msg } = await requestPost(url, { - issueId: "", - projectStaffId: "", + issueId: '', + projectStaffId: '', }); if (code === 0) { @@ -548,7 +512,7 @@ export default { }, //加载协同单位数据 - async getAssistanceUnitList() { + async getAssistanceUnitList () { const url = "/heart/icpartyunit/assistanceUnitList"; const { data, code, msg } = await requestPost(url, { @@ -557,14 +521,17 @@ export default { if (code === 0) { this.assistanceUnitList = data; + } else { this.$message.error(msg); } }, //加载标签 - async getTagList() { + async getTagList () { const url = "/governance/issueprojecttagdict/list"; - const { data, code, msg } = await requestPost(url, {}); + const { data, code, msg } = await requestPost(url, { + + }); if (code === 0) { this.tagOptions = { @@ -576,26 +543,29 @@ export default { } }, - handleTagChange(val) { + handleTagChange (val) { console.log(val); }, - updateProjectTag() { + updateProjectTag () { this.visibleTagPanel = false; }, - async getProjectInfo() { - this.okflag = false; + + async getProjectInfo () { + this.okflag = false this.$refs["ref_form"].validate((valid, messageObj) => { if (!valid) { app.util.validateRule(messageObj); + } else { - this.formData.tagList = this.tagList; - this.okflag = true; + + this.formData.tagList = this.tagList + this.okflag = true } }); }, - beforeImgUpload(file) { + beforeImgUpload (file) { const isLt1M = file.size / 1024 / 1024 < 10; if (!isLt1M) { @@ -603,8 +573,10 @@ export default { } return isLt1M; }, - resetData() {}, - handleImgSuccess(res, file, fileList) { + resetData () { + + }, + handleImgSuccess (res, file, fileList) { console.log("res.data.url", file); if (res.code === 0 && res.msg === "success") { console.log("res.data.url", res.data.url); @@ -621,7 +593,7 @@ export default { } }, - handleImgRemove(file) { + handleImgRemove (file) { let index = this.formData.internalFile.findIndex( (item) => item.url == file.response.data.url ); @@ -629,8 +601,9 @@ export default { console.log(this.formData.internalFile); }, + // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -638,7 +611,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); @@ -660,7 +633,7 @@ export default { - + + + + + } + + \ No newline at end of file diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue new file mode 100644 index 000000000..1a5f5d4bc --- /dev/null +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-urban.vue @@ -0,0 +1,175 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue index 3e977c1e5..d56fefb2f 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue @@ -1,201 +1,281 @@ + + + diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue index a8e2f5976..78b0659b2 100644 --- a/src/views/modules/shequzhili/eventOld/eventList.vue +++ b/src/views/modules/shequzhili/eventOld/eventList.vue @@ -1,225 +1,473 @@ diff --git a/vue.config.js b/vue.config.js index 1bd675a55..2f2549d8b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,12 +1,3 @@ -/* - * @Author: mk 2403457699@qq.com - * @Date: 2023-09-20 13:46:51 - * @LastEditors: mk 2403457699@qq.com - * @LastEditTime: 2023-09-22 15:16:23 - * @Description: 介绍一下改动了什么 - * - * - */ /** * 配置参考: https://cli.vuejs.org/zh/config/ */ From 851c73b0ea02ad8cf7db08fa0026acaca431ca52 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 13 Oct 2023 18:26:52 +0800 Subject: [PATCH 04/45] =?UTF-8?q?=E4=BF=9D=E9=9A=9C=E6=88=BF=E8=B5=B0?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../housingNature/housingNature.vue | 79 ++++++++++++------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue index e8cd2f616..865f056ff 100644 --- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue +++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue @@ -287,36 +287,58 @@ export default { } return fileType && isLt1M; }, - + async uploadHttpRequest(file) { - this.$message({ - showClose: true, - dangerouslyUseHTMLString: true, - message: - "导入中，请到系统管理-导入记录中查看进度", - duration: 3000, - }); - let than = this; - document.getElementById("clickA").addEventListener("click", function () { - than.$router.replace("/main/importRecord-index"); - }); - const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 - formData.append("file", file.file); //添加文件对象 - await this.$http - .post("/actual/base/resiHousingNature/import", formData) - .then((res) => { - console.log("res-up", res); - if (res.data.code == 0 && res.data.msg == "success") { - this.$message.success("导入成功"); - this.getTableData(); - this.$refs.upload.clearFiles(); - } else this.$message.error(res.data.msg); - }) - .catch((err) => { - console.log("失败", err); - file.onError(); //上传失败的文件会从文件列表中删除 - // this.$message.error('导入失败') + this.$message({ + showClose: true, + dangerouslyUseHTMLString: true, + message: + "导入中，请到系统管理-导入记录中查看进度", + duration: 3000, + }); + let than = this; + document.getElementById("clickA").addEventListener("click", function () { + than.$router.replace("/main/importRecord-index"); }); + const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 + formData.append("file", file.file); //添加文件对象 + formData.append("fileMode",'ENSUREHOUSE'); + await this.$http + .post("/actual/base/importExcelData/extractExcelHead", formData) + .then((res) => { + const { metaListData, fileCode, msg } = res.data.data; + this.dataList = {"所属网格":"所属网格","所属小区":"所属小区","所属楼栋":"所属楼栋","所属单元":"所属单元","所属房屋":"所属房屋","本地户籍":"本地户籍","居民姓名":"居民姓名","联系电话":"联系电话","国籍":"国籍","证件类型":"证件类型","证件号":"证件号","民族":"民族","备注":"备注","户籍地址":"户籍所在地","现居地址":"现居住地址","房东姓名":"房东姓名","房东身份证号":"房东身份证号","住房性质":"住房性质","领取通知书日期":"领取通知书日期","保障类型":"保障类型","发证日期":"发证日期","补贴编号":"补贴编号","补贴金额":"补贴金额"}; + // 相等于在for循环中写filter过滤,这样写能够以 O(1) 的时间复杂度获取 itemGroupId 匹配的元素。 + this.importCode = fileCode; + this.handleComfirmUpload() + }) + .catch((err) => { + console.log("失败", err); + file.onError(); //上传失败的文件会从文件列表中删除 + // this.$message.error('导入失败') + });// + }, + async handleComfirmUpload () { + this.importLoading = true; + this.importBtnTitle = "正在上传中..."; + const { importOption, importCode, dataList } = this; + const formData = new FormData(); + formData.append("columnMateJson", JSON.stringify(dataList)); + formData.append("fileCode", importCode); + await this.$http + .post("/actual/base/importExcelData/importResiHouseExcel", formData) + .then((res) => { + console.log("res-up", res); + if (res.data.code == 0 && res.data.msg == "success") { + this.getTableData(); + } else this.$message.error(res.data.msg); + }) + .catch((err) => { + console.log("失败", err); + file.onError(); //上传失败的文件会从文件列表中删除 + }); + this.importLoading = false; + this.importBtnTitle = "导入"; }, // 搜索事件 handleSearch(val) { @@ -356,6 +378,7 @@ export default { this.showAdd = false; this.showEdit = false; }, + // 新增弹出框组件确定事件 handleComfirm(type) { this.handleClose(); From c84e324e5ce9db0ef34685dd6ae80bd754c08a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com> Date: Fri, 13 Oct 2023 18:36:13 +0800 Subject: [PATCH 05/45] =?UTF-8?q?=E5=9C=B0=E5=9B=BElable=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/map/index.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index 65ec3792e..fc67d1489 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -186,7 +186,7 @@ export default { // level: item.level, center: [item.longitude, item.latitude], ...item, - parentName: srcGridData.name, + parentName: srcGridData.name || "", }, geometry: { type: "Polygon", @@ -475,7 +475,6 @@ export default { } // console.log("地图初始化数据", polygonData); - // 画区域面积 polygonLayer = new PolygonLayer({ autoFit: true, @@ -566,7 +565,7 @@ export default { } else { posLayer.hide() }*/ - textLayer = new PolygonLayer({ + textLayer = new PolygonLayer({ zIndex: 20, }) .source(polygonData) @@ -673,7 +672,6 @@ export default { scene.addLayer(dotLayer); dotBgLayer.on("click", (e) => { - console.log(e.feature.properties); this.$emit("clickDot", e.feature.properties); }); @@ -712,7 +710,6 @@ export default { scene.addLayer(dotLayer2); dotLayer2.on("click", (e) => { - console.log(e.feature.properties); this.$emit("clickDot", e.feature.properties); }); @@ -755,7 +752,7 @@ export default { if (polygonLayer) { polygonLayer.setData(polygonData); lineLayer.setData(polygonData); - textLayer.setData(polygonDotData); + textLayer.setData(polygonData); /* posLayer.setData(polygonDotData); // let gridPoint = scene.getLayerByName('gridPoint') if (this.level === 'grid') { @@ -770,7 +767,6 @@ export default { updateDot() { const { dotData } = this; if (dotLayer) { - console.log(dotData); dotLayer.setData(dotData); dotBgLayer.setData(dotData); } @@ -779,7 +775,6 @@ export default { updateDot2() { const { dotData2: dotData } = this; if (dotLayer2) { - console.log(dotData); dotLayer2.setData(dotData); } }, @@ -998,7 +993,6 @@ export default { }, async handleClickDot(item, posArr) { - console.log("handleClickDot", item, posArr); const res = await this.$refs.popup.show(item); if (res) { const popup = new Popup({ From d4479de691cba1a0db6acff5c8e2c80e04434e16 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 16 Oct 2023 09:54:27 +0800 Subject: [PATCH 06/45] =?UTF-8?q?=E7=89=B9=E6=89=B6=E4=BA=BA=E5=91=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/residentManagement/tefu/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/residentManagement/tefu/addForm.vue b/src/views/modules/base/residentManagement/tefu/addForm.vue index b6e213a06..5c1628247 100644 --- a/src/views/modules/base/residentManagement/tefu/addForm.vue +++ b/src/views/modules/base/residentManagement/tefu/addForm.vue @@ -180,7 +180,7 @@ formData.localResidenceFlag != null ? formData.localResidenceFlag == 1 ? "是" - : formData.gender == 0 + : formData.localResidenceFlag == 0 ? "否" : "--" : "--" From 13fbc358e56cbecff581fdf8a7ca7cae5e8855cb Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 16 Oct 2023 10:30:15 +0800 Subject: [PATCH 07/45] 1 --- src/views/modules/base/residentManagement/tefu/tefuList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue index f14c2ed08..e99a14b5d 100644 --- a/src/views/modules/base/residentManagement/tefu/tefuList.vue +++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue @@ -259,10 +259,10 @@ label="本地户籍" :show-overflow-tooltip="true"> + diff --git a/src/views/modules/jumin/cpts/rightBto.vue b/src/views/modules/jumin/cpts/rightBto.vue new file mode 100644 index 000000000..9338a3e49 --- /dev/null +++ b/src/views/modules/jumin/cpts/rightBto.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/views/modules/jumin/cpts/rightTop.vue b/src/views/modules/jumin/cpts/rightTop.vue index cbf3695ce..72d19773a 100644 --- a/src/views/modules/jumin/cpts/rightTop.vue +++ b/src/views/modules/jumin/cpts/rightTop.vue @@ -160,69 +160,70 @@ export default { pageSize: this.pageSize } // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) - const completeFlags = { - "-2": "未知", - "-1": "不接受回访", - 0: "接受回访/待回访", - 1: "已回访", + const statusArr = { + processing: "处理中", + closed_case: "已办结", }; + const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"]; + // 省满意度列表 - this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", parm).then(({ data: res }) => { - this.complainList = [{ - scope: "服务态度", - problemDesc: "服务人员态度不好", - completeFlag: "未办理", - isReturn: "否" - }, - { - scope: "处理速度", - problemDesc: "等待时间过长", - completeFlag: "已办理", - isReturn: "是" - }, - { - scope: "设备问题", - problemDesc: "使用的机器经常故障", - completeFlag: "办理中", - isReturn: "否" - }, - { - scope: "其他", - problemDesc: "场地不够干净", - completeFlag: "已办理", - isReturn: "是" - }, { - scope: "服务态度", - problemDesc: "服务人员态度不好", - completeFlag: "未办理", - isReturn: "否" - }, - { - scope: "处理速度", - problemDesc: "等待时间过长", - completeFlag: "已办理", - isReturn: "是" - }, - { - scope: "设备问题", - problemDesc: "使用的机器经常故障", - completeFlag: "办理中", - isReturn: "否" - }, - { - scope: "其他", - problemDesc: "场地不够干净", - completeFlag: "已办理", - isReturn: "是" - }] - // this.list = res.data.list.map((item) => { - // return { - // ...item, - // status: item.status ? statusArr[item.status] : null, - // marktype: marktypes[item.marktype], - // }; - // }); - this.complainTotal = this.complainList.length; + this.$http.post("/actual/base/peopleRoomOverview/eventPageList", parm).then(({ data: res }) => { + // this.complainList = [{ + // scope: "服务态度", + // problemDesc: "服务人员态度不好", + // completeFlag: "未办理", + // isReturn: "否" + // }, + // { + // scope: "处理速度", + // problemDesc: "等待时间过长", + // completeFlag: "已办理", + // isReturn: "是" + // }, + // { + // scope: "设备问题", + // problemDesc: "使用的机器经常故障", + // completeFlag: "办理中", + // isReturn: "否" + // }, + // { + // scope: "其他", + // problemDesc: "场地不够干净", + // completeFlag: "已办理", + // isReturn: "是" + // }, { + // scope: "服务态度", + // problemDesc: "服务人员态度不好", + // completeFlag: "未办理", + // isReturn: "否" + // }, + // { + // scope: "处理速度", + // problemDesc: "等待时间过长", + // completeFlag: "已办理", + // isReturn: "是" + // }, + // { + // scope: "设备问题", + // problemDesc: "使用的机器经常故障", + // completeFlag: "办理中", + // isReturn: "否" + // }, + // { + // scope: "其他", + // problemDesc: "场地不够干净", + // completeFlag: "已办理", + // isReturn: "是" + // }] + this.complainList = res.data.list.map((item) => { + return { + ...item, + status: item.status ? statusArr[item.status] : null, + marktype: marktypes[item.marktype], + }; + }); + this.complainTotal = res.data.total; + this.complainLabel = `12345投诉（${this.complainTotal}）` }); }, @@ -232,53 +233,40 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize } - // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) - const completeFlags = { - "-2": "未知", - "-1": "不接受回访", - 0: "接受回访/待回访", - 1: "已回访", - }; // 省满意度列表 this.$http.post("/actual/base/peopleRoomOverview/provincialSatisfactionPageList", parm).then(({ data: res }) => { - this.shengList = [{ - scope: "服务态度", - problemDesc: "服务员的态度冷淡，没有微笑", - completeFlag: "未办理", - isReturn: "否" - }, - { - scope: "处理速度", - problemDesc: "在前台等待时间超过30分钟", - completeFlag: "已办理", - isReturn: "是" - }, - { - scope: "环境问题", - problemDesc: "餐厅内部太吵，无法正常交流", - completeFlag: "办理中", - isReturn: "否" - }, - { - scope: "食品质量", - problemDesc: "点的咖啡味道太苦，不如以前", - completeFlag: "未办理", - isReturn: "否" - }, - { - scope: "其他", - problemDesc: "洗手间没有纸巾", - completeFlag: "已办理", - isReturn: "是" - }] - // this.list = res.data.list.map((item) => { - // return { - // ...item, - // status: item.status ? statusArr[item.status] : null, - // marktype: marktypes[item.marktype], - // }; - // }); - this.shengTotal = this.shengList.length; + // this.shengList = [{ + // scope: "服务态度", + // problemDesc: "服务员的态度冷淡，没有微笑", + // completeFlag: "未办理", + // isReturn: "否" + // }, + // { + // scope: "处理速度", + // problemDesc: "在前台等待时间超过30分钟", + // completeFlag: "已办理", + // isReturn: "是" + // }, + // { + // scope: "环境问题", + // problemDesc: "餐厅内部太吵，无法正常交流", + // completeFlag: "办理中", + // isReturn: "否" + // }, + // { + // scope: "食品质量", + // problemDesc: "点的咖啡味道太苦，不如以前", + // completeFlag: "未办理", + // isReturn: "否" + // }, + // { + // scope: "其他", + // problemDesc: "洗手间没有纸巾", + // completeFlag: "已办理", + // isReturn: "是" + // }] + this.shengList = res.data; + this.shengTotal = res.data.length; this.shengLabel = `省满意度调查（${this.shengTotal}）` }); }, @@ -296,48 +284,47 @@ export default { 1: "已回访", }; this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", parm).then(({ data: res }) => { - this.shequList = [{ - scope: "服务态度", - problemDesc: "服务人员态度不好", - completeFlag: "未办理", - isReturn: "否" - }, - { - scope: "设备问题", - problemDesc: "使用的机器经常故障", - completeFlag: "办理中", - isReturn: "否" - }, - { - scope: "其他", - problemDesc: "场地不够干净", - completeFlag: "已办理", - isReturn: "是" - }, { - scope: "服务态度", - problemDesc: "服务人员态度不好", - completeFlag: "未办理", - isReturn: "否" - }, - { - scope: "处理速度", - problemDesc: "等待时间过长", - completeFlag: "已办理", - isReturn: "是" - }, - { - scope: "设备问题", - problemDesc: "使用的机器经常故障", - completeFlag: "办理中", - isReturn: "否" - }] - // this.list = res.data.list.map((item) => { - // return { - // ...item, - // status: item.status ? statusArr[item.status] : null, - // marktype: marktypes[item.marktype], - // }; - // }); + // this.shequList = [{ + // scope: "服务态度", + // problemDesc: "服务人员态度不好", + // completeFlag: "未办理", + // isReturn: "否" + // }, + // { + // scope: "设备问题", + // problemDesc: "使用的机器经常故障", + // completeFlag: "办理中", + // isReturn: "否" + // }, + // { + // scope: "其他", + // problemDesc: "场地不够干净", + // completeFlag: "已办理", + // isReturn: "是" + // }, { + // scope: "服务态度", + // problemDesc: "服务人员态度不好", + // completeFlag: "未办理", + // isReturn: "否" + // }, + // { + // scope: "处理速度", + // problemDesc: "等待时间过长", + // completeFlag: "已办理", + // isReturn: "是" + // }, + // { + // scope: "设备问题", + // problemDesc: "使用的机器经常故障", + // completeFlag: "办理中", + // isReturn: "否" + // }] + this.shequList = res.data.map((item) => { + return { + ...item, + completeFlag: completeFlags[item.completeFlag], + }; + }); this.shequTotal = this.shequList.length; this.shequLabel = `社区满意度自查（${this.shequTotal}）` }); @@ -348,45 +335,39 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize } - // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) - const completeFlags = { - "-2": "未知", - "-1": "不接受回访", - 0: "接受回访/待回访", - 1: "已回访", - }; + const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"]; this.$http.post("/actual/base/peopleRoomOverview/eventPageList", parm).then(({ data: res }) => { - this.shijianList = [{ - categorycode: "设备故障", - eventcontent: "东侧出入口的闸机无法正常工作", - status: "处理中", - happentime: "2023-10-21 14:25:45" - }, - { - categorycode: "安全事故", - eventcontent: "西侧楼梯有脚手架工具掉落", - status: "已完成", - happentime: "2023-10-20 09:10:32" - }, - { - categorycode: "投诉", - eventcontent: "前台服务员态度不佳", - status: "未处理", - happentime: "2023-10-19 16:45:30" - }, - { - categorycode: "环境问题", - eventcontent: "会议室的空调太冷", - status: "处理中", - happentime: "2023-10-18 11:05:25" - },] - // this.list = res.data.list.map((item) => { - // return { - // ...item, - // status: item.status ? statusArr[item.status] : null, - // marktype: marktypes[item.marktype], - // }; - // }); + // this.shijianList = [{ + // categorycode: "设备故障", + // eventcontent: "东侧出入口的闸机无法正常工作", + // status: "处理中", + // happentime: "2023-10-21 14:25:45" + // }, + // { + // categorycode: "安全事故", + // eventcontent: "西侧楼梯有脚手架工具掉落", + // status: "已完成", + // happentime: "2023-10-20 09:10:32" + // }, + // { + // categorycode: "投诉", + // eventcontent: "前台服务员态度不佳", + // status: "未处理", + // happentime: "2023-10-19 16:45:30" + // }, + // { + // categorycode: "环境问题", + // eventcontent: "会议室的空调太冷", + // status: "处理中", + // happentime: "2023-10-18 11:05:25" + // },] + this.shijianList = res.data.list.map((item) => { + return { + ...item, + status: item.status ? statusArr[item.status] : null, + marktype: marktypes[item.marktype], + }; + }); this.shijianTotal = this.shijianList.length; this.shijianLabel = `上报事件（${this.shijianTotal}）` }); @@ -397,52 +378,43 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize } - // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) - const completeFlags = { - "-2": "未知", - "-1": "不接受回访", - 0: "接受回访/待回访", - 1: "已回访", - }; // 省满意度列表 this.$http.post("/actual/base/peopleRoomOverview/demandOfResidentsPageList", parm).then(({ data: res }) => { - this.xuqiuList = [{ - categoryName: "软件功能", - content: "希望增加导出 Excel 的功能", - status: "评估中", - reportTime: "2023-10-24 10:15:32" - }, - { - categoryName: "硬件升级", - content: "需要更高配置的服务器来支撑业务", - status: "已批准", - reportTime: "2023-10-23 14:05:50" - }, - { - categoryName: "界面优化", - content: "前台页面加载速度较慢，希望优化", - status: "处理中", - reportTime: "2023-10-22 11:30:15" - }, - { - categoryName: "新功能", - content: "需要一个新的数据可视化面板", - status: "未开始", - reportTime: "2023-10-21 09:45:10" - }, - { - categoryName: "其他", - content: "希望增加夜间模式，减少眼睛疲劳", - status: "评估中", - reportTime: "2023-10-20 16:20:45" - }] - // this.list = res.data.list.map((item) => { - // return { - // ...item, - // status: item.status ? statusArr[item.status] : null, - // marktype: marktypes[item.marktype], - // }; - // }); + // this.xuqiuList = [{ + // categoryName: "软件功能", + // content: "希望增加导出 Excel 的功能", + // status: "评估中", + // reportTime: "2023-10-24 10:15:32" + // }, + // { + // categoryName: "硬件升级", + // content: "需要更高配置的服务器来支撑业务", + // status: "已批准", + // reportTime: "2023-10-23 14:05:50" + // }, + // { + // categoryName: "界面优化", + // content: "前台页面加载速度较慢，希望优化", + // status: "处理中", + // reportTime: "2023-10-22 11:30:15" + // }, + // { + // categoryName: "新功能", + // content: "需要一个新的数据可视化面板", + // status: "未开始", + // reportTime: "2023-10-21 09:45:10" + // }, + // { + // categoryName: "其他", + // content: "希望增加夜间模式，减少眼睛疲劳", + // status: "评估中", + // reportTime: "2023-10-20 16:20:45" + // }] + this.xuqiuList = res.data.map((item) => { + return { + ...item, + }; + }); this.xuqiuTotal = this.xuqiuList.length; this.xuqiuLabel = `居民需求（${this.xuqiuTotal}）` }); @@ -453,45 +425,36 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize } - // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) - const completeFlags = { - "-2": "未知", - "-1": "不接受回访", - 0: "接受回访/待回访", - 1: "已回访", - }; this.$http.post("/actual/base/peopleRoomOverview/communityServicePageList", parm).then(({ data: res }) => { - this.fuwuList = [ { - serviceCategoryKey: "系统故障", - serviceName: "登录功能无法使用", - state: "处理中", - serviceTimeStart: "2023-10-25 09:20:15" - }, - { - serviceCategoryKey: "新功能请求", - serviceName: "添加多语言支持", - state: "已完成", - serviceTimeStart: "2023-10-24 15:10:45" - }, - { - serviceCategoryKey: "优化建议", - serviceName: "改进搜索算法，提高搜索速度", - state: "未开始", - serviceTimeStart: "2023-10-23 14:05:20" - }, - { - serviceCategoryKey: "界面问题", - serviceName: "移动端页面布局错乱", - state: "处理中", - serviceTimeStart: "2023-10-22 10:40:25" - },] - // this.list = res.data.list.map((item) => { - // return { - // ...item, - // status: item.status ? statusArr[item.status] : null, - // marktype: marktypes[item.marktype], - // }; - // }); + // this.fuwuList = [{ + // serviceCategoryKey: "系统故障", + // serviceName: "登录功能无法使用", + // state: "处理中", + // serviceTimeStart: "2023-10-25 09:20:15" + // }, + // { + // serviceCategoryKey: "新功能请求", + // serviceName: "添加多语言支持", + // state: "已完成", + // serviceTimeStart: "2023-10-24 15:10:45" + // }, + // { + // serviceCategoryKey: "优化建议", + // serviceName: "改进搜索算法，提高搜索速度", + // state: "未开始", + // serviceTimeStart: "2023-10-23 14:05:20" + // }, + // { + // serviceCategoryKey: "界面问题", + // serviceName: "移动端页面布局错乱", + // state: "处理中", + // serviceTimeStart: "2023-10-22 10:40:25" + // },] + this.fuwuList = res.data.map((item) => { + return { + ...item, + }; + }); this.fuwuTotal = this.fuwuList.length; this.fuwuLabel = `社区服务（${this.fuwuTotal}）` }); diff --git a/src/views/modules/jumin/cpts/table/complain.vue b/src/views/modules/jumin/cpts/table/complain.vue index 5f7c45961..9840a8180 100644 --- a/src/views/modules/jumin/cpts/table/complain.vue +++ b/src/views/modules/jumin/cpts/table/complain.vue @@ -2,10 +2,11 @@
- - - - + + + + + @@ -42,11 +43,11 @@ export default { activated() { }, watch: { - + }, mounted() { }, props: { - + tableData: { type: Array, default: [] @@ -118,15 +119,15 @@ export default { completeFlag: "已办理", isReturn: "是" }] - // this.list = res.data.list.map((item) => { - // return { - // ...item, - // status: item.status ? statusArr[item.status] : null, - // marktype: marktypes[item.marktype], - // }; - // }); + // this.list = res.data.list.map((item) => { + // return { + // ...item, + // status: item.status ? statusArr[item.status] : null, + // marktype: marktypes[item.marktype], + // }; + // }); this.total = this.list.length; - this.$emit("changeTotal", { name: 2, total: this.total }); + this.$emit("changeTotal", { name: 2, total: this.total }); }); }, handleView(item) { diff --git a/src/views/modules/jumin/cpts/table/shequ.vue b/src/views/modules/jumin/cpts/table/shequ.vue index 740a28d35..03af24b33 100644 --- a/src/views/modules/jumin/cpts/table/shequ.vue +++ b/src/views/modules/jumin/cpts/table/shequ.vue @@ -26,9 +26,6 @@ export default { }, data() { return { - queryParams: { - residList: [], - }, list: [], total: 0, rowId: null, @@ -36,12 +33,9 @@ export default { }; }, activated() { - // this.getList(); }, watch: { - "$route.query"(newVal, oldVal) { - // this.getList(); - }, + }, mounted() { }, props: { @@ -51,48 +45,6 @@ export default { } }, methods: { - getList() { - let residList = [this.resiId] - this.list = []; - this.total = 0; - // this.$emit("changeTotal", { name: 2, total: 0 }); - // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) - const completeFlags = { - "-2": "未知", - "-1": "不接受回访", - 0: "接受回访/待回访", - 1: "已回访", - }; - // 省满意度列表 - this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", { residList }).then(({ data: res }) => { - this.list = [{ - scope: "服务态度", - problemDesc: "服务人员态度不好", - completeFlag: "未办理", - isReturn: "否" - }, - { - scope: "处理速度", - problemDesc: "等待时间过长", - completeFlag: "已办理", - isReturn: "是" - }, - { - scope: "设备问题", - problemDesc: "使用的机器经常故障", - completeFlag: "办理中", - isReturn: "否" - }, - { - scope: "其他", - problemDesc: "场地不够干净", - completeFlag: "已办理", - isReturn: "是" - }] - this.total = res.data.length; - // this.$emit("changeTotal", { name: 2, total: this.total }); - }); - }, handleView(item) { this.rowId = item.id; this.showDialog = true; diff --git a/src/views/modules/jumin/cpts/xiangshoufuwu.vue b/src/views/modules/jumin/cpts/xiangshoufuwu.vue new file mode 100644 index 000000000..a157b029f --- /dev/null +++ b/src/views/modules/jumin/cpts/xiangshoufuwu.vue @@ -0,0 +1,139 @@ + + + + \ No newline at end of file diff --git a/src/views/modules/jumin/huaxiang.vue b/src/views/modules/jumin/huaxiang.vue index d44bfb346..b1b3a83aa 100644 --- a/src/views/modules/jumin/huaxiang.vue +++ b/src/views/modules/jumin/huaxiang.vue @@ -36,8 +36,21 @@
-
-
+
+
+
享受服务次数统计
+
+
+ +
+
+
+
+
积分记录
+
+
+ +
@@ -49,8 +62,11 @@ import { requestPost, requestGet } from '@/js/dai/request' import leftTop from "./cpts/leftTop"; import leftBto from "./cpts/leftBto"; import rightTop from "./cpts/rightTop"; +import rightBto from "./cpts/rightBto"; import resiInfo from "@/views/modules/cpts/resi/info"; import nextTick from "dai-js/tools/nextTick"; +import pointsRecord from "./cpts/pointsRecord"; +import xiangshoufuwu from "./cpts/xiangshoufuwu"; export default { @@ -59,7 +75,7 @@ export default { return { userInfo: {}, showedResiInfo: false, - + }; }, //创建前 @@ -92,7 +108,7 @@ export default { }, }, //子组件注册 - components: { leftTop, leftBto, resiInfo,rightTop }, + components: { leftTop, leftBto, resiInfo, rightTop, pointsRecord, rightBto, xiangshoufuwu }, //计算 computed: {}, //监听 From f72543723a6e8b7f70a18d4407391f06d543e1ec Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 25 Oct 2023 18:22:21 +0800 Subject: [PATCH 43/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regionalParty/activitys.vue | 8 ----- .../event/cpts/process-form-designate.vue | 25 ++++++++++++- .../event/cpts/process-form-replay-end.vue | 27 ++++++++++---- .../event/cpts/process-form-replay.vue | 35 ++++++++++--------- 4 files changed, 63 insertions(+), 32 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue index 2ff7c01e0..bbd1009ae 100644 --- a/src/views/modules/communityParty/regionalParty/activitys.vue +++ b/src/views/modules/communityParty/regionalParty/activitys.vue @@ -366,28 +366,20 @@ export default { async loadUnit () { const url = "/actual/base/icpartyunit/option" - // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option" - let params = { agencyId: this.agencyId } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { this.unitList = data - } else { this.$message.error(msg) } - }, //获取服务事项下拉框 async loadService () { const url = "/actual/base/serviceitem/dict-list" - - let params = { // parentCategoryCode: '1010' } diff --git a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue index fdd39d220..14e4e6488 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue @@ -177,6 +177,29 @@ export default { } else { this.$message.error(msg); } + if (this.eventDetailCopy.parentCategoryId) { + const pids = this.eventDetailCopy.parentCategoryId.split(','); + pids.push(this.eventDetailCopy.categoryId); + let nodes = this.casOptions; + for (let i = 0; i < pids.length; i++) { + nodes = this.buildNode(nodes, pids[i]) + } + if (nodes) { + this.formData.categoryList.push(nodes) + this.selCateObj = nodes + } + } + }, + buildNode(nodes, treeId) { + for (let i = 0; i < nodes.length; i++) { + if (nodes[i].id === treeId) { + if (nodes[i].children) { + return nodes[i].children + } else { + return nodes[i] + } + } + } }, handleChangeAgency(val) { let obj = this.$refs["agencyIdArray"].getCheckedNodes()[0].data @@ -223,7 +246,7 @@ export default { this.$message.error("请选择事件分类"); return false; } - if(this.fileList){ + if (this.fileList) { this.formData.files = this.fileList } this.formData.status = "processing"; diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue index 570051c5a..77e7d39ad 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue @@ -128,15 +128,28 @@ export default { } else { this.$message.error(msg); } + if (this.eventDetailCopy.parentCategoryId) { + const pids = this.eventDetailCopy.parentCategoryId.split(','); + pids.push(this.eventDetailCopy.categoryId); + let nodes = this.casOptions; + for (let i = 0; i < pids.length; i++) { + nodes = this.buildNode(nodes, pids[i]) + } + if (nodes) { + this.formData.categoryList.push(nodes) + } + } }, - buildTree(nodes, treeId) { - nodes.forEach(item => { - if (treeId === item.id) { - return item; - } else { - this.buildTree(item.children, treeId) + buildNode(nodes, treeId) { + for (let i = 0; i < nodes.length; i++) { + if (nodes[i].id === treeId) { + if (nodes[i].children) { + return nodes[i].children + } else { + return nodes[i] + } } - }) + } }, handleChangeCate() { if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) { diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue index e0b84438c..72a923867 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue @@ -122,24 +122,27 @@ export default { this.$message.error(msg); } if (this.eventDetailCopy.parentCategoryId) { - let pids = this.eventDetailCopy.parentCategoryId.split(','); - pids.push(this.eventDetailCopy.categoryId) - pids.forEach(id => { - let node = this.buildTree(this.casOptions, toString(id)); - this.selCategoryArray.push(node) - }); - let node = this.buildTree(this.casOptions, this.eventDetailCopy.categoryId); - this.selCategoryArray.push(node); + const pids = this.eventDetailCopy.parentCategoryId.split(','); + pids.push(this.eventDetailCopy.categoryId); + let nodes = this.casOptions; + for (let i = 0; i < pids.length; i++) { + nodes = this.buildNode(nodes,pids[i]) + } + if(nodes){ + this.formData.categoryList.push(nodes) + } } }, - buildTree(nodes, treeId) { - nodes.forEach(item => { - if (treeId === item.id) { - return item; - } else { - this.buildTree(item.children, treeId) + buildNode(nodes, treeId) { + for(let i = 0; i < nodes.length; i++){ + if (nodes[i].id === treeId) { + if(nodes[i].children){ + return nodes[i].children + }else { + return nodes[i] + } } - }) + } }, handleChangeCate(value) { if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) { @@ -148,7 +151,7 @@ export default { } else { this.selCateObj = {} } - if(!value) return + if (!value) return this.selCategoryArray = value }, //重构树，去除网格 From 1ab7243e5cabd474b751dbc3ae96b4cd7979f6f7 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 25 Oct 2023 19:24:18 +0800 Subject: [PATCH 44/45] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/jumin/huaxiang.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/jumin/huaxiang.vue b/src/views/modules/jumin/huaxiang.vue index b1b3a83aa..f540f90b3 100644 --- a/src/views/modules/jumin/huaxiang.vue +++ b/src/views/modules/jumin/huaxiang.vue @@ -20,7 +20,7 @@
各项业务记录
- +
@@ -41,7 +41,7 @@
享受服务次数统计
- +
@@ -49,7 +49,7 @@
积分记录
- +
From 4003ac8bfef58afbb583e4bfc1e4375020fea618 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 26 Oct 2023 08:49:28 +0800 Subject: [PATCH 45/45] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6?= =?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/views/modules/jumin/cpts/rightTop.vue | 222 ++---------------- .../modules/jumin/cpts/table/complain.vue | 2 +- src/views/modules/jumin/cpts/table/fuwu.vue | 2 +- src/views/modules/jumin/cpts/table/sheng.vue | 2 +- src/views/modules/jumin/cpts/table/shequ.vue | 2 +- .../modules/jumin/cpts/table/shijian.vue | 2 +- src/views/modules/jumin/cpts/table/xuqiu.vue | 2 +- 7 files changed, 24 insertions(+), 210 deletions(-) diff --git a/src/views/modules/jumin/cpts/rightTop.vue b/src/views/modules/jumin/cpts/rightTop.vue index 72d19773a..222226069 100644 --- a/src/views/modules/jumin/cpts/rightTop.vue +++ b/src/views/modules/jumin/cpts/rightTop.vue @@ -67,18 +67,24 @@ - - - -
共{{ fuwuTotal }}条
- - - - - - +
+ + + + + +
共{{ fuwuTotal }}条
+ + + + + + +
+ + @@ -159,7 +165,6 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize } - // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) const statusArr = { processing: "处理中", closed_case: "已办结", @@ -168,53 +173,6 @@ export default { // 省满意度列表 this.$http.post("/actual/base/peopleRoomOverview/eventPageList", parm).then(({ data: res }) => { - // this.complainList = [{ - // scope: "服务态度", - // problemDesc: "服务人员态度不好", - // completeFlag: "未办理", - // isReturn: "否" - // }, - // { - // scope: "处理速度", - // problemDesc: "等待时间过长", - // completeFlag: "已办理", - // isReturn: "是" - // }, - // { - // scope: "设备问题", - // problemDesc: "使用的机器经常故障", - // completeFlag: "办理中", - // isReturn: "否" - // }, - // { - // scope: "其他", - // problemDesc: "场地不够干净", - // completeFlag: "已办理", - // isReturn: "是" - // }, { - // scope: "服务态度", - // problemDesc: "服务人员态度不好", - // completeFlag: "未办理", - // isReturn: "否" - // }, - // { - // scope: "处理速度", - // problemDesc: "等待时间过长", - // completeFlag: "已办理", - // isReturn: "是" - // }, - // { - // scope: "设备问题", - // problemDesc: "使用的机器经常故障", - // completeFlag: "办理中", - // isReturn: "否" - // }, - // { - // scope: "其他", - // problemDesc: "场地不够干净", - // completeFlag: "已办理", - // isReturn: "是" - // }] this.complainList = res.data.list.map((item) => { return { ...item, @@ -235,36 +193,6 @@ export default { } // 省满意度列表 this.$http.post("/actual/base/peopleRoomOverview/provincialSatisfactionPageList", parm).then(({ data: res }) => { - // this.shengList = [{ - // scope: "服务态度", - // problemDesc: "服务员的态度冷淡，没有微笑", - // completeFlag: "未办理", - // isReturn: "否" - // }, - // { - // scope: "处理速度", - // problemDesc: "在前台等待时间超过30分钟", - // completeFlag: "已办理", - // isReturn: "是" - // }, - // { - // scope: "环境问题", - // problemDesc: "餐厅内部太吵，无法正常交流", - // completeFlag: "办理中", - // isReturn: "否" - // }, - // { - // scope: "食品质量", - // problemDesc: "点的咖啡味道太苦，不如以前", - // completeFlag: "未办理", - // isReturn: "否" - // }, - // { - // scope: "其他", - // problemDesc: "洗手间没有纸巾", - // completeFlag: "已办理", - // isReturn: "是" - // }] this.shengList = res.data; this.shengTotal = res.data.length; this.shengLabel = `省满意度调查（${this.shengTotal}）` @@ -276,7 +204,6 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize } - // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) const completeFlags = { "-2": "未知", "-1": "不接受回访", @@ -284,41 +211,6 @@ export default { 1: "已回访", }; this.$http.post("/actual/base/peopleRoomOverview/communitySatisfactionPageList", parm).then(({ data: res }) => { - // this.shequList = [{ - // scope: "服务态度", - // problemDesc: "服务人员态度不好", - // completeFlag: "未办理", - // isReturn: "否" - // }, - // { - // scope: "设备问题", - // problemDesc: "使用的机器经常故障", - // completeFlag: "办理中", - // isReturn: "否" - // }, - // { - // scope: "其他", - // problemDesc: "场地不够干净", - // completeFlag: "已办理", - // isReturn: "是" - // }, { - // scope: "服务态度", - // problemDesc: "服务人员态度不好", - // completeFlag: "未办理", - // isReturn: "否" - // }, - // { - // scope: "处理速度", - // problemDesc: "等待时间过长", - // completeFlag: "已办理", - // isReturn: "是" - // }, - // { - // scope: "设备问题", - // problemDesc: "使用的机器经常故障", - // completeFlag: "办理中", - // isReturn: "否" - // }] this.shequList = res.data.map((item) => { return { ...item, @@ -337,30 +229,6 @@ export default { } const marktypes = ["普通事件", "难点读点", "矛盾纠纷", "自身问题"]; this.$http.post("/actual/base/peopleRoomOverview/eventPageList", parm).then(({ data: res }) => { - // this.shijianList = [{ - // categorycode: "设备故障", - // eventcontent: "东侧出入口的闸机无法正常工作", - // status: "处理中", - // happentime: "2023-10-21 14:25:45" - // }, - // { - // categorycode: "安全事故", - // eventcontent: "西侧楼梯有脚手架工具掉落", - // status: "已完成", - // happentime: "2023-10-20 09:10:32" - // }, - // { - // categorycode: "投诉", - // eventcontent: "前台服务员态度不佳", - // status: "未处理", - // happentime: "2023-10-19 16:45:30" - // }, - // { - // categorycode: "环境问题", - // eventcontent: "会议室的空调太冷", - // status: "处理中", - // happentime: "2023-10-18 11:05:25" - // },] this.shijianList = res.data.list.map((item) => { return { ...item, @@ -380,36 +248,6 @@ export default { } // 省满意度列表 this.$http.post("/actual/base/peopleRoomOverview/demandOfResidentsPageList", parm).then(({ data: res }) => { - // this.xuqiuList = [{ - // categoryName: "软件功能", - // content: "希望增加导出 Excel 的功能", - // status: "评估中", - // reportTime: "2023-10-24 10:15:32" - // }, - // { - // categoryName: "硬件升级", - // content: "需要更高配置的服务器来支撑业务", - // status: "已批准", - // reportTime: "2023-10-23 14:05:50" - // }, - // { - // categoryName: "界面优化", - // content: "前台页面加载速度较慢，希望优化", - // status: "处理中", - // reportTime: "2023-10-22 11:30:15" - // }, - // { - // categoryName: "新功能", - // content: "需要一个新的数据可视化面板", - // status: "未开始", - // reportTime: "2023-10-21 09:45:10" - // }, - // { - // categoryName: "其他", - // content: "希望增加夜间模式，减少眼睛疲劳", - // status: "评估中", - // reportTime: "2023-10-20 16:20:45" - // }] this.xuqiuList = res.data.map((item) => { return { ...item, @@ -426,30 +264,6 @@ export default { pageSize: this.pageSize } this.$http.post("/actual/base/peopleRoomOverview/communityServicePageList", parm).then(({ data: res }) => { - // this.fuwuList = [{ - // serviceCategoryKey: "系统故障", - // serviceName: "登录功能无法使用", - // state: "处理中", - // serviceTimeStart: "2023-10-25 09:20:15" - // }, - // { - // serviceCategoryKey: "新功能请求", - // serviceName: "添加多语言支持", - // state: "已完成", - // serviceTimeStart: "2023-10-24 15:10:45" - // }, - // { - // serviceCategoryKey: "优化建议", - // serviceName: "改进搜索算法，提高搜索速度", - // state: "未开始", - // serviceTimeStart: "2023-10-23 14:05:20" - // }, - // { - // serviceCategoryKey: "界面问题", - // serviceName: "移动端页面布局错乱", - // state: "处理中", - // serviceTimeStart: "2023-10-22 10:40:25" - // },] this.fuwuList = res.data.map((item) => { return { ...item, diff --git a/src/views/modules/jumin/cpts/table/complain.vue b/src/views/modules/jumin/cpts/table/complain.vue index 9840a8180..afd3b1152 100644 --- a/src/views/modules/jumin/cpts/table/complain.vue +++ b/src/views/modules/jumin/cpts/table/complain.vue @@ -1,6 +1,6 @@