From 1b1f6379fe2f4a0b33a8dda259d79b1b4e21f908 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 30 Mar 2024 13:11:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?bug#1058=E6=88=BF=E5=B1=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=B8=AD=E6=88=BF=E5=B1=8B=E5=85=B3=E7=B3=BB=E5=9B=BE?= =?UTF-8?q?=E8=B0=B1=E9=AB=98=E5=BA=A6,=E5=AE=B6=E5=BA=AD=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 10 -- .../modules/portrayal/fangwu/cpts/leftTop.vue | 108 ---------------- .../portrayal/fangwu/cpts/rightBto.vue | 69 ---------- src/views/modules/portrayal/fangwu/index.vue | 118 ------------------ .../modules/portrayal/house/cpts/graph.vue | 8 +- src/views/modules/portrayal/house/index.vue | 3 +- src/views/modules/portrayal/jumin/index.vue | 30 ++++- 7 files changed, 35 insertions(+), 311 deletions(-) delete mode 100644 src/views/modules/portrayal/fangwu/cpts/leftTop.vue delete mode 100644 src/views/modules/portrayal/fangwu/cpts/rightBto.vue delete mode 100644 src/views/modules/portrayal/fangwu/index.vue diff --git a/src/router/index.js b/src/router/index.js index a4c73427a..b4438d81e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -128,16 +128,6 @@ export const moduleRoutes = { title: "", }, }, - { - path: "fangwu-huaxiang", - props: true, - name: "fangwu-huaxiang", - component: () => import("@/views/modules/portrayal/fangwu/index"), - meta: { - isTab: true, - title: "", - }, - }, { path: "loudong-huaxiang", props: true, diff --git a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue deleted file mode 100644 index 4c9af268c..000000000 --- a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/src/views/modules/portrayal/fangwu/cpts/rightBto.vue b/src/views/modules/portrayal/fangwu/cpts/rightBto.vue deleted file mode 100644 index 181af5549..000000000 --- a/src/views/modules/portrayal/fangwu/cpts/rightBto.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/views/modules/portrayal/fangwu/index.vue b/src/views/modules/portrayal/fangwu/index.vue deleted file mode 100644 index 3274a35fd..000000000 --- a/src/views/modules/portrayal/fangwu/index.vue +++ /dev/null @@ -1,118 +0,0 @@ - - - - diff --git a/src/views/modules/portrayal/house/cpts/graph.vue b/src/views/modules/portrayal/house/cpts/graph.vue index 69c0eed05..ed5bc882d 100644 --- a/src/views/modules/portrayal/house/cpts/graph.vue +++ b/src/views/modules/portrayal/house/cpts/graph.vue @@ -188,13 +188,15 @@ export default { margin-left: -5px; text-align: center; margin-top: 63px; - line-height: 20px; + // line-height: 20px; position: absolute; width: 96px; - height: 20px; + height: auto; background: #FFFFFF; box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4); - border-radius: 10px; + border-radius: 15px; + padding: 3px; + box-sizing: border-box; } .rel-node-checked { diff --git a/src/views/modules/portrayal/house/index.vue b/src/views/modules/portrayal/house/index.vue index b6547f601..3fb426b37 100644 --- a/src/views/modules/portrayal/house/index.vue +++ b/src/views/modules/portrayal/house/index.vue @@ -43,9 +43,10 @@
家庭标签：
-
+
{{familyTags() }}
+
--
房主姓名：
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 3f39030aa..908865d82 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -2,7 +2,9 @@
- +
+ +
{{ resiDetailObj.baseInfoDto.name }}（{{ resiDetailObj.baseInfoDto.age }}岁） @@ -1174,6 +1176,8 @@ export default { ensure_house: "保障房信息", chronic_disease: "慢病信息", base: "基本信息", + business_record:'业务记录', + update_record:'更新记录' }; this.menuList = Object.entries( res.data.data.integrityData.integrityQtyMap @@ -1484,7 +1488,29 @@ export default { return text; }, }, - computed: {}, + computed: { + familyStatus(){ + console.log(this.resiDetailObj.baseInfoDto.gender); + console.log(this.resiDetailObj.baseInfoDto.age ); + var status = ''; + if(this.resiDetailObj.baseInfoDto){ + if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age <18){ + status = 'son' + }else if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age >18 && this.resiDetailObj.baseInfoDto.age <60){ + status = 'father' + }else if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age >=60){ + status = 'grandpa' + }else if(this.resiDetailObj.baseInfoDto.gender =='2' && this.resiDetailObj.baseInfoDto.age >=60){ + status = 'grandma' + }else if(this.resiDetailObj.baseInfoDto.gender =='2' && ( this.resiDetailObj.baseInfoDto.age >18 && this.resiDetailObj.baseInfoDto.age <60)){ + status = 'mother' + } else if(this.resiDetailObj.baseInfoDto.gender =='2' && this.resiDetailObj.baseInfoDto.age <18){ + status = 'girl' + } + } + return status + } + }, watch: { "$store.state.huaXiang.userInfo.resiId": { handler(newValue, oldValue) { From 2ec40680da7f7280f38aca06d50075c4bc8804bf Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 30 Mar 2024 16:22:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/portrayal/jumin/cpts/graph.vue | 2 +- src/views/modules/portrayal/jumin/index.vue | 132 ++++++++---------- 2 files changed, 61 insertions(+), 73 deletions(-) diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue index b1994d66c..f85e1e728 100644 --- a/src/views/modules/portrayal/jumin/cpts/graph.vue +++ b/src/views/modules/portrayal/jumin/cpts/graph.vue @@ -61,7 +61,7 @@ export default { let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId; let { code, data, msg } = await requestPost(url) if (code == 0) { - let index = data.findIndex(item => item.name == this.userInfo.name); + let index = data.findIndex(item => item.id == this.userInfo.resiId); if (index !== -1) { const [item] = data.splice(index, 1); data.unshift(item); diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 908865d82..6cb8f8e15 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -23,7 +23,6 @@ :class="{ item: true, active: index == active }" v-for="(item, index) in menuList" @click="handelCLickMenu(item.id, index)" - v-show="item.filledQty != 0 || item.id == 'ext' || item.id == 'reside'" > {{ item.name }} { - if (res.data.code === 0) { + async getResiDetail() { + try { + const res = await this.$http.get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`); + if (res.data.code === 0) { this.resiDetailObj = res.data.data || {}; const nameMap = { - reside: "居住信息", - ext: "拓展信息", - united_front: "统战人员信息", - party_member: "党员信息", - death: "死亡信息", - disability: "残疾信息", - subsistence_allowance: "低保信息", - serious_illness: "大病信息", - veteran: "退役军人信息", - special_support: "特扶人员信息", - old_people: "老年人信息", - ensure_house: "保障房信息", - chronic_disease: "慢病信息", - base: "基本信息", - business_record:'业务记录', - update_record:'更新记录' + reside: "居住信息", + ext: "拓展信息", + united_front: "统战人员信息", + party_member: "党员信息", + death: "死亡信息", + disability: "残疾信息", + subsistence_allowance: "低保信息", + serious_illness: "大病信息", + veteran: "退役军人信息", + special_support: "特扶人员信息", + old_people: "老年人信息", + ensure_house: "保障房信息", + chronic_disease: "慢病信息", + base: "基本信息", + business_record: '业务记录', + update_record: '更新记录' }; - this.menuList = Object.entries( - res.data.data.integrityData.integrityQtyMap - ) - .map(([key, value]) => ({ - name: nameMap[key], - id: key, - filledQty: value.filledQty, - totalQty: value.totalQty, - })) - .reverse(); - const keysWithValueOne = []; + + const keysWithValueOne = []; for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) { if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1) { keysWithValueOne.push(this.incidence[key].formId); } } - this.expandList = this.originalExpandList.filter((itemA) => { - return keysWithValueOne.some((itemB) => itemB === itemA.id); + const keysWithValueOneName = keysWithValueOne.map(str => { + const matchedObject = this.originalExpandList.find(obj => obj.id === str); + return matchedObject ? matchedObject.title : null; }); - await Promise.all( - this.expandList.map(async (item) => { - await Promise.all( - item.children.map(async (child) => { - const key = child.formName; - if (this.resiDetailObj[item.id].hasOwnProperty(key)) { - child.value = await this.getDictName( - child.opctionUrl, - child.opctionParams, - this.resiDetailObj[item.id][ - key == "partyOrgId" ? "branchId" : key - ], - child.itemType, - child.opction - ); - } - }) - ); - }) - ); + this.menuList = Object.entries(res.data.data.integrityData.integrityQtyMap) + .map(([key, value]) => ({ + name: nameMap[key], + id: key, + filledQty: value.filledQty, + totalQty: value.totalQty, + })) + .reverse() + .filter(item => item.name === '基本信息' || item.name === '拓展信息' || item.name === '居住信息' || keysWithValueOneName.includes(item.name)); this.menuList.push( - { - name: "业务记录", - id: "businessRecord", - }, - { - name: "更新纪录", - id: "updateRecord", - } + { name: "业务记录", id: "businessRecord" }, + { name: "更新纪录", id: "updateRecord" } ); + this.expandList = this.originalExpandList.filter(itemA => keysWithValueOne.includes(itemA.id)); + + await Promise.all(this.expandList.map(async (item) => { + await Promise.all(item.children.map(async (child) => { + const key = child.formName; + if (this.resiDetailObj[item.id] && this.resiDetailObj[item.id].hasOwnProperty(key)) { + child.value = await this.getDictName( + child.opctionUrl, + child.opctionParams, + this.resiDetailObj[item.id][key == "partyOrgId" ? "branchId" : key], + child.itemType, + child.opction + ); + } + })); + })); + this.score = res.data.data.integrityData.score; - } else if (res.data.code >= 8000) { + } else if (res.data.code >= 8000) { this.resiDetailObj = {}; this.$message.error(res.data.msg); - } - }) - .catch((err) => { - console.log(err); - }); - }, + } + } catch (err) { + console.log(err); + } +}, + handelClickJumpEdit() { this.checkType = "edit"; this.showCheckPassword = true; @@ -1490,8 +1480,6 @@ export default { }, computed: { familyStatus(){ - console.log(this.resiDetailObj.baseInfoDto.gender); - console.log(this.resiDetailObj.baseInfoDto.age ); var status = ''; if(this.resiDetailObj.baseInfoDto){ if(this.resiDetailObj.baseInfoDto.gender =='1' && this.resiDetailObj.baseInfoDto.age <18){ From 61a78be175b9a2cb033dd713c10fd673bb29d510 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 30 Mar 2024 16:46:46 +0800 Subject: [PATCH 3/5] 1 --- .../base/smartImport/cpts/createdTask.vue | 42 ++--- .../modules/portrayal/house/cpts/graph.vue | 2 +- .../modules/portrayal/jumin/cpts/graph.vue | 12 +- src/views/modules/portrayal/jumin/index.vue | 150 +++++++++++------- 4 files changed, 116 insertions(+), 90 deletions(-) diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue index 4169783a0..87f8f217f 100644 --- a/src/views/modules/base/smartImport/cpts/createdTask.vue +++ b/src/views/modules/base/smartImport/cpts/createdTask.vue @@ -429,40 +429,28 @@ export default { data: params, }) .then((res) => { - // if (res.status==200) { + if (res.status==200) { // let fileName = window.decodeURI( // res.headers["content-disposition"] // .split(";")[1] // .split("=")[1] // ); - // let fileName = `${ - // this.$store.state.user.agencyName + this.categoryName - // }导入模板`; - // let blob = new Blob([res.data], { - // type: "application/vnd.ms-excel", - // }); - // var url = window.URL.createObjectURL(blob); - // var aLink = document.createElement("a"); - // aLink.style.display = "none"; - // aLink.href = url; - // aLink.setAttribute("download", fileName); - // document.body.appendChild(aLink); - // aLink.click(); - // document.body.removeChild(aLink); //下载完成移除元素 - // window.URL.revokeObjectURL(url); //释放掉blob对象 - // } else this.$message.error("下载失败"); - let fileName = `${ + let fileName = `${ this.$store.state.user.agencyName + this.categoryName }导入模板`; - const url = res.data.data; - const aLink = document.createElement("a"); - aLink.style.display = "none"; - aLink.href = url; - aLink.setAttribute("download",`${fileName}.xlsx`); - document.body.appendChild(aLink); - aLink.click(); - document.body.removeChild(aLink); - window.URL.revokeObjectURL(url); + let blob = new Blob([res.data], { + type: "application/vnd.ms-excel", + }); + var url = window.URL.createObjectURL(blob); + var aLink = document.createElement("a"); + aLink.style.display = "none"; + aLink.href = url; + aLink.setAttribute("download", fileName); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + } else this.$message.error("下载失败"); }) .catch((err) => { console.log(err); diff --git a/src/views/modules/portrayal/house/cpts/graph.vue b/src/views/modules/portrayal/house/cpts/graph.vue index ed5bc882d..fecd929ce 100644 --- a/src/views/modules/portrayal/house/cpts/graph.vue +++ b/src/views/modules/portrayal/house/cpts/graph.vue @@ -140,7 +140,7 @@ export default { line-height: 20px; position: absolute; width: 96px; - height: 20px; + height: auto; background: #FFFFFF; box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4); border-radius: 10px; diff --git a/src/views/modules/portrayal/jumin/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue index f85e1e728..8b05a5101 100644 --- a/src/views/modules/portrayal/jumin/cpts/graph.vue +++ b/src/views/modules/portrayal/jumin/cpts/graph.vue @@ -141,10 +141,10 @@ export default { margin-left: 2px; text-align: center; margin-top: 83px; - line-height: 20px; + // line-height: 20px; position: absolute; width: 96px; - height: 20px; + height: auto; background: #FFFFFF; box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4); border-radius: 10px; @@ -189,13 +189,13 @@ export default { } .c-node-name1 { - margin-left: 2px; + margin-left: 1px; text-align: center; - margin-top: 83px; - line-height: 20px; + margin-top: 72px; + // line-height: 20px; position: absolute; width: 96px; - height: 20px; + height: auto; background: #FFFFFF; box-shadow: 0px 4px 6px 0px rgba(211, 213, 214, 0.4); border-radius: 10px; diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 6cb8f8e15..0b8160a94 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -1154,81 +1154,119 @@ export default { console.log(error, `获取 ${dictType} 字典`); } }, - async getResiDetail() { - try { - const res = await this.$http.get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`); - if (res.data.code === 0) { + getResiDetail() { + this.$http + .get(`/actual/base/residentIntegratedInfo/detail/masked/${this.resiId}`) + .then(async (res) => { + if (res.data.code === 0) { this.resiDetailObj = res.data.data || {}; const nameMap = { - reside: "居住信息", - ext: "拓展信息", - united_front: "统战人员信息", - party_member: "党员信息", - death: "死亡信息", - disability: "残疾信息", - subsistence_allowance: "低保信息", - serious_illness: "大病信息", - veteran: "退役军人信息", - special_support: "特扶人员信息", - old_people: "老年人信息", - ensure_house: "保障房信息", - chronic_disease: "慢病信息", - base: "基本信息", - business_record: '业务记录', - update_record: '更新记录' + reside: "居住信息", + ext: "拓展信息", + united_front: "统战人员信息", + party_member: "党员信息", + death: "死亡信息", + disability: "残疾信息", + subsistence_allowance: "低保信息", + serious_illness: "大病信息", + veteran: "退役军人信息", + special_support: "特扶人员信息", + old_people: "老年人信息", + ensure_house: "保障房信息", + chronic_disease: "慢病信息", + base: "基本信息", + business_record:'业务记录', + update_record:'更新记录' }; - + const keysWithValueOne = []; for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) { - if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1) { + if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1 && this.incidence[key]) { keysWithValueOne.push(this.incidence[key].formId); } } - const keysWithValueOneName = keysWithValueOne.map(str => { + const keysWithValueOneName= keysWithValueOne.map(str => { const matchedObject = this.originalExpandList.find(obj => obj.id === str); return matchedObject ? matchedObject.title : null; }); + this.menuList = Object.entries( + res.data.data.integrityData.integrityQtyMap + ) + + .map(([key, value]) => ({ + name: nameMap[key], + id: key, + filledQty: value.filledQty, + totalQty: value.totalQty, + })) + .reverse(); + console.log(this.menuList,"this.menuList"); + for(let i in keysWithValueOneName){ + for(let k in this.originalExpandList){ + if(keysWithValueOneName[i] === this.originalExpandList[k].title){ + for(let c in this.menuList){ + if(this.menuList[c].name === keysWithValueOneName[i] || this.menuList[c].name === '基本信息' || this.menuList[c].name === '拓展信息' || this.menuList[c].name === '居住信息' ){ + console.log(this.menuList[c]); + if(this.menuList.findIndex(item=>item.name === keysWithValueOneName[i]) === -1){ + this.menuList.push(this.menuList[c]) + } + } + } - this.menuList = Object.entries(res.data.data.integrityData.integrityQtyMap) - .map(([key, value]) => ({ - name: nameMap[key], - id: key, - filledQty: value.filledQty, - totalQty: value.totalQty, - })) - .reverse() - .filter(item => item.name === '基本信息' || item.name === '拓展信息' || item.name === '居住信息' || keysWithValueOneName.includes(item.name)); + } + } + } + this.menuList = this.menuList.filter((itemA) => { + return itemA.name === '基本信息' || itemA.name === '拓展信息' || itemA.name === '居住信息'|| keysWithValueOneName.some((itemB) => itemB === itemA.name); + }); this.menuList.push( - { name: "业务记录", id: "businessRecord" }, - { name: "更新纪录", id: "updateRecord" } + { + name: "业务记录", + id: "businessRecord", + }, + { + name: "更新纪录", + id: "updateRecord", + } ); - - this.expandList = this.originalExpandList.filter(itemA => keysWithValueOne.includes(itemA.id)); - - await Promise.all(this.expandList.map(async (item) => { - await Promise.all(item.children.map(async (child) => { + this.expandList = this.originalExpandList.filter((itemA) => { + return keysWithValueOne.some((itemB) => itemB === itemA.id); + }); + console.log(keysWithValueOne,'keysWithValueOne'); + console.log(this.resiDetailObj,'this.resiDetailObj'); + await Promise.all( + this.expandList.map(async (item) => { + await Promise.all( + item.children.map(async (child) => { const key = child.formName; - if (this.resiDetailObj[item.id] && this.resiDetailObj[item.id].hasOwnProperty(key)) { - child.value = await this.getDictName( - child.opctionUrl, - child.opctionParams, - this.resiDetailObj[item.id][key == "partyOrgId" ? "branchId" : key], - child.itemType, - child.opction - ); + if(this.resiDetailObj[item.id]){ + if (this.resiDetailObj[item.id].hasOwnProperty(key)) { + child.value = await this.getDictName( + child.opctionUrl, + child.opctionParams, + this.resiDetailObj[item.id][ + key == "partyOrgId" ? "branchId" : key + ], + child.itemType, + child.opction + ); } - })); - })); - + } + + }) + ); + }) + ); this.score = res.data.data.integrityData.score; - } else if (res.data.code >= 8000) { + } else if (res.data.code >= 8000) { this.resiDetailObj = {}; this.$message.error(res.data.msg); - } - } catch (err) { - console.log(err); - } -}, + } + }) + .catch((err) => { + console.log(err); + }); + }, handelClickJumpEdit() { this.checkType = "edit"; From 12dbf5d12244d1db1109ac291165c6927a5a220c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 30 Mar 2024 16:57:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/smartImport/cpts/createdTask.vue | 42 ++++++++++++------- src/views/modules/portrayal/jumin/index.vue | 1 - 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue index 87f8f217f..4169783a0 100644 --- a/src/views/modules/base/smartImport/cpts/createdTask.vue +++ b/src/views/modules/base/smartImport/cpts/createdTask.vue @@ -429,28 +429,40 @@ export default { data: params, }) .then((res) => { - if (res.status==200) { + // if (res.status==200) { // let fileName = window.decodeURI( // res.headers["content-disposition"] // .split(";")[1] // .split("=")[1] // ); - let fileName = `${ + // let fileName = `${ + // this.$store.state.user.agencyName + this.categoryName + // }导入模板`; + // let blob = new Blob([res.data], { + // type: "application/vnd.ms-excel", + // }); + // var url = window.URL.createObjectURL(blob); + // var aLink = document.createElement("a"); + // aLink.style.display = "none"; + // aLink.href = url; + // aLink.setAttribute("download", fileName); + // document.body.appendChild(aLink); + // aLink.click(); + // document.body.removeChild(aLink); //下载完成移除元素 + // window.URL.revokeObjectURL(url); //释放掉blob对象 + // } else this.$message.error("下载失败"); + let fileName = `${ this.$store.state.user.agencyName + this.categoryName }导入模板`; - let blob = new Blob([res.data], { - type: "application/vnd.ms-excel", - }); - var url = window.URL.createObjectURL(blob); - var aLink = document.createElement("a"); - aLink.style.display = "none"; - aLink.href = url; - aLink.setAttribute("download", fileName); - document.body.appendChild(aLink); - aLink.click(); - document.body.removeChild(aLink); //下载完成移除元素 - window.URL.revokeObjectURL(url); //释放掉blob对象 - } else this.$message.error("下载失败"); + const url = res.data.data; + const aLink = document.createElement("a"); + aLink.style.display = "none"; + aLink.href = url; + aLink.setAttribute("download",`${fileName}.xlsx`); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); + window.URL.revokeObjectURL(url); }) .catch((err) => { console.log(err); diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 0b8160a94..ebecc80fb 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -1206,7 +1206,6 @@ export default { if(keysWithValueOneName[i] === this.originalExpandList[k].title){ for(let c in this.menuList){ if(this.menuList[c].name === keysWithValueOneName[i] || this.menuList[c].name === '基本信息' || this.menuList[c].name === '拓展信息' || this.menuList[c].name === '居住信息' ){ - console.log(this.menuList[c]); if(this.menuList.findIndex(item=>item.name === keysWithValueOneName[i]) === -1){ this.menuList.push(this.menuList[c]) } From 91c9dcf0e901d076a2cb2095c3a84573fc2953bc Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 1 Apr 2024 10:33:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=BF=E7=AD=96=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/policy/addPolicy.vue | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 9b2f0d4cd..1bad55b85 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -438,7 +438,6 @@ export default { await this.getServiceTypeDictOptions(); await this.getDictOptions(); await this.loadScopeTree(); - await this.loadDemandoption(); await this.getDemandOptions(); if (this.formType === "add") { this.$refs.ref_form.resetFields(); @@ -645,26 +644,6 @@ export default { }, - // 获取服务范围树 - loadDemandoption() { - const url = "/governance/icresidemanddict/demandoption"; - // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree' - let params = {}; - window.app.ajax.post( - url, - params, - (data, rspMsg) => { - this.demandOptions = this.getFlagData( - this.getTreeData(data), - "usableFlag" - ); - }, - (rspMsg, data) => { - this.$message.error(rspMsg); - } - ); - }, - async handleAdd() { // var oDate1 = new Date(this.formData.startDate); // var oDate2 = new Date(this.formData.endDate);