From 9aa75d91eb3f854c9d2001b3e3ae1743a51dd476 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 12 十月 2024 16:27:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/index.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 2fbeab3..16c38ad 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -226,8 +226,7 @@
import * as echarts from 'echarts'
import { weeks } from '@/utils/config'
import {
- getWorkbenchBody,
- getWorkbenchHead,
+ getWorkbenchData,
getAppHeaderNav
} from '@/api'
const colors = ['#52a4f7', '#7678f7', '#5fc6d5']
@@ -283,10 +282,10 @@
this.initEchart4()
},
getWorkBody() {
- getWorkbenchBody()
+ getWorkbenchData({queryType: 2})
},
getWorkHead() {
- getWorkbenchHead()
+ getWorkbenchData({queryType: 1})
},
initEchart1() {
const myChart = echarts.init(document.getElementById('echart1'))
@@ -458,9 +457,9 @@
symbol: 'circle',
symbolSize: 10,
itemStyle: {
- normal: {
- color: '#207FF7' // 鎶樼嚎鐐圭殑棰滆壊
- }
+ borderWidth: 1,
+ borderColor: '#fff',
+ color: '#207FF7'
},
smooth: false
}
@@ -557,9 +556,9 @@
symbol: 'circle',
symbolSize: 10,
itemStyle: {
- normal: {
- color: '#42D49D' // 鎶樼嚎鐐圭殑棰滆壊
- }
+ borderWidth: 1,
+ borderColor: '#fff',
+ color: '#42D49D' // 鎶樼嚎鐐圭殑棰滆壊
},
smooth: false
}
--
Gitblit v1.9.3