From eda1cd09c317d6fbbc592774c308c548aa4f7510 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 22 八月 2024 11:00:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/largescreen/largescreen.vue | 66 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index a58ecaa..5270e48 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,6 +1,6 @@
<template>
<el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" v-loading="loading">
- <el-scrollbar height="600px">
+ <el-scrollbar height="800px">
<div id="top" style="height: 150px;display: flex;">
<div class="echarts-container">
<div v-for="(processData, index) in processesData" :key="index" class="echarts-item">
@@ -46,32 +46,9 @@
<div class="moving-rect xiapianji5" v-show="xiapian5"></div>
<div class="moving-rect xiapianji6" v-show="xiapian6"></div>
</div>
-<!-- <div class="parter" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
- <img src="../../assets/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
- <div class="moving-rect vertical"></div>
- <div class="moving-rect all"></div>
- <div class="moving-rect horizontal"></div>
- <div class="moving-rect xiao"></div>
- <div class="moving-rect zhan"></div>
- <div class="moving-rect tu"></div>
- <div class="moving-rect zi"></div>
- <div class="moving-rect xia"></div>
- <div class="moving-rect zan"></div>
- <div class="moving-rect fa"></div>
- <div class="moving-rect hua"></div>
- <div class="moving-rect shui"></div>
-</div> -->
-<!-- <div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
- <el-table height="240" ref="table" width="340px"
- @selection-change="handleSelectionChange"
- :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="50" />
- <el-table-column prop="projectName" align="center" :label="$t('large.projectname')" min-width="50" />
- </el-table>
-</div> -->
</div>
-<div id="bottom" style="margin-top: 10px;height: 190px;background-color: #911005;">
-<el-table height="190" ref="table"
+<div id="bottom" style="margin-top: 10px;height: 190px;">
+<el-table height="390" ref="table"
@selection-change="handleSelectionChange"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />
@@ -106,14 +83,35 @@
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId')" min-width="110" />
- <el-table-column prop="project" fixed align="center" :label="$t('large.project')" min-width="110" />
- <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="110" />
- <el-table-column prop="width" fixed align="center" :label="$t('large.width')" min-width="100" />
- <el-table-column prop="height" fixed align="center" :label="$t('large.height')" min-width="100" />
- <el-table-column prop="area" fixed align="center" :label="$t('large.are')" min-width="100" />
- <el-table-column prop="quantity" fixed align="center" :label="$t('large.number')" min-width="110" />
- <el-table-column prop="processingNote" fixed align="center" :label="$t('large.method')" min-width="110" />
- <el-table-column prop="deliveryDate" fixed align="center" :label="$t('large.deliveryDate')" min-width="130" />
+ <el-table-column prop="project" align="center" :label="$t('large.project')" min-width="110" />
+ <el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="110" />
+ <el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />
+ <el-table-column prop="productName" align="center" :label="$t('large.productname')" min-width="110" />
+ <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="100" />
+ <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="100" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="100" />
+ <el-table-column prop="quantity" align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="numberPatches" align="center" :label="$t('large.numberpatches')" min-width="110" />
+ <el-table-column prop="receivedQuantity" align="center" :label="$t('large.innumber')" min-width="110" />
+ <el-table-column prop="terminationStatus" align="center" :label="$t('large.productstatus')" min-width="110" />
+ <el-table-column
+ align="center"
+ :label="$t('large.productstatus')"
+ min-width="80"
+ prop="terminationStatus"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.terminationStatus === 0 ? 'success' : 'danger'"
+ >
+ {{ scope.row.terminationStatus === 0 ? $t('large.right') : $t('large.stop') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="packType" align="center" :label="$t('large.quantity')" min-width="110" />
+ <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="110" />
+ <!-- <el-table-column prop="processingNote" fixed align="center" :label="$t('large.method')" min-width="110" /> -->
+ <!-- <el-table-column prop="deliveryDate" fixed align="center" :label="$t('large.deliveryDate')" min-width="130" /> -->
</el-table>
<template #footer>
<div id="dialog-footer" style="text-align: center;">
--
Gitblit v1.8.0