diff --git a/public/images/index/box-pic1.png b/public/images/index/box-pic1.png new file mode 100644 index 000000000..75005fafc Binary files /dev/null and b/public/images/index/box-pic1.png differ diff --git a/public/images/index/box-pic2.png b/public/images/index/box-pic2.png new file mode 100644 index 000000000..3d6fe7a02 Binary files /dev/null and b/public/images/index/box-pic2.png differ diff --git a/public/images/index/box-pic3.png b/public/images/index/box-pic3.png new file mode 100644 index 000000000..0f6467664 Binary files /dev/null and b/public/images/index/box-pic3.png differ diff --git a/public/images/index/box-pic4.png b/public/images/index/box-pic4.png new file mode 100644 index 000000000..b80864dd6 Binary files /dev/null and b/public/images/index/box-pic4.png differ diff --git a/public/images/index/decoration.png b/public/images/index/decoration.png new file mode 100644 index 000000000..bb1f6ea5b Binary files /dev/null and b/public/images/index/decoration.png differ diff --git a/public/images/index/footer-bg.png b/public/images/index/footer-bg.png new file mode 100644 index 000000000..c29ccc91d Binary files /dev/null and b/public/images/index/footer-bg.png differ diff --git a/public/images/index/indexlogo.png b/public/images/index/indexlogo.png new file mode 100644 index 000000000..e09caa940 Binary files /dev/null and b/public/images/index/indexlogo.png differ diff --git a/public/images/index/language.png b/public/images/index/language.png new file mode 100644 index 000000000..6d507086e Binary files /dev/null and b/public/images/index/language.png differ diff --git a/public/images/index/pic.png b/public/images/index/pic.png new file mode 100644 index 000000000..4a7671b2a Binary files /dev/null and b/public/images/index/pic.png differ diff --git a/public/images/index/square.png b/public/images/index/square.png new file mode 100644 index 000000000..f37f1199f Binary files /dev/null and b/public/images/index/square.png differ diff --git a/public/images/indexlogo.png b/public/images/indexlogo.png new file mode 100644 index 000000000..abb290382 Binary files /dev/null and b/public/images/indexlogo.png differ diff --git a/public/images/language.png b/public/images/language.png new file mode 100644 index 000000000..6d507086e Binary files /dev/null and b/public/images/language.png differ diff --git a/resources/assets/js/language/index.js b/resources/assets/js/language/index.js index 06f8d314c..d625c884e 100644 --- a/resources/assets/js/language/index.js +++ b/resources/assets/js/language/index.js @@ -79,6 +79,7 @@ export default { this.addLanguageData(require("./language.js").default); this.addLanguageData(window.languageData); // + languageListenerObjects.push((lang) => { this.languageType = lang; }); diff --git a/resources/assets/js/pages/index.vue b/resources/assets/js/pages/index.vue index 2550f4127..264d8f63b 100644 --- a/resources/assets/js/pages/index.vue +++ b/resources/assets/js/pages/index.vue @@ -1,21 +1,265 @@ diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 01c190afe..3621fe093 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -472,6 +472,55 @@ export default { } }, + msgAllUnread() { + if (this.$Electron) { + this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal); + } + }, + + dashboardTotal() { + if (this.$Electron) { + this.$Electron.ipcRenderer.send('setDockBadge', this.msgAllUnread + this.dashboardTotal); + } + }, + + dialogMsgPush(data) { + if (this.natificationHidden && this.natificationReady) { + const {id, dialog_id, type, msg} = data; + let body = ''; + switch (type) { + case 'text': + body = msg.text; + break; + case 'file': + body = '[' + this.$L(msg.type == 'img' ? '图片信息' : '文件信息') + ']' + break; + default: + return; + } + this._notificationId = id; + this.notificationClass.replaceOptions({ + icon: $A.originUrl('images/logo.png'), + body: body, + data: data, + tag: "dialog", + requireInteraction: true + }); + let dialog = this.dialogs.find((item) => item.id == dialog_id); + if (dialog) { + this.notificationClass.replaceTitle(dialog.name); + this.notificationClass.userAgreed(); + } else { + this.$store.dispatch("getDialogOne", dialog_id).then(({data}) => { + if (this._notificationId === id) { + this.notificationClass.replaceTitle(data.name); + this.notificationClass.userAgreed(); + } + }) + } + } + }, + projectKeyValue(val) { if (val == '') { return; diff --git a/resources/assets/js/pages/manage/components/Calendar.vue b/resources/assets/js/pages/manage/components/Calendar.vue index 76e1f9746..274ff3f68 100644 --- a/resources/assets/js/pages/manage/components/Calendar.vue +++ b/resources/assets/js/pages/manage/components/Calendar.vue @@ -1,9 +1,8 @@