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/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue index 9dcb1e554..5d4a322d0 100644 --- a/src/views/modules/base/smartImport/cpts/createdTask.vue +++ b/src/views/modules/base/smartImport/cpts/createdTask.vue @@ -446,40 +446,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/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..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; @@ -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/cpts/graph.vue b/src/views/modules/portrayal/jumin/cpts/graph.vue index b1994d66c..8b05a5101 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); @@ -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 3f39030aa..0b8160a94 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 }}岁） @@ -21,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 }} { + 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, @@ -1185,21 +1200,47 @@ export default { totalQty: value.totalQty, })) .reverse(); - const keysWithValueOne = []; - for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) { - if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1) { - keysWithValueOne.push(this.incidence[key].formId); + 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 = 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", + } + ); 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].hasOwnProperty(key)) { + if(this.resiDetailObj[item.id]){ + if (this.resiDetailObj[item.id].hasOwnProperty(key)) { child.value = await this.getDictName( child.opctionUrl, child.opctionParams, @@ -1210,22 +1251,12 @@ export default { child.opction ); } + } + }) ); }) ); - - this.menuList.push( - { - name: "业务记录", - id: "businessRecord", - }, - { - name: "更新纪录", - id: "updateRecord", - } - ); - this.score = res.data.data.integrityData.score; } else if (res.data.code >= 8000) { this.resiDetailObj = {}; @@ -1236,6 +1267,7 @@ export default { console.log(err); }); }, + handelClickJumpEdit() { this.checkType = "edit"; this.showCheckPassword = true; @@ -1484,7 +1516,27 @@ export default { return text; }, }, - computed: {}, + computed: { + familyStatus(){ + 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) {