- 访问日志 + ${text('访问日志')}
${text('查询')} @@ -14,52 +14,52 @@ <#form:form id="searchForm" model="${log}" action="${ctx}/sys/log/listData" method="post" class="form-inline " data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
- +
<#form:input path="logTitle" maxlength="500" class="form-control width-90"/>
- +
<#form:input path="requestUri" maxlength="255" class="form-control width-90"/>
- +
<#form:select path="logType" dictType="sys_log_type" blankOption="true" class="form-control required " />
- +
- <#form:listselect id="userSelect" title="用户选择" path="createBy" + <#form:listselect id="userSelect" title="${text('用户选择')}" path="createBy" url="${ctx}/sys/empUser/empUserSelect" allowClear="false" checkbox="false" itemCode="userCode" itemName="userName"/>
- +
<#form:select path="isException" dictType="sys_yes_no" blankOption="true" class="form-control"/>
- +
<#form:input path="bizType" maxlength="64" class="form-control width-90"/>
- +
<#form:input path="bizKey" maxlength="64" class="form-control width-90"/>
- +
<#form:input path="createDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="createDate_lte.click()"/> - @@ -68,24 +68,24 @@
- +
<#form:input path="remoteAddr" maxlength="255" class="form-control width-90"/>
- - + +
@@ -99,32 +99,32 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'日志标题', name:'logTitle', index:'a.log_title', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.id)+''; + {header:'${text("日志标题")}', name:'logTitle', index:'a.log_title', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){ + return ''+(val||row.id)+''; }}, - {header:'请求地址', name:'requestUri', index:'a.request_uri', width:260, align:"left", formatter: function(val, obj, row, act){ + {header:'${text("请求地址")}', name:'requestUri', index:'a.request_uri', width:260, align:"left", formatter: function(val, obj, row, act){ return ''+ row.requestUri; }}, - {header:'日志类型', name:'logType', index:'a.log_type', width:100, align:"center", formatter: function(val, obj, row, act){ + {header:'${text("日志类型")}', name:'logType', index:'a.log_type', width:100, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_log_type')}, val, '未知', true); }}, - {header:'操作用户', name:'createByName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){ - return ''+ row.createByName; + {header:'${text("操作用户")}', name:'createByName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){ + return ''+ row.createByName; }}, - {header:'异常', name:'isException', index:'a.is_exception', width:60, align:"center", formatter: function(val, obj, row, act){ + {header:'${text("异常")}', name:'isException', index:'a.is_exception', width:60, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_yes_no')}, val, '未知', true); }}, - {header:'业务类型', name:'bizType', index:'a.biz_type', width:90, align:"center"}, - {header:'业务主键', name:'bizKey', index:'a.biz_key', width:90, align:"center"}, - {header:'操作时间', name:'createDate', index:'a.create_date', width:100, align:"center"}, - {header:'客户端IP', name:'remoteAddr', index:'a.remote_addr', width:100, align:"center"}, - {header:'设备名称', name:'deviceName', index:'a.device_name', width:100, align:"center"}, - {header:'浏览器名', name:'browserName', index:'a.browser_name', width:100, align:"center"}, - {header:'响应时间', name:'executeTimeFormat', index:'a.execute_time', width:100, align:"center"}/* , - {header:'操作', name:'actions', width:130, formatter: function(val, obj, row, act){ + {header:'${text("业务类型")}', name:'bizType', index:'a.biz_type', width:90, align:"center"}, + {header:'${text("业务主键")}', name:'bizKey', index:'a.biz_key', width:90, align:"center"}, + {header:'${text("操作时间")}', name:'createDate', index:'a.create_date', width:100, align:"center"}, + {header:'${text("客户端IP")}', name:'remoteAddr', index:'a.remote_addr', width:100, align:"center"}, + {header:'${text("设备名称")}', name:'deviceName', index:'a.device_name', width:100, align:"center"}, + {header:'${text("浏览器名")}', name:'browserName', index:'a.browser_name', width:100, align:"center"}, + {header:'${text("响应时间")}', name:'executeTimeFormat', index:'a.execute_time', width:100, align:"center"}/* , + {header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:log:edit')){ %> - actions.push(' '); + actions.push(' '); <% } %> return actions.join(''); }} */ diff --git a/modules/core/src/main/resources/views/modules/sys/officeIndex.html b/modules/core/src/main/resources/views/modules/sys/officeIndex.html index 8e3aad63..3e4972ac 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/officeIndex.html @@ -27,7 +27,7 @@ // 初始化布局 $('body').layout({ west__initClosed: $(window).width() <= 767, // 是否默认关闭 - west__size: 170 + west__size: 200 }); // 主页框架 var win = $("#mainFrame")[0].contentWindow; diff --git a/modules/core/src/main/resources/views/modules/sys/switchSkin.html b/modules/core/src/main/resources/views/modules/sys/switchSkin.html index db6c1b64..23c5f9fb 100644 --- a/modules/core/src/main/resources/views/modules/sys/switchSkin.html +++ b/modules/core/src/main/resources/views/modules/sys/switchSkin.html @@ -1,4 +1,4 @@ -<% layout('/layouts/default.html', {title:'切换主题风格'}){ %> +<% layout('/layouts/default.html', {title:'切换主题'}){ %>