From 8aa3edd56c279100c9053576f3e90fa55459fe77 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 16 Jan 2023 16:15:55 +0800
Subject: [PATCH] 修改
---
src/views/supervisoryConsole/data.vue | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index f670ff7..5a7aecb 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -257,7 +257,7 @@
getList,
getEquipmentList,
getDayWarnList,
- getEquipment,
+ getEquipments,
} from "@/api/supervisory/data";
export default {
@@ -278,7 +278,7 @@
var that = this;
getList().then((res) => {
res.data.data.forEach((item) => {
- if (item.waringType == "紧急求救") {
+ if (item.waringType == "一键求助") {
that.tableData.push(item);
}
});
@@ -292,7 +292,7 @@
that.drawPillar(res.data.data);
});
- getEquipment().then((res) => {
+ getEquipments().then((res) => {
console.log(res.data.data, 123);
var total = 0;
@@ -300,6 +300,7 @@
total += res.data.data.zx;
total += res.data.data.dx;
total += res.data.data.gz;
+ total += res.data.data.yj;
console.log(total, 45);
@@ -331,6 +332,12 @@
itemStyle: { color: "#29c194" },
},
{
+ value: that.yj,
+ legendname: "预警",
+ name: "预警",
+ itemStyle: { color: "#F34A4A" },
+ },
+ {
value: that.gz,
legendname: "故障",
name: "故障",
@@ -345,10 +352,11 @@
];
var sum = 0;
-
m2R2Data.forEach((item) => {
sum += item.value;
});
+
+ // sum +=that.yj;
var option = {
title: [
@@ -371,20 +379,21 @@
],
tooltip: {
trigger: "item",
- formatter: function (parms) {
- var str =
- parms.marker +
- "" +
- parms.data.legendname +
- "</br>" +
- "数量：" +
- parms.data.value +
- "</br>" +
- "占比：" +
- parms.percent +
- "%";
- return str;
- },
+ // formatter: function (parms) {
+ // var str =
+ // parms.marker +
+ // "" +
+ // parms.data.legendname +
+ // "</br>" +
+ // "数量：" +
+ // parms.data.value +
+ // "</br>" +
+ // "占比：" +
+ // parms.percent +
+ // "%";
+ // return str;
+ // },
+ formatter: "{b}: {c} ({d}%)",
},
series: [
{
@@ -703,6 +712,7 @@
}
.pie-total-container {
display: flex;
+ border: 1px solid transparent;
padding: 20px 0;
}
.info-active {
--
Gitblit v1.9.3