diff --git a/src/apps/AppCountryAlbum/detail.vue b/src/apps/AppCountryAlbum/detail.vue index 79f3d057..0bd8941a 100644 --- a/src/apps/AppCountryAlbum/detail.vue +++ b/src/apps/AppCountryAlbum/detail.vue @@ -60,6 +60,7 @@ export default { console.log(this.params) this.getList() this.getStatistic() + uni.setNavigationBarTitle({title: '乡村相册'}) }, methods: { diff --git a/src/apps/AppCountryAlbum/list.vue b/src/apps/AppCountryAlbum/list.vue index b0178446..65117c73 100644 --- a/src/apps/AppCountryAlbum/list.vue +++ b/src/apps/AppCountryAlbum/list.vue @@ -38,6 +38,7 @@ export default { this.areaId = this.user.areaId this.areaName = this.user.areaName this.getList() + uni.setNavigationBarTitle({title: '乡村相册'}) }, methods: { diff --git a/src/apps/AppMailList/add.vue b/src/apps/AppMailList/add.vue index d3ea578f..6a4ec9dc 100644 --- a/src/apps/AppMailList/add.vue +++ b/src/apps/AppMailList/add.vue @@ -78,6 +78,7 @@ export default { this.getDetail() } }) + uni.setNavigationBarTitle({title: '新增'}) }, methods: { diff --git a/src/apps/AppMailList/list.vue b/src/apps/AppMailList/list.vue index 5e8161be..b983049f 100644 --- a/src/apps/AppMailList/list.vue +++ b/src/apps/AppMailList/list.vue @@ -43,6 +43,7 @@ export default { computed: { ...mapState(['user']) }, mounted() { this.getList() + uni.setNavigationBarTitle({title: '便民通讯录'}) }, methods: { diff --git a/src/apps/AppMailList/myAddList.vue b/src/apps/AppMailList/myAddList.vue index 4e827096..e7f1e25e 100644 --- a/src/apps/AppMailList/myAddList.vue +++ b/src/apps/AppMailList/myAddList.vue @@ -33,8 +33,8 @@ export default { }, computed: { ...mapState(['user']) }, mounted() { - console.log(this.user) this.getList() + uni.setNavigationBarTitle({title: '便民通讯录'}) }, methods: { diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue index 9cf4876e..b787b3d1 100644 --- a/src/apps/AppResidentDocument/AppResidentDocument.vue +++ b/src/apps/AppResidentDocument/AppResidentDocument.vue @@ -2,12 +2,12 @@
- +
- +
@@ -72,6 +72,7 @@ export default { }, ], currentTabs: 0, + areaId: '' } }, computed: { @@ -79,6 +80,7 @@ export default { }, watch: {}, onLoad() { + this.areaId = this.user.areaId this.getList() }, onShow() {}, diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue index 4e7ae0fa..b473476e 100644 --- a/src/apps/AppResidentDocument/DetailCard.vue +++ b/src/apps/AppResidentDocument/DetailCard.vue @@ -7,27 +7,27 @@
- {{ currentAreaName }} + {{ currentAddress }}
-
家庭成员
+
家庭成员{{data.family.length}}
- +
{{ item.name }} - 户主 + 户主 - {{ $dict.getLabel('householdRelation', item.householdName) }} + {{ $dict.getLabel('householdRelation', item.householdRelation) }}
@@ -38,7 +38,7 @@
身份证号: - {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }} + {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}
@@ -58,7 +58,7 @@ export default { return { id: '', data: [], - currentAreaName: '', + currentAddress: '', } }, computed: {}, @@ -76,7 +76,7 @@ export default { if (res.code == 0) { this.data = res.data this.$nextTick(() => { - this.currentAreaName = res.data.resident.currentAreaName + this.currentAddress = res.data.resident.currentAddress }) } }) diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue index 79d164dd..fcbf24d7 100644 --- a/src/apps/AppResidentDocument/DetailPeople.vue +++ b/src/apps/AppResidentDocument/DetailPeople.vue @@ -3,16 +3,16 @@
- +
{{ data.resident.name }} - 户主 + 户主 - {{ $dict.getLabel('householdRelation', data.resident.householdName) }} + {{ $dict.getLabel('householdRelation', data.resident.householdRelation) }}
@@ -27,7 +27,7 @@
- 家庭地址 + 籍贯 {{ data.resident.birthplaceAreaName }}
@@ -81,7 +81,7 @@
联系方式 - {{ data.resident.phone }} + {{ data.resident.phone }}
@@ -139,6 +139,9 @@ export default { } }) }, + callPhone(phone) { + uni.makePhoneCall({ phoneNumber: phone }) + }, }, } diff --git a/src/apps/AppServicePublic/Add.vue b/src/apps/AppServicePublic/Add.vue index ca203cb0..b3a0802c 100644 --- a/src/apps/AppServicePublic/Add.vue +++ b/src/apps/AppServicePublic/Add.vue @@ -72,6 +72,7 @@ export default { this.forms.areaId = this.user.areaId this.listName = o.listName this.getType() + uni.setNavigationBarTitle({title: this.listName}) }, mounted() {}, diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue index f406a70c..4441d84e 100644 --- a/src/apps/AppServicePublic/AppServicePublic.vue +++ b/src/apps/AppServicePublic/AppServicePublic.vue @@ -95,6 +95,7 @@ export default { uni.$on('update' , () => { this.getList() }) + uni.setNavigationBarTitle({title: this.listName}) }, methods: { getType() { diff --git a/src/apps/AppServicePublic/Detail.vue b/src/apps/AppServicePublic/Detail.vue index d2b9cbd7..8474747f 100644 --- a/src/apps/AppServicePublic/Detail.vue +++ b/src/apps/AppServicePublic/Detail.vue @@ -40,6 +40,7 @@ export default { this.id = o.id this.listName = o.listName this.getType() + uni.setNavigationBarTitle({title: this.listName}) }, mounted() {}, methods: { diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue index e6562c48..67e632ae 100644 --- a/src/apps/AppSpecialPeople/add.vue +++ b/src/apps/AppSpecialPeople/add.vue @@ -155,6 +155,7 @@ export default { computed: { ...mapState(['user']) }, created() { this.getType() + uni.setNavigationBarTitle({title: '新增人员'}) }, methods: { diff --git a/src/apps/AppSpecialPeople/detail.vue b/src/apps/AppSpecialPeople/detail.vue index 72fd103d..474c90ec 100644 --- a/src/apps/AppSpecialPeople/detail.vue +++ b/src/apps/AppSpecialPeople/detail.vue @@ -89,12 +89,12 @@ export default { }, computed: { ...mapState(['user']) }, created() { - console.log(1111) this.areaId = this.user.areaId this.areaName = this.user.areaName this.getStatistic() this.getStatisticMon() this.getUserList() + uni.setNavigationBarTitle({title: '特殊人群管理'}) }, methods: { diff --git a/src/apps/AppUniMsg/Detail.vue b/src/apps/AppUniMsg/Detail.vue index d80b7641..3866687c 100644 --- a/src/apps/AppUniMsg/Detail.vue +++ b/src/apps/AppUniMsg/Detail.vue @@ -13,7 +13,7 @@ {{ data.content }}
- +
@@ -48,6 +48,12 @@ export default { } }) }, + previewImage (images, img) { + uni.previewImage({ + urls: images.map(v => v.url), + current: img + }) + }, }, } diff --git a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue index 070b7d37..9fb89745 100644 --- a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue +++ b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue @@ -177,6 +177,7 @@ export default { this.areaId = this.user.areaId this.areaName = this.user.areaName this.getList() + uni.setNavigationBarTitle({title: '视频监控'}) // this.getMonitors() }, mounted() { diff --git a/src/apps/AppVideoSurveillance/monitorDetail.vue b/src/apps/AppVideoSurveillance/monitorDetail.vue index 6d80b9dd..0eebc2ed 100644 --- a/src/apps/AppVideoSurveillance/monitorDetail.vue +++ b/src/apps/AppVideoSurveillance/monitorDetail.vue @@ -22,6 +22,7 @@ export default { this.$nextTick(() => { this.detectOrient() }) + uni.setNavigationBarTitle({title: '视频监控'}) }, methods: { diff --git a/src/apps/AppWorkonline/AppWorkonline.vue b/src/apps/AppWorkonline/AppWorkonline.vue index d40efcbe..bd9f23d1 100644 --- a/src/apps/AppWorkonline/AppWorkonline.vue +++ b/src/apps/AppWorkonline/AppWorkonline.vue @@ -150,6 +150,9 @@ export default { } .u-card { + ::v-deep .u-card__head { + padding: 0 !important; + } ::v-deep .u-card__body { .body { position: relative; @@ -158,6 +161,10 @@ export default { font-size: 32px; font-weight: 500; margin-bottom: 16px; + width: 80%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .plan, .modetpye, diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue index 322237f6..b5fbd56a 100644 --- a/src/apps/AppWorkonline/Opinion.vue +++ b/src/apps/AppWorkonline/Opinion.vue @@ -56,7 +56,7 @@
- +
@@ -67,7 +67,7 @@ (最多9张)
- +