From 38b17821f508620d6c8bbf8b1b1fd1a72e2d71f2 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 24 十一月 2023 12:39:48 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/App.vue | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 29de49f..a91e2a5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,6 +2,7 @@
<div id="app">
<router-view />
<theme-picker />
+ <Assistant />
</div>
</template>
@@ -10,18 +11,30 @@
export default {
name: "App",
- components: { ThemePicker },
- metaInfo() {
- return {
- title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
- titleTemplate: title => {
- return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
- }
- }
- }
+ components: {
+ ThemePicker,
+ Assistant: () => import("./components/Assistant"), //寮傛缁勪欢鍔犺浇鏂瑰紡
+ },
+ metaInfo() {
+ return {
+ title:
+ this.$store.state.settings.dynamicTitle &&
+ this.$store.state.settings.title,
+ titleTemplate: (title) => {
+ return title
+ ? `${title} - ${process.env.VUE_APP_TITLE}`
+ : process.env.VUE_APP_TITLE;
+ },
+ };
+ },
};
</script>
<style scoped>
+#app {
+ overflow: scroll;
+ height: 100vh;
+ background: #F8FAFD;
+}
#app .theme-picker {
display: none;
}
--
Gitblit v1.9.3