From 4f370eb0bc9f73d39793cb60600258ace5ba1f84 Mon Sep 17 00:00:00 2001
From: fuguobin <fgbin2008@163.com>
Date: Sun, 4 Feb 2024 18:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                             |  4 +--
 src/api/user/index.ts                       | 11 +++++++
 src/store/modules/user.ts                   |  6 ++++
 src/styles/index.scss                       |  7 +++++
 src/views/dashboard/components/BarChart.vue |  6 ++--
 src/views/dashboard/components/PieChart.vue |  2 +-
 src/views/dashboard/index.scss              |  7 +++++
 src/views/dashboard/index.vue               | 32 +++++++++++++++++++--
 8 files changed, 66 insertions(+), 9 deletions(-)

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<Array<string>>([]); // 用户角色编码集合 → 判断路由权限
   const perms = ref<Array<string>>([]); // 用户权限编码集合 → 判断按钮权限
 
@@ -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(() => {});
 </script>
 <style lang="scss" scoped>
 .table {
-  width: 540px;
+  width: 498px;
   height: 300px;
   padding: 10px;
   .header {
diff --git a/src/views/dashboard/index.scss b/src/views/dashboard/index.scss
index 49aa9e5..7cee8c3 100644
--- a/src/views/dashboard/index.scss
+++ b/src/views/dashboard/index.scss
@@ -84,4 +84,11 @@
     //   }
     // }
   }
+  .statistics{
+    :deep(.el-card){
+      .el-card__header{
+        font-size: 1.4rem;
+      }
+    }
+  }
 }
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 4e92005..ade526c 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -51,7 +51,7 @@
                 <i class="iconfont" :class="item.icon"></i>
                 <span>
                   <countTo :start="1" :end="item.value" :duration="item.time"></countTo>
-                  <span v-if="item.total!=0"><i>/</i>{{ item.total }}</span>
+                  <span v-if="item.total != 0"><i>/</i>{{ item.total }}</span>
                 </span>
               </div>
             </div>
@@ -78,7 +78,7 @@
 <script lang="ts" setup>
 import { useDateFormat, useNow, useTransition, TransitionPresets } from '@vueuse/core';
 import { useUserStore } from '@/store/modules/user';
-import { getWeather } from '@/api/user/index';
+import { getWeather, userVersionRelation } from '@/api/user/index';
 // import { transitionNum } from '@/utils/index';
 import calendar from '@/utils/lunar';
 import countTo from '@/utils/countTo';
@@ -92,6 +92,7 @@ const isCurrentRoute = ref(true);
 const userStore = useUserStore();
 const duration = 5000;
 const userNumber = ref(2800);
+const notice = ref({});
 // const vsitsNumber = transitionNum(720, 5000);
 const currentTime = useDateFormat(useNow(), 'YYYY-MM-DD HH:mm:ss');
 const hoursNow = useNow().value.getHours();
@@ -169,10 +170,35 @@ const timePeriod = computed(() => {
 
 onMounted(() => {
   getWeatherData();
+  const webVersion = sessionStorage.getItem('webVersion');
+  if (webVersion != '') {
+    const version = JSON.parse(webVersion);
+    notice.value = ElNotification({
+      title: '更新日志',
+      dangerouslyUseHTMLString: true,
+      customClass: 'notice',
+      duration: 0,
+      message: version.versionDesc.replace(/\n/g, '<br>'),
+      onClose: () => {
+        noticeCloce(version.id);
+      }
+    });
+  }
 });
+function noticeCloce(id: any) {
+  //更新日志关闭事件
+  const params = {
+    versionId: id
+  };
+  userVersionRelation(params).then((res: any) => {
+    if (res.code === 200) {
+      console.log('更新日志关闭！')
+    }
+  });
+}
 function getWeatherData() {
   //获取天气
-  getWeather().then(res => {
+  getWeather().then((res: any) => {
     if (res.code === 200) {
       if (isCurrentRoute.value) {
         timer.value = setTimeout(async () => {