From 4cd062a6ef2e84acb048a125319e51c96aa35922 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 13 Apr 2021 16:56:08 +0800
Subject: [PATCH] 预警分析跳转bug修复，数据模式跳转添加
---
src/views/supervisoryConsole/data.vue | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index 9de54ae..593130d 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -108,7 +108,7 @@
</div>
<div class="head-right">
<div class="head-right offset-right">
- <a href="/#/realTimePolice/index">预警分析</a>
+ <a href="/#/alarmManagement/alarmAnalysis">预警分析</a>
</div>
</div>
</div>
@@ -116,10 +116,10 @@
<div class="alarm-bar">
<div class="alarm-bar-title">
<div class="title-left ng-binding">日累计预警事件数</div>
- <div class="title-right week">
- <span class="ng-binding">0</span
- ><span class="ng-binding">1.00</span>
- </div>
+<!-- <div class="title-right week">-->
+<!-- <span class="ng-binding">0</span-->
+<!-- ><span class="ng-binding">1.00</span>-->
+<!-- </div>-->
</div>
<div class="week-alarm-bar" id="day_warn_echarts"></div>
</div>
@@ -129,10 +129,10 @@
<div class="title-left change-flex-alarm ng-binding">
日累计预警设备数
</div>
- <div class="title-right week">
- <span class="ng-binding">0</span
- ><span class="ng-binding">1.00</span>
- </div>
+<!-- <div class="title-right week">-->
+<!-- <span class="ng-binding">0</span-->
+<!-- ><span class="ng-binding">1.00</span>-->
+<!-- </div>-->
</div>
<div class="week-device-line" id="day_equipment_echarts"></div>
</div>
@@ -316,9 +316,12 @@
if (params.name == "正常"){
//跳转在线设备
that.StartEquipment({dxtype:1});
- }else {
+ }else if(params.name == "掉线"){
//跳转离线设备
that.StartEquipment({dxtype:0});
+ }else if(params.name == "故障"){
+ //跳转故障设备
+ that.StartEquipment({dxtype:3});
}
});
@@ -406,6 +409,7 @@
},
drawPillar(data) {
+ var that = this;
var myChart = this.$echarts.init(
document.getElementById("day_warn_echarts")
);
@@ -480,6 +484,19 @@
],
};
myChart.setOption(option);
+ myChart.on('click', function (params) {
+ var data = [];
+ var date=new Date;
+ var y = date.getFullYear()
+ data.push({
+ startTime: y + "-" + params.name+" 00:00:00",
+ endTime:y + "-" + params.name+" 23:59:59",
+ waringType:'紧急求救',
+ })
+ that.handleStartAlarm(data);
+ });
+
+
},
//在线设备分页数据
StartEquipment(data) {
@@ -488,6 +505,13 @@
query: data,
});
},
+ //日累计预警数量跳转
+ handleStartAlarm(data) {
+ this.$router.push({
+ path: `/realTimePolice/index`,
+ query: data[0],
+ });
+ },
},
};
--
Gitblit v1.9.3