From 2afa2d381d6f20699f0a0d0caefa5eb3fc46edbb Mon Sep 17 00:00:00 2001
From: pengzh <736259020@qq.com>
Date: Wed, 16 Nov 2022 22:20:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B0=8F=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=88=87=E6=8D=A2"=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C"=E8=B0=83=E5=BA=A6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97"=E6=97=B6,=20=E5=AE=9A=E4=BD=8D=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=89=A7=E8=A1=8C=E5=99=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E6=B8=85=E7=A9=BA=EF=BC=88PS=20?=
 =?UTF-8?q?=E5=9C=A8=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E5=99=A8=20?=
 =?UTF-8?q?=E6=88=90=E7=99=BE=E4=B8=8A=E5=8D=83=E6=97=B6=20=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E4=BD=BF=E7=94=A8=EF=BC=8C=E9=81=BF=E5=85=8D=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=87=8D=E6=96=B0=E8=BE=93=E5=85=A5=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 772e8be547d4ef38c525b70695d2b0d705530b0a)
---
 .../resources/static/js/jobinfo.index.1.js    |  5 +++-
 .../resources/static/js/joblog.index.1.js     | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

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?'<a class="logTips" href="javascript:;" >'+ I18n.system_show +'<span style="display:none;">'+ data +'</span></a>':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 = {
 			}
 		});
 	}
+
+
 };