优化前端，添加删除任务移入历史

yanjinhui

2026-03-14 1f8a9a6a0f6cac4be41dc8ebf0444e80dd289440

优化前端，添加删除任务移入历史

 ´úÂë¹ÜÀí/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() {
            //框架初始化配置后

 ´úÂë¹ÜÀí/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":"服务器IP","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:'服务器IP',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":"服务器IP","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:'服务器IP',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>

 ´úÂë¹ÜÀí/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: "修改时间",

 ´úÂë¹ÜÀí/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*/
                };

 ´úÂë¹ÜÀí/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; }
    }
}
}

 ´úÂë¹ÜÀí/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); 
        }

    }
}