From 8eb708f2b6d792f03725a0ff437f51da5af45a45 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十一月 2024 10:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index fc9f8c0..10a374f 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -3,7 +3,7 @@
<div class="main_app">
<img src="@/assets/images/FireFighting/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
@@ -228,13 +228,13 @@
<div class="line" v-for="item, i in data6?.platformLogList">
<div class="time_wrap">
<div class="time" :style="{
- backgroundColor: item.objType == 5?'#4ca8f7':item.objType == 6?'#f2b23e':item.objType == 10?'#4673f6':'#4aa38f'
+ backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
}" v-if="item.createDate">{{ item.createDate.slice(11, 16) }}</div>
<div class="sp" :style="{
- backgroundColor: item.objType == 5?'#4ca8f7':item.objType == 6?'#f2b23e':item.objType == 10?'#4673f6':'#4aa38f'
+ backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
}"></div>
<div class="dian" :style="{
- backgroundColor: item.objType == 5?'#4ca8f7':item.objType == 6?'#f2b23e':item.objType == 10?'#4673f6':'#4aa38f'
+ backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
}"></div>
</div>
<div class="id_card">{{ item.carCodeFront || item.param4 }}</div>
@@ -277,6 +277,9 @@
<!-- <div class="status">澶勭悊涓�</div> -->
</div>
</div>
+ </div>
+ <div v-if="data7.length == 0" class="empty_wrap" style="margin-top: 50px;">
+ <img src="@/assets/images/default_empty.png" alt="">
</div>
</div>
</div>
@@ -556,10 +559,10 @@
color: '#61d3f9'
}])]
const temp = []
- temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: '100.0' })
- temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1)})
- temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) })
- temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) })
+ 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 })
+ temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.signedNum ? (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
+ temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.signedNum ? (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
console.log('temp', temp)
const option = {
@@ -581,7 +584,10 @@
maxSize: '80%',
gap: 4,
label: {
- show: false
+ show: false,
+ formatter: '',
+ lineHeight: 0,
+ position: 'inside'
},
itemStyle: { //鍘绘帀榛樿鐧借壊杈规绾�
@@ -753,7 +759,7 @@
const data7 = ref([])
const getData7 = () => {
- cnwarningList({ size: 7 }).then(res => {
+ cnwarningList({ size: 10 }).then(res => {
const result = res.data || []
data7.value = result.map(item => {
item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.createDate).getTime()).format('HH灏忔椂mm鍒嗛挓')
@@ -821,6 +827,15 @@
getData6()
getData7()
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData4()
+ getData5()
+ getData6()
+ getData7()
+ }, 1000 * 60)
// initEchart1()
// initEchart2()
// initEchart3()
@@ -924,7 +939,7 @@
padding: 0px 24px 0px;
height: 200px;
margin-top: 20px;
- overflow: auto;
+ overflow: hidden;
.line {
display: flex;
@@ -1146,18 +1161,18 @@
.two-swiper {
height: 180px;
- overflow: auto;
+ overflow: hidden;
}
.line {
display: flex;
height: 30px;
- &:nth-of-type(2n) {
+ &:nth-of-type(2n + 1) {
background: rgba(12, 153, 236, 0.2);
}
- &:nth-of-type(2n + 1) {
+ &:nth-of-type(2n) {
background: rgba(1, 15, 35, 0.61);
box-shadow: inset 0px 0px 40px 0px rgba(23, 51, 108, 0.66);
}
@@ -1167,15 +1182,17 @@
display: flex;
justify-content: center;
align-items: center;
- font-size: 12px;
+ font-size: 14px;
color: #D2E0FF;
}
}
.header {
font-weight: 500;
- font-size: 13px;
+ font-size: 14px;
color: #01ABFE;
+ background: rgba(1, 15, 35, 0.61) !important;
+ box-shadow: inset 0px 0px 40px 0px rgba(23, 51, 108, 0.66) !important;
}
}
}
@@ -1197,7 +1214,7 @@
align-items: center;
.name {
- font-size: 12px;
+ font-size: 14px;
color: #D2E0FF;
}
@@ -1282,14 +1299,16 @@
.list {
height: 220px;
- overflow: auto;
+ overflow: hidden;
margin-top: 15px;
scrollbar-width: none;
+
.item {
display: flex;
font-size: 13px;
color: #D2E0FF;
height: 110px;
+
.icon {
width: 40px;
display: flex;
--
Gitblit v1.9.3