'修改首页的图表'

@@ -9,9 +9,11 @@
     <template #tabBarExtraContent>
     <template #tabBarExtraContent>
       <div class="extra-date">
       <div class="extra-date">
         <template v-for="(item, index) in dateList" :key="item.value">
         <template v-for="(item, index) in dateList" :key="item.value">
-          <span @click="changeDate(index, item.value)" :class="{ active: index === activeIndex }">{{
-            item.label
-          }}</span>
+          <span
+            @click="quickQueryDate(index, item.value)"
+            :class="{ active: index === activeIndex }"
+            >{{ item.label }}</span
+          >
         </template>
         </template>
         <DatePicker @change="onDateChange" />
         <DatePicker @change="onDateChange" />
       </div>
       </div>
@@ -54,7 +56,7 @@
   defineExpose({
   defineExpose({
     isAdmin,
     isAdmin,
   });
   });
-  defineProps<{
+  const props = defineProps<{
     role: string;
     role: string;
   }>();
   }>();
   const activeKey = ref('1');
   const activeKey = ref('1');
@@ -70,7 +72,8 @@
       tab: '消息量统计',
       tab: '消息量统计',
     },
     },
   ];
   ];
-  const activeIndex = ref(0);
+  // 快速选择日期
+  const activeIndex = ref(1);
   const dateList = ref([
   const dateList = ref([
     { label: '1小时', value: 3600000 },
     { label: '1小时', value: 3600000 },
     { label: '1天', value: 86400000 },
     { label: '1天', value: 86400000 },
@@ -91,6 +94,7 @@
   });
   });
   const { send, close } = useWebSocket(state.server, {
   const { send, close } = useWebSocket(state.server, {
     async onConnected() {
     async onConnected() {
+      if (isAdmin(props.role)) return;
       const res = await getEntitiesId();
       const res = await getEntitiesId();
       entityId = res.data[0].entityId;
       entityId = res.data[0].entityId;
       const sendValue = JSON.stringify({
       const sendValue = JSON.stringify({
@@ -142,14 +146,12 @@
     },
     },
     onMessage(_, e) {
     onMessage(_, e) {
       const { data, update } = JSON.parse(e.data);
       const { data, update } = JSON.parse(e.data);
+      console.log('来新消息了', data, update);
       if (activeKey.value === '1') {
       if (activeKey.value === '1') {
         if (data) {
         if (data) {
-          const alarmData = data.data[0]?.latest.TIME_SERIES;
-          if (alarmData?.createdAlarmsCountHourly) {
-            const { createdAlarmsCountHourly } = alarmData;
-            state.alarmItem = [createdAlarmsCountHourly.ts, createdAlarmsCountHourly.value];
-            state.alarmList.push([createdAlarmsCountHourly.ts, createdAlarmsCountHourly.value]);
-          }
+          const { createdAlarmsCountHourly } = data.data[0].latest.TIME_SERIES;
+          state.alarmItem = [createdAlarmsCountHourly.ts, createdAlarmsCountHourly.value];
+          state.alarmList.push([createdAlarmsCountHourly.ts, createdAlarmsCountHourly.value]);
         }
         }
         if (update) {
         if (update) {
           const { createdAlarmsCountHourly } = update[0].timeseries;
           const { createdAlarmsCountHourly } = update[0].timeseries;
@@ -157,7 +159,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 = [[...state.alarmItem], ...newArray];
         }
         }
       } else {
       } else {
         if (data) {
         if (data) {
@@ -167,7 +169,6 @@
             transportDataPointsCountHourly.ts,
             transportDataPointsCountHourly.ts,
             transportDataPointsCountHourly.value,
             transportDataPointsCountHourly.value,
           ];
           ];
-
           state.MsgCount = [
           state.MsgCount = [
             transportDataPointsCountHourly.ts,
             transportDataPointsCountHourly.ts,
             transportDataPointsCountHourly.value,
             transportDataPointsCountHourly.value,
@@ -182,15 +183,14 @@
           const { transportDataPointsCountHourly, transportMsgCountHourly } = update[0].timeseries;
           const { transportDataPointsCountHourly, transportMsgCountHourly } = update[0].timeseries;
           const newArray: any[] = [];
           const newArray: any[] = [];
           const newArray1: any[] = [];
           const newArray1: any[] = [];
-          console.log(update[0]);
           for (const item of transportDataPointsCountHourly) {
           for (const item of transportDataPointsCountHourly) {
             newArray.push([item.ts, item.value]);
             newArray.push([item.ts, item.value]);
           }
           }
           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 = [[...state.dataPoint], ...newArray];
+          state.messageList = [[...state.MsgCount], ...newArray1];
         }
         }
       }
       }
     },
     },
@@ -208,10 +208,10 @@
             cmdId: activeKey.value,
             cmdId: activeKey.value,
             historyCmd: {
             historyCmd: {
               keys: ['createdAlarmsCountHourly'],
               keys: ['createdAlarmsCountHourly'],
-              startTs: 1638778336692,
-              endTs: 1641370336692,
-              interval: 43200000,
-              limit: 60,
+              startTs: Date.now() - 86400000,
+              endTs: Date.now(),
+              interval: 7200000,
+              limit: 12,
               agg: 'COUNT',
               agg: 'COUNT',
             },
             },
           },
           },
@@ -273,11 +273,11 @@
             cmdId: activeKey.value,
             cmdId: activeKey.value,
             historyCmd: {
             historyCmd: {
               keys: ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
               keys: ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
-              startTs: 1641283221226,
-              endTs: 1641369621226,
+              startTs: Date.now() - 86400000,
+              endTs: Date.now(),
               interval: 7200000,
               interval: 7200000,
               limit: 12,
               limit: 12,
-              agg: 'AVG',
+              agg: 'COUNT',
             },
             },
           },
           },
         ],
         ],
@@ -286,16 +286,36 @@
       send(sendMessageValue2);
       send(sendMessageValue2);
     }
     }
   }
   }
