Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
===================================================================
diff -u -r30879 -r30940
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js	(.../config.js)	(revision 30879)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js	(.../config.js)	(revision 30940)
@@ -80,5 +80,7 @@
   //一次性物品结算报表显示供应商列
   showSupplierColumnInDisposableSettlementReport:true,
   //是否使用旧版发货(默认不使用旧版)
-  useOldInvoiceVersion:true
+  useOldInvoiceVersion:true,
+  //logo设置
+  logoSetting : { "width" : 300, "height" : 49 }
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r30522 -r30940
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 30522)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 30940)
@@ -527,10 +527,8 @@
 <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td height="80" class="header" id="top_conttent1">
-		<div class="logo"><img
-			src="${ctx}/${logoPath}" width="215" height="55" vertical="middle"/></div>
-		<div class="logo1"><img
-			src="${ctx}/themes/portalPage/theme/images/productName.png" height="80"/></div>
+		<div class="logo"><img id="logoImg" src="${ctx}/${logoPath}" width="215" height="55" vertical="middle"/></div>
+		<div class="logo1"><img src="${ctx}/themes/portalPage/theme/images/productName.png" height="80"/></div>
 		<div class="welcome">
 		<ul>
 			<li>欢迎 <span class="green1"> <c:if test="${not empty depart}">${depart} </c:if>${loginUserData.userFullName}</span> 登录系统</li>
@@ -626,4 +624,14 @@
 	</dd>
 </dl> 
 </body>
+<script>
+	if(sstsConfig.logoSetting){
+		var logoWidth = sstsConfig.logoSetting.width || 215;
+		var logoHeight = sstsConfig.logoSetting.height || 55;
+		$("#logoImg").css({
+			width:logoWidth+'px',
+			height:logoHeight+'px'
+		})
+	}
+</script>
 </html>
Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r30624 -r30940
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 30624)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 30940)
@@ -140,7 +140,7 @@
 	</form>
 	<div class="login_box">
 		<div class="login_logo" >
-			<img src="${ctx}/${logoPath}" width="215" height="55"/>
+			<img id="logoImg" src="${ctx}/${logoPath}" width="215" height="55"/>
 		</div>
 		<div class="login_tag" id="tip" style="left:180px;">&nbsp;
 			<c:if test="${(message != null)}">${message }</c:if>
@@ -173,6 +173,15 @@
 	setCookie('ENABLE_SPEECH_RECOGNITION',ENABLE_SPEECH_RECOGNITION,10000*365);
 }
 
+if(sstsConfig.logoSetting){
+	var logoWidth = sstsConfig.logoSetting.width || 215;
+	var logoHeight = sstsConfig.logoSetting.height || 55;
+	$("#logoImg").css({
+		width:logoWidth+'px',
+		height:logoHeight+'px'
+	})
+}
+
 if (top != self) {
     top.location = self.location;
 }
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/img/logo_gyey.png
===================================================================
diff -u
Binary files differ