From 2e05d43a7da078224a40e6620544969799504a9f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 10 三月 2025 16:48:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Identify/identifwu.vue | 24 +++++++----
UI-Project/src/views/Identify/identifwutwo.vue | 24 +++++++----
UI-Project/src/views/Returns/upreturns.vue | 2
UI-Project/src/views/Identify/identify.vue | 24 +++++++----
UI-Project/src/views/Returns/upreturns2.vue | 2
UI-Project/src/views/hollow/hollowequipment.vue | 1
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 1
7 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwu.vue b/UI-Project/src/views/Identify/identifwu.vue
index e01fece..cdebbc0 100644
--- a/UI-Project/src/views/Identify/identifwu.vue
+++ b/UI-Project/src/views/Identify/identifwu.vue
@@ -109,18 +109,24 @@
}
function getRectColor(state: number): string {
switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case -1:
+ return '#99BBFF';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
case 8:
return '#911005';
case 9:
- return '#f3d19e';
+ return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
// 鏇存柊鐭╁舰鐘舵��
diff --git a/UI-Project/src/views/Identify/identifwutwo.vue b/UI-Project/src/views/Identify/identifwutwo.vue
index 5f99dfb..7d1bbf8 100644
--- a/UI-Project/src/views/Identify/identifwutwo.vue
+++ b/UI-Project/src/views/Identify/identifwutwo.vue
@@ -148,18 +148,24 @@
}
function getRectColor(state: number): string {
switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case -1:
+ return '#99BBFF';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
case 8:
return '#911005';
case 9:
- return '#f3d19e';
+ return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
// 鏇存柊鐭╁舰鐘舵��
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 88c6d21..969553b 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -198,18 +198,24 @@
};
function getRectColor(state: number): string {
switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case -1:
+ return '#99BBFF';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
case 8:
return '#911005';
case 9:
- return '#f3d19e';
+ return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
const optionsb = [
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 2bf1deb..aef3868 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -503,7 +503,7 @@
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ <el-button size="mini" :disabled="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index e164da7..802057b 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -504,7 +504,7 @@
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ <el-button size="mini" :disabled="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 8ed3196..2335fef 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -64,6 +64,7 @@
<el-table height="650" ref="table" :data="tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
<el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center"/>
<el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/>
<el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
<el-table-column prop="layer" :label="$t('hellow.layer')" align="center"/>
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index c5b1968..e41e3d5 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -37,6 +37,7 @@
<el-table height="650" ref="table" :data="tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
<el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center"/>
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center"/>
<el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/>
<el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
<el-table-column prop="layer" :label="$t('hellow.layer')" align="center"/>
--
Gitblit v1.8.0