From 8f3a85044b6e4b56a8dd0b104ca023933f1f129c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 03 十二月 2025 16:58:36 +0800
Subject: [PATCH] 统一卧转立扫码、卧转立、大车、大理片笼的定时器逻辑和步骤状态；添加设备拓扑图清除数据、联机状态切换按钮，
---
mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue | 148 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 111 insertions(+), 37 deletions(-)
diff --git a/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue b/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
index f3490b4..107603c 100644
--- a/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
+++ b/mes-web/src/views/plcTest/components/MultiDeviceTest/TaskOrchestration.vue
@@ -5,7 +5,7 @@
<h3>澶氳澶囨祴璇曠紪鎺�</h3>
<p v-if="group">褰撳墠璁惧缁勶細{{ group.groupName }}锛坽{ group.deviceCount || '-' }} 鍙拌澶囷級</p>
<p v-else class="warning">璇峰厛鍦ㄥ乏渚ч�夋嫨涓�涓澶囩粍</p>
- <p v-if="group && loadDeviceName" class="sub-info">涓婂ぇ杞﹁澶囷細{{ loadDeviceName }}</p>
+ <p v-if="group && loadDeviceName" class="sub-info">褰撳墠璁惧锛歿{ loadDeviceName }}</p>
</div>
<div class="action-buttons">
<el-button
@@ -25,25 +25,29 @@
</div>
</div>
- <el-form :model="form" label-width="120px">
- <el-form-item label="鐜荤拑ID鍒楄〃">
+ <el-form :model="form" label-width="120px" :rules="rules" ref="formRef">
+ <el-form-item label="鐜荤拑ID鍒楄〃" prop="glassIds">
<el-input
v-model="glassIdsInput"
type="textarea"
:rows="4"
- placeholder="璇疯緭鍏ョ幓鐠冩潯鐮侊紝鏀寔澶氳鎴栭�楀彿鍒嗛殧"
+ placeholder="鍙�夛細杈撳叆鐜荤拑ID锛屽皢浣跨敤杈撳叆鐨処D杩涜娴嬭瘯"
+ show-word-limit
+ :maxlength="5000"
/>
- </el-form-item>
- <el-form-item label="浣嶇疆缂栫爜">
- <el-input v-model="form.positionCode" placeholder="渚嬪锛歅OS1" />
- </el-form-item>
- <el-form-item label="瀛樺偍浣嶇疆">
- <el-input-number v-model="form.storagePosition" :min="1" :max="200" />
- </el-form-item>
- <el-form-item label="鎵ц闂撮殧 (ms)">
- <el-input-number v-model="form.executionInterval" :min="100" :max="10000" />
+ <div class="form-tip">
+ <span v-if="glassIds.length > 0">宸茶緭鍏� {{ glassIds.length }} 涓幓鐠僆D锛堟祴璇曟ā寮忥細浣跨敤杈撳叆鐨処D锛�</span>
+ <span v-else>鏈緭鍏ョ幓鐠僆D锛堟甯告ā寮忥細灏嗕粠鏁版嵁搴撹鍙栨渶杩戞壂鐮佺殑鐜荤拑ID锛�</span>
+ </div>
</el-form-item>
</el-form>
+
+ <!-- 璁惧缁勬嫇鎵戝浘 -->
+ <GroupTopology
+ v-if="group"
+ :group="group"
+ class="topology-section"
+ />
</div>
</template>
@@ -53,6 +57,7 @@
import { Delete, Promotion } from '@element-plus/icons-vue'
import { multiDeviceTaskApi } from '@/api/device/multiDeviceTask'
import { deviceGroupApi, deviceInteractionApi } from '@/api/device/deviceManagement'
+import GroupTopology from '../DeviceGroup/GroupTopology.vue'
const props = defineProps({
group: {
@@ -62,12 +67,38 @@
})
const emit = defineEmits(['task-started'])
+//閰嶇疆榛樿鍊�
+const form = reactive({})
-const form = reactive({
- positionCode: '',
- storagePosition: null,
- executionInterval: 1000
-})
+const formRef = ref(null)
+
+const rules = {
+ glassIds: [
+ {
+ validator: (rule, value, callback) => {
+ // 濡傛灉杈撳叆浜嗙幓鐠僆D锛屽垯杩涜楠岃瘉锛涘鏋滄病鏈夎緭鍏ワ紝鍒欏厑璁革紙灏嗕粠鏁版嵁搴撹鍙栵級
+ if (glassIds.value.length === 0) {
+ // 鍏佽涓虹┖锛屽皢浠庢暟鎹簱璇诲彇鏈�杩戞壂鐮佺殑鐜荤拑ID
+ callback()
+ } else if (glassIds.value.length > 100) {
+ callback(new Error('鐜荤拑ID鏁伴噺涓嶈兘瓒呰繃100涓�'))
+ } else {
+ // 楠岃瘉鐜荤拑ID鏍煎紡
+ const invalidIds = glassIds.value.filter(id => {
+ // 绠�鍗曠殑鏍煎紡楠岃瘉锛氫笉鑳戒负绌猴紝闀垮害鍦�1-50涔嬮棿
+ return !id || id.length === 0 || id.length > 50
+ })
+ if (invalidIds.length > 0) {
+ callback(new Error(`瀛樺湪鏃犳晥鐨勭幓鐠僆D鏍煎紡锛岃妫�鏌))
+ } else {
+ callback()
+ }
+ }
+ },
+ trigger: 'blur'
+ }
+ ]
+}
const glassIdsInput = ref('')
const loading = ref(false)
@@ -92,6 +123,8 @@
.filter((item) => item.length > 0)
})
+const normalizeType = (type) => (type || '').trim().toUpperCase()
+
const fetchLoadDevice = async () => {
loadDeviceId.value = null
loadDeviceName.value = ''
@@ -113,9 +146,15 @@
: Array.isArray(rawList?.data)
? rawList.data
: []
- const targetDevice =
- deviceList.find((item) => (item.deviceType || '').toUpperCase() === 'LOAD_VEHICLE') ||
- deviceList[0]
+ const scannerDevice = deviceList.find((item) => {
+ const type = normalizeType(item.deviceType)
+ return type.includes('SCANNER') || type.includes('鎵爜')
+ })
+ const loadVehicleDevice = deviceList.find((item) => {
+ const type = normalizeType(item.deviceType)
+ return type.includes('LOAD_VEHICLE') || type.includes('澶ц溅')
+ })
+ const targetDevice = scannerDevice || loadVehicleDevice || deviceList[0]
if (targetDevice && targetDevice.id) {
loadDeviceId.value = targetDevice.id
loadDeviceName.value = targetDevice.deviceName || targetDevice.deviceCode || `ID: ${targetDevice.id}`
@@ -133,23 +172,49 @@
ElMessage.warning('璇峰厛閫夋嫨璁惧缁�')
return
}
- if (glassIds.value.length === 0) {
- ElMessage.warning('璇疯嚦灏戣緭鍏ヤ竴涓幓鐠僆D')
+
+ // 琛ㄥ崟楠岃瘉
+ if (!formRef.value) return
+ try {
+ await formRef.value.validate()
+ } catch (error) {
+ ElMessage.warning('璇锋鏌ヨ〃鍗曡緭鍏�')
return
}
+
try {
loading.value = true
- await multiDeviceTaskApi.startTask({
+
+ // 鏋勫缓浠诲姟鍙傛暟
+ // 濡傛灉杈撳叆浜嗙幓鐠僆D锛屼娇鐢ㄨ緭鍏ョ殑锛涘鏋滄病鏈夎緭鍏ワ紝glassIds涓虹┖鏁扮粍锛屽悗绔細浠庢暟鎹簱璇诲彇
+ const parameters = {
+ glassIds: glassIds.value.length > 0 ? glassIds.value : []
+ }
+
+ // 寮傛鍚姩浠诲姟锛岀珛鍗宠繑鍥烇紝涓嶉樆濉�
+ const response = await multiDeviceTaskApi.startTask({
groupId: props.group.id || props.group.groupId,
- parameters: {
- glassIds: glassIds.value,
- positionCode: form.positionCode || null,
- storagePosition: form.storagePosition,
- executionInterval: form.executionInterval
- }
+ parameters
})
- ElMessage.success('浠诲姟宸插惎鍔�')
- emit('task-started')
+
+ const task = response?.data
+ if (task && task.taskId) {
+ ElMessage.success(`浠诲姟宸插惎鍔紙寮傛鎵ц锛�: ${task.taskId}`)
+ emit('task-started', task)
+
+ // 绔嬪嵆鍒锋柊鐩戞帶鍒楄〃锛屾樉绀烘柊鍚姩鐨勪换鍔�
+ setTimeout(() => {
+ emit('task-started')
+ }, 500)
+
+ // 閲嶇疆琛ㄥ崟锛堜繚鐣欐墽琛岄厤缃級锛屾柟渚跨户缁惎鍔ㄥ叾浠栬澶囩粍
+ glassIdsInput.value = ''
+
+ // 鎻愮ず鐢ㄦ埛鍙互缁х画鍚姩鍏朵粬璁惧缁�
+ ElMessage.info('鍙互缁х画閫夋嫨鍏朵粬璁惧缁勫惎鍔ㄦ祴璇曪紝澶氫釜璁惧缁勫皢骞惰鎵ц')
+ } else {
+ ElMessage.warning('浠诲姟鍚姩鍝嶅簲寮傚父')
+ }
} catch (error) {
ElMessage.error(error?.message || '浠诲姟鍚姩澶辫触')
} finally {
@@ -163,17 +228,15 @@
return
}
if (!loadDeviceId.value) {
- ElMessage.warning('鏈壘鍒颁笂澶ц溅璁惧锛屾棤娉曟竻绌篜LC')
+ ElMessage.warning('鏈壘鍒板搴旇澶囷紝鏃犳硶娓呯┖PLC')
return
}
try {
clearLoading.value = true
const response = await deviceInteractionApi.executeOperation({
deviceId: loadDeviceId.value,
- operation: 'clearGlass',
- params: {
- positionCode: form.positionCode || null
- }
+ operation: 'clearPlc',
+ params: {}
})
if (response?.code !== 200) {
throw new Error(response?.message || 'PLC娓呯┖澶辫触')
@@ -234,5 +297,16 @@
gap: 12px;
align-items: center;
}
+
+.form-tip {
+ font-size: 12px;
+ color: #909399;
+ margin-top: 4px;
+ line-height: 1.4;
+}
+
+.topology-section {
+ margin-top: 24px;
+}
</style>
--
Gitblit v1.8.0