From 637668ccd8a20772540eaf88ecf8b6eb098df5a1 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 05 九月 2024 16:55:26 +0800
Subject: [PATCH] 新增WMS下发任务表，增加分拣任务菜单；绑定分拣码垛设备数据
---
Web/src/views/device/sortPallet/index.vue | 104 +++++++++++++--------------------------------------
1 files changed, 27 insertions(+), 77 deletions(-)
diff --git a/Web/src/views/device/sortPallet/index.vue b/Web/src/views/device/sortPallet/index.vue
index 950d163..1084a8c 100644
--- a/Web/src/views/device/sortPallet/index.vue
+++ b/Web/src/views/device/sortPallet/index.vue
@@ -18,7 +18,7 @@
<div class="card-container">
<el-card class="other-box-card" v-for="deviceInfo in devicePointData" :key="deviceInfo.id">
<div slot="header" class="linefix">
- <span>{{ deviceInfo.name }}</span>
+ <span>{{ deviceInfo.text }}</span>
<div :class="['lineStatus', { 'device-status-0': deviceInfo.status === 0 }, { 'device-status-1': deviceInfo.status === 1 }]"></div>
</div>
<div class="otherValuefix" >
@@ -29,6 +29,9 @@
<el-form-item label="浠诲姟鍙�">
<el-input v-model="deviceInfo.taskNumber"></el-input>
</el-form-item>
+ <el-form-item label="鎵规鍙�">
+ <el-input></el-input>
+ </el-form-item>
<el-form-item label="鐗╂枡缂栫爜">
<el-input></el-input>
</el-form-item>
@@ -38,7 +41,7 @@
<el-form-item label="鍖呰鍚嶇О">
<el-input></el-input>
</el-form-item>
- <el-form-item label="鐘舵��">
+ <el-form-item label="缁戝畾鐘舵��">
<el-input></el-input>
</el-form-item>
<el-form-item label="鎶撶鍝佺">
@@ -75,90 +78,37 @@
<script lang="ts" setup>
import { ref } from 'vue';
-import { GetWcsPackPlcList } from '/@/api/wcs/wcsDevice';
-
+import { GetWcsPackPlcList,GetWcsPackStationPlcList } from '/@/api/wcs/wcsDevice';
+//璁惧鏁版嵁
const deviceList=ref<any>([]);
+//璁惧瀵瑰簲宸ヤ綅鏁版嵁
+const devicePointData = ref<any>([]);
-const devicePointList=[
- {
- id: 1,
- deviceId:586494087331909,
- name: '1鍙风爜鍨涙満鍣ㄤ汉 1宸ヤ綅',
- taskNumber: 'T000001',
- taskType: '',
- plc: '',
- wcs: '',
- status: 0
- },
- {
- id: 2,
- deviceId:586494087331909,
- name: '1鍙风爜鍨涙満鍣ㄤ汉 2宸ヤ綅',
- taskNumber: '',
- taskType: '',
- plc: '',
- wcs: '',
- status: 1
- },
- {
- id: 3,
- deviceId:586494087331909,
- name: '1鍙风爜鍨涙満鍣ㄤ汉 3宸ヤ綅',
- taskNumber: '',
- taskType: '',
- plc: '',
- wcs: '',
- status: 1
- },
- {
- id: 4,
- deviceId:586494241939525,
- name: '2鍙风爜鍨涙満鍣ㄤ汉 1宸ヤ綅',
- taskNumber: 'T000001',
- taskType: '',
- plc: '',
- wcs: '',
- status: 0
- },
- {
- id: 5,
- deviceId:586494241939525,
- name: '2鍙风爜鍨涙満鍣ㄤ汉 2宸ヤ綅',
- taskNumber: '',
- taskType: '',
- plc: '',
- wcs: '',
- status: 1
- },
- {
- id: 6,
- deviceId:3,
- name: '3鍙锋満鍣ㄤ汉 1宸ヤ綅',
- taskNumber: 'T000001',
- taskType: '',
- plc: '',
- wcs: '',
- status: 0
- }
-];
-
-let devicePointData = ref<any>([]);
const selectedDeviceId=ref<any>();
-// 鏌ヨ鎿嶄綔
-const handleQuery = async () => {
+
+//鑾峰彇
+const fetchStationData = async (plcId: any) => {
+ const res2 = await GetWcsPackStationPlcList({ plcId });
+ devicePointData.value = res2.data.result;
+ console.log('data:'+devicePointData.value);
+};
+// 鑾峰彇璁惧鏁版嵁
+const fetchPLCDeviceData = async () => {
var res = await GetWcsPackPlcList();
deviceList.value = res.data.result;
- //杈撻�佺嚎鏁版嵁
- selectedDeviceId.value = deviceList.value[0].id;
- devicePointData.value= devicePointList.filter(device => device.deviceId === selectedDeviceId.value);
+ if (deviceList.value.length > 0) {
+ selectedDeviceId.value = deviceList.value[0].id;
+ await fetchStationData(selectedDeviceId.value);
+ }
};
-handleQuery();
+fetchPLCDeviceData();
//鍒囨崲
function chooseDevice(id) {
selectedDeviceId.value = id;
- devicePointData.value = devicePointList.filter(device => device.deviceId === id);
+
+ fetchStationData(id);
}
</script>
@@ -204,13 +154,13 @@
}
.otherValuefix{
width: 100%;
- height: 500px;
+ height: 540px;
padding: 10px;
border-bottom: 1px solid rgb(197, 195, 195);
}
.otherButtonfix{
width: 100%;
- height: 100px;
+ height: 60px;
display: flex;
align-items: center;
justify-content: center;
--
Gitblit v1.8.0