From b60319ed031a019895188f9643f7f150083b24b9 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 18 Jan 2022 17:01:44 +0800 Subject: [PATCH 1/7] bug --- src/apps/AppWalkask/detail.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/apps/AppWalkask/detail.vue b/src/apps/AppWalkask/detail.vue index 04382260..957921bd 100644 --- a/src/apps/AppWalkask/detail.vue +++ b/src/apps/AppWalkask/detail.vue @@ -8,7 +8,6 @@ {{ data.name }} {{ data.menuLevel3Name }} - {{ $dict.getLabel('realityStatus', data.reality) }} @@ -110,7 +109,7 @@ export default { height: 40px; border-radius: 4px; border: 1px solid #FFFFFF; - margin-right: 16px; + margin-left: 16px; } } } From 8218448c60104ca97e0f700a5733950e498c6c8d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 18 Jan 2022 17:16:18 +0800 Subject: [PATCH 2/7] 26840 --- src/apps/AppWalkask/add.vue | 6 ++++-- src/components/AiAreaPicker.vue | 21 ++++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue index 8fc405d9..cc020225 100644 --- a/src/apps/AppWalkask/add.vue +++ b/src/apps/AppWalkask/add.vue @@ -4,7 +4,7 @@
- + @@ -93,7 +93,7 @@ export default { this.areaIdProps = this.user.areaId if (!this.id) { this.forms.areaId = this.user.areaId - this.areaName = this.user.areaName + this.forms.areaName = this.user.areaName } this.$dict.load('realityStatus').then(() => { this.getDetail() @@ -126,6 +126,8 @@ export default { this.forms = res.data this.forms.create_user_name = res.data.name this.forms.realityValue = res.data.reality + this.forms.areaId = res.data.areaId + this.forms.areaName = res.data.areaName this.forms.reality = this.$dict.getLabel('realityStatus', res.data.reality) if (res.data.images) { this.forms.images = JSON.parse(res.data.images || '[]') diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue index b02eaf1a..6a56abbf 100644 --- a/src/components/AiAreaPicker.vue +++ b/src/components/AiAreaPicker.vue @@ -5,7 +5,7 @@
-
+
@@ -90,6 +90,7 @@ export default { return { fullArea: [], index: '', + areaName: '', list: [], levelLabels: ["省", "市", "县/区", "镇/街道", "村/社区"], selected: {}, @@ -101,6 +102,12 @@ export default { v && (this.getFullArea()) }, + value (v) { + if (this.list.length && v) { + this.areaName = this.list.find((e) => e.id == this.value).name + } + }, + fullArea: { handler(v) { this.$nextTick(() => { @@ -134,8 +141,8 @@ export default { this.fullArea = res.data.reverse().slice(this.dataRange) } else { this.fullArea = res.data + } - return this.fullArea } }) @@ -148,6 +155,14 @@ export default { if (res.data.length) { this.list = res.data let self = this.fullArea.find((e) => e.id == this.areaId) + + if (this.value && !this.areaName && this.value !== this.areaId) { + this.areaName = this.list.find((e) => e.id == this.value).name + } + + if (!this.areaName && this.value === this.areaId) { + this.areaName = self.name + } if (self.id) { this.list.unshift(self) } @@ -173,6 +188,7 @@ export default { if (this.selected.type == 5) { fullName = fullName + this.selected.name } + this.areaName = this.selected.name this.$emit('update:fullName', fullName) this.$emit('update:name', this.selected.name) this.closePopup() @@ -210,7 +226,6 @@ export default { return false } - console.log(this.index) this.getFullArea().then(() => { this.getChildAreas(this.currentArea.id || this.areaId) }) From 8d15875750ca57506a3b87be090248f3a3f55fca Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 18 Jan 2022 17:18:00 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AiAreaPicker.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue index 6a56abbf..07a98adb 100644 --- a/src/components/AiAreaPicker.vue +++ b/src/components/AiAreaPicker.vue @@ -111,7 +111,9 @@ export default { fullArea: { handler(v) { this.$nextTick(() => { - this.scrollHeight() + if (v) { + this.scrollHeight() + } }) } } @@ -125,7 +127,7 @@ export default { this.$refs.areaSelector.showPopup() }, scrollHeight () { - return this.height = `calc(100% - ${document.querySelector('.areaSelector').offsetHeight}px)` + return this.height = document.querySelector('.areaSelector') && `calc(100% - ${document.querySelector('.areaSelector').offsetHeight}px)` }, getFullArea() { let areaId = this.areaId || (this.all ? '' : this.$areaId) From 9602ad6d2495d13a717914364801a6e4f5ad8591 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 18 Jan 2022 17:39:53 +0800 Subject: [PATCH 4/7] bug --- src/components/AiAreaPicker.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue index 07a98adb..0e366ba0 100644 --- a/src/components/AiAreaPicker.vue +++ b/src/components/AiAreaPicker.vue @@ -188,11 +188,11 @@ export default { }) if (this.selected.type == 5) { - fullName = fullName + this.selected.name + fullName = fullName + (this.selected.name || this.areaName) } - this.areaName = this.selected.name + this.areaName = this.selected.name || this.areaName this.$emit('update:fullName', fullName) - this.$emit('update:name', this.selected.name) + this.$emit('update:name', (this.selected.name || this.areaName)) this.closePopup() }, getChild(op) { From 4d02e122f551c2331a2046cf3ed43273fef51712 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 18 Jan 2022 17:40:18 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 57cd43b5..eeb9a6c3 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -356,7 +356,7 @@ const store = new Vuex.Store({ state.dispatch("injectJWeixin", "selectPrivilegedContact").then(() => { setTimeout(() => { let sdk = typeof wx?.invoke == 'function' ? wx : jWeixin - sdk?.invoke("selectEnterpriseContact", { + sdk?.invoke("selectPrivilegedContact", { fromDepartmentId: -1, mode: "multi", ...params From 4302e51896b6663e717eebaf676526aadccee4c6 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 18 Jan 2022 17:56:53 +0800 Subject: [PATCH 6/7] bug --- src/components/AiAreaPicker.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue index 0e366ba0..fb912697 100644 --- a/src/components/AiAreaPicker.vue +++ b/src/components/AiAreaPicker.vue @@ -18,7 +18,7 @@
-
@@ -169,6 +169,14 @@ export default { this.list.unshift(self) } this.scrollHeight() + } else { + if (this.areaId.substr(this.areaId.length - 3, 3) !== '000') { + this.list = [{ + id: this.areaId, + name: this.fullArea[0].name + }] + this.areaName = this.fullArea[0].name + } } }) }, From f4b0823b8ffd67c34b4a55cc44699359220eb5d0 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 18 Jan 2022 18:26:43 +0800 Subject: [PATCH 7/7] 26796 --- src/apps/AppGridManagement/Map.vue | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/apps/AppGridManagement/Map.vue b/src/apps/AppGridManagement/Map.vue index a9e940f7..07159a31 100644 --- a/src/apps/AppGridManagement/Map.vue +++ b/src/apps/AppGridManagement/Map.vue @@ -72,7 +72,13 @@ export default { this.areaId = this.user.areaId // this.getLeafNodes() uni.$on('goback', e => { - this.getGridInfo(e.id, true) + if (e.girdLevel == '0') { + setTimeout(() => { + this.$u.toast('请选择二级或者三级网格') + }, 400) + return false + } + this.getGridList(e.id, true) }) }, onShow() { @@ -103,6 +109,26 @@ export default { }) }, + getGridList (id) { + this.$loading() + this.$http.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${id}`).then((res) => { + this.$hideLoading() + if (res?.data) { + const arr = res.data.map(v => { + return { + id: v.id, + girdName: v.girdName, + points: v.points ? v.points.map(p => [p.lng, p.lat]) : [] + } + }) + + this.renderGridMap(arr) + } + }).catch(() => { + this.$hideLoading() + }) + }, + getGridInfo (id, flag) { this.$loading() this.$http.post(`/app/appgirdinfo/queryDetailById?id=${id}`).then((res) => {