From 7484c990d769413ce92c37774b4c9a89518b799b Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 1 May 2022 23:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=94=A8=E6=88=B7=E5=90=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/sys/onlineList.html         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html
index 67b143dc..c1e6a5b4 100644
--- a/modules/core/src/main/resources/views/modules/sys/onlineList.html
+++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html
@@ -11,8 +11,8 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" action="${ctx}/sys/online/listData" method="post" class="form-inline hide2"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+			<#form:form id="searchForm" action="${ctx}/sys/online/listData" method="post" class="form-inline hide2"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
 				<div class="form-group">
 					<label class="control-label">${text('操作用户')}：</label>
 					<div class="control-inline width-160">
@@ -21,11 +21,11 @@
 							checkbox="false" itemCode="userCode" itemName="userName"/>
 					</div>
 				</div>
-				<div class="form-group">
+				<div class="form-group">
 					<div class="control-inline" title="${text('包含3分钟以上未操作的用户')}">&nbsp;
 						<#form:checkbox name="isAllOnline" value="false" label="${text('查询所有在线')}"
 							class="form-control"/>
-					</div>
+					</div>
 				</div>
 				<div class="form-group">
 					<div class="control-inline" title="${text('包含未登录的用户')}">
@@ -33,10 +33,10 @@
 							class="form-control"/>
 					</div>
 				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
-				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>
 		</div>
@@ -48,7 +48,7 @@
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'${text("用户名称")}', name:'userName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){
+		{header:'${text("用户名称")}', name:'userName', index:'userName', width:100, align:"center", formatter: function(val, obj, row, act){
 			return '<span title="${text("账号")}：'+(row.userCode||'')+'">'+(val||'${text("游客")}');
 		}},
 		{header:'${text("创建时间")}', name:'startTimestamp', firstsortorder:'desc', width:100, align:'center'},
@@ -56,10 +56,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("超时时间")}', name:'timeout', width:100, align:'center'},
 		{header:'${text("客户主机")}', name:'host', width:70, align:'center'},
 		{header:'${text("用户类型")}', name:'userType', width:50, align:'center', formatter: function(val, obj, row, act){
-			return js.getDictLabel(${@DictUtils.getDictListJson('sys_user_type')}, val, '未设置', true);
+			return js.getDictLabel(${@DictUtils.getDictListJson('sys_user_type')}, val, ${text('未设置')}, true);
 		}},
 		{header:'${text("设备类型")}', name:'deviceType', width:50, align:'center', formatter: function(val, obj, row, act){
-			return js.getDictLabel(${@DictUtils.getDictListJson('sys_device_type')}, val, '未设置', true);
+			return js.getDictLabel(${@DictUtils.getDictListJson('sys_device_type')}, val, ${text('未设置')}, true);
 		}}
 		<% if(hasPermi('sys:online:edit')){ %>
 		,{header:'${text("操作")}', name:'actions', width:100, sortable:false, formatter: function(val, obj, row, act){