From a898658d37cdc233a3f6140e94d62a9b000d1e73 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 10 Feb 2022 15:08:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AiTMap.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/AiTMap.vue b/src/components/AiTMap.vue index ada7504e..64abcb6b 100644 --- a/src/components/AiTMap.vue +++ b/src/components/AiTMap.vue @@ -54,7 +54,7 @@ export default { this.mapLib = TMap this.tmap = new TMap.Map(this.$refs.tmap, { zoom: 11, - center: new TMap.LatLng(this.config.lat, this.config.lng), + // center: new TMap.LatLng(this.config.lat, this.config.lng), ...this.ops }) this.$emit('loaded') From 89d85d9a3ef0477309e0b7ab6e39ac8e90398836 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 10 Feb 2022 15:21:08 +0800 Subject: [PATCH 2/7] bug --- src/saas/AppGridManagement/Organization.vue | 4 +++- src/saas/AppGridManagement/SetGird.vue | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/saas/AppGridManagement/Organization.vue b/src/saas/AppGridManagement/Organization.vue index 51ffae47..d69c8eb7 100644 --- a/src/saas/AppGridManagement/Organization.vue +++ b/src/saas/AppGridManagement/Organization.vue @@ -5,7 +5,9 @@
-
{{item.name}}
+
+ +
{{item.checkType == 2 ? '网格长' : '网格员'}}

{{item.girdName}}

diff --git a/src/saas/AppGridManagement/SetGird.vue b/src/saas/AppGridManagement/SetGird.vue index 0e459d82..5622960a 100644 --- a/src/saas/AppGridManagement/SetGird.vue +++ b/src/saas/AppGridManagement/SetGird.vue @@ -49,7 +49,7 @@
网格长 - + @@ -60,7 +60,7 @@
网格员 - + From 3136a182e81dfb599897a0bad9493995325b0d65 Mon Sep 17 00:00:00 2001 From: wanglei <1336977847@qq.com> Date: Thu, 10 Feb 2022 15:34:16 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/saas/AppSpecialPeople/add.vue | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/saas/AppSpecialPeople/add.vue b/src/saas/AppSpecialPeople/add.vue index a7f2cf35..690f0743 100644 --- a/src/saas/AppSpecialPeople/add.vue +++ b/src/saas/AppSpecialPeople/add.vue @@ -5,7 +5,7 @@ *类型
{{ + :class="form.userType === '' ? 'color-999' : ''" >{{ $dict.getLabel('appSpecialTypeFive', form.userType) || '请选择' }} @@ -53,9 +53,9 @@
*所属区域
- - {{ form.areaName }} - 请选择 + + {{ form.areaName }} + 请选择
@@ -71,7 +71,7 @@ 所属网格
{{ + :class="form.girdName === '' ? 'color-999' : ''">{{ $dict.getLabel('appSpecialTypeFive', form.girdName) || '请选择' }} @@ -92,7 +92,7 @@ {{ item.label }}
{{ + :class="form[item.formDbName] === '' ? 'color-999' : ''" >{{ $dict.getLabel(item.dict, form[item.formDbName]) || '请选择' }} @@ -102,7 +102,7 @@
{{ item.label }}
- {{ + {{ $dateFormat(form[item.formDbName], 'YYYY-MM-DD') || '请选择' }} @@ -550,7 +550,6 @@ export default { .u-icon { margin-left: 16px; margin-bottom: 4px; - vertical-align: center; } } From 92579604f5b426add94b25ada389e98cc6e81aa4 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 10 Feb 2022 15:38:27 +0800 Subject: [PATCH 4/7] 27103 --- src/saas/AppAskForm/Statistical.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/saas/AppAskForm/Statistical.vue b/src/saas/AppAskForm/Statistical.vue index 53c90444..d6a3e739 100644 --- a/src/saas/AppAskForm/Statistical.vue +++ b/src/saas/AppAskForm/Statistical.vue @@ -44,8 +44,8 @@
-

- {{ $dict.getLabel('wxUserType', item.userType) }} +

{{ item.nickName }}

+

{{ item.commitTime }}

From 45cb528eb8ac836852c391caee5351093cc26232 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 10 Feb 2022 15:42:11 +0800 Subject: [PATCH 5/7] 27104 --- src/saas/AppAskForm/components/List.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/saas/AppAskForm/components/List.vue b/src/saas/AppAskForm/components/List.vue index 44bf042a..79470c8f 100644 --- a/src/saas/AppAskForm/components/List.vue +++ b/src/saas/AppAskForm/components/List.vue @@ -216,6 +216,14 @@ export default { }, toResult () { + if (this.info.dataCount < 1) { + this.$confirm('暂无调查结果信息', '', { + showCancel: false + }) + + return false + } + this.linkTo(`./Statistical?id=${this.info.id}`) }, From 60360911085730977bbbcdc2a96092504af507de Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 10 Feb 2022 15:44:56 +0800 Subject: [PATCH 6/7] bug --- src/saas/AppBackUserList/AppBackUserList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/saas/AppBackUserList/AppBackUserList.vue b/src/saas/AppBackUserList/AppBackUserList.vue index 142af5b6..54093f7b 100644 --- a/src/saas/AppBackUserList/AppBackUserList.vue +++ b/src/saas/AppBackUserList/AppBackUserList.vue @@ -47,7 +47,7 @@

没有网格员权限
无法查看返乡登记哦~

-
+
登记
邀请居民填写
From 670c8fcb49c9a95deb0e35a742f3347b983b040d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 10 Feb 2022 15:53:04 +0800 Subject: [PATCH 7/7] 27105 --- src/saas/AppAskForm/Statistical.vue | 4 ++++ src/saas/AppAskForm/components/List.vue | 9 ++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/saas/AppAskForm/Statistical.vue b/src/saas/AppAskForm/Statistical.vue index d6a3e739..fd7fe0d3 100644 --- a/src/saas/AppAskForm/Statistical.vue +++ b/src/saas/AppAskForm/Statistical.vue @@ -265,6 +265,10 @@ line-height: 40px; h2 { + max-width: 300px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; margin-right: 20px; font-size: 30px; color: #333; diff --git a/src/saas/AppAskForm/components/List.vue b/src/saas/AppAskForm/components/List.vue index 79470c8f..189e7f57 100644 --- a/src/saas/AppAskForm/components/List.vue +++ b/src/saas/AppAskForm/components/List.vue @@ -130,13 +130,8 @@ export default { }, showPopup(item) { - if (item.status === '2') { - this.$confirm('该调查已结束，谢谢您的参与！', '', { - showCancel: false - }) - - return false - } + this.info = item + this.id = item.id this.info = item this.id = item.id