diff --git a/index.html b/index.html index 8558494..1f23f8d 100644 --- a/index.html +++ b/index.html @@ -1,14 +1,10 @@ - - 灵机AI营销平台1 + 灵机AI营销平台
diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Bold.otf b/src/assets/fonts/Alibaba-PuHuiTi-Bold.otf new file mode 100644 index 0000000..2ed2026 Binary files /dev/null and b/src/assets/fonts/Alibaba-PuHuiTi-Bold.otf differ diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Medium.otf b/src/assets/fonts/Alibaba-PuHuiTi-Medium.otf new file mode 100644 index 0000000..a308250 Binary files /dev/null and b/src/assets/fonts/Alibaba-PuHuiTi-Medium.otf differ diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Regular.otf b/src/assets/fonts/Alibaba-PuHuiTi-Regular.otf new file mode 100644 index 0000000..5960ba1 Binary files /dev/null and b/src/assets/fonts/Alibaba-PuHuiTi-Regular.otf differ diff --git a/src/assets/img/hottranslation/good.png b/src/assets/img/hottranslation/good.png index 9a29ec8..71da582 100644 Binary files a/src/assets/img/hottranslation/good.png and b/src/assets/img/hottranslation/good.png differ diff --git a/src/assets/img/hottranslation/normal.png b/src/assets/img/hottranslation/normal.png index 02a6fbb..e3d1e90 100644 Binary files a/src/assets/img/hottranslation/normal.png and b/src/assets/img/hottranslation/normal.png differ diff --git a/src/assets/img/hottranslation/poor.png b/src/assets/img/hottranslation/poor.png index 2c76fee..539dc83 100644 Binary files a/src/assets/img/hottranslation/poor.png and b/src/assets/img/hottranslation/poor.png differ diff --git a/src/components/_base/exit-account-modal/img/icon1.png b/src/components/_base/exit-account-modal/img/icon1.png new file mode 100644 index 0000000..40402eb Binary files /dev/null and b/src/components/_base/exit-account-modal/img/icon1.png differ diff --git a/src/components/_base/exit-account-modal/index.vue b/src/components/_base/exit-account-modal/index.vue new file mode 100644 index 0000000..030e470 --- /dev/null +++ b/src/components/_base/exit-account-modal/index.vue @@ -0,0 +1,98 @@ + + + + + + diff --git a/src/components/_base/menu/index.vue b/src/components/_base/menu/index.vue index aaa8d94..b4f9043 100644 --- a/src/components/_base/menu/index.vue +++ b/src/components/_base/menu/index.vue @@ -121,7 +121,7 @@ export default defineComponent({ auto-open={false} selected-keys={selectedKey.value} auto-open-selected={true} - level-indent={34} + level-indent={24} style="height: 100%;width:100%;" onCollapse={setCollapse} > @@ -132,16 +132,59 @@ export default defineComponent({ }); - diff --git a/src/components/_base/navbar/index.vue b/src/components/_base/navbar/index.vue index cf7be89..87e2fbb 100644 --- a/src/components/_base/navbar/index.vue +++ b/src/components/_base/navbar/index.vue @@ -8,6 +8,7 @@ import { useSidebarStore } from '@/stores/modules/side-bar'; import { MENU_GROUP_IDS } from '@/router/constants'; import router from '@/router'; import { useRoute } from 'vue-router'; +import ExitAccountModal from '@/components/_base/exit-account-modal/index.vue'; interface MenuItem { name: string; @@ -20,7 +21,7 @@ interface MenuItem { const lists = ref([]); const sidebarStore = useSidebarStore(); const route = useRoute(); - +const exitAccountModalRef = ref(null); const selectedKey = computed(() => { // 判断是否为工作台页面（假设路由名为 'Home' 或 path 为 '/'） if (route.name === 'Home' || route.path === '/') { @@ -31,10 +32,7 @@ const selectedKey = computed(() => { }); const clickExit = async () => { - const { code } = await fetchLogOut(); - if (code === 200) { - handleUserLogout(); - } + exitAccountModalRef.value?.open(); }; const getMenus = async () => { const res = await fetchMenusTree(); @@ -80,27 +78,30 @@ const handleDopdownClick = (index: any, ind: any) => { - + diff --git a/src/components/no-data/style.scss b/src/components/no-data/style.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/layouts/Basic.vue b/src/layouts/Basic.vue index 8ec85e9..3378cf5 100644 --- a/src/layouts/Basic.vue +++ b/src/layouts/Basic.vue @@ -11,8 +11,10 @@ const appStore = useAppStore(); const router = useRouter(); const route = useRoute(); +console.log({ appStore }); + useResponsive(true); -const navbarHeight = `60px`; +const navbarHeight = `72px`; const navbar = computed(() => appStore.navbar); const renderMenu = computed(() => appStore.menu && !appStore.topMenu); const hideMenu = computed(() => appStore.hideMenu); @@ -23,14 +25,17 @@ const menuWidth = computed(() => { const collapsed = computed(() => { return appStore.menuCollapse; }); -const paddingStyle = computed(() => { - const paddingLeft = renderMenu.value && !hideMenu.value ? { paddingLeft: `${menuWidth.value}px` } : {}; - const paddingTop = navbar.value ? { paddingTop: navbarHeight } : {}; - return { ...paddingLeft, ...paddingTop }; -}); const showSidebar = computed(() => { return !(route.meta && route.meta.hideSidebar); }); +const paddingStyle = computed(() => { + const paddingLeft = + showSidebar.value && renderMenu.value && !hideMenu.value ? { paddingLeft: `${menuWidth.value}px` } : {}; + const paddingTop = navbar.value ? { paddingTop: navbarHeight } : {}; + return { ...paddingLeft, ...paddingTop }; +}); + +console.log('showSidebar', showSidebar); onMounted(() => { checkHasInviteCode(); @@ -69,7 +74,7 @@ provide('toggleDrawerMenu', () => { breakpoint="xl" :collapsed="collapsed" :width="menuWidth" - :style="{ paddingTop: navbar ? '60px' : '' }" + :style="{ paddingTop: navbar ? '72px' : '' }" collapsible hide-trigger @collapse="setCollapsed" @@ -102,7 +107,7 @@ provide('toggleDrawerMenu', () => { diff --git a/src/views/components/dataEngine/hotTranslation.vue b/src/views/components/dataEngine/hotTranslation.vue index b69c1c8..c7a1fa8 100644 --- a/src/views/components/dataEngine/hotTranslation.vue +++ b/src/views/components/dataEngine/hotTranslation.vue @@ -2,58 +2,46 @@ - - - 行业热门话题洞察 - - - - - - - + +
+ 行业热门话题洞察 + + + + +
+ - +
- - 话题名称 - {{ topicInfo.name }} - - - 话题简介 - {{ topicInfo.intro }} - - - 关键词 - {{ item }} - - - 热度指数 +
+

话题名称

+ {{ topicInfo.name }} +
+
+

话题简介

+ {{ topicInfo.intro }} +
+
+

关键词

+ {{ item }} +
+
+

热度指数

- - - 情感指数 - +
+
+

情感指数

+ - - - 原始来源 - - - {{ item.title }} - - - - +
+
+

原始来源

+
+
+ {{ + item.title + }} + +
+
+
+ @@ -188,10 +182,10 @@ const columns = [ minWidth: 180, title: '热度指数', dataIndex: 'hot', + slotName: 'hot', sortable: { sortDirections: ['ascend', 'descend'], }, - slotName: 'hot', }, { titleSlotName: 'sentimentTitle', @@ -204,8 +198,7 @@ const columns = [ { title: '操作', slotName: 'optional', - width: 120, - minWidth: 120, + width: 80, }, ]; // 切换排序方向 @@ -305,7 +298,16 @@ const handleOk = () => { }; - + + diff --git a/src/views/components/dataEngine/keyBrandMovement.vue b/src/views/components/dataEngine/keyBrandMovement.vue index 77f1bc1..c7de82d 100644 --- a/src/views/components/dataEngine/keyBrandMovement.vue +++ b/src/views/components/dataEngine/keyBrandMovement.vue @@ -1,72 +1,57 @@ +