'修改首页样式部分,修改部分图表，fix:修复token过期没有权限问题'

@@ -12,7 +12,7 @@ export default {
     networkExceptionMsg:
     networkExceptionMsg:
       'Please check if your network connection is normal! The network is abnormal',
       'Please check if your network connection is normal! The network is abnormal',
 
 
-    errMsg401: 'no permission',
+    errMsg401: '',
     errMsg403: 'not authorized',
     errMsg403: 'not authorized',
     errMsg404: 'the resource was not found!',
     errMsg404: 'the resource was not found!',
     errMsg405: 'Network request error, request method not allowed!',
     errMsg405: 'Network request error, request method not allowed!',

@@ -10,8 +10,7 @@ export default {
     apiRequestFailed: '请求出错，请稍候重试',
     apiRequestFailed: '请求出错，请稍候重试',
     networkException: '网络异常',
     networkException: '网络异常',
     networkExceptionMsg: '网络异常，请检查您的网络连接是否正常!',
     networkExceptionMsg: '网络异常，请检查您的网络连接是否正常!',
-
-    errMsg401: '没有权限!',
+    errMsg401: '',
     errMsg403: '未授权',
     errMsg403: '未授权',
     errMsg404: '未找到该资源!',
     errMsg404: '未找到该资源!',
     errMsg405: '网络请求错误,请求方法未允许!',
     errMsg405: '网络请求错误,请求方法未允许!',

@@ -10,7 +10,6 @@ import { SessionTimeoutProcessingEnum } from '/@/enums/appEnum';
 const { createMessage, createErrorModal } = useMessage();
 const { createMessage, createErrorModal } = useMessage();
 const error = createMessage.error!;
 const error = createMessage.error!;
 const stp = projectSetting.sessionTimeoutProcessing;
 const stp = projectSetting.sessionTimeoutProcessing;
-
 export function checkStatus(
 export function checkStatus(
   status: number,
   status: number,
   msg: string,
   msg: string,
@@ -19,7 +18,6 @@ export function checkStatus(
   const { t } = useI18n();
   const { t } = useI18n();
   const userStore = useUserStoreWithOut();
   const userStore = useUserStoreWithOut();
   let errMessage = '';
   let errMessage = '';
-
   switch (status) {
   switch (status) {
     case 400:
     case 400:
       errMessage = `${msg}`;
       errMessage = `${msg}`;

@@ -121,7 +121,6 @@ const transform: AxiosTransform = {
     const msg: string = response?.data?.msg ?? '';
     const msg: string = response?.data?.msg ?? '';
     const err: string = error?.toString?.() ?? '';
     const err: string = error?.toString?.() ?? '';
     let errMessage = '';
     let errMessage = '';
-
     try {
     try {
       console.log(response.data);
       console.log(response.data);
       if (response.data.status == '401' || response.data.message == '"Authentication failed"') {
       if (response.data.status == '401' || response.data.message == '"Authentication failed"') {

@@ -41,11 +41,7 @@
             src="/src/assets/images/alarm-count.png"
             src="/src/assets/images/alarm-count.png"
             style="width: 5rem; height: 5rem"
             style="width: 5rem; height: 5rem"
           />
           />
-          <img
-            v-if="isAdmin(role)"
-            src="/src/assets/images/zh.png"
-            style="width: 5rem; height: 5rem"
-          />
+          <img v-else src="/src/assets/images/zh.png" style="width: 5rem; height: 5rem" />
         </div>
         </div>
         <div class="flex-auto">
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
           <div class="flex justify-between" style="align-items: center">
@@ -54,7 +50,7 @@
             }}</div>
             }}</div>
             <img src="/src/assets/images/tip.png" style="width: 1.4rem; height: 1.4rem" />
             <img src="/src/assets/images/tip.png" style="width: 1.4rem; height: 1.4rem" />
           </div>
           </div>
-          <div> {{ !isAdmin(role) ? '11月告警数（条）' : '租户总量(个)' }}</div>
+          <div> {{ !isAdmin(role) ? `${currentMonth}月告警数（条）` : '租户总量(个)' }}</div>
         </div>
         </div>
       </div>
       </div>
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
@@ -68,30 +64,34 @@
             v-if="!isAdmin(role)"
             v-if="!isAdmin(role)"
             src="/src/assets/images/msg-count.png"
             src="/src/assets/images/msg-count.png"
             style="width: 5rem; height: 5rem"
             style="width: 5rem; height: 5rem"
-          /><img
-            v-if="isAdmin(role)"
-            src="/src/assets/images/kf.png"
-            style="width: 5rem; height: 5rem"
-          />
+          /><img v-else src="/src/assets/images/kf.png" style="width: 5rem; height: 5rem" />
         </div>
         </div>
-        <div class="flex-auto">
-          <div class="flex justify-between" style="align-items: center">
-            <div style="font-size: 1.625rem; color: #333">{{
-              growCardList?.customerInfo?.sumCount
-            }}</div>
-            <img src="/src/assets/images/tip.png" style="width: 1.4rem; height: 1.4rem" />
+        <div style="display: flex; align-items: center">
+          <div v-if="!isAdmin(role)">
+            <div>
+              {{ `${currentMonth}月数据点（条）` }}
+              <span>{{ growCardList?.messageInfo?.dataPointsCount }}</span>
+            </div>
+            <div>
+              {{ `${currentMonth}月消息量（条）` }}
+              <span>{{ growCardList?.messageInfo?.messageCount }}</span>
+            </div>
           </div>
           </div>
-          <div> {{ !isAdmin(role) ? '11月消息量（条）' : '客户总量(个)' }} </div>
+          <div v-else>客户总量(个)</div>
         </div>
         </div>
       </div>
       </div>
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
-        今日新增 {{ growCardList?.customerInfo?.todayAdd }}</div
-      >
+        <div>
+          今日新增
+          <span class="ml-8">数据点 ({{ growCardList?.messageInfo?.todayDataPointsAdd }})</span>
+          <span class="ml-8">消息量 ({{ growCardList?.messageInfo?.todayMessageAdd }})</span>
+        </div>
+      </div>
     </Card>
     </Card>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, onMounted } from 'vue';
+  import { ref, onMounted, computed } from 'vue';
   import { Card } from 'ant-design-vue';
   import { Card } from 'ant-design-vue';
   import { getHomeData } from '/@/api/dashboard';
   import { getHomeData } from '/@/api/dashboard';
   import { isAdmin } from '/@/enums/roleEnum';
   import { isAdmin } from '/@/enums/roleEnum';
@@ -109,12 +109,26 @@
       inActive: number;
       inActive: number;
       todayAdd: number;
       todayAdd: number;
     };
     };
-    tenantInfo: { sumCount: number; todayAdd: number };
-    customerInfo: { sumCount: number; todayAdd: number };
+    tenantInfo?: { sumCount: number; todayAdd: number };
+    customerInfo?: { sumCount: number; todayAdd: number };
+    alarmInfo?: {
+      sumCount: number;
+      todayAdd: number;
+    };
+    messageInfo?: {
+      dataPointsCount: number;
+      messageCount: number;
+      todayDataPointsAdd: number;
+      todayMessageAdd: number;
+    };
   }
   }
   const growCardList = ref<CardList>();
   const growCardList = ref<CardList>();
   onMounted(async () => {
   onMounted(async () => {
     const res = await getHomeData();
     const res = await getHomeData();
     growCardList.value = res;
     growCardList.value = res;
   });
   });
+  // 获取当前月份0-11    +1
+  const currentMonth = computed(() => {
+    return new Date().getMonth() + 1;
+  });
 </script>
 </script>

@@ -19,12 +19,10 @@
       </div>
       </div>
     </template>
     </template>
     <div v-show="activeKey === '1'">
     <div v-show="activeKey === '1'">
-      <p class="center">告警数</p>
       <!-- 折线图 -->
       <!-- 折线图 -->
       <VisitAnalysis :alarmList="state.alarmList" />
       <VisitAnalysis :alarmList="state.alarmList" />
     </div>
     </div>
     <div v-show="activeKey === '2'">
     <div v-show="activeKey === '2'">
-      <p class="center">消息量</p>
       <!-- 柱形图 -->
       <!-- 柱形图 -->
       <VisitAnalysisBar :dataPointList="state.dataPointList" :messageList="state.messageList" />
       <VisitAnalysisBar :dataPointList="state.dataPointList" :messageList="state.messageList" />
     </div>
     </div>
@@ -170,7 +168,7 @@
           for (const item of createdAlarmsCountHourly) {
           for (const item of createdAlarmsCountHourly) {
             newArray.push([item.ts, item.value]);
             newArray.push([item.ts, item.value]);
           }
           }
-          state.alarmList = [[...state.alarmItem], ...newArray];
+          state.alarmList = newArray;
         }
         }
       } else {
       } else {
         if (data) {
         if (data) {
@@ -200,8 +198,8 @@
           for (const item of transportMsgCountHourly) {
           for (const item of transportMsgCountHourly) {
             newArray1.push([item.ts, item.value]);
             newArray1.push([item.ts, item.value]);
           }
           }
-          state.dataPointList = [[...state.dataPoint], ...newArray];
-          state.messageList = [[...state.MsgCount], ...newArray1];
+          state.dataPointList = newArray;
+          state.messageList = newArray1;
         }
         }
       }
       }
     },
     },
