From ee0f467d189e1535cbe9810d9a2d460a5f841bfc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:37:54 +0800
Subject: [PATCH] 首页
---
src/api/home/home.js | 7 +++++++
src/views/wel/home.vue | 36 ++++++++++++++++++++++++------------
2 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/api/home/home.js b/src/api/home/home.js
index 281b0b9..18cb7e0 100644
--- a/src/api/home/home.js
+++ b/src/api/home/home.js
@@ -5,4 +5,11 @@
url: '/api/blade-user/getUserRegisterStatisticsData',
method: 'get'
})
+}
+
+export const getSevenDaty = () => {
+ return request({
+ url: '/api/alarm/alarm/countAlarm',
+ method: 'get'
+ })
}
\ No newline at end of file
diff --git a/src/views/wel/home.vue b/src/views/wel/home.vue
index c3a01ae..9fe572d 100644
--- a/src/views/wel/home.vue
+++ b/src/views/wel/home.vue
@@ -101,7 +101,7 @@
import * as echarts from "echarts";
import geojson from "@/geojson/nanchang.json";
-import { getList } from "@/api/home/home";
+import { getList, getSevenDaty } from "@/api/home/home";
export default {
data() {
@@ -129,23 +129,35 @@
created() {},
mounted() {
// eslint-disable-next-line no-undef
- this.onTwoEcharts();
+ this.getDataSevenDaty(); //获取7天下发数量
+ // this.onTwoEcharts();
this.createechart1(); //建立图表1
this.onSixEcharts(); //图表1数据
this.createMapJson();
},
methods: {
- onTwoEcharts() {
+ getDataSevenDaty() {
+ var that = this;
+ getSevenDaty().then((res) => {
+ var d = res.data.data.alarmData;
+ var t = res.data.data.times;
+ // console.log(d, t);
+ that.onTwoEcharts(d, t);
+ });
+ },
+ onTwoEcharts(d, t) {
var myChart = echarts.init(document.getElementById("on_two_yjy"));
- var data1 = [18, 30, 22, 20, 15, 33, 28];
- var xData = (function () {
- var data = [];
- var d = 20;
- for (var i = d - 6; i <= d; i++) {
- data.push(i + "号");
- }
- return data;
- })();
+ var data1 = d;
+ // var data1 = [18, 30, 22, 20, 15, 33, 28];
+ var xData = t;
+ // var xData = (function () {
+ // var data = [];
+ // var d = 20;
+ // for (var i = d - 6; i <= d; i++) {
+ // data.push(i + "号");
+ // }
+ // return data;
+ // })();
var option = {
tooltip: {
trigger: "axis",
--
Gitblit v1.9.3