diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js index b479e972..acbf86bd 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js @@ -203,7 +203,9 @@ $(function() { //reload var jobGroup = $('#jobGroup').val(); window.location.href = base_url + "/jobinfo?jobGroup=" + jobGroup; - }); + localStorage.setItem("jobGroup.value",jobGroup) + + }); // job operate $("#job_list").on('click', '.job_operate',function() { @@ -736,4 +738,5 @@ $(function() { $('#addModal').modal({backdrop: false, keyboard: false}).modal('show'); }); + $("#jobGroup").find("option[value='" + localStorage.getItem("jobGroup.value") + "']").attr("selected",true); }); diff --git a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js index e0fc3f20..df392df0 100644 --- a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js @@ -72,7 +72,7 @@ $(function() { // init date tables var logTable = $("#joblog_list").dataTable({ "deferRender": true, - "processing" : true, + "processing" : true, "serverSide": true, "ajax": { url: base_url + "/joblog/pageList" , @@ -141,7 +141,7 @@ $(function() { return data?''+ I18n.system_show +''+ data +'':I18n.system_empty; } }, - { + { "data": 'handleTime', "width":'20%', "render": function ( data, type, row ) { @@ -165,7 +165,7 @@ $(function() { return html; } }, - { + { "data": 'handleMsg', "width":'10%', "render": function ( data, type, row ) { @@ -207,7 +207,7 @@ $(function() { return html; } - return null; + return null; } } } @@ -242,22 +242,22 @@ $(function() { layer.msg( json.msg || I18n.system_api_error ); } }); - + // logTips alert $('#joblog_list').on('click', '.logTips', function(){ var msg = $(this).find('span').html(); ComAlertTec.show(msg); }); - + // search Btn $('#searchBtn').on('click', function(){ logTable.fnDraw(); }); - + // logDetail look $('#joblog_list').on('click', '.logDetail', function(){ var _id = $(this).attr('_id'); - + window.open(base_url + '/joblog/logDetailPage?id=' + _id); return; }); @@ -352,6 +352,12 @@ $(function() { $("#clearLogModal .form")[0].reset(); }); + $('#jobGroup').on('change', function(){ + var jobGroup = $('#jobGroup').val(); + localStorage.setItem("jobGroup.value",jobGroup) + }); + $("#jobGroup").find("option[value='" + localStorage.getItem("jobGroup.value") + "']").attr("selected",true); + }); @@ -393,4 +399,6 @@ var ComAlertTec = { } }); } + + };