调整窗口大小,增加一些打印信息

zhitom · Sep 6, 2018 · 78b95eb · 78b95eb
1 parent ca569e3
commit 78b95eb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
@@ -129,21 +129,21 @@
 
     </div>
 
-    <div id="zkweb_add_cfg" class="easyui-window" title="添加配置信息" data-options="iconCls:'icon-add',modal:true,closed:true,maximizable:false" style="width:280px;height:170px;padding:10px;">  
+    <div id="zkweb_add_cfg" class="easyui-window" title="添加配置信息" data-options="iconCls:'icon-add',modal:true,closed:true,maximizable:false" style="width:500px;height:170px;padding:10px;">  
 
         <form id="zkweb_add_cfg_form" method="post" action="zkcfg/addZkCfg">  
-		    <table>    
+		    <table width="100%">    
 		        <tr>    
-		            <td>DESC:</td>    
-		            <td><input name="desc" type="text"></input></td>    
+		            <td width="100px">DESC:</td>    
+		            <td ><input name="desc" type="text" style="width:100%"></input></td>    
 		        </tr>    
 		        <tr>    
-		            <td>CONNECTSTR:</td>    
-		            <td><input name="connectstr" type="text"></input></td>    
+		            <td width="100px">CONNECTSTR:</td>    
+		            <td ><input name="connectstr" type="text" style="width:100%"></input></td>    
 		        </tr>    
 		        <tr>    
-		            <td>SESSIONTIMEOUT:</td>    
-		            <td><input name="sessiontimeout" type="text"></input></td>    
+		            <td width="100px">SESSIONTIMEOUT[ms]:</td>    
+		            <td ><input name="sessiontimeout" type="text" style="width:100%"></input></td>    
 		        </tr>    
 		        <tr>    
 		            <td>
@@ -158,22 +158,22 @@
 
     </div>  
 
-    <div id="zkweb_up_cfg" class="easyui-window" title="更新配置信息" data-options="iconCls:'icon-update',modal:true,closed:true,maximizable:false" style="width:280px;height:170px;padding:10px;">  
+    <div id="zkweb_up_cfg" class="easyui-window" title="更新配置信息" data-options="iconCls:'icon-update',modal:true,closed:true,maximizable:false" style="width:500px;height:170px;padding:10px;">  
 
         <form id="zkweb_up_cfg_form" method="post" action="zkcfg/updateZkCfg">  
             <input type="hidden" name="id"/>
-		    <table>    
+		    <table width="100%">    
 		        <tr>    
-		            <td>DESC:</td>    
-		            <td><input name="desc" type="text"></input></td>    
+		            <td width="100px">DESC:</td>    
+		            <td><input name="desc" type="text"  style="width:100%"></input></td>    
 		        </tr>    
 		        <tr>    
-		            <td>CONNECTSTR:</td>    
-		            <td><input name="connectstr" type="text"></input></td>    
+		            <td width="100px">CONNECTSTR:</td>    
+		            <td><input name="connectstr" type="text"  style="width:100%"></input></td>    
 		        </tr>    
 		        <tr>    
-		            <td>SESSIONTIMEOUT:</td>    
-		            <td><input name="sessiontimeout" type="text"></input></td>    
+		            <td width="100px">SESSIONTIMEOUT[ms]:</td>    
+		            <td><input name="sessiontimeout" type="text"  style="width:100%"></input></td>    
 		        </tr>    
 		        <tr>    
 		            <td>

diff --git a/src/main/webapp/resources/zkweb-language.js b/src/main/webapp/resources/zkweb-language.js
@@ -83,6 +83,7 @@ var getLanguageFromCookie=function(language){
 	var webLanguage = ['zh_CN', 'zh_TW', 'en'];
 	if (getCookie(i18nCookiename)) {
         i18nLanguage = getCookie(i18nCookiename);
+        console.log("i18nLanguage1 is "+i18nLanguage);
     } else {
     	if(!language)
     		language=i18nSettings.language;
@@ -93,9 +94,11 @@ var getLanguageFromCookie=function(language){
             var charSize = $.inArray(navLanguage, webLanguage);
             if (charSize > -1) {
                 i18nLanguage = navLanguage;
+                console.log("i18nLanguage2 is "+i18nLanguage);
                 // 存到缓存中
                 getCookie(i18nCookiename,navLanguage);
             };
+            console.log("i18nLanguage3 is "+i18nLanguage);
         } else{
             console.log("not navigator,default is "+i18nLanguage);
 
@@ -118,12 +121,12 @@ var setLanguage=function(node){
 	language=node.value
 	cookielanguage=getCookie(i18nCookiename);
 	if (cookielanguage&&cookielanguage!=language) {
-		console.log('cookielanguage='+cookielanguage+',newlanguage='+language)
+		console.log('1.cookielanguage='+cookielanguage+',newlanguage='+language)
 		getCookie(i18nCookiename,language);
     }else if (cookielanguage&&cookielanguage==language){
-    	console.log('cookielanguage='+cookielanguage+',newlanguage='+language)
+    	console.log('2.cookielanguage='+cookielanguage+',newlanguage='+language)
     }else{
-    	console.log('cookie['+i18nCookiename+']='+language)
+    	console.log('3.cookie['+i18nCookiename+']='+language)
     	getCookie(i18nCookiename,language);
     }
 	console.log('active cookie['+i18nCookiename+']='+getCookie(i18nCookiename))

diff --git a/src/main/webapp/resources/zkweb.js b/src/main/webapp/resources/zkweb.js
@@ -84,6 +84,7 @@ $(function(){
 		});
 	}
 	function refreshConnectState(row){
+		//return;
 		$.post("zk/queryZKOk", {cacheId:row.ID},function(data){$('#connstaterefresh').html(data);});
 		if($('#lastRefreshConn').val()){
 			clearInterval($('#lastRefreshConn').val());