部分数据对接

pages/monthReport/components/rightBar.vue

@@ -14,9 +14,9 @@ import * as echarts from "echarts";
 export default {
   props: {
     alarmLists: {
-      type: Array,
+      type: Object,
       default: () => {
-        return [];
+        return {};
       }
     }
   },
@@ -25,38 +25,41 @@ export default {
       lists: [
         {
           name: "终端告警",
-          key: 'terminal',
+          key: '1',
         },
         {
           name: "应用告警",
-          key: 'application',
+          key: '4',
         },
         {
           name: "机房告警",
-          key: 'computerData',
+          key: '5',
         },
         {
           name: "网络告警",
-          key: 'netData',
+          key: '2',
         },
         {
           name: "数据中心告警",
-          key: 'dataCenter',
+          key: '6',
         },
         {
           name: "用户疑似违规",
-          key: 'userData',
+          key: '3',
         },
       ],
       xData: [],
-      yData: [],
+      yData1: [],
+      yData2: [],
+      yData3: [],
     };
   },
   computed: {
     option() {
       let xData = this.xData
-      let data1 = this.yData[0] || [],
-        data2 = this.yData[1] || [];
+	  let data1 = this.yData1 || []
+	  let data2 = this.yData2 || []
+	  let data3 = this.yData3 || []
 
       return {
         tooltip: {
@@ -64,6 +67,39 @@ export default {
           axisPointer: {
             type: "shadow",
           },
+		  formatter: (data) => {
+			  let str =
+				"<div style='font-family: PingFangSC-Medium;font-size: 14px;color: #000000;line-height: 1.5;margin-bottom:8px;'>" +
+				data[0].axisValue +
+				"</div>";
+			  
+			  data.forEach((item, index) => {
+				let seriesName = item.seriesName;
+				str =
+				  str +
+				  "<div style='font-family: PingFangSC-Regular;color: #000000;line-height: 1.5;margin-bottom:8px;font-size:12px'>" +
+				  "<div style='width:90px; display:inline-block;'>" +
+				  item.marker +
+				  seriesName +
+				  " : " +
+				  "</div>" +
+				  "<div style='margin-left:.0833rem; display:inline-block;min-width:40px;text-align: right;'>" +
+				  item.data +
+				  "次" +
+				  "</div>" +
+				  "</div>";
+			  });
+			  str =
+				  str +
+				  "<div style='font-family: PingFangSC-Regular;color: #000000;line-height: 1.5;margin-bottom:8px;font-size:12px'>" +
+				  "<div style='width:90px; display:inline-block;'>环比 : " +
+				  "</div>" +
+				  "<div style='margin-left:.0833rem; display:inline-block;min-width:40px;text-align: right;'>" +
+				  data3[data[0].dataIndex] +
+				  "%</div>" +
+				  "</div>";
+			  return str;
+		  },
         },
         legend: {
           right: "0",
@@ -106,9 +142,7 @@ export default {
       };
     },
   },
-  async mounted() {
-    this.setData(this.alarmLists);
-  },
+  
   methods: {
     changeOption() {
       // const data = this.option.series[0].data;
@@ -117,22 +151,27 @@ export default {
       //   data.splice(index, 1, Math.random() * 40);
       // });
     },
-    setData(arr = []){
-      // x轴
-      let xData = []
-      this.lists.forEach((item,i)=>{
-        xData.push(item.name)
-      })
-      // y轴
-      let yData = []
-      arr.forEach((item,i)=>{
-        yData[i] = []
-        this.lists.forEach(ele=>{
-          yData[i].push(item?.[ele.key] || 0)
-        })
-      })
-      this.xData = xData
-      this.yData = yData
+    setData(obj = {}){
+		// x轴
+		let xData = []
+		this.lists.forEach((item,i)=>{
+		  xData.push(item.name)
+		})
+		this.xData = xData
+		// y轴
+		let yData1 = [], yData2 = [], yData3 = []
+		this.lists.forEach(item=>{
+		  Object.keys(obj).forEach(key=>{
+			if(item.key == key){
+			  yData1.push(obj[key]?.before || 0)
+			  yData2.push(obj[key]?.now || 0)
+			  yData3.push(obj[key]?.hb || "0%")
+			}
+		  })
+		})
+		this.yData1 = yData1
+		this.yData2 = yData2
+		this.yData3 = yData3
     
     },
   },

pages/monthReport/components/rightLine.vue

@@ -13,9 +13,9 @@
 export default {
   props: {
     warningLists: {
-      type: Array,
+      type: Object,
       default: () => {
-        return [];
+        return {};
       },
     },
   },
@@ -24,32 +24,32 @@ export default {
       lists: [
         {
           name: "终端",
-          key: "terminal",
+          key: "1",
           yData: [],
         },
         {
           name: "应用",
-          key: "application",
+          key: "4",
           yData: [],
         },
         {
           name: "机房",
-          key: "computerData",
+          key: "5",
           yData: [],
         },
         {
           name: "网络",
-          key: "netData",
+          key: "2",
           yData: [],
         },
         {
           name: "数据中心",
-          key: "dataCenter",
+          key: "6",
           yData: [],
         },
         {
           name: "用户疑似违规",
-          key: "userData",
+          key: "3",
           yData: [],
         },
       ],
@@ -126,20 +126,20 @@ export default {
       // });
     },
 
-    setData(arr = []) {
-      let xData = [];
-      arr.forEach((item, i) => {
-        xData.push(item.date);
-      });
-      this.xData = xData;
-
-      this.lists.map((item) => {
-        let Data = [];
-        arr.forEach((ele) => {
-          Data.push(ele[item.key] || 0);
-        });
-        item.yData = Data;
-      });
+    setData(obj = {}) {
+		this.xData = Object.keys(obj)
+		let arr = []
+		Object.keys(obj).forEach((item,i) => {
+		  arr.push(obj[item])
+		})
+  
+		this.lists.map(item=>{
+		  let Data = []
+		  arr.forEach(ele=>{
+			Data.push(ele[item.key] || 0)
+		  })
+		  item.yData = Data;
+		})
     },
   },
   watch: {

pages/monthReport/index.vue

@@ -297,7 +297,6 @@ import {
   userData,
   ywData,
   fbData,
-  result,
 } from "./config.js";
 export default {
   components: {
@@ -348,9 +347,15 @@ export default {
       const result = this.allReport.filter(item => item.data.reportTime == reportTime)[0]
 
       this.detailData = mergeObjectsWithUnderscoreKey(result.data);
-
-
-      // this.detailData = mergeObjectsWithUnderscoreKey(result);
+	  this.detailData.alarmLists = result?.data?.alarm?.hbMap || {}
+	  this.detailData.warningLists = result?.data?.alarm?.tendencyMap || {}
+	  if(result?.data.netWork.onlineStatus){
+		let arr = JSON.parse(result?.data.netWork.onlineStatus)
+		arr.forEach((item,i)=>{
+		  this.detailData['netWork_'+i+'_onlineNum'] = item?.['onlineNum'] || 0
+		  this.detailData['netWork_'+i+'_abnormalNum'] = item?.['abnormalNum'] || 0
+		})
+	  }
     },
     // 搜索 change
     searchChange(val) {