diff --git a/.env.production b/.env.production index e13848c..46fe9a0 100644 --- a/.env.production +++ b/.env.production @@ -5,6 +5,6 @@ VITE_APP_PORT = 8089 #VITE_APP_WS_API = 'ws://board.heatiot.cn:8001/prod-api' ## websocket地址 #VITE_APP_BASE_API = 'http://board.heatiot.cn:8001/prod-api/' ## 线上接口 #VITE_APP_WS_API = 'ws://${window.location.host}/ws' ## websocket地址 ws://10.10.10.56:9000/websocket/ -VITE_APP_BASE_API = '/prod-api/' ## 正式环境 -# VITE_APP_BASE_API = '/biprod-api/' ## 测试环境 +# VITE_APP_BASE_API = '/prod-api/' ## 正式环境 +VITE_APP_BASE_API = '/biprod-api/' ## 测试环境 diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 9f86b92..fd33efd 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -162,3 +162,14 @@ export function importUser(deptId: number, file: File) { } }); } + +/** + * 更新日志 + */ +export function userVersionRelation(data: any) { + return request({ + url: 'model/userVersionRelation', + method: 'post', + data: data + }); +} diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7fe2a25..fa3d740 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -16,6 +16,7 @@ export const useUserStore = defineStore('user', () => { const userInfo = useSessionStorage('userInfo', {}); const nickname = ref(''); const avatar = ref(''); + const webVersion = useSessionStorage('webVersion', ''); const roles = ref>([]); // 用户角色编码集合 → 判断路由权限 const perms = ref>([]); // 用户权限编码集合 → 判断按钮权限 @@ -56,6 +57,11 @@ 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) + } // useStorage('userInfo', user); resolve(data); }) diff --git a/src/styles/index.scss b/src/styles/index.scss index 0831d47..80595f2 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -199,3 +199,10 @@ color: #eee !important; } } +.el-notification.notice { + border: none !important; + background-color: #fff !important; + .el-notification__content { + color: #000 !important; + } +} diff --git a/src/views/dashboard/components/BarChart.vue b/src/views/dashboard/components/BarChart.vue index bb48341..c1e5a91 100644 --- a/src/views/dashboard/components/BarChart.vue +++ b/src/views/dashboard/components/BarChart.vue @@ -196,7 +196,7 @@ const options = { precision: 1, position: 'right', color: '#000', - valueAnimation: true // 柱子右侧的数字动态变化 + valueAnimation: false // 柱子右侧的数字动态变化 }, emphasis: { focus: 'series' //聚焦当前高亮的数据所在的系列的所有图形 @@ -212,8 +212,8 @@ const options = { elements: [ { type: 'text', - right: 120, - bottom: 100, + right: 50, + bottom: 50, style: { text: startYear, font: 'bolder 80px monospace', diff --git a/src/views/dashboard/components/PieChart.vue b/src/views/dashboard/components/PieChart.vue index de7652d..e385305 100644 --- a/src/views/dashboard/components/PieChart.vue +++ b/src/views/dashboard/components/PieChart.vue @@ -95,7 +95,7 @@ onMounted(() => {});