From 2e6cfde0e6533c734bd5fe81a5d62b931098f6a3 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 05 十二月 2023 16:51:51 +0800
Subject: [PATCH] 人员，物料y轴超出文字点点点
---
src/views/cockpitPage/components/WorkOrderProgress.vue | 373 ++++++++++++++++++++++++++++------------------------
1 files changed, 199 insertions(+), 174 deletions(-)
diff --git a/src/views/cockpitPage/components/WorkOrderProgress.vue b/src/views/cockpitPage/components/WorkOrderProgress.vue
index 0763725..16ae3c4 100644
--- a/src/views/cockpitPage/components/WorkOrderProgress.vue
+++ b/src/views/cockpitPage/components/WorkOrderProgress.vue
@@ -16,35 +16,35 @@
height="100%"
>
<el-table-column
- prop="workOrderId"
+ prop="Number"
label="宸ュ崟缂栧彿"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="product"
+ prop="Product"
label="浜у搧"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="productSpecs"
+ prop="Scale"
label="浜у搧瑙勬牸"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="amount"
+ prop="Amount"
label="鐢熶骇鏁伴噺"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="planTime"
+ prop="PlanTime"
label="璁″垝鏃堕棿"
align="center"
min-width="100"
@@ -55,7 +55,7 @@
<template slot-scope="scope">
<div class="progerss-bg">
<div
- v-for="item in scope.row.completeProgerss"
+ v-for="(item, index) in scope.row.completeProgerss"
class="progerss"
:class="
item.status == 1
@@ -73,9 +73,17 @@
</el-table-column>
<el-table-column label="寤舵湡棰勮" align="center">
<template slot-scope="scope">
- <div v-show="scope.row.delayWarning > 0" class="round-view">
- <div class="round"></div>
- <div class="title">{{ scope.row.delayWarning + "澶�" }}</div>
+ <div v-show="scope.row.DelayDays > 0" class="round-view">
+ <div class="round red-bg"></div>
+ <div class="title red-color">
+ {{ scope.row.DelayDays + "澶�" }}
+ </div>
+ </div>
+ <div v-show="scope.row.DelayDays < 0" class="round-view">
+ <div class="round green-bg"></div>
+ <div class="title green-color">
+ {{ scope.row.DelayDays + "澶�" }}
+ </div>
</div>
</template>
</el-table-column>
@@ -88,171 +96,176 @@
<script>
export default {
components: {},
- props: {},
+ props: {
+ tableData: {
+ type: Array,
+ default: () => [],
+ },
+ },
data() {
return {
- tableData: [
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 3,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 1 },
- { status: 1 },
- { status: 1 },
- { status: 1 },
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 2,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "A5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "BA5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- {
- workOrderId: "BA5435",
- product: "浜у搧1",
- productSpecs: "瑙勬牸",
- amount: "2000",
- planTime: "02-23~05-23",
- completeProgerss: [
- { status: 1 },
- { status: 1 },
- { status: 2 },
- { status: 0 },
- ],
- delayWarning: 0,
- },
- ],
+ // tableData: [
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 3,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 2,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: -2,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // {
+ // Number: "A5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // {
+ // Number: "BA5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // {
+ // Number: "BA5435",
+ // Product: "浜у搧1",
+ // Scale: "瑙勬牸",
+ // Amount: "2000",
+ // PlanTime: "02-23~05-23",
+ // completeProgerss: [
+ // { status: 1 },
+ // { status: 1 },
+ // { status: 2 },
+ // { status: 0 },
+ // ],
+ // DelayDays: 0,
+ // },
+ // ],
};
},
mounted() {
@@ -344,14 +357,26 @@
.round-view {
display: flex;
justify-content: center;
- color: #ff0000;
+
.round {
width: 22px;
height: 22px;
border-radius: 11px;
- background: #ff0000;
+
margin-right: 5px;
}
+ .red-bg {
+ background: #ff0000;
+ }
+ .green-bg {
+ background: #00cc00;
+ }
+ .red-color {
+ color: #ff0000;
+ }
+ .green-color {
+ color: #00cc00;
+ }
}
}
}
--
Gitblit v1.8.0