From cb221a76856b945b4501b6628cebe1815303f2f3 Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期三, 22 十月 2025 08:47:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- screen/src/views/TaskEfficiency.vue | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue index e78f9de..e270f2a 100644 --- a/screen/src/views/TaskEfficiency.vue +++ b/screen/src/views/TaskEfficiency.vue @@ -94,6 +94,11 @@ </div> </div> <div class="center_box"> + + <div class="left_box_top_znz"> + <img src="@/assets/images/ic_compass@2x.png" alt="" /> + </div> + <div class="center_box_one"> <div class="static_wrap"> <div class="item"> @@ -306,7 +311,7 @@ </div> </div> <div v-if="data7.length == 0" class="empty_wrap" style="margin-top: 50px;"> - <img src="@/assets/images/default_empty.png" alt=""> + <img src="@/assets/images/default_nowarning.png" alt=""> </div> </div> </div> @@ -593,11 +598,17 @@ }]), ] const temp = [] - temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100' : 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 }) + // temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100' : 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 }) + temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum || 0 }) + temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.calledNum || 0 }) + temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.workedNum || 0 }) + temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.doneNum || 0 }) + + console.log('temp', temp) const option = { color: colors, tooltip: { @@ -644,7 +655,7 @@ position: 'outside', formatter: (params) => { const index = params.dataIndex - return `{color${index}|${params.data.name} ${params.data.rate}%}` + return `{color${index}|${params.data.name} ${params.data.rate}}` // return `<div>${params.data.name}</div>` }, rich: { @@ -765,7 +776,7 @@ cnplatformWorkData().then(res => { const result = res.data || [] dataList5.value = result.map(i => { - i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : '浣滀笟瓒呮椂' + i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : i.status == 2 ? '浣滀笟瓒呮椂' : '鍙彿涓�' if (i.workTime) { // i.workTime = dayjs.duration(i.workTime * 1000).format('HH灏忔椂mm鍒�') i.workTime = (i.workTime / 60).toFixed(0) @@ -1111,6 +1122,19 @@ display: flex; flex-direction: column; justify-content: space-between; + position: relative; + + .left_box_top_znz { + width: 68px; + height: 68px; + position: absolute; + right: 30px; + top: 150px; + img { + width: 100%; + height: 100%; + } + } .center_box_one { .static_wrap { -- Gitblit v1.9.3