diff --git a/src/store/modules/date.js b/src/store/modules/date.js
index 12a786b..d6c4c2f 100644
--- a/src/store/modules/date.js
+++ b/src/store/modules/date.js
@@ -5,9 +5,12 @@ const useCounter = defineStore('date', {
* 存储全局状态
*/
state: () => ({
- deptIdStr:'',
+ deptIdStr: '',
dateStr: '',
- orgStr:''
+ orgStr: {
+ title: '',
+ uuid: ''
+ }
}),
/**
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index fa3d740..6839636 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -8,7 +8,7 @@ import { store } from '@/store';
import { LoginData } from '@/api/auth/types';
import { UserInfo } from '@/api/user/types';
-import { useStorage,useSessionStorage } from '@vueuse/core';
+import { useStorage, useSessionStorage } from '@vueuse/core';
export const useUserStore = defineStore('user', () => {
// state
@@ -57,10 +57,10 @@ export const useUserStore = defineStore('user', () => {
roles.value = data.roles;
perms.value = data.permissions;
userInfo.value = user;
- if(data.webVersion===null){
- webVersion.value=''
- }else{
- webVersion.value=JSON.stringify(data.webVersion)
+ if (data.webVersion === null) {
+ webVersion.value = '';
+ } else {
+ webVersion.value = JSON.stringify(data.webVersion);
}
// useStorage('userInfo', user);
resolve(data);
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index ff9cf43..4b8a87e 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -9,12 +9,15 @@ declare module '@vue/runtime-core' {
export interface GlobalComponents {
Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
Button: typeof import('./../components/Widgets/button.vue')['default']
+ ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
+ ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton']
ElCard: typeof import('element-plus/es')['ElCard']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
+ ElDivider: typeof import('element-plus/es')['ElDivider']
ElDropdown: typeof import('element-plus/es')['ElDropdown']
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -30,6 +33,7 @@ declare module '@vue/runtime-core' {
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect']
+ ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index ec80068..808a366 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -171,8 +171,7 @@ const timePeriod = computed(() => {
onMounted(() => {
getWeatherData();
const webVersion = sessionStorage.getItem('webVersion');
- debugger
- if (webVersion != '') {
+ if (webVersion != '' && webVersion != null) {
const version = JSON.parse(webVersion);
notice.value = ElNotification({
title: '更新日志',
@@ -193,7 +192,7 @@ function noticeCloce(id: any) {
};
userVersionRelation(params).then((res: any) => {
if (res.code === 200) {
- console.log('更新日志关闭!')
+ console.log('更新日志关闭!');
}
});
}
diff --git a/src/views/data-visual/components/header.vue b/src/views/data-visual/components/header.vue
index 293ac29..be6612d 100644
--- a/src/views/data-visual/components/header.vue
+++ b/src/views/data-visual/components/header.vue
@@ -14,10 +14,10 @@