From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 10a374f..f02d4e1 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -1,7 +1,7 @@
<template>
<v-scale-screen width="1920" height="960">
<div class="main_app">
- <img src="@/assets/images/FireFighting/bg@2x.png" class="main_bg" alt="" />
+ <img src="@/assets/images/task/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
<img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺</div>
@@ -19,7 +19,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>浠婃棩鏈堝彴瀹屾垚璁㈠崟缁熻</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="car_static">
<div class="echart_wrap">
@@ -60,7 +60,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>浠婃棩鏈堝彴宸ヤ綔鏃堕暱瓒嬪娍</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="list one-swiper">
<div class="swiper-wrapper">
@@ -86,7 +86,7 @@
<div class="separate"></div>
<div class="tab" :class="{ active: activeTab3 == 0 }" @click="tabClick3(0)">鍏ュ簱</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="echart_wrap">
<div class="echart2" id="echart2"></div>
@@ -201,7 +201,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>浠婃棩杞﹁締浣滀笟鎯呭喌</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="static_wrap">
<div class="item">
@@ -249,7 +249,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>瀹炴椂鍛婅</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="list three-swiper">
<div class="swiper-wrapper">
@@ -546,18 +546,19 @@
}]),
new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0,
+ color: '#4370f2'
+ }, {
+ offset: 1,
+ color: '#61d3f9'
+ }]),
+ new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+ offset: 0,
color: '#4679f6'
}, {
offset: 1,
color: '#4674f6'
}]),
- new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
- offset: 0,
- color: '#4370f2'
- }, {
- offset: 1,
- color: '#61d3f9'
- }])]
+ ]
const temp = []
temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100.0' : 0 })
temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.signedNum ? (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
@@ -610,14 +611,15 @@
show: true,
position: 'outside',
formatter: (params) => {
- return `{a|${params.data.name} ${params.data.rate}%}`
+ const index = params.dataIndex;
+ return `{color${index}|${params.data.name} ${params.data.rate}%}`
// return `<div>${params.data.name}</div>`
},
rich: {
- a: {
- color: '#869CC9',
- fontSize: 13
- },
+ color0: { color: 'orange', fontSize: 14 },
+ color1: { color: '#869CC9', fontSize: 13 },
+ color2: { color: '#869CC9', fontSize: 13 },
+ color3: { color: '#869CC9', fontSize: 13 }
}
},
labelLine: {
@@ -689,7 +691,6 @@
item.rate = ((item.workTotalTime / count) * 30).toFixed(0)
return item
})
- loopFn2()
})
}
@@ -745,7 +746,6 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
- loopFn5()
})
}
@@ -765,7 +765,6 @@
item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.createDate).getTime()).format('HH灏忔椂mm鍒嗛挓')
return item
})
- loopFn7()
})
}
@@ -836,9 +835,12 @@
getData6()
getData7()
}, 1000 * 60)
- // initEchart1()
- // initEchart2()
- // initEchart3()
+
+ setTimeout(() => {
+ loopFn2()
+ loopFn5()
+ loopFn7()
+ }, 12000)
})
--
Gitblit v1.9.3