From 46229c2a788c1f2a725d5d31225eec5dfa9ce8b4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 26 九月 2024 10:13:41 +0800
Subject: [PATCH] 演示模式错误提示
---
Web/src/views/device/deviceInfo/index.vue | 7 +++++++
Admin.NET/WCS.Application/Hub/PlcHub.cs | 20 +++++++++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcHub.cs b/Admin.NET/WCS.Application/Hub/PlcHub.cs
index bfb6fb8..5dc02c2 100644
--- a/Admin.NET/WCS.Application/Hub/PlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcHub.cs
@@ -77,9 +77,19 @@
var checkTask = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Status == "1").ToListAsync();
if (checkTask.Count > 0)
{
- throw Oops.Oh("鍒嗘嫞鐮佸灈宸茬粦瀹氫换鍔★紝涓嶆敮鎸佸紑鍚紨绀烘ā寮忥紒");
+ await _plcHubContext.Clients.All.UpdateService(
+ new PLCServiceModel()
+ {
+ BoRunningState = PLCTaskAction.boRunningState,
+ BoRefresh = PLCTaskAction.boRefresh,
+ BoOffline = PLCTaskAction.boOffline,
+ BoDemo = PLCTaskAction.boDemo,
+ BoDrumReversal = PLCTaskAction.boDrumReversal,
+ Error = "鍒嗘嫞鐮佸灈宸茬粦瀹氫换鍔★紝涓嶆敮鎸佸紑鍚紨绀烘ā寮忥紒"
+ });
+ return;
}
- }
+ }
//PLC杩炴帴
var plcStackeConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == "10.18.51.120");
if (plcStackeConn.Connected)
@@ -120,7 +130,7 @@
PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
}
}
- else
+ else
{
PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
}
@@ -141,4 +151,8 @@
public bool? BoDemo { get; set; }
public bool? BoDrumReversal { get; set; }
+ /// <summary>
+ /// 閿欒淇℃伅
+ /// </summary>
+ public string Error { get; set; }
}
\ No newline at end of file
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 4e0cddd..3d76125 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -85,6 +85,7 @@
import { listStatus, listPosition } from '/@/api/wcs/wcsPlc';
import { signalR } from './signalR';
import { cellsDataLine, cellsDataOne, cellsDataTwo, cellsDataThree } from './data';
+import { ElMessage } from "element-plus";
const state = ref<any>({});
const stackers = ref<any>({});
@@ -140,6 +141,12 @@
signalR.off('UpdateService');
signalR.on('UpdateService', (data: any) => {
state.value = data;
+ if (data.error) {
+ ElMessage({
+ message: data.error,
+ type: "error",
+ });
+ }
});
signalR.off('PublicPosition');
signalR.on('PublicPosition', (data: any) => {
--
Gitblit v1.8.0