From 0324a529fea90786724b724856c0ced64593885a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 25 Mar 2022 11:14:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 10 ++++-- src/views/modules/base/community/roomForm.vue | 12 +++---- .../modules/base/community/roomTable.vue | 35 ++++++++++++------- .../regionalParty/activitys.vue | 8 ++--- .../communityParty/regionalParty/units.vue | 8 ++--- src/views/modules/visual/basicinfo/people.vue | 2 +- 6 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 1708c943..ece5784a 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -98,12 +98,16 @@ export default { }, computed: { rowHeight () { - return (this.clientHeight - 120) + 'px' + + return this.$store.state.inIframe ? this.clientHeight - 120 + this.iframeHeight + 'px' : this.clientHeight - 120 + 'px' + }, treeHeight () { - return (this.clientHeight - 200) + 'px' + return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px' + }, - ...mapGetters(['clientHeight']) + + ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { async loadTree (isRefresh) { diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index dfdda844..b60fe6c6 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -11,7 +11,7 @@ - {{ agencyObj.communityName }}—{{agencyObj.label}} + {{ agencyObj.neighborHoodName }}—{{agencyObj.label}} - + min-width="160"> + min-width="150"> + label="所属楼栋" + width="80"> - + + label="门牌号" + width="70"> + label="类型" + width="50"> + label="用途" + width="50"> + label="是否出租" + width="80"> + label="房主姓名" + width="90"> { + item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName + item.unitNumShow = item.unitNum + '单元' if (item.agencyId === this.staffAgencyId) { item.showBtn = true this.validTableDataNum++ @@ -327,6 +337,7 @@ export default { }, handleAdd () { + this.formTitle = '新增房屋' this.formShow = true this.$nextTick(() => { diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue index 0fbdc006..d98baa20 100644 --- a/src/views/modules/communityParty/regionalParty/activitys.vue +++ b/src/views/modules/communityParty/regionalParty/activitys.vue @@ -634,13 +634,11 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 430) + return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430 }, - rowHeight () { - return (this.clientHeight - 200) + 'px' - }, - ...mapGetters(['clientHeight']) + + ...mapGetters(['clientHeight', 'iframeHeight']) }, watch: { diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index cb0696ce..9c6d5b6b 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -675,13 +675,11 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 430) + return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430 }, - rowHeight () { - return (this.clientHeight - 200) + 'px' - }, - ...mapGetters(['clientHeight']) + + ...mapGetters(['clientHeight', 'iframeHeight']) }, watch: { diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 74ed24d8..146a16d0 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -126,7 +126,7 @@ src="@/assets/img/shuju/people/huzhu.png" /> -
{{ houseInfo.ownerName }}
+
{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}

（户主）

From 884d4f54871eab36a9486e4923da920c4d5027e9 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 25 Mar 2022 11:16:44 +0800 Subject: [PATCH 2/5] dd --- src/utils/index.js | 30 ++++++++++++++++ src/views/components/editResi.vue | 2 +- src/views/components/resiForm.vue | 55 +++++++---------------------- src/views/components/resiSearch.vue | 2 +- 4 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/utils/index.js b/src/utils/index.js index fe742c9a..c2232ac7 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -115,3 +115,33 @@ export function dateFormats(fmt, date) { } return fmt } +// 根据身份证计算出生日期，性别，年龄 +export function computedCard(idCard) { + let sex = null; + let birth = null; + let myDate = new Date(); + let month = myDate.getMonth() + 1; + let day = myDate.getDate(); + let age = 0; + + if(idCard.length===18){ + age = myDate.getFullYear() - idCard.substring(6, 10) - 1; + sex = idCard.substring(16,17); + birth = idCard.substring(6,10)+"-"+idCard.substring(10,12)+"-"+idCard.substring(12,14); + if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day) age++; + + } + if(idCard.length===15){ + age = myDate.getFullYear() - idCard.substring(6, 8) - 1901; + sex = idCard.substring(13,14); + birth = "19"+idCard.substring(6,8)+"-"+idCard.substring(8,10)+"-"+idCard.substring(10,12); + if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day) age++; + } + + if(sex%2 === 0) + sex = '0'; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别 + else + sex = '1'; + return {age , sex, birth} +} + diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index d7afc877..fba7172b 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -33,7 +33,7 @@ - +
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 506c2265..6ed432b4 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -32,7 +32,7 @@ - +
@@ -99,48 +99,7 @@
- + @@ -158,6 +117,7 @@ size="small" clearable placeholder="请输入内容" + @blur="handleValidBlur(n)" > import { isCard, isMobile } from '@/utils/validate' +import { computedCard } from '@/utils/index' export default { name: 'resiForm', @@ -525,6 +486,14 @@ export default { // } }) }, + handleValidBlur(n) { + console.log('n---', n) + if (n.columnName !== 'ID_CARD') return + if (!isCard(this.form.ID_CARD)) return + const { sex, birth } = computedCard(this.form.ID_CARD) + this.form.BIRTHDAY = birth + this.form.GENDER = sex == 1 ? '1' : '2' + }, handleOpenSearch () { this.openSearch = !this.openSearch }, diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 1c2cd549..6cc4a41a 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -28,7 +28,7 @@
-
所属小区
+
所属房屋
Date: Fri, 25 Mar 2022 13:50:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ai=E5=AE=89=E9=98=B2=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=AE=89=E9=98=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index 9712a81a..d0f37f37 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -315,7 +315,7 @@ router.beforeEach((to, from, next) => { { icon: "icon-setting", id: "44rq22222q2222", - name: "AI安防", + name: "智慧安防", // url: "visual/basicinfo/basicInfoMain", children: [ { From 36161bfd842c3e53e17165da273ba44f9c2a3721 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 25 Mar 2022 14:07:47 +0800 Subject: [PATCH 4/5] dd --- src/views/modules/base/collect.vue | 12 ++++++----- src/views/modules/base/resi.vue | 18 ++++++++++++++--- .../modules/communityParty/elegant/index.vue | 14 +++++++++++-- .../communityService/measure/index.vue | 13 ++++++++++-- .../modules/communityService/sqzzz/index.vue | 4 ++-- src/views/modules/importRecord/index.vue | 11 ++++++---- .../difficulty/difficultyList.vue | 12 ++++++----- .../secretaryLog/humanisticCare/careList.vue | 12 ++++++----- .../modules/secretaryLog/workLog/index.vue | 7 ++++--- .../serviceMatter/service.vue | 12 +++++------ .../modules/workPc/guidance/categoryList.vue | 11 +++++++--- .../modules/workPc/guidance/guidanceList.vue | 6 ++++-- src/views/modules/workSys/demandCate.vue | 14 +++++++++++-- src/views/modules/workSys/elegantCate.vue | 20 +++++++++++++------ src/views/modules/workSys/resiCate.vue | 14 +++++++++++-- 15 files changed, 127 insertions(+), 53 deletions(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index 8f6c49af..155f675e 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -61,7 +61,7 @@ border style="width: 100%" class="resi-table" - :height="maxTableHeight" + :height="tableHeight" :span-method="arraySpanMethod" > @@ -189,10 +189,12 @@ export default { }; }, computed: { - maxTableHeight() { - return this.clientHeight - 360; - }, - ...mapGetters(["clientHeight"]), + ...mapGetters(['clientHeight', 'iframeHeight']), + tableHeight() { + const h = this.clientHeight - 360 + this.iframeHeigh + const _h = this.clientHeight - 360 + return this.$store.state.inIframe ? h : _h + } }, watch: { timeRange(val) { diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 9e35e8d6..95b645a5 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -297,7 +297,7 @@ export default { currentPage: 1, pageSize: 20, total: null, - tableHeight: 0, + searchH: 0, conditions: [], activeName: '', tableData: [], @@ -336,6 +336,14 @@ export default { } }, + computed: { + ...mapGetters(['clientHeight', 'iframeHeight']), + tableHeight() { + const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh + const _h = this.clientHeight - 280 - this.searchH + return this.$store.state.inIframe ? h : _h + } + }, async created () { if (this.$route.query) { let query = this.$route.query @@ -352,12 +360,16 @@ export default { // this.handleSearch() // this.getTableData() this.pageLoading = true + this.searchH = this.$refs.resiSearch.$el.offsetHeight console.log('storeoooo----0000', this.$store) console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight) - this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px' + }, mounted () { - + + // this.$nextTick(() => { + // this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px' + // }) console.log('document.documentElement.clientWidth', document.documentElement.clientHeight) }, methods: { diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index 1366c673..c1cce0ed 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -235,6 +235,7 @@