From b0d91c66d2237a80177c2fd5aeed54a8da958051 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 26 Jul 2021 16:01:48 +0800
Subject: [PATCH] 问题修复
---
src/views/realTimePolice/real.vue | 38 ++++++++++++--------------------------
src/api/real/real.js | 10 +++++++++-
2 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/src/api/real/real.js b/src/api/real/real.js
index 281c15f..9b7551c 100644
--- a/src/api/real/real.js
+++ b/src/api/real/real.js
@@ -50,7 +50,15 @@
export const getChartData = (row) => {
return request({
- url: '/api/blade-jfpts/alarm/alarm/getChartData',
+ url: '/api/blade-jfpts/alarm/alarm/getChartDataAlarm',
+ method: 'get',
+ data: row
+ })
+}
+
+export const getChartDataBs = (row) => {
+ return request({
+ url: '/api/blade-jfpts/alarm/alarm/getChartDataAlarmBs',
method: 'get',
data: row
})
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 688fe7e..c8ecaad 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -180,7 +180,7 @@
</template>
<script>
- import {getList, remove, update, add, getclient,getChartData} from "@/api/real/real";
+ import {getList, remove, update, add, getclient,getChartData,getChartDataBs} from "@/api/real/real";
import {mapGetters} from "vuex";
export default {
@@ -1072,7 +1072,7 @@
title: [
{
text: sum,
- subtext: "安装任务总数",
+ subtext: "警情总数",
textStyle: {
fontSize: 36,
fontWeight: "normal",
@@ -1087,7 +1087,7 @@
y: "39%",
},
],
- color:['#29c194','#F48F57', 'green'],
+ color:['#ff5127','#ffc666', '#5380f5'],
tooltip: {
trigger: 'item'
},
@@ -1097,7 +1097,7 @@
},
series: [
{
- name: '任务状态',
+ name: '警情状态',
type: "pie",
radius: ["46%", "66%"],
data: data,
@@ -1123,32 +1123,18 @@
},
getDataBs() {
var that = this;
- getChartData(null).then(res => {
+ getChartDataBs(null).then(res => {
var data = res.data.data;
var sum = 0;
for (let i = 0; i < data.length; i++) {
sum += data[i].value;
}
var option = {
- title: [
- {
- text: sum,
- subtext: "安装任务总数",
- textStyle: {
- fontSize: 36,
- fontWeight: "normal",
- color: "#393939",
- },
- subtextStyle: {
- fontSize: 16,
- color: "#434343",
- },
- textAlign: "center",
- x: "49%",
- y: "39%",
- },
- ],
- color:['#29c194','#F48F57', 'green'],
+ title: {
+ text: '警情严重程度',
+ left: 'center'
+ },
+ color:['#F48F57','#59b5f6', '#F34A4A'],
tooltip: {
trigger: 'item'
},
@@ -1158,9 +1144,9 @@
},
series: [
{
- name: '任务状态',
+ name: '严重程度',
type: "pie",
- radius: ["46%", "66%"],
+ radius: ['65%'],
data: data,
label: {
normal: {
--
Gitblit v1.9.3