Merge branch 'main' of http://172.16.20.1:3000/chenjiancheng/bigScreen into main

src/pages/calculateCenter/base/rightModule/index.vue

@@ -166,7 +166,7 @@ function processData(data) {
     });
   }
 
-  const series = ['B', 'C', 'A', 'SYSTEM', '其它'].map((source) => ({
+  const series = ['B', 'C', 'A', '其它'].map((source) => ({
     name: source,
     data: categories.map((time) =>
       seriesMap[source] && seriesMap[source][time] !== undefined ? seriesMap[source][time] : 0,
@@ -195,6 +195,8 @@ const handleEchartData = (res) => {
     realTime.value += historyPeakAndRealTime.value[nameMap[item]].realTime;
   });
   const { categories, series } = processData(res.timeCounts);
+  debugger;
+  dayMax.value = getDayMax(series, categories.length);
   lineOption.series.forEach((rawItem) => {
     series.forEach((item) => {
       if (rawItem.name === item.name) {
@@ -296,6 +298,17 @@ const datasetOption = {
     },
   ],
 };
+const dayMax = ref(0);
+const getDayMax = (series, n) => {
+  let daySum = new Array(n).fill(0);
+  series.forEach((item, index) => {
+    item.data.forEach((value, idx) => {
+      daySum[idx] += value;
+    });
+  });
+  return Math.max(...daySum);
+};
+
 const usageCount = ref(); //调用统计chart
 let netSum = ref(0);
 let businessAlgNum = ref(0);
@@ -685,7 +698,7 @@ onMounted(() => {
 
         request
           .get({
-            url: '/y4_sys/y4/socialSearch/showStats',
+            url: '/y4_sys/y4/network/network_type/nums',
             headers: {
               y4Authorization: token,
             },
@@ -701,7 +714,7 @@ onMounted(() => {
           .get({
             url: '/y4_sys/y4/socialSearch/showStats',
             headers: {
-              Authorization: res,
+              y4Authorization: res,
             },
           })
           .then((res4) => {
@@ -722,7 +735,7 @@ onMounted(() => {
               algType: 'BUSINESS',
             },
             headers: {
-              Authorization: res,
+              y4Authorization: res,
             },
           })
           .then((res5) => {
@@ -736,7 +749,7 @@ onMounted(() => {
               algType: 'BASIC',
             },
             headers: {
-              Authorization: res,
+              y4Authorization: res,
             },
           })
           .then((res6) => {
@@ -964,15 +977,15 @@ function switchOption(index) {
         <div class="assets-dashboard">
           <div class="column">
             <div class="assets-title .orange">
-              峰值并发<span
+              日峰值<span
                 class="orange"
                 :style="{ color: theme.appThemeDetail.cssName === 'theme-red' ? '' : '#0062D9' }"
-                >{{ peak }}</span
+                >{{ dayMax }}</span
               >
             </div>
           </div>
-          <div class="border" style="border: 1px solid rgba(0, 0, 0, 0.12)"></div>
+          <!-- <div class="border" style="border: 1px solid rgba(0, 0, 0, 0.12)"></div> -->
-          <div class="column">
+          <!-- <div class="column">
             <div class="assets-title">
               实时并发<span
                 class="red"
@@ -980,8 +993,9 @@ function switchOption(index) {
                 >{{ realTime }}</span
               >
             </div>
-          </div>
+          </div> -->
         </div>
+
         <div ref="usageCount" class="bottom-chart">
           <result v-if="!hasUsageData" type="404" tip="暂无数据，请核查数据源" />
         </div>