From ba2a88b235360c8bea43f1c3adc90df84f437576 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 23 八月 2023 11:48:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen_standard/src/views/process.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index 80b656a..9394242 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -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>
@@ -142,7 +142,7 @@
]
})
-let { listData, top1, top2, baseNum, allBad } = toRefs(data)
+let { listData, top1, top2, baseNum, allBad, reportListData } = toRefs(data)
// start()
onBeforeUnmount(() => {
@@ -154,7 +154,7 @@
initData()
mainTimer.value = setInterval(() => {
initData()
- }, 6000)
+ }, 60000)
})
@@ -308,12 +308,12 @@
data.dayDistribution.forEach(item => {
dateList.push(item.createTime)
- numList.push(item.unqualifiedNum)
+ numList.push(item.unqualifiedNum || 0)
})
let option;
option = {
title: {
- text: ' 杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�67',
+ text: ` 杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�${data.allBad}`,
textStyle: {
color: '#fff',
fontSize: 12
@@ -470,7 +470,6 @@
<style lang="scss" scoped>
.proccess-content {
display: flex;
-
.header-title {
background-image: url('@/assets/img/gongxu_title@2x.png');
height: 28px;
@@ -488,7 +487,6 @@
.process-left {
flex: 1;
margin-right: 20px;
-
.proccess-plan {
height: 460px;
background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
--
Gitblit v1.9.3