From 11cea3bba7ac11d67c1110f3a922c8a19cb5a57d Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 03 九月 2024 11:42:53 +0800
Subject: [PATCH] 报警监控通讯和页面优化
---
Web/src/views/device/alarmManage/index.vue | 194 +++++++++++++++++--------------
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 132 ++++++++++++++++-----
Web/src/views/wcs/wcsAlarmInfo/index.vue | 2
Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs | 2
Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs | 3
5 files changed, 210 insertions(+), 123 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 2d1116b..9576ac4 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -1,4 +1,5 @@
锘縰sing Admin.NET.Core.Service;
+using DocumentFormat.OpenXml.Drawing;
using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
@@ -16,9 +17,10 @@
private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
- private static List<WcsPlc> listPlc;
- private static List<WcsDevice> listPlcDevice;
- private static List<WcsPosition> listPlcStation;
+ private static List<WcsPlc> listPlc = new List<WcsPlc>();
+ private static List<WcsDevice> listPlcDevice = new List<WcsDevice>();
+ private static List<WcsPosition> listPlcStation = new List<WcsPosition>();
+ private static List<WcsAlarmInfo> listAlarmInfo = new List<WcsAlarmInfo>();
private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
private static CancellationTokenSource cts = new CancellationTokenSource();//鍙栨秷绾跨▼鏍囪瘑
@@ -32,10 +34,6 @@
{
//璁㈤槄浜嬩欢
DeviceValueChangeEvent += PLCService.OnChangeEvent;
-
- listPlc = _db.Queryable<WcsPlc>().ToList();
- listPlcDevice = _db.Queryable<WcsDevice>().ToList();
- listPlcStation = _db.Queryable<WcsPosition>().ToList();
}
/// <summary>
/// 鍒濆鍖朠LC杩炴帴
@@ -48,6 +46,7 @@
listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine).ToList();
listPlcDevice = _db.Queryable<WcsDevice>().ToList();
listPlcStation = _db.Queryable<WcsPosition>().ToList();
+ listAlarmInfo = _db.Queryable<WcsAlarmInfo>().ToList();
//绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
Thread.Sleep(5000);
foreach (var modPlcUtil in listPlcUtil)
@@ -65,6 +64,7 @@
boRunningState = true;
StartRead();
ConnectionStatus();
+ StartWatchAlarm();
}
/// <summary>
/// 寮�鍚鍙杙lc绾跨▼
@@ -87,7 +87,7 @@
modPlcUtil.Close();
}
break;
- throw new OperationCanceledException();
+ //throw new OperationCanceledException();
}
try
{
@@ -149,35 +149,41 @@
{
try
{
- //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
- if (cts.Token.IsCancellationRequested)
+ while (true)
{
- foreach (var modPlcUtil in listPlcUtil)
+
+ //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
+ if (cts.Token.IsCancellationRequested)
{
- modPlcUtil.Close();
- }
- throw new OperationCanceledException();
- }
- //鑾峰彇姣忎釜PLC杩炴帴鐘舵��
- foreach (var modPlc in listPlc)
- {
- var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
- if (modPlcUtil == null)
- modPlc.IsConn = false;
- else
- modPlc.IsConn = modPlcUtil.Connected;
- if (sysCacheService.ExistKey("PLCCONN" + modPlc.Id))
- {
- var cachePlc = sysCacheService.Get<WcsPlc>("PLCCONN" + modPlc.Id);
- if (cachePlc.IsConn != modPlc.IsConn)
+ foreach (var modPlcUtil in listPlcUtil)
{
- //杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
- _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
}
+ break;
+ //throw new OperationCanceledException();
}
- sysCacheService.Set("PLCCONN" + modPlc.Id, modPlc);
+ //鑾峰彇姣忎釜PLC杩炴帴鐘舵��
+ foreach (var modPlc in listPlc)
+ {
+ var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
+ if (modPlcUtil == null)
+ modPlc.IsConn = false;
+ else
+ modPlc.IsConn = modPlcUtil.Connected;
+ if (sysCacheService.ExistKey("PLCCONN" + modPlc.Id))
+ {
+ var cachePlc = sysCacheService.Get<WcsPlc>("PLCCONN" + modPlc.Id);
+ if (cachePlc.IsConn != modPlc.IsConn)
+ {
+ //杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
+ _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+ }
+ }
+ sysCacheService.Set("PLCCONN" + modPlc.Id, modPlc);
+ }
+ Thread.Sleep(1000);
}
- Thread.Sleep(3000);
}
catch (OperationCanceledException)
{
@@ -192,6 +198,70 @@
});
}
+
+ /// <summary>
+ /// 寮�鍚姤璀︾洃鎺�
+ /// </summary>
+ public static void StartWatchAlarm()
+ {
+ Task.Run(() =>
+ {
+ var listPlc = listAlarmInfo.GroupBy(s => new { s.PlcIP, s.PlcPort }).ToList();
+ List<PLCUtil> listPlcUtil = new List<PLCUtil>();
+ int i = 0;
+ foreach (var modPlc in listPlc)
+ {
+ listPlcUtil.Add(new PLCUtil(new WcsPlc() { Id = i++, IP = modPlc.Key.PlcIP, Port = modPlc.Key.PlcPort, PLCType = PLCEnum.S7_1500 }));
+ }
+ while (true)
+ {
+ //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
+ if (cts.Token.IsCancellationRequested)
+ {
+ foreach (var modPlcUtil in listPlcUtil)
+ {
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
+ }
+ break;
+ //throw new OperationCanceledException();
+ }
+ foreach (var modUtil in listPlcUtil)
+ {
+ //鎶ヨ鐐逛綅
+ var listAlarm = listAlarmInfo.Where(s => s.PlcIP == modUtil.PlcId.ToString());
+ foreach (var modAlarm in listAlarm)
+ {
+ (var result, var value) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, modAlarm.AlarmCode, "");
+ if (result.IsSucceed)
+ {
+ //鍋囪涓嶄负0灏辩畻鎶ヨ
+ if (value != 0)
+ {
+ //淇敼鎶ヨ鐘舵�佸悓鏃惰褰曟姤璀︽棩蹇�
+ modAlarm.AlarmTime = DateTime.Now;
+ modAlarm.Status = YesNoEnum.Y;
+ _db.Updateable(modAlarm).ExecuteCommand();
+ WcsAlarmLog modLog = modAlarm.Adapt<WcsAlarmLog>();
+ _db.Insertable(modLog).ExecuteCommand();
+ //涓嬪彂鎶ヨ鐘舵��
+ _plcHubContext.Clients.All.PublicAlarm(modAlarm.Adapt<WcsAlarmInfoOutput>());
+ }
+ //鍙栨秷鎶ヨ
+ else if (modAlarm.Status == YesNoEnum.Y)
+ {
+ modAlarm.AlarmTime = null;
+ modAlarm.Status = YesNoEnum.N;
+ _db.Updateable(modAlarm).ExecuteCommand();
+ }
+ }
+ }
+
+ }
+ Thread.Sleep(1000);
+ }
+ }, cts.Token);
+ }
/// <summary>
/// 鍋滄鏈嶅姟
/// </summary>
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
index d68c3b6..396fd7a 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
@@ -43,7 +43,7 @@
/// <summary>
/// 鐘舵��
/// </summary>
- public int? Status { get; set; }
+ public YesNoEnum? Status { get; set; }
/// <summary>
/// 璁惧绫诲瀷
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
index 09b5112..a5eda3e 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
@@ -46,6 +46,7 @@
public async Task<long> Add(AddWcsAlarmInfoInput input)
{
var entity = input.Adapt<WcsAlarmInfo>();
+ entity.Status = YesNoEnum.N;
await _wcsAlarmInfoRep.InsertAsync(entity);
return entity.Id;
}
@@ -103,7 +104,7 @@
public async Task<List<WcsAlarmInfoOutput>> List([FromQuery] PageWcsAlarmInfoInput input)
{
return await _wcsAlarmInfoRep.AsQueryable()
- //.WhereIF(!input.Status.IsNullOrEmpty(), s => s.Status == input.Status)
+ .WhereIF(!input.Status.IsNullOrEmpty(), s => s.Status == input.Status)
.Select<WcsAlarmInfoOutput>().ToListAsync();
}
diff --git a/Web/src/views/device/alarmManage/index.vue b/Web/src/views/device/alarmManage/index.vue
index 6235e26..4f54ba3 100644
--- a/Web/src/views/device/alarmManage/index.vue
+++ b/Web/src/views/device/alarmManage/index.vue
@@ -36,7 +36,7 @@
<div class="grid-container">
<div v-for="cell in cellsData" :key="cell.Id">
<!-- IsUse鐘舵�� 0:姝ｅ父 1锛氭湁鐗╁搧 2锛氶潪宸ヤ綅 3锛氬皬杞﹁矾绾� 4锛氭晠闅� -->
- <div v-if="cell.IsShow === 0"
+ <div v-if="cell.IsShow === 0"
:class="['grid-item', { 'active': cell.IsUse === 1 }, { 'active2': cell.IsUse === 2 }, { 'active3': cell.IsUse === 3 }, { 'active3': cell.IsUse === 3 }, { 'active4': cell.IsUse === 4 }]">
<div>{{ cell.Code }}</div>
</div>
@@ -49,7 +49,7 @@
</template>
<script lang="ts" setup>
-import { ref, reactive,onMounted } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
import { Splitpanes, Pane } from 'splitpanes';
import 'splitpanes/dist/splitpanes.css';
import { Vue2 } from 'vue-demi';
@@ -59,19 +59,44 @@
onMounted(async () => {
signalR.off('PublicAlarm');
signalR.on('PublicAlarm', (data: any) => {
- console.log(data)
- var listAlarm = tableData.value.filter(t => t.id == data.id);
- if (listAlarm.length == 0) {
- tableData.value.unshift(data)
+ console.log(data);
+
+ // 鏇存柊 tableData
+ const index = tableData.value.findIndex(t => t.id == data.id);
+
+ if (index === -1) {
+ // 濡傛灉涓嶅瓨鍦紝娣诲姞鏂版暟鎹�
+ tableData.value.unshift(data);
tableParams.value.total = tableData.value.length;
+ } else {
+ if (data.status == 1) {
+ // 濡傛灉鐘舵�佷负 1锛屾洿鏂版暟鎹�
+ tableData.value.splice(index, 1, data);
+ } else {
+ // 濡傛灉鐘舵�佷笉鏄� 1锛屾姤璀︽秷闄�
+ tableData.value.splice(index, 1);
+ }
}
- else {
- //濡傛灉宸茬粡瀛樺湪灏辨洿鏂版暟鎹�
- const index = tableData.value.findIndex(t => t.id == data.id);
- tableData.value.splice(index, 1, data);
- }
+
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCellData(cellsDataOne, data);
+ updateCellData(cellsDataTwo, data);
+ updateCellData(cellsDataThree, data);
});
});
+// 鏇存柊杈撻�佺嚎鏁版嵁鐨勯�氱敤鍑芥暟
+function updateCellData(cellsData: any[], data: any) {
+ const foundCell = cellsData.find(cell => cell.Code === data.stationNum);
+ if (foundCell) {
+ if (data.status == 1) {
+ foundCell.IsUse = 4;
+ }
+ else{
+ foundCell.IsUse = 0;
+ }
+ }
+}
+
//鍫嗗灈鏈烘暟鎹�
const cellsDataLine = [
{ Id: 1, Code: '001', LineCode: '', EndLocat: '', IsShow: 1, IsUse: 0, BoxHeight: 10 },
@@ -1562,56 +1587,56 @@
{ Id: 202, Code: '', IsShow: 0, IsUse: 2 },
{ Id: 203, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 204, Code: '', IsShow: 0, IsUse: 2 },
- { Id:205 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:206 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:207 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:208 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:209 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:210 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:211 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:212 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:213 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:214 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:215 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:216 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:217 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:218 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:219 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:220 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:221 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:222 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:223 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:224 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:225 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:226 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:227 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:228 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:229 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:230 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:231 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:232 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:233 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:234 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:235 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:236 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:237 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:238 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:239 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:240 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:241 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:242 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:243 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:244 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:245 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:246 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:247 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:248 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:249 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:250 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:251 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:252 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:253 , Code: '', IsShow: 0, IsUse: 3 },
- { Id:254 , Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 205, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 206, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 207, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 208, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 209, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 210, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 211, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 212, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 213, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 214, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 215, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 216, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 217, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 218, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 219, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 220, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 221, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 222, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 223, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 224, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 225, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 226, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 227, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 228, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 229, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 230, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 231, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 232, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 233, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 234, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 235, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 236, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 237, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 238, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 239, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 240, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 241, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 242, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 243, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 244, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 245, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 246, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 247, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 248, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 249, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 250, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 251, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 252, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 253, Code: '', IsShow: 0, IsUse: 3 },
+ { Id: 254, Code: '', IsShow: 0, IsUse: 3 },
{ Id: 255, Code: '', IsShow: 0, IsUse: 3 },
{ Id: 256, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 257, Code: '', IsShow: 1, IsUse: 0 },
@@ -1870,7 +1895,7 @@
{ Id: 510, Code: '', IsShow: 1, IsUse: 0 },
];
//鍔犺浇杈撻�佺嚎鏁版嵁
-let cellsData=ref<any>([]);
+let cellsData = ref<any>([]);
const tableParams = ref({
page: 1,
@@ -1885,36 +1910,23 @@
tableData.value = res.data.result;
tableParams.value.total = tableData.value.length;
- //澶勭悊涓�妤艰緭閫佺嚎鏁版嵁
- tableData.value.forEach((item) => {
- const foundCell = cellsDataOne.find(cell => cell.Code === item.stationNum);
- if (foundCell) {
- foundCell.IsUse = 4;
- }
- });
//鍔犺浇杈撻�佺嚎鏁版嵁
- cellsData.value =cellsDataOne;
+ cellsData.value = cellsDataOne;
- //澶勭悊浜屾ゼ杈撻�佺嚎鏁版嵁
- tableData.value.forEach((item) => {
- const foundCell = cellsDataTwo.find(cell => cell.Code === item.stationNum);
- if (foundCell) {
- foundCell.IsUse = 4;
- }
- });
-
- //澶勭悊涓夋ゼ杈撻�佺嚎鏁版嵁
- tableData.value.forEach((item) => {
- const foundCell = cellsDataThree.find(cell => cell.Code === item.stationNum);
- if (foundCell) {
- foundCell.IsUse = 4;
- }
- });
+ // 鏇存柊杈撻�佺嚎鏁版嵁
+ updateCells(cellsDataOne);
+ updateCells(cellsDataTwo);
+ updateCells(cellsDataThree);
console.log(tableParams.value.total);
loading.value = false;
};
-
+// 鏇存柊杈撻�佺嚎鏁版嵁鐨勯�氱敤鍑芥暟
+function updateCells(cellsData: any[]) {
+ tableData.value.forEach((item) => {
+ updateCellData(cellsData, item);
+ });
+}
handleQuery();
//澶嶄綅鎶ヨ
@@ -2062,8 +2074,9 @@
/* 姣忚楂樺害 */
gap: 0px;
/* Gap between cells */
-
- margin-top: -20px;;
+
+ margin-top: -20px;
+ ;
}
.grid-item {
@@ -2097,13 +2110,16 @@
.active2>div {
display: none;
}
+
.active3 {
background-color: #fff;
- border:1px solid red;
+ border: 1px solid red;
}
+
.active3>div {
display: none;
}
+
.active4 {
background-color: red;
}
diff --git a/Web/src/views/wcs/wcsAlarmInfo/index.vue b/Web/src/views/wcs/wcsAlarmInfo/index.vue
index 0eac6fd..f01cb0e 100644
--- a/Web/src/views/wcs/wcsAlarmInfo/index.vue
+++ b/Web/src/views/wcs/wcsAlarmInfo/index.vue
@@ -59,7 +59,7 @@
<el-table-column prop="alarmCode" label="鎶ヨ缂栧彿" show-overflow-tooltip="" />
<el-table-column prop="alarmName" label="鎶ヨ鎻忚堪" show-overflow-tooltip="" />
<el-table-column prop="ledIP" label="鏄剧ず灞廼p鍦板潃" show-overflow-tooltip="" />
- <el-table-column prop="status" label="鐘舵��" show-overflow-tooltip="">
+ <el-table-column prop="status" label="鏄惁鎶ヨ" show-overflow-tooltip="">
<template #default="scope">
<el-tag :type="dv('YesNoEnum', scope.row.status)?.tagType"> {{ dv('YesNoEnum',
scope.row.status)?.name}}</el-tag>
--
Gitblit v1.8.0