From 42d333112ed74032fbf8f2cd60d3cc8f3b4a0a08 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 03 四月 2025 08:48:00 +0800
Subject: [PATCH] 更新看板
---
UI-Project/src/views/MechanicalArm/mechanicalArm.vue | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 14 deletions(-)
diff --git a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
index c68bd9e..b3dd11f 100644
--- a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
+++ b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
@@ -14,7 +14,7 @@
});
const blind = ref(false)
const blindMode = ref(false)
-const blindModeNumber = ref('')
+const blindModeNumberLocal = ref('')
const errorInfo = ref(true)
const loadData = ref([]);
const findMachine = ref([]);
@@ -23,7 +23,12 @@
const findPrimitiveTask = ref([]);
const scanCodeOld = ref([]);
const searchs = ref();
-const machineId = 2;//褰撳墠椤甸潰鐨勮澶嘔D
+
+const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
+const pageParams=userInfo.user.menus[0].pages[0].params;
+const pageParamsJson=JSON.parse(pageParams);
+const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
+console.log(machineId);
var errorScanId;
//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
let socket = null;
@@ -31,12 +36,33 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/deviceInteraction/api/talk/loadTask`;
const socketDownLineTaskUrl = `ws://${WebSocketHost}:${host}/api/deviceInteraction/api/talk/downLineTask`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+
+
+
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
- loadData.value = data.findPrimitiveTasking[0];
- findPrimitiveTask.value = data.findPrimitiveTask[0];
- findMachine.value = data.machine[0];
- sendRecords.value = data.sendRecords[0].reverse();
+ let dataJson = data[""+machineId][0];
+
+ loadData.value = dataJson.findPrimitiveTasking[0];
+ findPrimitiveTask.value = dataJson.findPrimitiveTask[0];
+ findMachine.value = dataJson.machine[0];
+ if(findMachine.value.mode=="1"){
+ modevalue.value = {
+ value: '1',
+ label: '鏍囧噯',
+ };
+ }else if(findMachine.value.mode=="2"){
+ modevalue.value = {
+ value: '2',
+ label: '瀹氬埗',
+ };
+ }else if(findMachine.value.mode=="3"){
+ modevalue.value = {
+ value: '3',
+ label: '鎵嬪姩',
+ };
+ }
+ //sendRecords.value = data.sendRecords[0].reverse();
};
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage2 = (data) => {
@@ -334,13 +360,48 @@
label: '鎵嬪姩',
}
]
+
+const modeShow = async () => {
+ blindMode.value = true;
+ blindModeNumberLocal.value=findMachine.taskCount;
+}
//妯″紡閫夋嫨鏃惰繘琛屽鐞�
const modeChange = async () => {
+ let mode=modevalue.value;
+ request.post("/deviceInteraction/machine/toggleModeMachine",
+ {
+ "id": machineId,
+ "mode": mode
+ }).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ ElMessage.success(res.message);
+ } else {
+ ElMessage.warning(res.message)
+ }
+ })
if(modevalue.value=='3'){
//褰撴槸鎵嬪姩妯″紡鏃跺脊绐楁彁绀� 璁剧疆涓婄墖鏁伴噺
blindMode.value = true;
}
+}
+
+//鎻愪氦淇敼鎵嬪姩妯″紡鐨勫惛鐗囨暟閲�
+const fetchSubmit = async () => {
+ //鎵爜鍥炶溅鎻愪氦
+ request.post("/deviceInteraction/machine/manualOperationTask",
+ {
+ "id": machineId,
+ "taskCount": blindModeNumberLocal.value,
+ "finshCount": 0
+ }).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ ElMessage.success(res.message);
+ } else {
+ ElMessage.warning(res.message)
+ }
+ })
+ blindMode.value = false;
}
</script>
<template>
@@ -348,10 +409,10 @@
<div id="div-title" style="font-size: 20px; font-weight: bold; margin:10px 0 10px 0;padding-left: 20px;">
{{ $t('machine.mechanicalArm') }}
</div>
- <el-dialog v-model="blind" top="30vh" style="text-align: center;" @close="handleDialogClose">
+ <el-dialog v-model="blind" top="10vh" style="text-align: center;width:1400px ;" @close="handleDialogClose">
<!-- 鏈鍙栫殑鏍囧噯浠诲姟 -->
- <el-table :data="findPrimitiveTask" stripe style="height:260px"
+ <el-table :data="findPrimitiveTask" stripe style="height:660px"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }">
<!-- <el-table-column type="selection" min-width="30" /> -->
@@ -382,7 +443,8 @@
</div>
<div>
鎵嬪姩杈撳叆涓婄墖鏁伴噺锛�
- <el-input v-model="blindModeNumber" style="width: 200px;" type="Number" id="blindMode" @keyup.enter="fetchData"></el-input>
+ <el-input v-model="blindModeNumberLocal" style="width: 200px;" type="Number" id="blindMode" @keyup.enter="fetchSubmit"></el-input>
+
</div>
<!-- <div>
<el-button size="mini" link type="primary" plain @click="startOrStopTask(scope.row, 2, 2)">纭</el-button>
@@ -399,7 +461,12 @@
<el-select v-model="modevalue" @change="modeChange" placeholder="璇烽�夋嫨妯″紡" size="large" style="width: 220px">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
- <span @click="modeChange" style="margin-left: 40px;">涓婄墖鏁伴噺:{{ blindModeNumber}}</span>
+
+ <span>
+ <span @click="modeShow" style="margin-left: 40px;">{{ findMachine.mode=="3"? ("涓婄墖鏁伴噺锛�"+findMachine.taskCount):"" }}</span>
+ <span style="margin-left: 40px;">{{ findMachine.mode=="3"? ("宸插畬鎴愭暟閲忥細"+findMachine.finshCount):"" }}</span>
+ </span>
+
</div>
<br>
@@ -407,10 +474,6 @@
@click="machineStatus((findMachine['state'] == '鏆傚仠' ? '寮�宸�' : '鏆傚仠'))">{{ findMachine['state'] == '寮�宸�' ?
$t('functionState.start') : $t('functionState.stop') }}</el-button>
<el-button type="primary" id="ButtonTopLine" @click="topLineShow">{{ $t('functionState.getTask') }}</el-button>
-
- <el-button :type="(findMachine['mode'] == '瀹氬埗' ? 'danger' : 'success')" id="ButtonMachineMode"
- @click="machineMode((findMachine['mode'] == 0 ? 1 : 0))">{{ findMachine['mode'] == 0 ?
- $t('functionState.modeD') : $t('functionState.modeB') }}</el-button>
</div>
<div id="main-body" style="min-height:240px;">
--
Gitblit v1.8.0