From 83e94cd3d681dad60362dd678b9c93a68b927092 Mon Sep 17 00:00:00 2001 From: tianq Date: Thu, 13 Apr 2023 09:42:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E5=8F=82bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/people-info2.scss | 132 +++ src/views/modules/census/addFormHouse.vue | 11 +- src/views/modules/census/addFormResident.vue | 872 ++++++++++-------- src/views/modules/census/census-houseList.vue | 2 +- .../modules/census/census-residentList.vue | 8 +- src/views/modules/census/people-more.vue | 577 ------------ 6 files changed, 627 insertions(+), 975 deletions(-) create mode 100644 src/assets/scss/people-info2.scss delete mode 100644 src/views/modules/census/people-more.vue diff --git a/src/assets/scss/people-info2.scss b/src/assets/scss/people-info2.scss new file mode 100644 index 000000000..7a28a1e3c --- /dev/null +++ b/src/assets/scss/people-info2.scss @@ -0,0 +1,132 @@ +@import "c/config"; +@import "c/function"; + + + + .wrap2 { + box-sizing: border-box; + padding: 20px; + height: 90vh; + width: 1180px; + overflow-y: auto; + overflow-x: hidden; + position: relative; + } + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #333; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + + .div_tuomin{ + position: absolute; + top:25px; + right:40px; + } + + .btn-close { + position: absolute; + z-index: 2; + top: -30px; + right: -30px; + cursor: pointer; + } + + .list { + display: flex; + flex-wrap: wrap; + padding: 10px 30px; + + .item { + position: relative; + box-sizing: border-box; + padding: 0 15px; + width: 33%; + color: #fff; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #333; + line-height: 24px; + margin: 15px 0; + + &.z-long { + width: 100%; + } + + &::before { + position: absolute; + left: 0; + top: 9px; + content: ""; + display: block; + width: 7px; + height: 7px; + background: #ddd; + border-radius: 3px; + } + } + } + + .line { + margin: 20px auto; + width: 900px; + height: 1px; + border: 1px dashed #ddd; + } + + .tabs { + margin-top: 30px; + display: flex; + align-items: center; + padding-left: 20px; + + .tab-btn { + margin: 0 5px; + width: 30px; + text-align: center; + cursor: pointer; + padding: 10px 0; + border-radius: 3px; + background-color: rgba(#000, 0.3); + } + + .tab { + @include toe; + margin: 0 5px; + min-width: 80px; + padding: 0 8px; + height: 36px; + background: #fff; + border: 1px solid #eee; + box-shadow: 0 0 10px 0 inset #ddd; + border-radius: 2px; + text-align: center; + font-size: 17px; + font-family: PingFang SC; + font-weight: 400; + color: #333; + line-height: 36px; + cursor: pointer; + transition: all ease 0.1s; + &.z-on { + background: linear-gradient(90deg, #1a5afd, #009cff); + box-shadow: none; + color: #ffffff; + border: 1px solid #1a5afd; + } + } + } diff --git a/src/views/modules/census/addFormHouse.vue b/src/views/modules/census/addFormHouse.vue index b5cdde320..7a84e7156 100644 --- a/src/views/modules/census/addFormHouse.vue +++ b/src/views/modules/census/addFormHouse.vue @@ -7,6 +7,9 @@
+
+ 显示脱敏信息 +
@@ -89,6 +92,7 @@
+ @@ -213,7 +217,7 @@ export default { }; return { agencyObj: {}, - view_real_data: false, + view_real_data: true, btnDisable: false, user: '', agencyId: '', @@ -488,4 +492,9 @@ export default { @import '@/assets/scss/modules/management/form-main.scss'; @import '@/assets/scss/modules/management/form.scss'; // @import '@/assets/scss/modules/visual/a_customize.scss'; +.div_tuomin { + position: absolute; + top: 25px; + right: 40px; +} diff --git a/src/views/modules/census/addFormResident.vue b/src/views/modules/census/addFormResident.vue index b5cdde320..bec9b8ce3 100644 --- a/src/views/modules/census/addFormResident.vue +++ b/src/views/modules/census/addFormResident.vue @@ -7,139 +7,132 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- +
显示脱敏信息
- - - {{ formData.fullName }} - - - - {{ formData.unitName ? formData.unitName : '--' }} - - - {{ formData.doorName }} - - - {{ formData.coding ? formData.coding : '--' }} - - - {{ formData.houseTypeName ? formData.houseTypeName : '--' }} - - - {{ formData.purposeName ? formData.purposeName : '--' }} - - - {{ formData.rentName ? formData.rentName : '--' }} - - - {{ formData.ownerName ? formData.ownerName : '--' }} - - - {{ formData.showOwnerPhone ? formData.showOwnerPhone : '--' }} - - - {{ formData.showOwnerIdCard ? formData.showOwnerIdCard : '--' }} - - - {{ formData.remark ? formData.remark : '--' }} - - - + + +
+
+
+ {{ item.label }} +
+
+
+ +
+
+
+
+ {{ field.label }}： + + {{ infoItem[field.columnName] == null ? '--' : getOptionLabel(field.options, infoItem[field.columnName], field.itemType) }} + + + {{ infoItem[field.columnName] == null ? '--' : infoItem[field.columnName] }} +
+
+
+
+ + + + + + + +
+
+ + + + + + + + + +
+
+ + + + + + + +
+
+
+ {{ field.label }}： + + {{ + !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null + ? '--' + : getOptionLabel(field.options, allInfo[group.tableName][0][field.columnName], field.itemType) + }} + + + + {{ !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? '--' : allInfo[group.tableName][0][field.columnName] }} + +
+
+
-
- 取 消 - - 保 存 -
-
- 关 闭 @@ -148,128 +141,149 @@ + diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue index ac20e4650..52aa515c0 100644 --- a/src/views/modules/census/census-houseList.vue +++ b/src/views/modules/census/census-houseList.vue @@ -243,7 +243,7 @@ export default { }, computed: { maxTableHeight() { - this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675; + this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635; return this.TableHeight; }, ...mapGetters(['clientHeight', 'iframeHeight']) diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue index 92a8c9a56..cb3d500da 100644 --- a/src/views/modules/census/census-residentList.vue +++ b/src/views/modules/census/census-residentList.vue @@ -137,7 +137,7 @@ import screenEchartsFrame2 from './chart'; import { requestPost } from '@/js/dai/request'; import nextTick from 'dai-js/tools/nextTick'; import { mapGetters } from 'vuex'; -import addForm from './people-more.vue'; +import addForm from './addFormResident.vue'; import axios from 'axios'; @@ -215,7 +215,7 @@ export default { }, computed: { maxTableHeight() { - this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675; + this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635; return this.TableHeight; }, ...mapGetters(['clientHeight', 'iframeHeight']) @@ -232,7 +232,7 @@ export default { console.log(this.$store.state); this.user = this.$store.state.user; this.agencyId = this.user.agencyId; - this.orgId = this.agencyId; + // this.orgId = this.agencyId; this.getOrgTreeList(); this.getTableData(); this.getsubData(); @@ -243,7 +243,7 @@ export default { this.dialogVisible = true; this.pageType = 'view'; this.detailId = row.icResiUserId; - this.detailData = row.educationName; + this.detailData = row.gridName; }, handleClose() { this.dialogVisible = false; diff --git a/src/views/modules/census/people-more.vue b/src/views/modules/census/people-more.vue deleted file mode 100644 index 960a1166b..000000000 --- a/src/views/modules/census/people-more.vue +++ /dev/null @@ -1,577 +0,0 @@ - - - - - -