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 @@ 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 { 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()) } }) } 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') diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue index f173f356..a9211a3d 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue @@ -26,8 +26,7 @@
- (/ - ) + (
@@ -88,7 +87,7 @@

未执行成员

-

{{ memberInfo.cannotExecuteCount || 0 }}

+

{{ memberInfo.unExecutedCount || 0 }}

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

{{ memberInfo.unExecutedCount || 0 }}

+

{{ memberInfo.cannotExecuteCount || 0 }}

@@ -118,7 +117,7 @@
- 请选择 + 请选择部门
选择
@@ -162,19 +161,19 @@

未送达居民群

-

{{ groupInfo.planCount || 0 }}

+

{{ groupInfo.unExecutedCount || 0 }}

已送达居民群

-

{{ groupInfo.planCount || 0 }}

+

{{ groupInfo.executedCount || 0 }}

无法送达居民群

-

{{ groupInfo.planCount || 0 }}

+

{{ groupInfo.cannotExecuteCount || 0 }}

@@ -187,7 +186,7 @@
- 请选择 + 请选择部门
选择
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(() => {