From ae2fad05393d2bbb94ec46712a1a717c85e766f0 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 22 八月 2023 19:29:01 +0800
Subject: [PATCH] 大萨达撒
---
screen_standard/src/views/process.vue | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index c4e6f42..78f162f 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -40,7 +40,7 @@
<span>{{ item.userName }}</span>
</div>
<div class="content_left_item1_content_row_line">
- <el-progress :show-text="false" :percentage="item.doneNum / baseNum">
+ <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
</el-progress>
</div>
<div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
@@ -55,7 +55,7 @@
<span>{{ item.userName }}</span>
</div>
<div class="content_left_item1_content_row_line">
- <el-progress :show-text="false" :percentage="item.doneNum / baseNum">
+ <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
</el-progress>
</div>
<div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
@@ -86,7 +86,7 @@
<div class="scroll_item_row">{{ item.userName }}</div>
<div class="scroll_item_row">{{ item.materialName }}</div>
<div class="scroll_item_row">{{ item.materialCode }}</div>
- <div class="scroll_item_row">{{ item.createTime }}</div>
+ <div class="scroll_item_row" style="flex: 1.5;">{{ item.createTime }}</div>
<div class="scroll_item_row">{{ item.qualifiedNum }}</div>
<div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
<div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
@@ -120,6 +120,7 @@
import * as echarts from 'echarts'
const route = useRoute()
const enterprise = useCounterStore()
+let mainTimer = ref(null)
let planTimer = ref(null)
let reportTimer = ref(null)
let planContainer = ref(null)
@@ -131,15 +132,7 @@
top2: [],
baseNum: 0,
allBad: 0,
- dayDistribution: [
- { date: '8/1', num: '20' },
- { date: '8/2', num: '10' },
- { date: '8/3', num: '20' },
- { date: '8/4', num: '40' },
- { date: '8/5', num: '30' },
- { date: '8/6', num: '10' },
- { date: '8/7', num: '20' },
- ],
+ dayDistribution: [],
typeDistribution: [
{ categoryName: '澶栬涓嶈壇', unqualifiedNum: 15 },
{ categoryName: '鏈夋瘺鍒�', unqualifiedNum: 12 },
@@ -149,21 +142,26 @@
]
})
-let { listData, top1, top2, baseNum, allBad } = toRefs(data)
+let { listData, top1, top2, baseNum, allBad, reportListData } = toRefs(data)
// start()
onBeforeUnmount(() => {
clearTimeout(planTimer.value)
clearTimeout(reportTimer.value)
+ clearTimeout(mainTimer.value)
})
onMounted(() => {
initData()
+ mainTimer.value = setInterval(() => {
+ initData()
+ }, 60000)
})
onUnmounted(() => {
clearTimeout(planTimer.value)
clearTimeout(reportTimer.value)
+ clearTimeout(mainTimer.value)
})
function initData() {
@@ -213,7 +211,7 @@
getUnqualifiedCateData(enterprise.companyId, enterprise.departId, route.query.procedureId)
.then(res => {
data.typeDistribution = res
- data.allBad = res.reduce((accumulator, currentValue) => accumulator + currentValue, 0)
+ data.allBad = res.reduce((accumulator, currentValue) => accumulator + currentValue.unqualifiedNum, 0)
setTypeChart()
})
}
@@ -315,7 +313,7 @@
let option;
option = {
title: {
- text: ' 杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�67',
+ text: ` 杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�${data.allBad}`,
textStyle: {
color: '#fff',
fontSize: 12
@@ -534,6 +532,11 @@
font-weight: 400;
color: #D2E0FF;
margin-left: 9px;
+ width: 50px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -webkit-text-overflow: ellipsis;
+ overflow: hidden;
}
.num {
@@ -722,6 +725,7 @@
display: flex;
align-items: center;
justify-content: center;
+ font-size: 13px;
}
}
}
--
Gitblit v1.9.3