From 1f8a9a6a0f6cac4be41dc8ebf0444e80dd289440 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 14 三月 2026 16:54:46 +0800
Subject: [PATCH] 优化前端，添加删除任务移入历史
---
代码管理/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js | 30 +++---
代码管理/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 45 +++++++---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs | 2
代码管理/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue | 42 +++++-----
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 15 +++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_trackloginfo.cs | 60 +++++----------
6 files changed, 100 insertions(+), 94 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
index 8a02afb..8f64c39 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
@@ -27,21 +27,21 @@
if (recoveryButton) recoveryButton.hidden = true;
//鎵╁睍椤甸潰鍒濆鍖栨搷浣�
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 70,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅</i>'
- );
- },
- click: (row) => {
- this.$refs.gridBody.open(row);
- }
- });
+ // this.columns.push({
+ // field: '鎿嶄綔',
+ // title: '鎿嶄綔',
+ // width: 70,
+ // fixed: 'right',
+ // align: 'center',
+ // formatter: (row) => {
+ // return (
+ // '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅</i>'
+ // );
+ // },
+ // click: (row) => {
+ // this.$refs.gridBody.open(row);
+ // }
+ // });
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue"
index 9742628..c34d43b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue"
@@ -22,33 +22,33 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '绯荤粺鏃ュ織',
name: 'Sys_Log',
url: "/Sys_Log/",
- sortName: "Id"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
- const searchFormFields = ref({"BeginDate":"","Url":"","LogType":[],"Success":[],"UserIP":"","ServiceIP":"","Role_Id":""});
- const searchFormOptions = ref([[{"title":"璇锋眰鍦板潃","field":"Url","type":"text"},{"title":"鐢ㄦ埛IP","field":"UserIP","type":"text"},{"title":"鏈嶅姟鍣↖P","field":"ServiceIP","type":"text"}],[{"title":"寮�濮嬫椂闂�","field":"BeginDate","type":"datetime"},{"dataKey":"restatus","data":[],"title":"鍝嶅簲鐘舵��","field":"Success","type":"selectList"},{"dataKey":"roles","data":[],"title":"瑙掕壊ID","field":"Role_Id","type":"select"}],[{"dataKey":"log","data":[],"title":"鏃ュ織绫诲瀷","field":"LogType","colSize":12,"type":"checkbox"}]]);
- const columns = ref([{field:'Id',title:'Id',type:'int',width:90,hidden:true,readonly:true,require:true,align:'left'},
- {field:'BeginDate',title:'寮�濮嬫椂闂�',type:'datetime',width:140,align:'left',sortable:true},
- {field:'UserName',title:'鐢ㄦ埛鍚嶇О',type:'string',width:90,align:'left'},
- {field:'Url',title:'璇锋眰鍦板潃',type:'string',width:110,align:'left'},
- {field:'LogType',title:'鏃ュ織绫诲瀷',type:'string',bind:{ key:'log',data:[]},width:80,align:'left'},
- {field:'Success',title:'鍝嶅簲鐘舵��',type:'int',bind:{ key:'restatus',data:[]},width:80,align:'left'},
- {field:'ElapsedTime',title:'鏃堕暱',type:'int',width:60,align:'left'},
- {field:'RequestParameter',title:'璇锋眰鍙傛暟',type:'string',width:70,align:'left'},
- {field:'ResponseParameter',title:'鍝嶅簲鍙傛暟',type:'string',width:70,align:'left'},
- {field:'ExceptionInfo',title:'寮傚父淇℃伅',type:'string',width:70,align:'left'},
- {field:'UserIP',title:'鐢ㄦ埛IP',type:'string',width:90,align:'left'},
- {field:'ServiceIP',title:'鏈嶅姟鍣↖P',type:'string',width:90,hidden:true,align:'left'},
- {field:'BrowserType',title:'娴忚鍣ㄧ被鍨�',type:'string',width:90,align:'left'},
- {field:'User_Id',title:'鐢ㄦ埛ID',type:'int',width:90,hidden:true,align:'left'},
- {field:'Role_Id',title:'瑙掕壊ID',type:'int',bind:{ key:'roles',data:[]},width:90,hidden:true,align:'left'},
- {field:'EndDate',title:'缁撴潫鏃堕棿',type:'datetime',width:150,hidden:true,align:'left',sortable:true}]);
+ const searchFormFields = ref({"beginDate":"","url":"","logType":[],"success":[],"userIP":"","serviceIP":"","role_Id":""});
+ const searchFormOptions = ref([[{"title":"璇锋眰鍦板潃","field":"url","type":"text"},{"title":"鐢ㄦ埛IP","field":"userIP","type":"text"},{"title":"鏈嶅姟鍣↖P","field":"serviceIP","type":"text"}],[{"title":"寮�濮嬫椂闂�","field":"beginDate","type":"datetime"},{"dataKey":"restatus","data":[],"title":"鍝嶅簲鐘舵��","field":"success","type":"selectList"},{"dataKey":"roles","data":[],"title":"瑙掕壊ID","field":"role_Id","type":"select"}],[{"dataKey":"log","data":[],"title":"鏃ュ織绫诲瀷","field":"logType","colSize":12,"type":"checkbox"}]]);
+ const columns = ref([{field:'id',title:'Id',type:'int',width:90,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'beginDate',title:'寮�濮嬫椂闂�',type:'datetime',width:140,align:'left',sortable:true},
+ {field:'userName',title:'鐢ㄦ埛鍚嶇О',type:'string',width:90,align:'left'},
+ {field:'url',title:'璇锋眰鍦板潃',type:'string',width:110,align:'left'},
+ {field:'logType',title:'鏃ュ織绫诲瀷',type:'string',bind:{ key:'log',data:[]},width:80,align:'left'},
+ {field:'success',title:'鍝嶅簲鐘舵��',type:'int',bind:{ key:'restatus',data:[]},width:80,align:'left'},
+ {field:'elapsedTime',title:'鏃堕暱',type:'int',width:60,align:'left'},
+ {field:'requestParameter',title:'璇锋眰鍙傛暟',type:'string',width:70,align:'left'},
+ {field:'responseParameter',title:'鍝嶅簲鍙傛暟',type:'string',width:70,align:'left'},
+ {field:'exceptionInfo',title:'寮傚父淇℃伅',type:'string',width:70,align:'left'},
+ {field:'userIP',title:'鐢ㄦ埛IP',type:'string',width:90,align:'left'},
+ {field:'serviceIP',title:'鏈嶅姟鍣↖P',type:'string',width:90,hidden:true,align:'left'},
+ {field:'browserType',title:'娴忚鍣ㄧ被鍨�',type:'string',width:90,align:'left'},
+ {field:'user_Id',title:'鐢ㄦ埛ID',type:'int',width:90,hidden:true,align:'left'},
+ {field:'role_Id',title:'瑙掕壊ID',type:'int',bind:{ key:'roles',data:[]},width:90,hidden:true,align:'left'},
+ {field:'endDate',title:'缁撴潫鏃堕棿',type:'datetime',width:150,hidden:true,align:'left',sortable:true}]);
const detail = ref({
cnName: "#detailCnName",
columns: [],
@@ -67,4 +67,4 @@
};
},
});
-</script>
+</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
index 1192707..2710da8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
@@ -38,10 +38,18 @@
nextAddress: "",
creater: "",
createDate: "",
+ wmsTaskNum:""
});
const searchFormOptions = ref([
[
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
+ {
+ field: "wmsTaskNum",
+ title: "WMS浠诲姟鍙�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
{
title: "浠诲姟绫诲瀷",
@@ -65,7 +73,7 @@
{ title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
],
[
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ // { title: "宸烽亾鍙�", field: "roadway", type: "like" },
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
@@ -89,19 +97,26 @@
align: "left",
},
{
+ field: "wmsTaskNum",
+ title: "WMS浠诲姟鍙�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
width: 200,
align: "left",
},
- {
- field: "roadway",
- title: "宸烽亾鍙�",
- type: "string",
- width: 90,
- align: "left",
- },
+ // {
+ // field: "roadway",
+ // title: "宸烽亾鍙�",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // },
{
field: "taskType",
title: "浠诲姟绫诲瀷",
@@ -190,13 +205,13 @@
width: 150,
align: "left",
},
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
+ // {
+ // field: "modifier",
+ // title: "淇敼浜�",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // },
{
field: "modifyDate",
title: "淇敼鏃堕棿",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs"
index a5b1345..68b6ed4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/TrackloginfoService.cs"
@@ -50,7 +50,7 @@
Creater = "system",
tracklog_type = content.Status ? "鎴愬姛" : "澶辫触",
tracklog_code = content.Status ? logCode : ("4" + logCode),
- tracklog_des = description,
+ tracklog_des = JsonConvert.SerializeObject(content),
tracklog_message = content.Status ? "" : content.Message,
tracklog_operator = "system"/*UserContext.Current.UserName*/
};
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_trackloginfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_trackloginfo.cs"
index 483df52..e1855c1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_trackloginfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_trackloginfo.cs"
@@ -7,6 +7,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core.DB.Models;
using SqlSugar;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
namespace WIDESEAWCS_Model.Models
{
@@ -14,78 +15,57 @@
public class Dt_trackloginfo : BaseEntity
{
/// <summary>
- ///涓婚敭
+ /// 涓婚敭
/// </summary>
- [Key]
- [Display(Name = "涓婚敭")]
- [Column(TypeName = "int")]
- [Required(AllowEmptyStrings = false)]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int tracklog_id { get; set; }
/// <summary>
- ///鎿嶄綔鍚嶇О
+ /// 鎿嶄綔鍚嶇О
/// </summary>
- [Display(Name = "鎿嶄綔鍚嶇О")]
- [MaxLength(100)]
- [Column(TypeName = "nvarchar(100)")]
- [Required(AllowEmptyStrings = false)]
+ [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "鎿嶄綔鍚嶇О")]
public string tracklog_name { get; set; }
/// <summary>
- ///鍙傛暟浼犻�掑唴瀹�
+ /// 鍙傛暟浼犻�掑唴瀹�
/// </summary>
- [Display(Name = "鍙傛暟浼犻�掑唴瀹�")]
- [Column(TypeName = "nvarchar(max)")]
+ [SugarColumn(IsNullable = false, ColumnDataType = "nvarchar(max)", ColumnDescription = "鍙傛暟浼犻�掑唴瀹�")]
public string tracklog_content { get; set; }
/// <summary>
- ///绫诲瀷
+ /// 绫诲瀷
/// </summary>
- [Display(Name = "绫诲瀷")]
- [MaxLength(20)]
- [Column(TypeName = "nvarchar(20)")]
- [Required(AllowEmptyStrings = false)]
+ [SugarColumn(IsNullable = false, ColumnDataType = "nvarchar(20)", ColumnDescription = "绫诲瀷")]
public string tracklog_type { get; set; }
/// <summary>
- ///鎻忚堪
+ /// 鎻忚堪
/// </summary>
- [Display(Name = "鎻忚堪")]
- [Column(TypeName = "nvarchar(max)")]
- [Required(AllowEmptyStrings = false)]
+ [SugarColumn(IsNullable = false, ColumnDataType = "nvarchar(max)", ColumnDescription = "鎻忚堪")]
public string tracklog_des { get; set; }
/// <summary>
- ///鏃ュ織浠ｇ爜
+ /// 鏃ュ織浠ｇ爜
/// </summary>
- [Display(Name = "鏃ュ織浠ｇ爜")]
- [MaxLength(20)]
- [Column(TypeName = "nvarchar(20)")]
- [Required(AllowEmptyStrings = false)]
+ [SugarColumn(IsNullable = false, ColumnDataType = "nvarchar(20)", ColumnDescription = "鏃ュ織浠ｇ爜")]
public string tracklog_code { get; set; }
/// <summary>
- ///閿欒淇℃伅
+ /// 閿欒淇℃伅
/// </summary>
- [Display(Name = "閿欒淇℃伅")]
- [Column(TypeName = "nvarchar(max)")]
+ [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(max)", ColumnDescription = "閿欒淇℃伅")]
public string tracklog_message { get; set; }
/// <summary>
- ///鎿嶄綔鑰�
+ /// 鎿嶄綔鑰�
/// </summary>
- [Display(Name = "鎿嶄綔鑰�")]
- [MaxLength(40)]
- [Column(TypeName = "nvarchar(40)")]
- [Required(AllowEmptyStrings = false)]
+ [SugarColumn(IsNullable = false, ColumnDataType = "nvarchar(40)", ColumnDescription = "鎿嶄綔鑰�")]
public string tracklog_operator { get; set; }
/// <summary>
- ///鍒涘缓鏃堕棿"
+ /// 鍒涘缓鏃堕棿
/// </summary>
- [Display(Name = "鍒涘缓鏃堕棿")]
- [Column(TypeName = "datetime")]
- [Required(AllowEmptyStrings = false)]
+ [SugarColumn(IsNullable = false, ColumnDataType = "datetime", ColumnDescription = "鍒涘缓鏃堕棿")]
public DateTime tracklog_createtime { get; set; }
}
-}
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index c13ac63..bd413ad 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -98,8 +98,8 @@
foreach (var task in item.tasks)
{
#region 鍒ゆ柇
- content = TaskHelpMethods.isOkTaskInfo(task, true, true);
- if (!content.Status)
+ var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
+ if (!contentStatus.Status)
{
objects.Add(new
{
@@ -1315,5 +1315,16 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+
+ public override WebResponseContent DeleteData(object[] keys)
+ {
+ //鏌ユ壘鎵�鏈変换鍔′腑鍖呭惈杩欎釜id鐨�
+ var take= BaseDal.QueryData(x => keys.Contains(x.TaskId));
+ //鎴戝氨灏嗚繖涓换鍔＄Щ鍏ュ巻鍙蹭腑
+ BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.鑷姩瀹屾垚);
+ return base.DeleteData(keys);
+ }
+
}
}
--
Gitblit v1.9.3