Merge branch 'demostration_08' into 'develop'

日志界面URL列加宽

See merge request !12

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

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 import com.nis.domain.Page;
 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());
 			if (fromJson.getStatus().intValue() == 200) {
-				BeanUtils.copyProperties(fromJson.getData(), page);
+				Page<NtcHttpLog> data = fromJson.getData();
+				page.setList(data.getList());
 				List<NtcHttpLog> list = page.getList();
 				for (NtcHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());

src/main/webapp/static/pages/scripts/pageLogs.js

@@ -11,6 +11,15 @@ $(document).ready(function() {
 		// 设置界面标题宽度（不包括第一列）
 		var px = getPixelsCount($(this).text(),fontSize)+32;
 		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 = "";