From 9b9456c48be5a1a61de85cf3f4bafdb74be15fc6 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 04 三月 2025 10:49:26 +0800
Subject: [PATCH] 钢化前大理片笼、中空理片笼进片添加是否相同，相同该行添加背景色，中空一线二线新增进入页面清空流程卡号
---
UI-Project/src/views/Slicecage/slicecage.vue | 35 +++++++++++++++++
UI-Project/src/views/hollow/hollowslicecage.vue | 35 +++++++++++++++++
UI-Project/src/lang/en.js | 3 +
UI-Project/src/lang/py.js | 3 +
UI-Project/src/lang/zh.js | 4 +
UI-Project/src/views/hollow/hollowequipment.vue | 1
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 1
7 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index c233405..e0814ef 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -132,6 +132,9 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ whethersame:'鏄惁鐩稿悓',
+ same:'鐩稿悓',
+ notsame:'涓嶇浉鍚�',
partask:'浠诲姟閲嶇疆',
partasks:'鏄惁浠诲姟閲嶇疆锛�',
empty:'榛樿绌轰换鍔�',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index ce44e86..f393c56 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -132,6 +132,9 @@
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ whethersame:'鏄惁鐩稿悓',
+ same:'鐩稿悓',
+ notsame:'涓嶇浉鍚�',
partasks:'鏄惁浠诲姟閲嶇疆锛�',
empty:'榛樿绌轰换鍔�',
partask:'浠诲姟閲嶇疆',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 759bbc6..3e62c41 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -131,7 +131,9 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
- partask:'浠诲姟閲嶇疆',
+ whethersame:'鏄惁鐩稿悓',
+ same:'鐩稿悓',
+ notsame:'涓嶇浉鍚�',
partasks:'鏄惁浠诲姟閲嶇疆锛�',
empty:'榛樿绌轰换鍔�',
historicaltasks:'鍘嗗彶浠诲姟',
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 41ecca8..750145f 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1065,6 +1065,28 @@
return t('searchOrder.waiting');
}
}
+function getcasOnea(isSame) {
+ switch (isSame) {
+ case 1:
+ return 'danger';
+ case 0:
+ return 'info';
+ }
+}
+function getStatuscasOnea(isSame) {
+ switch (isSame) {
+ case 1:
+ return t('searchOrder.same');
+ case 0:
+ return t('searchOrder.notsame');
+ }
+}
+function tableRowClassName({ row }) {
+ if (row.isSame === 1) {
+ return 'row-red-background'; // 璁剧疆绾㈣壊鑳屾櫙
+ }
+ return '';
+}
onBeforeUnmount(() => {
closeWebSocket();
});
@@ -1112,6 +1134,7 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<el-table height="300px" ref="table"
@selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName"
:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
<el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
@@ -1120,6 +1143,13 @@
<template #default="scope">
<el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
</template>
+ </el-table-column>
+ <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.isSame)">
+ {{ getStatuscasOnea(scope.row.isSame) }}
+ </el-tag>
+ </template>
</el-table-column>
</el-table>
</el-card>
@@ -1680,7 +1710,7 @@
:printGlassId="printGlassId" style=""/>
</el-dialog>
</template>
-<style scoped>
+<style>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -1826,4 +1856,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+.row-red-background {
+ background-color: #CDAF95 !important;
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 960454e..b3d9177 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -1112,6 +1112,7 @@
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ window.localStorage.setItem('flowCardId', '')
});
onUnmounted(() => {
if (socket) {
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 861978e..c5b1968 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -587,6 +587,7 @@
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ window.localStorage.setItem('flowCardId', '')
});
onUnmounted(() => {
if (socket) {
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 36d40ee..40c339a 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -594,6 +594,28 @@
return t('searchOrder.rengongxp');
}
}
+function getcasOnea(isSame) {
+ switch (isSame) {
+ case 1:
+ return 'danger';
+ case 0:
+ return 'info';
+ }
+}
+function getStatuscasOnea(isSame) {
+ switch (isSame) {
+ case 1:
+ return t('searchOrder.same');
+ case 0:
+ return t('searchOrder.notsame');
+ }
+}
+function tableRowClassName({ row }) {
+ if (row.isSame === 1) {
+ return 'row-red-background'; // 璁剧疆绾㈣壊鑳屾櫙
+ }
+ return '';
+}
onBeforeUnmount(() => {
closeWebSocket();
});
@@ -637,6 +659,7 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<el-table height="300px" ref="table"
@selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName"
:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
<el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
@@ -645,6 +668,13 @@
<template #default="scope">
<el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
</template>
+ </el-table-column>
+ <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.isSame)">
+ {{ getStatuscasOnea(scope.row.isSame) }}
+ </el-tag>
+ </template>
</el-table-column>
</el-table>
</el-card>
@@ -903,7 +933,7 @@
</div>
</el-dialog>
</template>
-<style scoped>
+<style>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -1049,4 +1079,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+.row-red-background {
+ background-color: #CDAF95 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0