From 91c0c361e68607641754141ebf325bbdf3d1f775 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 31 十二月 2024 16:37:45 +0800
Subject: [PATCH] 中空配方添加解决bug，更改磨边表格样式及语言切换
---
UI-Project/src/views/Slicecage/slicecage.vue | 54 +++++++++++++++---------------------------------------
1 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 3dfe112..67921f1 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -376,8 +376,8 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
- engineerId: row.engineer_id
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId",{
+ engineerId: row.engineerId
});
if (response.code === 200) {
ElMessage.success(response.message);
@@ -389,7 +389,7 @@
console.error('鍙戠敓閿欒:', error);
}
};
-// 鎸囧畾宸ョ▼
+// 鍙栨秷鎸囧畾
const broked = async() => {
try {
const confirmResult = await ElMessageBox.confirm(
@@ -538,7 +538,7 @@
deviceId: deviceId,
slot: slot
};
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
if (response.code === 200) {
tableDataa.value = response.data;
add.value = false;
@@ -575,12 +575,6 @@
const { engineerId, temperingLayoutId } = row;
fetchlack(engineerId, temperingLayoutId);
dialogFormVisibled.value = true;
-};
-// 鎸囧畾宸ョ▼
-const handlespecifyengineerid = (row) => {
- const { engineerId } = row;
- fetchspecify(engineerId);
- dialogFormVisiblee.value = true;
};
// 绗煎唴璇︽儏
const handlecagedetails = (row) => {
@@ -630,8 +624,8 @@
if (response.code === 200) {
ElMessage.success(response.message);
tableDataa.value = response.data
- filmsId.value = ''
- flowCardId.value = ''
+ // filmsId.value = ''
+ // flowCardId.value = ''
} else {
ElMessage.warning(response.msg)
}
@@ -662,24 +656,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatalack.value = response.data
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
-// 鎸囧畾宸ョ▼
-const fetchspecify = async (engineerId) => {
- try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId',{
- engineerId: engineerId,
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDataspecify.value = response.data
} else {
ElMessage.error(response.message);
}
@@ -812,19 +788,19 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
if (data.inkageEntity != null) {
- inkageEntity.value = data.inkageEntity == 1 ? '#911005' : 'green';
+ inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
if (data.requestEntity != null) {
- requestEntity.value = data.requestEntity == 1 ? '#911005' : 'green';
+ requestEntity.value = data.requestEntity == 1 ? 'green' : '#911005';
}
if (data.mesReplyEntity != null) {
- mesReplyEntity.value = data.mesReplyEntity == 1 ? '#911005' : 'green';
+ mesReplyEntity.value = data.mesReplyEntity == 1 ? 'green' : '#911005';
}
if (data.outInkageEntity != null) {
- outInkageEntity.value = data.outInkageEntity == 1 ? '#911005' : 'green';
+ outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
}
if (data.outRequestEntity != null) {
- outRequestEntity.value = data.outRequestEntity == 1 ? '#911005' : 'green';
+ outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
}
if (data.scanGlass != null) {
scanGlass.value = data.scanGlass[0];
@@ -1374,8 +1350,8 @@
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
<div style="display: flex;">
- <el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
- <el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
+ <el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchxianga">
{{$t('reportmanage.inquire')}}</el-button>
</div>
@@ -1572,7 +1548,6 @@
<el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
<el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
<el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlespecifyengineerid(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
<el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
@@ -1666,12 +1641,13 @@
<el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
<el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
<el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150" />
+ <el-table-column prop="slot" fixed align="center" :label="$t('film.slot')" min-width="150" />
<el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
<el-table-column prop="temperingFeedSequence" fixed align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
<el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
<el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
<el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
- <el-table-column prop="filmsid" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+ <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
<el-table-column
align="center"
:label="$t('searchOrder.state')"
--
Gitblit v1.8.0