gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'demostration_08' into 'develop'

Browse Source 
日志界面URL列加宽

See merge request !12
This commit is contained in:
zhangwenqing
2018-08-13 18:15:29 -04:00
parent 41fb17eff6 d42b161602
commit ff041bfe68
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
View File

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonSyntaxException;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.PageLog; import com.nis.domain.PageLog;
@@ -50,7 +49,8 @@ public class HttpLogController extends BaseController {
LogRecvData<NtcHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcHttpLog>>(){}.getType()); LogRecvData<NtcHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcHttpLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) { if (fromJson.getStatus().intValue() == 200) {
BeanUtils.copyProperties(fromJson.getData(), page); Page<NtcHttpLog> data = fromJson.getData();
page.setList(data.getList());
List<NtcHttpLog> list = page.getList(); List<NtcHttpLog> list = page.getList();
for (NtcHttpLog l : list) { for (NtcHttpLog l : list) {
l.setFunctionId(log.getFunctionId()); l.setFunctionId(log.getFunctionId());

9
src/main/webapp/static/pages/scripts/pageLogs.js
View File

@@ -11,6 +11,15 @@ $(document).ready(function() {
// 设置界面标题宽度（不包括第一列） // 设置界面标题宽度（不包括第一列）
var px = getPixelsCount($(this).text(),fontSize)+32; var px = getPixelsCount($(this).text(),fontSize)+32;
this.setAttribute('width',px+'px'); this.setAttribute('width',px+'px');
// URL列加宽
var th = this;
var thText = this.innerText;
$("table.logTb td").each(function(){
var tdText = this.innerText;
if((tdText.trim().length > thText.trim().length) && (thText == "URL" || thText == "Log URI")){
th.setAttribute('width','110px');
}
});
}); });
var tdString = ""; var tdString = "";