diff --git a/components.d.ts b/components.d.ts index 94c93f7..222bbbd 100644 --- a/components.d.ts +++ b/components.d.ts @@ -21,8 +21,10 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] + NEllipsis: typeof import('naive-ui')['NEllipsis'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NGi: typeof import('naive-ui')['NGi'] NGrid: typeof import('naive-ui')['NGrid'] NGridItem: typeof import('naive-ui')['NGridItem'] NImage: typeof import('naive-ui')['NImage'] @@ -31,6 +33,7 @@ declare module 'vue' { NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] + NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] NProgress: typeof import('naive-ui')['NProgress'] diff --git a/src/assets/icons/ai-approve.svg b/src/assets/icons/ai-approve.svg new file mode 100644 index 0000000..8ac61c6 --- /dev/null +++ b/src/assets/icons/ai-approve.svg @@ -0,0 +1,19 @@ + + + 编组 11 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ai-order.svg b/src/assets/icons/ai-order.svg new file mode 100644 index 0000000..649ce4a --- /dev/null +++ b/src/assets/icons/ai-order.svg @@ -0,0 +1,20 @@ + + + 编组 33 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/robot-two.svg b/src/assets/icons/robot-two.svg new file mode 100644 index 0000000..33ee42c --- /dev/null +++ b/src/assets/icons/robot-two.svg @@ -0,0 +1,13 @@ + + + 开心 2 + + + + + + + + + + \ No newline at end of file diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue index 14f518b..3585a3c 100644 --- a/src/layout/components/Header/UserSettings.vue +++ b/src/layout/components/Header/UserSettings.vue @@ -3,6 +3,7 @@ import { computed, inject, onMounted, ref } from "vue"; import { useRoute, useRouter } from "vue-router"; import { useUser } from "@/store/modules/user"; import { getImgUrl } from "@/utils/urlUtils"; +import defaultAvatar from '@/assets/icons/avatar.svg'; const emit = defineEmits<{ (e: "logout"): void; @@ -107,7 +108,7 @@ const options = computed(() => {
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index f6c6efe..f900d17 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -12,6 +12,7 @@ import { asideMap } from '@/config/aside' import type { AsideConfig } from '/#/api' import emitter from '@/utils/mitt' import { getFilterList } from '@/api/home/main' +import dayjs from 'dayjs' const configStore = useConfig() @@ -105,13 +106,29 @@ configStore.$subscribe(() => { Object.keys(customObjRef.value).map(key => { if(asideMap.hasOwnProperty(key)) { const str = key.toLowerCase() + console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]); if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") { customObjRef.value[str] = customObjRef.value[str].split(','); + asideValue[key] = customObjRef.value[str];// 赋值 + }else if(str == "izyear" && typeof customObjRef.value[str] == "string") { + let time = customObjRef.value[str].split('-'); + time[0] = (new Date(time[0])).getTime(); + time[1] = (new Date(time[1])).getTime(); + customObjRef.value[str] = time; + asideValue[key] = customObjRef.value[str];// 赋值 + console.log("时间2222222222", customObjRef.value[str]); + }else if((str != 'izsimilarity' && str != "izyear") && customObjRef.value[str]) { + console.log("customObjRef.value[str]222222", customObjRef.value[str]); + let list = customObjRef.value[str].split(','); + console.log("list222222", list); + asideValue[key] = customObjRef.value[str];// 赋值 + }else { + asideValue[key] = ""; } // asideMap[str].defaultValue = customObjRef.value[str];// 赋值 - asideValue[key] = customObjRef.value[str];// 赋值 } }); + } // console.log("showKeys", showKeys); const items = showKeys.reduce((acc, key) => { @@ -178,6 +195,7 @@ function editFilter(filter: any) { } watch(asideValue, (newVal) => { + console.log("asideValue处理后", newVal); configStore.setAsideValue(newVal) }, { deep: true }) diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue index 47ee014..9b61489 100644 --- a/src/views/home/aside/comp/items/IzCustomlevel.vue +++ b/src/views/home/aside/comp/items/IzCustomlevel.vue @@ -1,5 +1,5 @@