diff --git a/src/views/Main/SafetyAppraise/index.vue b/src/views/Main/SafetyAppraise/index.vue index 9fa8c69..f799698 100644 --- a/src/views/Main/SafetyAppraise/index.vue +++ b/src/views/Main/SafetyAppraise/index.vue @@ -65,9 +65,9 @@ const safety = reactive({ djd: 0, yjd: 0 }); -const okNum = computed(() => { - const num = safetyData.value.find((item: any) => item.name === '任务数'); - return taskCount.value ? ((Number(num?.value || 0) / taskCount.value) * 100).toFixed(2) : 0; +const okNum: any = computed(() => { + // const num = safetyData.value.find((item: any) => item.name === '任务数'); + return safety.rws ? ((Number(safety.rws || 0) / taskCount.value) * 100).toFixed(2) : 0; }); // const inNum = computed(() => { // const num = safetyData.value.find((item: any) => item.name === '已完成'); @@ -76,6 +76,9 @@ const okNum = computed(() => { const getChartData = async (time: any) => { taskCount.value = 0; safetyData.value = []; + safety.rws = 0; + safety.djd = 0; + safety.yjd = 0; const pramas = { // endTime: '', @@ -91,16 +94,16 @@ const getChartData = async (time: any) => { safety.rws = +(+item.sum).toFixed(0); } if (item.code === 'YZT_TOUR_CHECK_DJD_SUM') { - safety.dyd = +(+item.sum).toFixed(0); + safety.djd = +(+item.sum).toFixed(0); } if (item.code === 'YZT_TOUR_CHECK_YJD_SUM') { safety.yjd = +(+item.sum).toFixed(0); } - safetyData.value.push({ - name: item.name || '', - value: Number(item.sum)?.toFixed(0) || 0, - unit: item.unit || '' - }); + // safetyData.value.push({ + // name: item.name || '', + // value: Number(item.sum)?.toFixed(0) || 0, + // unit: item.unit || '' + // }); taskCount.value += Number(item.sum) || 0; }); } else {