+  // 选择日期
   function onDateChange(_, dateString) {
   function onDateChange(_, dateString) {
-    const dateTime = formatToDateTime(dateString, 'x');
-    console.log(dateTime);
+    activeIndex.value = -1;
+    const dateTime = Number(formatToDateTime(dateString, 'x'));
+    // 动态发送ws数据
+    const sendValue = JSON.stringify({
+      entityDataCmds: [
+        {
+          cmdId: activeKey.value,
+          historyCmd: {
+            keys:
+              activeKey.value === '1'
+                ? ['createdAlarmsCountHourly']
+                : ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
+            startTs: dateTime,
+            endTs: dateTime + 86400000,
+            interval: 7200000,
+            limit: 12,
+            agg: 'COUNT',
+          },
+        },
+      ],
+    });
+    send(sendValue);
   }
   }
-  function changeDate(index: number, value: number) {
+  // 快速选择时间
+  function quickQueryDate(index: number, value: number) {
     activeIndex.value = index;
     activeIndex.value = index;
-    let limit;
-    if (value === 3600000 || value === 86400000) {
-      limit = 12;
-    } else if (value === 604800000) {
+    let limit = 12;
+    if (value === 604800000) {
       limit = 7;
       limit = 7;
     } else if (value === 2592000000) {
     } else if (value === 2592000000) {
       limit = 30;
       limit = 30;

@@ -26,8 +26,7 @@
         tooltip: {
         tooltip: {
           trigger: 'axis',
           trigger: 'axis',
           axisPointer: {
           axisPointer: {
-            // Use axis to trigger tooltip
-            type: 'shadow', // 'shadow' as default; can also be 'line' or 'shadow'
+            type: 'shadow',
           },
           },
         },
         },
         xAxis: {
         xAxis: {

@@ -10,12 +10,12 @@
       </div>
       </div>
     </div>
     </div>
     <div class="md:w-3/10 w-full enter-y">
     <div class="md:w-3/10 w-full enter-y">
-      <HelpDoc :role="role" ref="helpDocRef" />
+      <HelpDoc :role="role" />
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, defineExpose } from 'vue';
+  import { ref } from 'vue';
   import GrowCard from './components/GrowCard.vue';
   import GrowCard from './components/GrowCard.vue';
   import SiteAnalysis from './components/SiteAnalysis.vue';
   import SiteAnalysis from './components/SiteAnalysis.vue';
   import { Card } from 'ant-design-vue';
   import { Card } from 'ant-design-vue';
@@ -28,23 +28,12 @@
   });
   });
 
 
   const userInfo: any = getAuthCache(USER_INFO_KEY);
   const userInfo: any = getAuthCache(USER_INFO_KEY);
-  const role = userInfo.roles[0];
+  const role: string = userInfo.roles[0];
+  const loading = ref(true);
 
 
   console.log(role);
   console.log(role);
-  const loading = ref(true);
-  const helpDocRef = ref();
+
   setTimeout(() => {
   setTimeout(() => {
     loading.value = false;
     loading.value = false;
   }, 1500);
   }, 1500);
-  window.addEventListener(
-    'scroll',
-    () => {
-      const scrollBottom =
-        document.body.scrollHeight - document.body.scrollTop - document.body.clientHeight;
-      if (scrollBottom <= 0) {
-        helpDocRef.value.redoHeight();
-      }
-    },
-    true
-  );
 </script>
 </script>