@@ -316,7 +314,7 @@
     if (activeIndex.value === index) return;
     if (activeIndex.value === index) return;
     activeIndex.value = index;
     activeIndex.value = index;
     dateValue.value = '';
     dateValue.value = '';
-    let interval = 3600000;
+    let interval = 300000;
     if (value === 86400000) {
     if (value === 86400000) {
       interval = 7200000;
       interval = 7200000;
     } else if (value === 604800000 || value === 2592000000) {
     } else if (value === 604800000 || value === 2592000000) {
@@ -342,11 +340,11 @@
     });
     });
     send(sendValue);
     send(sendValue);
 
 
-    console.log(JSON.parse(sendValue), '----interval');
+    console.log(JSON.parse(sendValue), '----interval', state.alarmList);
   }
   }
 </script>
 </script>
 
 
-<style scoped lang="less">
+<style lang="less">
   .center {
   .center {
     display: flex;
     display: flex;
     justify-content: center;
     justify-content: center;

 <template>
 <template>
-  <div ref="chartRef" :style="{ height, width }"></div>
+  <div>
+    <p class="center">告警数</p>
+    <div ref="chartRef" :style="{ height, width }" v-show="alarmList.length"></div>
+    <div v-show="!alarmList.length">暂无数据</div>
+  </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { onMounted, ref, Ref, withDefaults, watch } from 'vue';
   import { onMounted, ref, Ref, withDefaults, watch } from 'vue';

 <template>
 <template>
-  <div ref="chartRef" :style="{ height, width }"></div>
+  <div>
+    <p class="center">消息量</p>
+    <div ref="chartRef" :style="{ height, width }" v-show="dataPointList.length"></div>
+    <div v-show="!dataPointList.length">暂无数据</div>
+  </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { ref, Ref, watch, withDefaults } from 'vue';
   import { ref, Ref, watch, withDefaults } from 'vue';
@@ -22,6 +26,15 @@
   watch(
   watch(
     () => [props.dataPointList, props.messageList],
     () => [props.dataPointList, props.messageList],
     ([newValue, newValue1]) => {
     ([newValue, newValue1]) => {
+      // 计算总量
+      let dataPointTotal = 0;
+      let messageTotal = 0;
+      for (const item of newValue) {
+        dataPointTotal += Number(item[1]);
+      }
+      for (const item of newValue1) {
+        messageTotal += Number(item[1]);
+      }
       setOptions({
       setOptions({
         tooltip: {
         tooltip: {
           trigger: 'axis',
           trigger: 'axis',
@@ -34,8 +47,13 @@
         },
         },
         legend: {
         legend: {
           data: ['传输数据点', '传输消息量'],
           data: ['传输数据点', '传输消息量'],
-          left: '10%',
+          left: '5%',
+          orient: 'vertical',
+          formatter: (name) => {
+            return name === '传输数据点' ? `${name} ${dataPointTotal}` : `${name} ${messageTotal}`;
+          },
         },
         },
+
         yAxis: {},
         yAxis: {},
         grid: {
         grid: {
           left: '3%',
           left: '3%',
@@ -45,18 +63,18 @@
         },
         },
         series: [
         series: [
           {
           {
-            name: '传输消息量',
+            name: '传输数据点',
             type: 'bar',
             type: 'bar',
             stack: 'total',
             stack: 'total',
-            data: newValue1,
-            color: '#5c7bd9',
+            data: newValue,
+            color: '#9fe080',
           },
           },
           {
           {
-            name: '传输数据点',
+            name: '传输消息量',
             type: 'bar',
             type: 'bar',
             stack: 'total',
             stack: 'total',
-            data: newValue,
-            color: '#9fe080',
+            data: newValue1,
+            color: '#5c7bd9',
           },
           },
         ],
         ],
       });
       });