From 6bd673610b45c8b7af056d296dde17585c886586 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 17:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 224a5a5..3576b8f 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -241,8 +241,9 @@
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
import ChargeRate from '@/components/ChargeRate.vue'
-
import * as echarts from 'echarts'
+
+
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
const date = ref(dayjs().format('YYYY.MM.DD'))
const week = ref(weekMap[new Date().getDay()])
@@ -495,27 +496,10 @@
const option = {
color: colors,
tooltip: {
- trigger: "axis",
- axisPointer: {
- type: "cross",
- label: {
- backgroundColor: "red"
- },
- lineStyle: {
- color: "#9eb2cb"
- }
- }
+ show: false
},
-
legend: {
- show: false,
- top: "top",
- left: "2%",
- textStyle: {
- color: "#000"
- },
- itemHeight: 2,
- data: ['棰勭害鏁�', '宸茶繘鍦�', '宸蹭綔涓�', '宸茬鍦�']
+ show: false
},
series: [
{
@@ -528,6 +512,31 @@
maxSize: '80%',
gap: 4,
label: {
+ show: false
+ },
+
+ itemStyle: { //鍘绘帀榛樿鐧借壊杈规绾�
+ borderWidth: 0,
+ borderColor: '#fff'
+ },
+ data: [
+ { value: 100, name: '棰勭害鏁�', },
+ { value: 50, name: '宸茶繘鍦�' },
+ { value: 20, name: '宸蹭綔涓�' },
+ { value: 30, name: '宸茬鍦�' },
+ ]
+ },
+ {
+ type: 'funnel',
+ left: '15%',
+ right: '45%',
+ top: '10%',
+ bottom: '10%',
+ minSize: '80%',
+ maxSize: '80%',
+ gap: 4,
+ z: 1,
+ label: {
show: true,
position: 'outside',
formatter: '{a|{b}} {a|{c}%}',
@@ -539,22 +548,33 @@
}
},
labelLine: {
- length: 80,
- lineStyle: {
- width: 1,
- type: 'dashed'
- }
+ show: true,
+ normal: {
+ length: 80,
+ position: 'right',
+ lineStyle: {
+ width: 1,
+ type: 'dashed',
+ color: 'rgba(102, 160, 239,.5)'
+ }
+ },
},
itemStyle: { //鍘绘帀榛樿鐧借壊杈规绾�
borderWidth: 0,
borderColor: '#fff'
+ },
+ itemStyle: {
+ normal: {
+ color: 'transparent',
+ borderWidth: 0,
+ opacity: 1
+ }
},
data: [
{ value: 100, name: '棰勭害鏁�', },
{ value: 50, name: '宸茶繘鍦�' },
{ value: 20, name: '宸蹭綔涓�' },
{ value: 30, name: '宸茬鍦�' },
-
]
},
]
@@ -869,6 +889,7 @@
margin: 0 20px 0;
width: 100%;
height: 222px;
+
.line {
display: flex;
align-items: center;
@@ -876,11 +897,13 @@
height: 33px;
color: #D2E0FF;
width: 100%;
+
.time_wrap {
display: flex;
align-items: center;
width: 52px;
color: #FFFFFF;
+
.time {
width: 40px;
height: 18px;
--
Gitblit v1.9.3