From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 167a2c2..fa0c416 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -30,35 +30,8 @@
</div>
<div id="dotClass">
- <!-- <div style="margin-bottom: -5px;margin-left: 5px;"> -->
- <!-- <el-form> -->
- <!-- <el-row> -->
- <!-- <el-col :span="4">
- <div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.currenttask')" style="width: 14vw">
- {{ temperingtotal }}
- </el-form-item>
- </div>
- </el-col> -->
- <!-- <el-col :span="5">
- <div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.claimednumber')" style="width: 14vw">
- {{ glasstotal }}
- </el-form-item>
- </div>
- </el-col> -->
- <!-- <el-col :span="4">
- <div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.linenumber')" style="width: 14vw">
- {{ fulltotals }}
- </el-form-item>
- </div>
- </el-col> -->
<div style="margin-left: 70px;">{{ $t('hellow.freetwo') }}</div>
<i :style="{ marginTop: '2px', backgroundColor: freetwo, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <!-- </el-row> -->
- <!-- </el-form> -->
- <!-- </div> -->
</div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="650" ref="table" :data="tableDataa"
@@ -494,7 +467,13 @@
<el-table ref="table" style="margin-top: 20px;height: 400px;"
:data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="formulaName" fixed align="center" :label="$t('hellow.formulaNamep')"/>
- <el-table-column prop="filmRemove" fixed align="center" :label="$t('Mounting.removalmethodp')"/>
+ <el-table-column prop="filmRemove" align="center" :label="$t('Mounting.removalmethodp')" min-width="110">
+ <template #default="scope">
+ <el-tag :type="getcasOnea(scope.row.filmRemove)">
+ {{ getStatuscasOnea(scope.row.filmRemove) }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="topRemove" align="center" :label="$t('hellow.topRemovep')"> </el-table-column>
<el-table-column prop="bottomRemove" align="center" :label="$t('hellow.bottomRemovep')"> </el-table-column>
<el-table-column prop="leftRemove" align="center" :label="$t('hellow.leftRemovep')"> </el-table-column>
@@ -592,8 +571,8 @@
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
- if (data.freeTwoReqvestEntity != null) {
- freetwo.value = data.freetwo[0] == true ? 'green' : '#911005';
+ if (data.freeTwoRequestEntity != null) {
+ freetwo.value = data.freeTwoRequestEntity[0] == true ? 'green' : '#911005';
}
// if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
// tableDataa.value = currentPageData[0];
@@ -612,6 +591,26 @@
closeWebSocket(socket);
}
});
+function getcasOnea(filmRemove) {
+ switch (filmRemove) {
+ case 1:
+ return 'success';
+ case 0:
+ return 'warning';
+ default:
+ return 'info';
+ }
+}
+function getStatuscasOnea(filmRemove) {
+ switch (filmRemove) {
+ case 1:
+ return t('Mounting.removal');
+ case 0:
+ return t('Mounting.noremoval');
+ default:
+ return '';
+ }
+}
// 寮�濮嬩换鍔�
const handleBinda = (row) => {
blinda.value = true;
@@ -765,6 +764,7 @@
leftRemove.value = '';
rightRemove.value = '';
topRemove.value = '';
+ fetchmulan()
} else {
ElMessage.error('Failed to fetch data');
}
@@ -815,7 +815,8 @@
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
+ fetchmulan()
+ } else {
ElMessage.error(response.msg);
}
}
--
Gitblit v1.8.0