From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 95 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 34 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index d2bafbb..fa0c416 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -28,33 +28,11 @@
</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
</div>
- <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>
- </el-row>
- </el-form>
- </div>
+
+ <div id="dotClass">
+ <div style="margin-left: 70px;">{{ $t('hellow.freetwo') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: freetwo, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ </div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="650" ref="table" :data="tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
@@ -483,13 +461,19 @@
</el-dialog>
<!-- 涓┖閰嶆柟 -->
<el-dialog v-model="mulan" top="15vh" width="70%" :title="$t('hellow.hollowformula')">
- <el-button id="searchButton" type="primary" @click="add = true">
+ <el-button id="searchButton" type="primary" @click="openAddDialog">
{{ $t('basicData.add') }}
</el-button>
<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>
@@ -539,6 +523,7 @@
const topRemove = ref('')
const filmsId = ref('')
const flowCardId = ref('')
+const freetwo = ref('#911005');
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
@@ -582,10 +567,13 @@
};
const handleMessage = (data) => {
try {
- tableDataa.value = data[931][0];
- const allPageData = data;
+ tableDataa.value = data[931][0];
+ const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
+ if (data.freeTwoRequestEntity != null) {
+ freetwo.value = data.freeTwoRequestEntity[0] == true ? 'green' : '#911005';
+ }
// if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
// tableDataa.value = currentPageData[0];
// } else {
@@ -603,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;
@@ -632,7 +640,16 @@
rightRemove.value = row.rightRemove;
topRemove.value = row.topRemove;
adda.value = true;
-}
+}
+function openAddDialog() {
+ formulaName.value = '';
+ filmRemove.value = '';
+ bottomRemove.value = '';
+ leftRemove.value = '';
+ rightRemove.value = '';
+ topRemove.value = '';
+ add.value = true;
+}
const handlezhiban = () => {
dialogFormVisiblea.value = true;
fetchFlowCardId();
@@ -747,6 +764,7 @@
leftRemove.value = '';
rightRemove.value = '';
topRemove.value = '';
+ fetchmulan()
} else {
ElMessage.error('Failed to fetch data');
}
@@ -797,7 +815,8 @@
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
+ fetchmulan()
+ } else {
ElMessage.error(response.msg);
}
}
@@ -1024,4 +1043,12 @@
#dialog-footer {
text-align: center;
margin-top: -15px;
-}</style>
\ No newline at end of file
+}
+#dotClass {
+ display: flex;
+ margin-left: 20px;
+ size: 50px;
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0