From 24fb859f5ff1b36ec902b6770ab99c2c70558db2 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 十月 2024 09:51:16 +0800
Subject: [PATCH] 新增上片界面
---
UI-Project/src/views/Slicecage/slicecage.vue | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 0846f5d..686a171 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -79,6 +79,8 @@
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
const temperingtotal = ref(0);
const glasstotal = ref(0);
+const fulltotals = ref(0);
+const temperingengineerId=ref('');
// 褰撳墠椤电爜鍜屾瘡椤垫樉绀虹殑鏉℃暟
const currentPage = ref(1);
const itemsPerPage = computed(() => {
@@ -386,6 +388,58 @@
console.error('鍙戠敓閿欒:', error);
}
};
+ // 鎸囧畾宸ョ▼
+ const brokek = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.specifytemperinga'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
+ engineerId: row.engineer_id
+ });
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 鎸囧畾宸ョ▼
+const broked = async() => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.specifytemperinga'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
+ engineerId: ""
+ });
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
// 鎸囧畾娴佺▼鍗�
const brokes = async(row) => {
try {
@@ -571,11 +625,17 @@
ElMessage.success(response.message);
tableDatagh.value = response.data
temperingtotal.value = response.data.length
- let totalCount = 0;
+ let totalCount = 0;
+ let fullCount = 0;
response.data.forEach(item => {
- totalCount += item.count || 0;
+ totalCount += item.count1 || 0;
+ if(item.count2-item.count1-item.count4==0){
+ fullCount+=1;
+ }
});
glasstotal.value = totalCount;
+ fulltotals.value = fullCount;
+
} else {
ElMessage.error(response.message);
}
@@ -589,8 +649,8 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/cacheVerticalGlass/work_assignment/selectWorkAssignment',{
- line: 2001,
- workingProcedure : '鍐峰姞宸�'
+ line: 4001,
+ workingProcedure : '閽㈠寲'
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -642,6 +702,10 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
+ //褰撳墠鎸囧畾宸ョ▼
+ if(data.bigStorageCageDetailsOutTask!=null){
+ temperingengineerId.value=data.temperingengineerId[0];
+ }
// 鏇存柊 tableData 鐨勬暟鎹�
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
@@ -1465,6 +1529,25 @@
</el-form-item>
</div>
</el-col>
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('婊＄倝鏁伴噺')" style="width: 14vw">
+ {{ fulltotals }}
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('褰撳墠鎸囧畾宸ョ▼')" style="width: 14vw">
+ {{ temperingengineerId }}
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
+ <el-button size="mini" type="text" plain @click="broked()">{{ $t('鍙栨秷鎸囧畾') }}</el-button>
+ </div>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -1475,10 +1558,11 @@
<el-table-column prop="count2" align="center" :label="$t('鎬绘暟閲�')" min-width="150" />
<el-table-column prop="count1" align="center" :label="$t('绗煎瓙鍐呮暟閲�')" min-width="150" />
<el-table-column prop="count3" align="center" :label="$t('缂哄皯鏁伴噺')" min-width="150" />
+ <el-table-column prop="count4" align="center" :label="$t('鐮存崯/鎷胯蛋鏁伴噺')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
<template #default="scope">
<el-button size="mini" type="text" plain @click="brokee(scope.row)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokee(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
</template>
</el-table-column>
--
Gitblit v1.8.0