From 06ea2eb0b511340032f46efca7d2ae5fb09bb930 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 05 六月 2024 15:47:09 +0800
Subject: [PATCH] 上片机页面样式，表格状态新增接口
---
UI-Project/src/views/Returns/returns.vue | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 2aadf11..002f537 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -68,7 +68,7 @@
label: thickness,
}));
} else {
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
} catch (error) {
// 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
@@ -91,7 +91,7 @@
flakea.value = true
}
} else {
- ElMessage.warning(res.msg)
+ ElMessage.warning(res.message)
// router.push("/login")
}
});
@@ -210,7 +210,7 @@
}
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
} catch (error) {
// 澶勭悊璇锋眰閿欒
@@ -249,7 +249,7 @@
}
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
} catch (error) {
// 澶勭悊璇锋眰閿欒
@@ -291,7 +291,7 @@
}
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
} catch (error) {
// 澶勭悊閿欒
@@ -337,7 +337,8 @@
}));
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
+ // ElMessage.error(response.msg);
}
}
catch (error) {
@@ -362,10 +363,10 @@
ElMessage.success(response.message);
// window.location.reload()
blind.value = false;
- selectedProjectNoa.value = ''
+ selectedProjectNoa.value = '';
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
}
catch (error) {
@@ -390,10 +391,10 @@
if (response.code == 200) {
ElMessage.success(response.message);
blinda.value = false;
- tableData.splice([]);
+ // tableData.splice([]);
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
}
else {
@@ -426,7 +427,7 @@
tableData.splice([]);
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
}
else {
@@ -494,8 +495,29 @@
const confirmCuttingMachine = () => {
cuttingMachineStatus.value = 'green';
};
-
-
+const toggleEnableState = async (row: any) => {
+ // 妫�鏌� id 鏄惁涓虹┖
+ if (!row.id) {
+ ElMessage.error('璇峰厛寮�濮嬩笂鐗囷紒');
+ return; // 濡傛灉 id 涓虹┖锛屽垯涓嶆墽琛屽悗缁搷浣�
+ }
+
+ const newState = row.state === 100 ? 0 : 100;
+
+ try {
+ // 鍙戦�佽姹傚埌鍚庣鏇存柊鐘舵��
+ const response = await request.post('/loadGlass/up-patten-usage/updateGlassState', { id: row.id, state: newState });
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰閿欒
+ console.error('鏇存柊鐜荤拑鐘舵�佽姹傚け璐�:', error);
+ ElMessage.error('鏇存柊鐜荤拑鐘舵�佹椂鍙戠敓閿欒');
+ }
+};
const wsUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const ws = new WebSocket(wsUrl);
@@ -569,7 +591,7 @@
<el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;" >纭</el-button>
<div style="margin-left: 70px;">{{ upstatus }} </div>
<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;" >纭</el-button>
+ <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;" >鍒囨崲</el-button>
</div>
<el-button style="margin-top: 5px;margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true">閫夋嫨宸ョ▼</el-button>
@@ -591,7 +613,7 @@
<el-table-column prop="filmsId" label="鑶滅郴" align="center"/>
<el-table-column prop="layoutSequence" label="鏁伴噺" align="center"/>
<el-table-column prop="thickness" label="鍘氬害" align="center"/>
- <el-table-column
+ <!-- <el-table-column
align="center"
label="鐘舵��"
min-width="80"
@@ -601,7 +623,21 @@
<el-tag :type="getStatusType(scope.row.state)">
{{ getStatusText(scope.row.state) }}
</el-tag>
- </template>
+ </template> -->
+ <el-table-column
+ align="center"
+ label="鍚敤鐘舵��"
+ min-width="80"
+ prop="state"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.state === 100 ? 'success' : 'warning'"
+ @click="toggleEnableState(scope.row)"
+ >
+ {{ scope.row.state === 100 ? '閫氳繃' : '绛夊緟涓�' }}
+ </el-tag>
+ </template>
</el-table-column>
</el-table>
</div>
--
Gitblit v1.8.0