From 27da7b76d81f97e84ebdded5f62023151989ab11 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 07 May 2021 10:42:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/supervisoryConsole/data.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index f670ff7..47a2d36 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 {
@@ -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);
@@ -350,6 +351,8 @@
sum += item.value;
});
+ sum +=that.yj;
+
var option = {
title: [
{
--
Gitblit v1.9.3