From f2fe072a1656bece33174c6a4b51dacc6f33abc7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 九月 2025 15:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreen/largescreen.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 70534ca..46c97fc 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -12,7 +12,7 @@
</div>
<div style="display: flex;">
<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">
+ <img src="/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
<div class="moving-rect lipiana" v-show="woshia"></div>
<div class="moving-rect lipianb" v-show="woshia"></div>
<div class="moving-rect lipianc" v-show="woshic"></div>
@@ -75,7 +75,7 @@
<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="quantity" align="center" :label="$t('large.tionnumber')" 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" />
@@ -186,7 +186,7 @@
case 2:
return 'success';
}
-}
+}
function getStatusText(warehousing) {
switch (warehousing) {
case 0:
--
Gitblit v1.8.0