Merge branch 'master' of https://git.lgzn.space/chengdandan/fayuanjiangbei

src/api/index.js

@@ -13,3 +13,15 @@ export const GetLevelAlarm = (params) => {
         params
     })
 };
+//获取昨天、今天报警数量
+export const getSecurityAlarmCount = (params) => {
+    return axios.get('api/GetSecurityAlarmCount', {
+        params
+    })
+};
+//获取报警统计接口
+export const getAlarmStatistics = (params) => {
+    return axios.get('api/GetAlarmStatistics', {
+        params
+    })
+};

src/views/index.vue

@@ -242,7 +242,7 @@
 </template>
 
 <script>
-import { GetLevelAlarm } from "../api/index";
+import { GetLevelAlarm, getAlarmStatistics } from "../api/index";
 export default {
   data() {
     return {
@@ -377,7 +377,7 @@ export default {
     setTimeout(() => {
       this.cameraList = camera;
     }, 1000);
-    this.warnSelect(0)
+    this.warnSelect(0);
   },
   methods: {
     //选中图片
@@ -444,6 +444,15 @@ export default {
     },
     //设备左
     warningOne() {
+      let data = [];
+      let dataX = []
+      getAlarmStatistics({
+        Type: "消防",
+      }).then((res) => {
+        res.data.data.forEach((item, index) => {
+          data.push(item.Count);
+          dataX.push(item.Name)
+        });
         var myChart = this.$echarts.init(document.getElementById("warningOne"));
         let option = {
           legend: {
@@ -475,7 +484,7 @@ export default {
             top: "17%",
           },
           xAxis: {
-          data: ["温感", "烟感", "手动报警"],
+            data: dataX,
             axisLine: {
               show: true,
               lineStyle: {
@@ -557,14 +566,24 @@ export default {
                   position: "inside",
                 },
               },
-            data: [90, 94, 98],
+              data: data,
             },
           ],
         };
         myChart.setOption(option);
+      });
     },
     //设备右
     warningTwo() {
+      let data = [];
+      let dataX = []
+      getAlarmStatistics({
+        Type: "设备",
+      }).then((res) => {
+        res.data.data.forEach((item, index) => {
+          data.push(item.Count);
+          dataX.push(item.Name)
+        });
         var myChart = this.$echarts.init(document.getElementById("warningTwo"));
         let option = {
           legend: {
@@ -596,7 +615,7 @@ export default {
             top: "17%",
           },
           xAxis: {
-          data: ["空调", "照明", "电梯", "太阳灯"],
+            data: dataX,
             axisLine: {
               show: true,
               lineStyle: {
@@ -678,11 +697,12 @@ export default {
                   position: "inside",
                 },
               },
-            data: [90, 100, 98, 97],
+              data: data,
             },
           ],
         };
         myChart.setOption(option);
+      });
     },
     maintenanceLeft() {
       var myChart = this.$echarts.init(

src/views/security.vue

@@ -147,7 +147,7 @@
 </template>
 
 <script>
-import { GetLevelAlarm } from "../api/index";
+import { GetLevelAlarm , getSecurityAlarmCount} from "../api/index";
 export default {
   name: "security",
   data() {
@@ -261,8 +261,17 @@ export default {
     this.getFireWarnList()
     // 获取安防告警
     this.getPoliceList()
+    //获取安防统计今天昨天报警数量
+    this.getAlarmCount()
   },
   methods: {
+    //获取昨天今天的报警数量
+    getAlarmCount(){
+      getSecurityAlarmCount().then((res)=>{
+        this.securityList[4].count = res.data.data.TodayCount
+        this.securityList[5].count = res.data.data.YesterdayCount
+      })
+    },
     videoChange(index) {
       this.warnCameraList.forEach((item, i) => {
         item.icon = require("../assets/images/anFang/video.png");
@@ -321,6 +330,7 @@ export default {
         });
       });
     },
+    
   },
   watch: {},
   components: {},