From 663ddc83869381b33c8eb499ce3bbd6edfbd5925 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 27 Jul 2022 16:59:45 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/apps/AppQyWxConfig/AppQyWxConfig.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/core/apps/AppQyWxConfig/AppQyWxConfig.vue b/core/apps/AppQyWxConfig/AppQyWxConfig.vue index 3833dda6..283de097 100644 --- a/core/apps/AppQyWxConfig/AppQyWxConfig.vue +++ b/core/apps/AppQyWxConfig/AppQyWxConfig.vue @@ -31,5 +31,6 @@ export default { From 32eaae40d72298e4be09c4cad57fbaafb96ac079 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 27 Jul 2022 17:09:40 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B6=88=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/dvui/components/AiDvRender.vue | 1 - project/dvui/components/AiSprite/building/building1.js | 4 ---- project/dvui/components/AiSprite/mods.js | 1 - 3 files changed, 6 deletions(-) delete mode 100644 project/dvui/components/AiSprite/building/building1.js delete mode 100644 project/dvui/components/AiSprite/mods.js diff --git a/project/dvui/components/AiDvRender.vue b/project/dvui/components/AiDvRender.vue index 6b8c859d..eeaa3392 100644 --- a/project/dvui/components/AiDvRender.vue +++ b/project/dvui/components/AiDvRender.vue @@ -41,7 +41,6 @@ import AiDvPanel from "../layout/AiDvPanel/AiDvPanel"; import AiDvDisplay from "../layout/AiDvDisplay/AiDvDisplay"; import AiDvSummary from "../layout/AiDvSummary/AiDvSummary"; import AiSprite from "./AiSprite"; -import * as mods from "./AiSprite/mods"; export default { diff --git a/project/dvui/components/AiSprite/building/building1.js b/project/dvui/components/AiSprite/building/building1.js deleted file mode 100644 index 6d44db1e..00000000 --- a/project/dvui/components/AiSprite/building/building1.js +++ /dev/null @@ -1,4 +0,0 @@ -const initModel = () => { - -} -export default initModel diff --git a/project/dvui/components/AiSprite/mods.js b/project/dvui/components/AiSprite/mods.js deleted file mode 100644 index 35d79516..00000000 --- a/project/dvui/components/AiSprite/mods.js +++ /dev/null @@ -1 +0,0 @@ -export const building1 = import('./building/building1') From d7f0b63eb95a6ca9a5d8d95aa43c9f09dcf5eb7e Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 27 Jul 2022 17:19:40 +0800 Subject: [PATCH 3/8] 30638 --- .../sass/apps/Announce/AppAnnounce/components/List.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue index bafc2f69..d4e36b22 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/List.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue @@ -116,7 +116,7 @@ total: 0, colConfigs: [ { prop: 'taskTitle', label: '任务名称' }, - { prop: 'sendType', label: '群发类型', formart: v => v === '0' ? '立即发送' : '定时发送', align: 'center' }, + { prop: 'typeName', label: '群发类型', align: 'center' }, { slot: 'user', label: '创建人', openType: 'userName', align: 'center' }, { prop: 'choiceTime', label: '群发时间', align: 'center' }, { @@ -162,7 +162,12 @@ } }).then(res => { if (res.code == 0) { - this.tableData = res.data.records + this.tableData = res.data.records.map(v => { + return { + ...v, + typeName: '群发居民群' + } + }) this.total = res.data.total this.$nextTick(() => { From fb491446c77bf8092cff26c7560e1bdd2d167702 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 27 Jul 2022 17:23:12 +0800 Subject: [PATCH 4/8] 30574 --- .../apps/Announce/AppAnnounce/components/Detail.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue index f173f356..d798a474 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue @@ -88,7 +88,7 @@

未执行成员

-

{{ memberInfo.cannotExecuteCount || 0 }}

+

{{ memberInfo.unExecutedCount || 0 }}

@@ -105,7 +105,7 @@
-

{{ memberInfo.unExecutedCount || 0 }}

+

{{ memberInfo.cannotExecuteCount || 0 }}

@@ -162,19 +162,19 @@

未送达居民群

-

{{ groupInfo.planCount || 0 }}

+

{{ groupInfo.unExecutedCount || 0 }}

已送达居民群

-

{{ groupInfo.planCount || 0 }}

+

{{ groupInfo.executedCount || 0 }}

无法送达居民群

-

{{ groupInfo.planCount || 0 }}

+

{{ groupInfo.cannotExecuteCount || 0 }}

From 9d0047e071770ef62ce02be34e0e491aab91169a Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 27 Jul 2022 17:25:38 +0800 Subject: [PATCH 5/8] 30636 --- project/sass/apps/Announce/AppAnnounce/components/Detail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue index d798a474..c94d58bd 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue @@ -118,7 +118,7 @@
- 请选择 + 请选择部门
选择
 @@ -187,7 +187,7 @@
- 请选择 + 请选择部门
选择
 From 2a8d1f17a5e821b157035cbc57ee1eaee473e755 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 27 Jul 2022 17:32:43 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/apps/AppQyWxConfig/themeSetting.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/apps/AppQyWxConfig/themeSetting.vue b/core/apps/AppQyWxConfig/themeSetting.vue index 196f2827..15e205bf 100644 --- a/core/apps/AppQyWxConfig/themeSetting.vue +++ b/core/apps/AppQyWxConfig/themeSetting.vue @@ -49,7 +49,7 @@ export default { }) }, cancel() { - this.$router.push({}) + return this.$router.push({}) }, submit() { this.$refs.ThemeForm.validate(v => { @@ -59,7 +59,7 @@ export default { this.instance.post("/app/appdvcpconfig/updateSysColorScheme", {...this.form, colorScheme}).then(res => { if (res?.code == 0) { this.$message.success("保存成功!") - this.cancel() + this.cancel().then(() => location.reload()) } }) } From 720adb7e8639917e2e8e1dda69241b16dec37944 Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 28 Jul 2022 10:02:43 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BC=95=E5=AF=BC=E9=A1=B5=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E8=B5=84=E6=BA=90=E5=BE=80oms=E7=9A=84=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/apps/AppMenuManager/introPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apps/AppMenuManager/introPage.vue b/core/apps/AppMenuManager/introPage.vue index 47053626..ece7709b 100644 --- a/core/apps/AppMenuManager/introPage.vue +++ b/core/apps/AppMenuManager/introPage.vue @@ -21,7 +21,7 @@ From a1b4574bae7c309992d6217088ae6c671c979beb Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 28 Jul 2022 10:45:05 +0800 Subject: [PATCH 8/8] 30648 --- project/sass/apps/Announce/AppAnnounce/components/Detail.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue index c94d58bd..a9211a3d 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue @@ -26,8 +26,7 @@
- （/ - ） + （）