From bd07dc56f2d923f204a2b40504175e2658258cb4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 29 八月 2024 16:59:41 +0800
Subject: [PATCH] 报警信息调整
---
Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs | 56 +++++-
Admin.NET/WCS.Application/Enum/PLCEnum.cs | 9
Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs | 21 +
Web/src/views/wcs/wcsAlarmInfo/index.vue | 62 ++++---
Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs | 63 +++----
Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs | 19 -
Web/src/views/wcs/wcsAlarmInfo/component/editDialog.vue | 16 +
Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoDto.cs | 200 ++++++++++++------------
8 files changed, 253 insertions(+), 193 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs b/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
index 5b6c957..1244ff8 100644
--- a/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
@@ -5,19 +5,28 @@
/// 鎶ヨ淇℃伅琛�
/// </summary>
[SugarTable("WCSAlarmInfo","鎶ヨ淇℃伅琛�")]
-public class WcsAlarmInfo : EntityBaseData
+public class WcsAlarmInfo : EntityBaseData
{
/// <summary>
/// PLCIP鍦板潃
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "PlcIP", ColumnDescription = "PLCIP鍦板潃", Length = 20)]
- public string? PlcIP { get; set; }
+ public string PlcIP { get; set; }
+
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PlcPort", ColumnDescription = "PLCIP鍦板潃")]
+ public int PlcPort { get; set; }
/// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
+ [Required]
[SugarColumn(ColumnName = "AlarmCode", ColumnDescription = "鎶ヨ缂栧彿", Length = 20)]
- public string? AlarmCode { get; set; }
+ public string AlarmCode { get; set; }
/// <summary>
/// 鎶ヨ鎻忚堪
@@ -30,18 +39,18 @@
/// </summary>
[SugarColumn(ColumnName = "LedIP", ColumnDescription = "鏄剧ず灞廼p鍦板潃", Length = 20)]
public string? LedIP { get; set; }
-
+
/// <summary>
/// 鐘舵��
/// </summary>
[SugarColumn(ColumnName = "Status", ColumnDescription = "鐘舵��")]
- public YesNoEnum? Status { get; set; } = YesNoEnum.N;
+ public YesNoEnum? Status { get; set; }
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "Type", ColumnDescription = "璁惧绫诲瀷", Length = 20)]
- public string? Type { get; set; }
+ public PLCTypeEnum Type { get; set; }
/// <summary>
/// 鎶ヨ鏃ユ湡
diff --git a/Admin.NET/WCS.Application/Enum/PLCEnum.cs b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
index 0677b5e..1bdfe6d 100644
--- a/Admin.NET/WCS.Application/Enum/PLCEnum.cs
+++ b/Admin.NET/WCS.Application/Enum/PLCEnum.cs
@@ -12,9 +12,9 @@
[Description("鍫嗚泛鏈�")]
StackingMachine = 0,
/// <summary>
- /// 杈撻�佺嚎
+ /// 鎵樼洏杈撻�佺嚎
/// </summary>
- [Description("杈撻�佺嚎")]
+ [Description("鎵樼洏杈撻�佺嚎")]
ConveyorLine = 1,
/// <summary>
/// AGV灏忚溅
@@ -26,6 +26,11 @@
/// </summary>
[Description("鍙犳媶鎵樻満")]
PalletMachine = 3,
+ /// <summary>
+ /// 浠剁杈撻�佺嚎
+ /// </summary>
+ [Description("浠剁杈撻�佺嚎")]
+ BoxConveyorLine = 4,
}
/// <summary>
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoDto.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoDto.cs
index b3551b2..2c245b8 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoDto.cs
@@ -1,104 +1,104 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
+锘�
namespace WCS.Application;
+/// <summary>
+/// 鎶ヨ淇℃伅琛ㄨ緭鍑哄弬鏁�
+/// </summary>
+public class WcsAlarmInfoDto
+{
/// <summary>
- /// 鎶ヨ淇℃伅琛ㄨ緭鍑哄弬鏁�
+ /// 涓婚敭Id
/// </summary>
- public class WcsAlarmInfoDto
- {
- /// <summary>
- /// 涓婚敭Id
- /// </summary>
- public long Id { get; set; }
-
- /// <summary>
- /// PLCIP鍦板潃
- /// </summary>
- public string? PlcIP { get; set; }
-
- /// <summary>
- /// 鎶ヨ缂栧彿
- /// </summary>
- public string? AlarmCode { get; set; }
-
- /// <summary>
- /// 鎶ヨ鎻忚堪
- /// </summary>
- public string? AlarmName { get; set; }
-
- /// <summary>
- /// 鏄剧ず灞廼p鍦板潃
- /// </summary>
- public string? LedIP { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public YesNoEnum Status { get; set; }
-
- /// <summary>
- /// 璁惧绫诲瀷
- /// </summary>
- public string? Type { get; set; }
-
- /// <summary>
- /// 鎶ヨ鏃ユ湡
- /// </summary>
- public DateTime? AlarmTime { get; set; }
-
- /// <summary>
- /// LED鐘舵��
- /// </summary>
- public YesNoEnum LedStatus { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime? CreateTime { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- public DateTime? UpdateTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰匢d
- /// </summary>
- public long? CreateUserId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呭鍚�
- /// </summary>
- public string? CreateUserName { get; set; }
-
- /// <summary>
- /// 淇敼鑰匢d
- /// </summary>
- public long? UpdateUserId { get; set; }
-
- /// <summary>
- /// 淇敼鑰呭鍚�
- /// </summary>
- public string? UpdateUserName { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂↖d
- /// </summary>
- public long? CreateOrgId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public string? CreateOrgName { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- public bool IsDelete { get; set; }
-
- }
+ public long Id { get; set; }
+
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ public string PlcIP { get; set; }
+
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ public int PlcPort { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ缂栧彿
+ /// </summary>
+ public string AlarmCode { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ鎻忚堪
+ /// </summary>
+ public string? AlarmName { get; set; }
+
+ /// <summary>
+ /// 鏄剧ず灞廼p鍦板潃
+ /// </summary>
+ public string? LedIP { get; set; }
+
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public int? Status { get; set; }
+
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ public PLCTypeEnum Type { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ鏃ユ湡
+ /// </summary>
+ public DateTime? AlarmTime { get; set; }
+
+ /// <summary>
+ /// LED鐘舵��
+ /// </summary>
+ public int? LedStatus { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ public DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰匢d
+ /// </summary>
+ public long? CreateUserId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呭鍚�
+ /// </summary>
+ public string? CreateUserName { get; set; }
+
+ /// <summary>
+ /// 淇敼鑰匢d
+ /// </summary>
+ public long? UpdateUserId { get; set; }
+
+ /// <summary>
+ /// 淇敼鑰呭鍚�
+ /// </summary>
+ public string? UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂↖d
+ /// </summary>
+ public long? CreateOrgId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
+ /// </summary>
+ public string? CreateOrgName { get; set; }
+
+ /// <summary>
+ /// 杞垹闄�
+ /// </summary>
+ public bool IsDelete { get; set; }
+
+}
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
index 2cf82fb..6eaa5e1 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
@@ -1,12 +1,4 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
-using Admin.NET.Core;
-using System.ComponentModel.DataAnnotations;
-
+锘�
namespace WCS.Application;
/// <summary>
@@ -17,12 +9,17 @@
/// <summary>
/// PLCIP鍦板潃
/// </summary>
- public virtual string? PlcIP { get; set; }
+ public virtual string PlcIP { get; set; }
+
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ public virtual int PlcPort { get; set; }
/// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
- public virtual string? AlarmCode { get; set; }
+ public virtual string AlarmCode { get; set; }
/// <summary>
/// 鎶ヨ鎻忚堪
@@ -37,12 +34,12 @@
/// <summary>
/// 鐘舵��
/// </summary>
- public virtual YesNoEnum Status { get; set; } = YesNoEnum.N;
+ public virtual int? Status { get; set; }
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public virtual string? Type { get; set; }
+ public virtual PLCTypeEnum Type { get; set; }
/// <summary>
/// 鎶ヨ鏃ユ湡
@@ -52,7 +49,7 @@
/// <summary>
/// LED鐘舵��
/// </summary>
- public virtual YesNoEnum LedStatus { get; set; } = YesNoEnum.N;
+ public virtual int? LedStatus { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -117,9 +114,14 @@
public string? PlcIP { get; set; }
/// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public YesNoEnum? Status { get; set; }
+
+ /// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public string? Type { get; set; }
+ public PLCTypeEnum? Type { get; set; }
}
@@ -129,6 +131,30 @@
public class AddWcsAlarmInfoInput : WcsAlarmInfoBaseInput
{
/// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ [Required(ErrorMessage = "PLCIP鍦板潃涓嶈兘涓虹┖")]
+ public override string PlcIP { get; set; }
+
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ [Required(ErrorMessage = "PLCIP鍦板潃涓嶈兘涓虹┖")]
+ public override int PlcPort { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ缂栧彿
+ /// </summary>
+ [Required(ErrorMessage = "鎶ヨ缂栧彿涓嶈兘涓虹┖")]
+ public override string AlarmCode { get; set; }
+
+ /// <summary>
+ /// 璁惧绫诲瀷
+ /// </summary>
+ [Required(ErrorMessage = "璁惧绫诲瀷涓嶈兘涓虹┖")]
+ public override PLCTypeEnum Type { get; set; }
+
+ /// <summary>
/// 杞垹闄�
/// </summary>
[Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
index d933188..2c1d3cb 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
@@ -1,10 +1,4 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
-namespace WCS.Application;
+锘縩amespace WCS.Application;
/// <summary>
/// 鎶ヨ淇℃伅琛ㄨ緭鍑哄弬鏁�
@@ -15,92 +9,97 @@
/// 涓婚敭Id
/// </summary>
public long Id { get; set; }
-
+
/// <summary>
/// PLCIP鍦板潃
/// </summary>
- public string? PlcIP { get; set; }
-
+ public string PlcIP { get; set; }
+
+ /// <summary>
+ /// PLCIP鍦板潃
+ /// </summary>
+ public int PlcPort { get; set; }
+
/// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
- public string? AlarmCode { get; set; }
-
+ public string AlarmCode { get; set; }
+
/// <summary>
/// 鎶ヨ鎻忚堪
/// </summary>
public string? AlarmName { get; set; }
-
+
/// <summary>
/// 鏄剧ず灞廼p鍦板潃
/// </summary>
public string? LedIP { get; set; }
-
+
/// <summary>
/// 鐘舵��
/// </summary>
- public YesNoEnum Status { get; set; }
-
+ public int? Status { get; set; }
+
/// <summary>
/// 璁惧绫诲瀷
/// </summary>
- public string? Type { get; set; }
-
+ public PLCTypeEnum Type { get; set; }
+
/// <summary>
/// 鎶ヨ鏃ユ湡
/// </summary>
public DateTime? AlarmTime { get; set; }
-
+
/// <summary>
/// LED鐘舵��
/// </summary>
- public YesNoEnum LedStatus { get; set; }
-
+ public int? LedStatus { get; set; }
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public DateTime? CreateTime { get; set; }
-
+
/// <summary>
/// 鏇存柊鏃堕棿
/// </summary>
public DateTime? UpdateTime { get; set; }
-
+
/// <summary>
/// 鍒涘缓鑰匢d
/// </summary>
public long? CreateUserId { get; set; }
-
+
/// <summary>
/// 鍒涘缓鑰呭鍚�
/// </summary>
public string? CreateUserName { get; set; }
-
+
/// <summary>
/// 淇敼鑰匢d
/// </summary>
public long? UpdateUserId { get; set; }
-
+
/// <summary>
/// 淇敼鑰呭鍚�
/// </summary>
public string? UpdateUserName { get; set; }
-
+
/// <summary>
/// 鍒涘缓鑰呴儴闂↖d
/// </summary>
public long? CreateOrgId { get; set; }
-
+
/// <summary>
/// 鍒涘缓鑰呴儴闂ㄥ悕绉�
/// </summary>
public string? CreateOrgName { get; set; }
-
+
/// <summary>
/// 杞垹闄�
/// </summary>
public bool IsDelete { get; set; }
-
- }
-
+
+}
+
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
index aba81e5..eb15497 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
@@ -1,12 +1,4 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
-
-using Admin.NET.Core.Service;
-using Microsoft.AspNetCore.Http;
-namespace WCS.Application;
+锘縩amespace WCS.Application;
/// <summary>
/// 鎶ヨ淇℃伅琛ㄦ湇鍔�
@@ -30,18 +22,19 @@
[DisplayName("鍒嗛〉鏌ヨ鎶ヨ淇℃伅琛�")]
public async Task<SqlSugarPagedList<WcsAlarmInfoOutput>> Page(PageWcsAlarmInfoInput input)
{
- input.SearchKey = input.SearchKey?.Trim();
+ input.SearchKey = input.SearchKey?.Trim();
var query = _wcsAlarmInfoRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.PlcIP.Contains(input.SearchKey)
- || u.Type.Contains(input.SearchKey)
)
.WhereIF(!string.IsNullOrWhiteSpace(input.PlcIP), u => u.PlcIP.Contains(input.PlcIP.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.Type), u => u.Type.Contains(input.Type.Trim()))
+ .WhereIF(input.Status.HasValue, u => u.Status == input.Status)
+ .WhereIF(input.Type.HasValue, u => u.Type == input.Type)
.Select<WcsAlarmInfoOutput>();
- return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+ return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
+
/// <summary>
/// 澧炲姞鎶ヨ淇℃伅琛�
/// </summary>
diff --git a/Web/src/views/wcs/wcsAlarmInfo/component/editDialog.vue b/Web/src/views/wcs/wcsAlarmInfo/component/editDialog.vue
index 7ab3eef..3467db0 100644
--- a/Web/src/views/wcs/wcsAlarmInfo/component/editDialog.vue
+++ b/Web/src/views/wcs/wcsAlarmInfo/component/editDialog.vue
@@ -20,6 +20,13 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="PLCIP绔彛" prop="plcPort">
+ <el-input-number v-model="ruleForm.plcPort" placeholder="璇疯緭鍏LCIP鍦板潃" clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鎶ヨ缂栧彿" prop="alarmCode">
<el-input v-model="ruleForm.alarmCode" placeholder="璇疯緭鍏ユ姤璀︾紪鍙�" maxlength="20" show-word-limit clearable />
@@ -42,11 +49,15 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="璁惧绫诲瀷" prop="type">
- <el-input v-model="ruleForm.type" placeholder="璇疯緭鍏ヨ澶囩被鍨�" maxlength="20" show-word-limit clearable />
+ <el-select clearable v-model="ruleForm.type" placeholder="璇烽�夋嫨璁惧绫诲瀷">
+ <el-option v-for="(item,index) in dl('PLCTypeEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
+
+ </el-select>
</el-form-item>
</el-col>
+
</el-row>
</el-form>
<template #footer>
@@ -89,6 +100,9 @@
const ruleForm = ref<any>({});
//鑷娣诲姞鍏朵粬瑙勫垯
const rules = ref<FormRules>({
+ plcIP: [{required: true, message: '璇疯緭鍏LCIP鍦板潃锛�', trigger: 'blur',},],
+ plcPort: [{required: true, message: '璇疯緭鍏LCIP鍦板潃锛�', trigger: 'blur',},],
+ alarmCode: [{required: true, message: '璇疯緭鍏ユ姤璀︾紪鍙凤紒', trigger: 'blur',},],
});
// 椤甸潰鍔犺浇鏃�
diff --git a/Web/src/views/wcs/wcsAlarmInfo/index.vue b/Web/src/views/wcs/wcsAlarmInfo/index.vue
index 1b582da..94f0147 100644
--- a/Web/src/views/wcs/wcsAlarmInfo/index.vue
+++ b/Web/src/views/wcs/wcsAlarmInfo/index.vue
@@ -1,42 +1,50 @@
锘�<template>
<div class="wcsAlarmInfo-container">
- <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+ <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="queryParams" ref="queryForm" labelWidth="90">
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item label="鍏抽敭瀛�">
- <el-input v-model="queryParams.searchKey" clearable="" placeholder="璇疯緭鍏ユā绯婃煡璇㈠叧閿瓧" />
-
+ <el-input v-model="queryParams.searchKey" clearable="" placeholder="璇疯緭鍏ユā绯婃煡璇㈠叧閿瓧"/>
+
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
<el-form-item label="PLCIP鍦板潃">
- <el-input v-model="queryParams.plcIP" clearable="" placeholder="璇疯緭鍏LCIP鍦板潃" />
-
+ <el-input v-model="queryParams.plcIP" clearable="" placeholder="璇疯緭鍏LCIP鍦板潃"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="鐘舵��">
+ <el-select clearable="" v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option v-for="(item,index) in dl('YesNoEnum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" />
+
+ </el-select>
+
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
<el-form-item label="璁惧绫诲瀷">
- <el-input v-model="queryParams.type" clearable="" placeholder="璇疯緭鍏ヨ澶囩被鍨�" />
-
+ <el-select clearable="" v-model="queryParams.type" placeholder="璇烽�夋嫨璁惧绫诲瀷">
+ <el-option v-for="(item,index) in dl('PLCTypeEnum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" />
+
+ </el-select>
+
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
- <el-form-item>
+ <el-form-item >
<el-button-group style="display: flex; align-items: center;">
- <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsAlarmInfo:page'"> 鏌ヨ
- </el-button>
- <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 閲嶇疆 </el-button>
- <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI"
- style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
- <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI"
- style="margin-left:5px;"> 闅愯棌 </el-button>
- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsAlarmInfo"
- v-auth="'wcsAlarmInfo:add'"> 鏂板 </el-button>
-
+ <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsAlarmInfo:page'"> 鏌ヨ </el-button>
+ <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 閲嶇疆 </el-button>
+ <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
+ <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 闅愯棌 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsAlarmInfo" v-auth="'wcsAlarmInfo:add'"> 鏂板 </el-button>
+
</el-button-group>
</el-form-item>
-
+
</el-col>
</el-row>
</el-form>
@@ -46,21 +54,27 @@
@sort-change="sortChange" border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column prop="plcIP" label="PLCIP鍦板潃" show-overflow-tooltip="" />
+ <el-table-column prop="plcPort" label="PLCIP绔彛" show-overflow-tooltip="" />
<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>
+ scope.row.status)?.name}}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="type" label="璁惧绫诲瀷" show-overflow-tooltip="" />
+ <el-table-column prop="type" label="璁惧绫诲瀷" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag :type="dv('PLCTypeEnum', scope.row.type)?.tagType"> {{ dv('PLCTypeEnum',
+ scope.row.type)?.name}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃ユ湡" show-overflow-tooltip="" />
- <el-table-column prop="ledStatus" label="LED鏄剧ず鐘舵��" show-overflow-tooltip="">
+ <el-table-column prop="ledStatus" label="LED鐘舵��" show-overflow-tooltip="">
<template #default="scope">
<el-tag :type="dv('YesNoEnum', scope.row.ledStatus)?.tagType"> {{ dv('YesNoEnum',
- scope.row.ledStatus)?.name }}</el-tag>
+ scope.row.ledStatus)?.name}}</el-tag>
</template>
</el-table-column>
<el-table-column label="淇敼璁板綍" width="80" align="center" show-overflow-tooltip>
--
Gitblit v1.8.0