Browse Source

优化问卷收集,数据统计图标

keyuan 4 năm trước cách đây
mục cha
commit
300e8f866e

+ 5 - 4
README.md

@@ -87,15 +87,16 @@ DWSurvey是一款方便、高效、实用的调研问卷系统,一款基于 JA
 
 调问网交流QQ群 ```群1:635994795(满)```,```群2:301105635(满)```, 群3:811287103(可加)(加群时请说明来由)
 
-微信:
-<img src="https://www.surveyform.cn/images/dwsurvey_wx_28261618534356.jpg" alt="图片替换文本" width="200" height="200" align="top" />
+微信公众号
 
-## 源代码地址
+<img src="http://www.diaowen.net/images/dw_ewm.png" alt="图片替换文本" width="200" height="200" align="top" />
 
-github: https://github.com/wkeyuan/DWSurvey
+## 源代码地址
 
 gitee: http://gitee.com/wkeyuan/DWSurvey
 
+github: https://github.com/wkeyuan/DWSurvey
+
 ## 开源协议
 
 DWSurvey以通用公共许可证AGPL3.0为开源协议,商业环境使用请购买商业授权!

+ 19 - 20
src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_1.jsp

@@ -12,11 +12,11 @@
 <body>
 	<input type="hidden" id="id" name="id" value="${surveyId }">
 	<input type="hidden" id="surveyState" name="surveyState" value="${survey.surveyState }">
-	
-	<div class="creatgeSurveyStepBody">
+
+	<div class="creatgeSurveyStepBody" >
 		<div class="creatgeSurveyStepContent bodyCenter">
 			<ul class="createSsUl">
-				<li><a href=""  class="clickHideMenu csscStep csscStep4"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">设计问卷</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href=""  class="clickHideMenu csscStep csscStep4"><i class="fa fa-magic" aria-hidden="true"></i><span class="csscStepCenter">设计问卷</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -29,10 +29,10 @@
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5 active"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据收集</span><span class="csscStepRight" >&nbsp;</span></a>
+				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5 active"><i class="fa fa-chain" aria-hidden="true"></i> <span class="csscStepCenter">数据收集</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据分析</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"> <i class="fa fa-line-chart" aria-hidden="true"></i> <span class="csscStepCenter">数据分析</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;margin-left: 15px;">
 		                	<div class="selc">
@@ -46,16 +46,15 @@
 			</ul>
 		</div>
 	</div>
-	
+
 	<div style="">
 		<div class="main-tabs-content bodyCenter">
 			<div class="tab-content">
 				<div class="tab-content-collectTab">
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1 active"><span class="collectTabItemLeft">&nbsp;</span><span>答卷地址</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4" ><span class="collectTabItemLeft">&nbsp;</span><span>社交分享</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5"><span class="collectTabItemLeft">&nbsp;</span><span>网站组件</span></a>
-					<%-- <a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=iframe" class="collectTab tabItem_6"><span class="collectTabItemLeft">&nbsp;</span><span>IFrame嵌入</span></a> --%>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2"><span class="collectTabItemLeft">&nbsp;</span><span>微信收集</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1 active"> <i class="fa fa-chain" aria-hidden="true"></i> <span>答卷地址</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4 " > <i class="fa fa-share-alt" aria-hidden="true"></i> <span>社交分享</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5 "> <i class="fa fa-paperclip" aria-hidden="true"></i> <span>网站组件</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2 ">  <i class="fa fa-weixin" aria-hidden="true"></i> <span>微信收集</span></a>
 				</div>
 			</div>
 		</div>
@@ -65,7 +64,7 @@
 		<div id="dwBodyContent" class="bodyCenter" style="border:1px solid #C1DAEC;">
 		<div id="dwBodyUser">
 			<div class="surveyCollectMiddle">
-				
+
 				<!-- <div class="surveyCollectMiddleTab">
 					<div class="scmTabLeft">
 						<div class="scmTabLeftItem"><a href="">问卷设计</a>&nbsp;&nbsp;&gt;</div>
@@ -97,7 +96,7 @@
 									<a href="" class="surveyStateBtn sbtn25 sbtn25_2">重新打开收集</a>
 								</c:when>
 							</c:choose>
-							
+
 						</div>
 					</div>
 					<div class="surveyCollectInfoDiv">
@@ -110,9 +109,9 @@
 						</span>
 					</div>
 				</div>
-				
+
 				<div class="surveyCollectMiddleContent">
-					
+
 					<div class="collect_1_content">
 					<div style="padding:0px 60px;">
 						<div style="" >
@@ -158,16 +157,16 @@
 						</div>
 						</div>
 					</div>
-					
 
-					
+
+
 				</div>
 			</div>
-			
+
 		</div>
 		</div>
 	</div>
-	
+
 <script type="text/javascript">
 
 /*var client = new ZeroClipboard( document.getElementById("clipLink") );
@@ -195,4 +194,4 @@ clipboard.on('error', function(e) {
 
 </script>
 </body>
-</html>
+</html>

+ 23 - 24
src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_2.jsp

@@ -16,7 +16,7 @@
 	<div class="creatgeSurveyStepBody">
 		<div class="creatgeSurveyStepContent bodyCenter">
 			<ul class="createSsUl">
-				<li><a href=""  class="clickHideMenu csscStep csscStep4"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">设计问卷</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href=""  class="clickHideMenu csscStep csscStep4"><i class="fa fa-magic" aria-hidden="true"></i><span class="csscStepCenter">设计问卷</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -29,10 +29,10 @@
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5 active"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据收集</span><span class="csscStepRight" >&nbsp;</span></a>
+				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5 active"><i class="fa fa-chain" aria-hidden="true"></i> <span class="csscStepCenter">数据收集</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据分析</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"> <i class="fa fa-line-chart" aria-hidden="true"></i> <span class="csscStepCenter">数据分析</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;margin-left: 15px;">
 		                	<div class="selc">
@@ -46,16 +46,15 @@
 			</ul>
 		</div>
 	</div>
-	
+
 	<div style="">
 		<div class="main-tabs-content bodyCenter">
 			<div class="tab-content">
 				<div class="tab-content-collectTab">
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1 "><span class="collectTabItemLeft">&nbsp;</span><span>答卷地址</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4 active" ><span class="collectTabItemLeft">&nbsp;</span><span>社交分享</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5"><span class="collectTabItemLeft">&nbsp;</span><span>网站组件</span></a>
-					<%-- <a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=iframe" class="collectTab tabItem_6"><span class="collectTabItemLeft">&nbsp;</span><span>IFrame嵌入</span></a> --%>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2"><span class="collectTabItemLeft">&nbsp;</span><span>微信收集</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1"> <i class="fa fa-chain" aria-hidden="true"></i> <span>答卷地址</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4 active" > <i class="fa fa-share-alt" aria-hidden="true"></i> <span>社交分享</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5 "> <i class="fa fa-paperclip" aria-hidden="true"></i> <span>网站组件</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2 ">  <i class="fa fa-weixin" aria-hidden="true"></i> <span>微信收集</span></a>
 				</div>
 			</div>
 		</div>
@@ -65,7 +64,7 @@
 		<div id="dwBodyContent" class="bodyCenter" style="border:1px solid #C1DAEC;">
 		<div id="dwBodyUser">
 			<div class="surveyCollectMiddle">
-				
+
 				<!-- <div class="surveyCollectMiddleTab">
 					<div class="scmTabLeft">
 						<div class="scmTabLeftItem"><a href="">问卷设计</a>&nbsp;&nbsp;&gt;</div>
@@ -97,7 +96,7 @@
 									<a href="" class="surveyStateBtn sbtn25 sbtn25_2">重新打开收集</a>
 								</c:when>
 							</c:choose>
-							
+
 						</div>
 					</div>
 					<div class="surveyCollectInfoDiv">
@@ -110,9 +109,9 @@
 						</span>
 					</div>
 				</div>
-				
+
 				<div class="surveyCollectMiddleContent">
-					
+
 					<div class="collect_1_content">
 					<div style="padding:0px 60px;">
 						<div style="" >
@@ -146,21 +145,21 @@
 												document.getElementById("bdshell_js").src = "http://bdimg.share.baidu.com/static/js/shell_v2.js?cdnversion=" + Math.ceil(new Date()/3600000)
 												</script>
 												<!-- Baidu Button END -->
-												
+
 										<!-- <div class="bshare-custom icon-medium-plus"><div class="bsPromo bsPromo2"></div><a title="分享到QQ空间" class="bshare-qzone"></a><a title="分享到新浪微博" class="bshare-sinaminiblog"></a><a title="分享到人人网" class="bshare-renren"></a><a title="分享到腾讯微博" class="bshare-qqmb"></a><a title="分享到网易微博" class="bshare-neteasemb"></a><a title="更多平台" class="bshare-more bshare-more-icon more-style-addthis"></a></div>
 										<script type="text/javascript" charset="utf-8" src="http://static.bshare.cn/b/buttonLite.js#style=-1&amp;uuid=&amp;pophcol=2&amp;lang=zh"></script>
 										<script type="text/javascript" charset="utf-8" src="http://static.bshare.cn/b/bshareC0.js"></script> -->
-										
+
 									</div>
 									<div style="text-align: right;float: right;line-height: 45px;">还可以输入:<span id="wordsInfo" style="color: green;">120</span>个字符。</div>
 								</div>
 							</div>
 						</div>
 						<div style="clear: both;"></div>
-						
+
 						</div>
 					</div>
-					
+
 					<%-- <div class="scmcLeft">
 						<ul>
 							<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="hover">答卷地址</a></li>
@@ -190,14 +189,14 @@
 						</div>
 						</div>
 					</div> -->
-					
+
 				</div>
 			</div>
-			
+
 		</div>
 		</div>
 	</div>
-	
+
 <script type="text/javascript">
 
 /*
@@ -208,14 +207,14 @@ function bindClipBoard(textareaId,clipBtn,clipSpanId){
 	clip.setCSSEffects( true );
 	var clipText=$("#"+textareaId).text();
 	clip.setText(clipText); // 设置要复制的文本。
-	//这个 button 不一定要求是一个 input 按钮,也可以是其他 DOM 元素。 
-	clip.glue(clipBtn); // 和上一句位置不可调换 
+	//这个 button 不一定要求是一个 input 按钮,也可以是其他 DOM 元素。
+	clip.glue(clipBtn); // 和上一句位置不可调换
 	clip.addEventListener('complete', function (client, text) {
 		//alert(text+":复成功");//notify("复制成功!");
 		$("#"+clipSpanId).show().delay(5000).fadeOut("slow");
 		//$("#"+textareaId).select();
 	});
-	clip.reposition(clipBtn); 
+	clip.reposition(clipBtn);
 }
 bindClipBoard("linkTextarea","clipLink","clipLinkSpan");
 */
@@ -238,4 +237,4 @@ $("#shareSurTextarea").keyup();
 
 </script>
 </body>
-</html>
+</html>

+ 26 - 27
src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_website.jsp

@@ -34,7 +34,7 @@
 	<div class="creatgeSurveyStepBody">
 		<div class="creatgeSurveyStepContent bodyCenter">
 			<ul class="createSsUl">
-				<li><a href=""  class="clickHideMenu csscStep csscStep4"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">设计问卷</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href=""  class="clickHideMenu csscStep csscStep4"><i class="fa fa-magic" aria-hidden="true"></i><span class="csscStepCenter">设计问卷</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -47,9 +47,9 @@
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="csscStep csscStep5 active"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据收集</span><span class="csscStepRight" >&nbsp;</span></a></li>
+				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5 active"><i class="fa fa-chain" aria-hidden="true"></i> <span class="csscStepCenter">数据收集</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据分析</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"> <i class="fa fa-line-chart" aria-hidden="true"></i> <span class="csscStepCenter">数据分析</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;margin-left: 15px;">
 		                	<div class="selc">
@@ -63,16 +63,15 @@
 			</ul>
 		</div>
 	</div>
-	
+
 	<div style="">
 		<div class="main-tabs-content bodyCenter">
 			<div class="tab-content">
 				<div class="tab-content-collectTab">
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1"><span class="collectTabItemLeft">&nbsp;</span><span>答卷地址</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4" ><span class="collectTabItemLeft">&nbsp;</span><span>社交分享</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5 active"><span class="collectTabItemLeft">&nbsp;</span><span>网站组件</span></a>
-					<%-- <a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=iframe" class="collectTab tabItem_6"><span class="collectTabItemLeft">&nbsp;</span><span>IFrame嵌入</span></a> --%>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2"><span class="collectTabItemLeft">&nbsp;</span><span>微信收集</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1"> <i class="fa fa-chain" aria-hidden="true"></i> <span>答卷地址</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4" > <i class="fa fa-share-alt" aria-hidden="true"></i> <span>社交分享</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5 active"> <i class="fa fa-paperclip" aria-hidden="true"></i> <span>网站组件</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2 ">  <i class="fa fa-weixin" aria-hidden="true"></i> <span>微信收集</span></a>
 				</div>
 			</div>
 		</div>
@@ -82,8 +81,8 @@
 		<div id="dwBodyContent" class="bodyCenter" style="border:1px solid #C1DAEC;">
 		<div id="dwBodyUser">
 			<div class="surveyCollectMiddle">
-				
-				
+
+
 				<div class="surveyCollectTop">
 					<div class="surveyCollectTitleDiv">
 						<span class="surveyCollectTitle">${survey.surveyName }</span>
@@ -99,7 +98,7 @@
 									<a href="" class="surveyStateBtn sbtn25 sbtn25_2">重新打开收集</a>
 								</c:when>
 							</c:choose>
-							
+
 						</div>
 					</div>
 					<div class="surveyCollectInfoDiv">
@@ -112,9 +111,9 @@
 						</span>
 					</div>
 				</div>
-				
+
 				<div class="surveyCollectMiddleContent">
-					
+
 					<div class="collect_1_content">
 					<div style="margin: 0px auto; width: 950px;">
 						<div style="clear: both;"></div>
@@ -124,7 +123,7 @@
 									<div class="scmcRightTopLeftTitle">通过您的网站收集问卷</div>
 								</div>
 								<div style="padding-top: 15px;overflow: auto;clear: both;">
-								
+
 								<div class="scmcsiteLeft">
 									<div class="scmcsiteTitle">1、风格选择</div>
 									<div class="scmcsiteLeftContent">
@@ -159,13 +158,13 @@
 									</div>
 									<div style="clear: both;"></div>
 									<div style="color: #9B9B9B;font-size: 14px;padding-top: 10px;">高度与背景色可自动调节,请从页面左右侧预览实际效果。</div>
-									
+
 								</div>
 								<div class="scmcsiteRight">
 									<div class="scmcsiteTitle">2、代码复制</div>
 									<div class="scmcsiteRightContent">
 										<textarea id="compCodeText" rows="" cols="" class="scmcsiteRCEdit" readonly="readonly">
-										
+
 										</textarea>
 										<div style="text-align: center;padding-top: 8px;">
 										<span id="compCopyMsg" style="display:none;color: #7BA400;font-size: 22px;position: absolute;margin-left: -120px;">复制成功!</span>
@@ -175,36 +174,36 @@
 									<div style="clear: both;"></div>
 									<div style="color: #9B9B9B;font-size: 14px;padding-top: 10px;">高度与背景色可自动调节,请从页面左右侧预览实际效果。</div>
 								</div>
-								
+
 								</div>
 							</div>
 						</div>
 						</div>
 					</div>
-					
-					
+
+
 				</div>
 			</div>
-			
+
 		</div>
 		</div>
 	</div>
-	
+
 <div id="compStyle1" style="display: none;"><!-- DIAOWEN.NET Button BEGIN --><div style="position: fixed;right: 0px;top: 100px;z-index: 9999;"><a href="http://www.diaowen.net/wenjuan/${survey.sid }.html" style="background: #1C658B;width: 15px;height: 100px;background: #8CBCD1;display: block;padding: 5px;padding-top: 10px;font-weight: bold;color: white! important;cursor: pointer;float: right;vertical-align: middle;text-decoration: none;font-size: 12px;-moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px;-khtml-border-top-left-radius: 5px;border-top-left-radius: 5px;-moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px;-khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;">问卷调查</a></div><!-- DIAOWEN.NET Button END --></div>
-	
+
 <div id="priviewContent" class="priviewContentFixed">
 	<div id="webSiteLeftCode">
 	<div id="webSiteFixedLeft" class="websiteFixed" style="position: fixed;left: 0px;top: 520px;z-index: 9999;display: none;">
 		<a class="websiteAId" href="http://www.diaowen.net/wenjuan/${survey.sid }.html" style="background: #1C658B;width: 15px;background: #8CBCD1;display: block;padding: 5px;padding-top: 10px;padding-bottom:10px;font-weight: bold;color: white;cursor: pointer;float: right;vertical-align: middle;text-decoration: none;font-size: 12px;-moz-border-radius-topright: 5px;-webkit-border-top-right-radius: 5px;-khtml-border-top-right-radius: 5px;border-top-right-radius: 5px;-moz-border-radius-bottomright: 5px;-webkit-border-bottom-right-radius: 5px;-khtml-border-bottom-right-radius: 5px;border-bottom-right-radius: 5px;">问卷调查</a>
 	</div>
 	</div>
-	
+
 	<div id="webSiteRightCode">
 	<div id="webSiteFixedRight" class="websiteFixed" style="position: fixed;right: 0px;top: 520px;z-index: 9999;">
 		<a class="websiteAId" href="http://www.diaowen.net/wenjuan/${survey.sid }.html" style="background: #1C658B;width: 15px;background: #8CBCD1;display: block;padding: 5px;padding-top: 10px;padding-bottom:10px;font-weight: bold;color: white;cursor: pointer;float: right;vertical-align: middle;text-decoration: none;font-size: 12px;-moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px;-khtml-border-top-left-radius: 5px;border-top-left-radius: 5px;-moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px;-khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;">问卷调查</a>
 	</div>
 	</div>
-</div>	
+</div>
 <script type="text/javascript">
 
 $("#compCodeText").click(function(){
@@ -242,7 +241,7 @@ $("#site_color_box").colpick({
 		updateCode();
 	},
 	onSubmit:function(hsb,hex,rgb,el) {
-		
+
 	}
 });
 
@@ -290,4 +289,4 @@ clipboard.on('error', function(e) {
 
 </script>
 </body>
-</html>
+</html>

+ 23 - 23
src/main/webapp/WEB-INF/page/content/diaowen-collect/collect_weixin.jsp

@@ -12,11 +12,11 @@
 <body>
 	<input type="hidden" id="id" name="id" value="${surveyId }">
 	<input type="hidden" id="surveyState" name="surveyState" value="${survey.surveyState }">
-	
+
 	<div class="creatgeSurveyStepBody">
 		<div class="creatgeSurveyStepContent bodyCenter">
 			<ul class="createSsUl">
-				<li><a href=""  class="clickHideMenu csscStep csscStep4"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">设计问卷</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href=""  class="clickHideMenu csscStep csscStep4"><i class="fa fa-magic" aria-hidden="true"></i><span class="csscStepCenter">设计问卷</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -29,9 +29,9 @@
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="csscStep csscStep5 active"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据收集</span><span class="csscStepRight" >&nbsp;</span></a></li>
+				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5 active"><i class="fa fa-chain" aria-hidden="true"></i> <span class="csscStepCenter">数据收集</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据分析</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6"> <i class="fa fa-line-chart" aria-hidden="true"></i> <span class="csscStepCenter">数据分析</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;margin-left: 15px;">
 		                	<div class="selc">
@@ -45,15 +45,15 @@
 			</ul>
 		</div>
 	</div>
-	
+
 	<div style="">
 		<div class="main-tabs-content bodyCenter">
 			<div class="tab-content">
 				<div class="tab-content-collectTab">
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1"><span class="collectTabItemLeft">&nbsp;</span><span>答卷地址</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4" ><span class="collectTabItemLeft">&nbsp;</span><span>社交分享</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5"><span class="collectTabItemLeft">&nbsp;</span><span>网站组件</span></a>
-					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2 active"><span class="collectTabItemLeft">&nbsp;</span><span>微信收集</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}" class="collectTab tabItem_1"> <i class="fa fa-chain" aria-hidden="true"></i> <span>答卷地址</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=share" class="collectTab tabItem_4" > <i class="fa fa-share-alt" aria-hidden="true"></i> <span>社交分享</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp" class="collectTab tabItem_5"> <i class="fa fa-paperclip" aria-hidden="true"></i> <span>网站组件</span></a>
+					<a href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin" class="collectTab tabItem_2 active">  <i class="fa fa-weixin" aria-hidden="true"></i> <span>微信收集</span></a>
 				</div>
 			</div>
 		</div>
@@ -63,7 +63,7 @@
 		<div id="dwBodyContent" class="bodyCenter" style="border:1px solid #C1DAEC;">
 		<div id="dwBodyUser">
 			<div class="surveyCollectMiddle">
-				
+
 				<div class="surveyCollectTop">
 					<div class="surveyCollectTitleDiv">
 						<span class="surveyCollectTitle">${survey.surveyName }</span>
@@ -79,7 +79,7 @@
 									<a href="" class="surveyStateBtn sbtn25 sbtn25_2">重新打开收集</a>
 								</c:when>
 							</c:choose>
-							
+
 						</div>
 					</div>
 					<div class="surveyCollectInfoDiv">
@@ -92,14 +92,14 @@
 						</span>
 					</div>
 				</div>
-				
+
 				<div class="surveyCollectMiddleContent">
-					
+
 					<div class="collect_1_content">
 					<div class="collect_weixin_content">
-						
+
 						<div style="clear: both;"></div>
-						
+
 						<div style="margin: 0px auto; width: 930px;padding-top: 10px;">
 							<div class="scmcRightTop" >
 								<div class="scmcRightTopLeft">
@@ -114,7 +114,7 @@
 								</div>
 							</div>
 						</div>
-						
+
 						<div style="">
 							<div class="weixinSteps">
 								<div class="wxinTitle">发送或分享给好友</div>
@@ -125,8 +125,8 @@
 								</ul></div>
 							</div>
 						</div>
-						
-						
+
+
 						<div style="margin: 0px auto; width: 930px;margin-top: 30px;" >
 							<div>
 							<div class="scmcRightTop" >
@@ -150,7 +150,7 @@
 						</div>
 						</div>
 						<div style="clear: both;"></div>
-						
+
 						<div style="margin-top: 15px;">
 							<div class="weixinSteps">
 								<div class="wxinTitle">通过微信公众账号</div>
@@ -160,13 +160,13 @@
 								</ul></div>
 							</div>
 						</div>
-						
-						
+
+
 					</div>
 				</div>
 				</div>
 			</div>
-			
+
 		</div>
 		</div>
 	</div>
@@ -188,4 +188,4 @@
 
 </script>
 </body>
-</html>
+</html>

+ 102 - 102
src/main/webapp/WEB-INF/page/content/diaowen-da/default-report.jsp

@@ -33,7 +33,7 @@ $(document).ready(function(){
 		}
 		th.parent().find(".dw_btn026.active").removeClass("active");
 		th.addClass("active");
-		
+
 		if(amchartdivId!=null){
 			var amchartdivObj=$("#"+amchartdivId);
 			if(!amchartdivObj[0]){
@@ -44,9 +44,9 @@ $(document).ready(function(){
 					data:data,
 					type:"post",
 					success:function(msg){
-						
+
 						$("#amchart_"+quId).find(".higChartSvg").hide();
-						
+
 						if(thClass.indexOf("linechart_pic")>0){
 							//buildChart(msg,quId);
 							higLineChart(msg,quId);
@@ -58,7 +58,7 @@ $(document).ready(function(){
 						}else if(thClass.indexOf("columnchart_pic")>0){
 							higColumnChart(msg,quId);
 						}
-							
+
 					}
 				});
 			}else{
@@ -66,10 +66,10 @@ $(document).ready(function(){
 				amchartdivObj.show();
 			}
 		}
-		
+
 		return false;
 	});
-	
+
 	//$("")
 	//$(".linechart_pic").click();
 	//$(".piechart_pic").click();
@@ -82,27 +82,27 @@ $(document).ready(function(){
 		$.each(quCoNums,function(i,item){
 			$(this).html((i+1)+"、");
 		});
-		
+
 	}
 });
 
 
 function getHighchartsData(quItemBody,charType){
 	var quType=quItemBody.find("input[name='quType']").val();
-	
+
 	var categories=[];
 	var series=new Array();
 	var seriesData=new Array();
 	var tagText="次数";
 	var legendData=new Array();
-	
+
 	var seriesType = 'bar';
 	if (charType==="Line") {
-		seriesType = 'line';	
+		seriesType = 'line';
 	}
-	
+
 	if(quType==="CHENRADIO" || quType==="CHENCHECKBOX" ||  quType==="CHENSCORE"){
-		
+
 		if(charType==="PIE"){
 			seriesData=new Array();
 			var rowItemTrs=quItemBody.find(".rowItemTr");
@@ -115,33 +115,33 @@ function getHighchartsData(quItemBody,charType){
 					var columnItemOptionName=$(this).find(".columnItemOptionName").text();
 					var anCount=$(this).find("input[name='columnItemAnCount']").val();
 					//seriesData.push([rowItemOptionName+"|"+columnItemOptionName, parseInt(anCount)]);
-					
+
 					var data = {};
 				    data["value"] = parseInt(anCount);
 				    data["name"] = rowItemOptionName+"|"+columnItemOptionName;
 				    series.push(data);
-				    
+
 				});
 			});
-			
+
 			/*
 			series=[{                                 //指定数据列
 		        name: '选项',                          //数据列名
 		        data: seriesData                      //数据
 		    }];
 			*/
-			
+
 		}else{
-			
-			
-			
+
+
+
 			var columnItemTrs=quItemBody.find(".anColumnTable:eq(0) .columnItemTr");
 			$.each(columnItemTrs,function(){
 				//var columnItemOptionName=$(this).find("input[name='columnItemOptionName']").val();
 				var columnItemOptionName=$(this).find(".columnItemOptionName").text();
 				categories.push(columnItemOptionName);
 			});
-			
+
 			var rowItemTrs=quItemBody.find(".rowItemTr");
 			$.each(rowItemTrs,function(){
 				//var rowItemOptionName=$(this).find("input[name='rowItemOptionName']").val();
@@ -158,28 +158,28 @@ function getHighchartsData(quItemBody,charType){
 			        type: seriesType,
 			        data: seriesData                      //数据
 			    });
-			        
+
 				legendData.push(rowItemOptionName);
-				
+
 			});
 		}
-		
+
 	}else{
-		
-		var seriesDataTemp="[";	
-		
+
+		var seriesDataTemp="[";
+
 		var quRadioOptions=quItemBody.find(".quTrOptions");
 		$.each(quRadioOptions,function(i,item){
 			var quOptionName=$(this).find(".optionName").text();
 			var anCount=$(this).find("input[name='quItemAnCount']").val();
-			
+
 			if(anCount==""){
 				anCount=0;
 			}
 			categories.push(quOptionName);
 			if(quType==="SCORE"){
 				var avgScore=$(this).find("input[name='quItemAvgScore']").val();
-				//平均分 setAvgScore  
+				//平均分 setAvgScore
 				//alert(avgScore);
 				avgScore=parseFloat(avgScore).toFixed(2);
 				if(avgScore==="NaN"){
@@ -192,7 +192,7 @@ function getHighchartsData(quItemBody,charType){
 				    data["name"] = quOptionName;
 				    seriesData.push(data);
 				}else{
-					seriesData.push(parseFloat(avgScore));	
+					seriesData.push(parseFloat(avgScore));
 				}
 				tagText="分数";
 			} else if(quType==="ORDERQU"){
@@ -202,7 +202,7 @@ function getHighchartsData(quItemBody,charType){
 				    data["name"] = quOptionName;
 				    seriesData.push(data);
 				}else{
-					seriesData.push(parseInt(anCount));	
+					seriesData.push(parseInt(anCount));
 				}
 				tagText="排名";
 			} else{
@@ -215,13 +215,13 @@ function getHighchartsData(quItemBody,charType){
 				    data["name"] = quOptionName;
 				    seriesData.push(data);
 				}else{
-					seriesData.push(parseInt(anCount));	
+					seriesData.push(parseInt(anCount));
 				}
 			}
-			
-			
+
+
 		});
-		
+
 		if(charType==="PIE"){
 			/*
 			series=[{
@@ -254,9 +254,9 @@ function getHighchartsData(quItemBody,charType){
 		        data: seriesData
 		    }]
 		}
-		
+
 	}
-	
+
 	return [categories,series,tagText,legendData];
 }
 
@@ -267,18 +267,18 @@ function higColumnChart(resultJson,quId){
 	$("#amchart_"+quId).prepend("<div id='"+chartdivId+"' class=\"higChartSvg\"></div>");
 	$("#"+chartdivId).css({"height": "300px"});
 	//$("#"+chartdivId).css({"width": "800px"});
-	
+
 	var quItemBody=$("#quTr_"+quId);
 	var quTitle=quItemBody.find(".quCoTitleText").text();
-	
+
 	var quTypeName=quItemBody.find("input[name='quTypeCnName']").val();
-	
+
 	var datas=getHighchartsData(quItemBody,"column");
 	var categories=datas[0];
 	var series=datas[1];
 	var tagText=datas[2];
 	var legendData = datas[3];
-	
+
 	var myChart = echarts.init($('#'+chartdivId)[0],"shine");
 	// 指定图表的配置项和数据
 	var option = {
@@ -335,7 +335,7 @@ function higColumnChart(resultJson,quId){
 	    		show: false
 	    	}/*,
 	    	splitLine: {show:true}
-	    	 
+
 	    	splitArea:{
 	    		interval: 0,
 	    		show : true
@@ -362,8 +362,8 @@ function higColumnChart(resultJson,quId){
 	    },
 	    series: series
 	};
-	
-	/* 
+
+	/*
 	option = {
 		    tooltip: {
 		        trigger: 'axis'
@@ -398,7 +398,7 @@ function higColumnChart(resultJson,quId){
 		            interval: 50,
 		            axisLabel: {
 		                formatter: '{value} ml'
-		            } 
+		            }
 		        }
 		    ],
 		    series: [
@@ -425,22 +425,22 @@ function higColumnChart(resultJson,quId){
 }
 
 function higPieChart(resultJson,quId){
-	
+
 	//$("#"+chartdivId).css({"margin-top":"10px"});
 	var chartdivId="pie_chart_"+quId;
 	$("#amchart_"+quId).prepend("<div id='"+chartdivId+"' class=\"higChartSvg\"></div>");
 	$("#"+chartdivId).css({"height": "300px"});
-	
+
 	var quItemBody=$("#quTr_"+quId);
 	var quTitle=quItemBody.find(".quCoTitleText").text();
 	var quTypeName=quItemBody.find("input[name='quTypeCnName']").val();
-	
+
 	var datas=getHighchartsData(quItemBody,"PIE");
 	var series=datas[1];
 	var tagText=datas[2];
 	var categories = datas[0]
 	var legendData = datas[3];
-	
+
     // Build the chart
     var myChart = echarts.init($('#'+chartdivId)[0],"shine");
     var option = {
@@ -471,7 +471,7 @@ function higPieChart(resultJson,quId){
 		        y : 'bottom',
 		        data: categories//['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
 		    },
-		    series :// series 
+		    series :// series
 		    	[
 		        {
 		            //name: '访问来源',
@@ -498,28 +498,28 @@ function higPieChart(resultJson,quId){
 		    ]
 		};
     myChart.setOption(option);
-    
+
 }
 
 
 
 function higBarChart(resultJson,quId){
-	
+
 	//$("#"+chartdivId).css({"margin-top":"10px"});
 	var chartdivId="bar_chart_"+quId;
 	$("#amchart_"+quId).prepend("<div id='"+chartdivId+"' class=\"higChartSvg\"></div>");
 	$("#"+chartdivId).css({"height": "300px"});
-	
+
 	var quItemBody=$("#quTr_"+quId);
 	var quTitle=quItemBody.find(".quCoTitleText").text();
 	var quTypeName=quItemBody.find("input[name='quTypeCnName']").val();
-	
+
 	var datas=getHighchartsData(quItemBody,"BAR");
 	var categories=datas[0];
 	var series=datas[1];
 	var tagText=datas[2];
 	var legendData = datas[3];
-	
+
 	var myChart = echarts.init($('#'+chartdivId)[0],"shine");
 	var option = {
 	    title: {
@@ -609,21 +609,21 @@ function higBarChart(resultJson,quId){
 
 function higLineChart(resultJson,quId){
 	//根据quId得到数据对象,并且解析
-	
+
 	var chartdivId="line_chart_"+quId;
 	$("#amchart_"+quId).prepend("<div id='"+chartdivId+"' class=\"higChartSvg\"></div>");
 	$("#"+chartdivId).css({"height": "300px"});
-	
+
 	var quItemBody=$("#quTr_"+quId);
 	var quTitle=quItemBody.find(".quCoTitleText").text();
 	var quTypeName=quItemBody.find("input[name='quTypeCnName']").val();
-	
+
 	var datas=getHighchartsData(quItemBody,"Line");
 	var categories=datas[0];
 	var series=datas[1];
 	var tagText=datas[2];
 	var legendData = datas[3];
-	
+
 	var myChart = echarts.init($('#'+chartdivId)[0],"shine");
 	// 指定图表的配置项和数据
 	var option = {
@@ -708,7 +708,7 @@ function higLineChart(resultJson,quId){
 	};
 	// 使用刚指定的配置项和数据显示图表。
 	myChart.setOption(option);
-	
+
 }
 
 
@@ -746,7 +746,7 @@ function substring(json) {
 }
 
 .suQuTable .quTrOptions:FIRST-CHILD  td,.suQuTable .rowItemTr:FIRST-CHILD  td,.suQuTable .columnItemTr:FIRST-CHILD td {
- 	border-top: none! important; 
+ 	border-top: none! important;
 }
 .r-qu-body-title .quCoNum {
     float: left;
@@ -763,17 +763,17 @@ function substring(json) {
 }
 
 .higChartSvg{
-	
+
 }
 </style>
 </head>
 <body>
 	<input type="hidden" id="id" name="id" value="${surveyId }">
-	
+
 	<div class="creatgeSurveyStepBody">
 		<div class="creatgeSurveyStepContent bodyCenter">
 				<ul class="createSsUl">
-				<li><a href=""  class="clickHideMenu csscStep csscStep4"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">设计问卷</span><span class="csscStepRight">&nbsp;</span></a>
+					<li><a href=""  class="clickHideMenu csscStep csscStep4"><i class="fa fa-magic" aria-hidden="true"></i><span class="csscStepCenter">设计问卷</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -786,7 +786,7 @@ function substring(json) {
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据收集</span><span class="csscStepRight" >&nbsp;</span></a>
+				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5"><i class="fa fa-chain" aria-hidden="true"></i> <span class="csscStepCenter">数据收集</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -801,18 +801,18 @@ function substring(json) {
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6 active"><span class="csscStepLeft">&nbsp;</span><span class="csscStepCenter">数据分析</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6 active"> <i class="fa fa-line-chart" aria-hidden="true"></i> <span class="csscStepCenter">数据分析</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
 				</li>
 			</ul>
 		</div>
 	</div>
-	
+
 	<div style="">
 		<div class="main-tabs-content bodyCenter">
 			<div class="tab-content">
 				<div class="tab-content-collectTab">
-					<a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}" class="collectTab tabItem_1 active"><span class="collectTabItemLeft">&nbsp;</span><span>默认报告</span></a>
-					<a href="${ctx }/da/my-survey-answer.action?surveyId=${surveyId}" class="collectTab tabItem_3"><span class="collectTabItemLeft">&nbsp;</span><span>原始数据</span></a>
+					<a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}" class="collectTab tabItem_1 active">  <i class="fa fa-area-chart" aria-hidden="true"></i>  <span>默认报告</span></a>
+					<a href="${ctx }/da/my-survey-answer.action?surveyId=${surveyId}" class="collectTab tabItem_3"> <i class="fa fa-database" aria-hidden="true"></i> <span>原始数据</span></a>
 					<a href="#" class="collectTab tabItem_3" style="display: none;"><span class="collectTabItemLeft">&nbsp;</span><span>问卷日志</span></a>
 				</div>
 			</div>
@@ -823,8 +823,8 @@ function substring(json) {
 		<div id="dwBodyContent" class="bodyCenter" style="border:1px solid #C1DAEC;">
 		<div id="dwBodyUser">
 			<div class="surveyCollectMiddle">
-				
-				
+
+
 				<div class="surveyCollectTop">
 					<div class="surveyCollectTitleDiv">
 						<span class="surveyCollectTitle">${directory.surveyName }</span>
@@ -842,25 +842,25 @@ function substring(json) {
 						</span>
 					</div>
 				</div>
-				
+
 				<div class="surveyCollectMiddleContent">
 					<div style="padding: 15px 25px;overflow: auto;">
 							<div style="overflow: auto;">
 								<div style="float: left;" >
 									<a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId }" class="dw_btn025 tabpic active"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
 									<%-- <a href="${ctx }/da/survey-report!lineChart.action?surveyId=${surveyId }" class="dw_btn025 linepic" style="margin-left: 10px;"><i class="fa fa-bar-chart"></i>&nbsp;柱状图</a>
-									<a href="${ctx }/da/survey-report!pieChart.action?surveyId=${surveyId }" class="dw_btn025 piepic " style="margin-left: 10px;"><i class="fa fa-pie-chart"></i>&nbsp;饼状图</a> --%> 
+									<a href="${ctx }/da/survey-report!pieChart.action?surveyId=${surveyId }" class="dw_btn025 piepic " style="margin-left: 10px;"><i class="fa fa-pie-chart"></i>&nbsp;饼状图</a> --%>
 								</div>
 								<div style="float: right;" >
 									<a href="${ctx }/da/my-survey-answer!exportXLS.action?surveyId=${surveyId }" class="dw_btn025"><i class="fa fa-download"></i>下载数据</a>
 									<!-- <a href="" class="dw_btn025"><i class="fa fa-share"></i>分享</a>-->
-									</div> 
+									</div>
 							</div>
 							<div style="padding-top:8px;">
 								<div class="" style="border: 1px solid #D1D6DD;padding: 0px;">
 									<table id="content-tableList" width="100%"  cellpadding="0" cellspacing="0">
 								<c:forEach items="${surveyStats.questions }" var="en" varStatus="i">
-								
+
 								<c:if test="${en.quType ne 'PARAGRAPH' && en.quType ne 'PAGETAG' }">
 								<tr id="quTr_${en.id }">
 									<td colspan="3">
@@ -870,9 +870,9 @@ function substring(json) {
 											<input type="hidden" name="quAnCount" value="${en.anCount }">
 											<%-- <input type="hidden" name="quTitle" value="${en.quTitle }"> --%>
 											<input type="hidden" name="quTypeCnName" value="${en.quType.cnName }">
-					
-				
-							
+
+
+
 							<div class="r-qu-body-title">
 								<div class="quCoNum">${i.count }、</div>
 								<div class="quCoTitleText">${en.quTitle }[${en.quType.cnName }]</div>
@@ -1080,7 +1080,7 @@ function substring(json) {
 															<td width="180px"><div id="bfbTd${en.quType }${i.count }_${quI.count}" class="progressbarDiv progress${quI.index }"></div></td>
 															<td width="60px" align="right" id="bfbNum${en.quType }${i.count }_${quI.count}" class="bfbTd">0%</td>
 															<%-- <td align="left" class="tdAnCount">&nbsp;&nbsp;${quEn.anCount }次</td> --%>
-															<td align="left" class="tdAnCount">&nbsp;&nbsp;平均</td> 
+															<td align="left" class="tdAnCount">&nbsp;&nbsp;平均</td>
 															<td width="40px">&nbsp;
 																<input type="hidden" name="quItemAnCount" value="${quEn.anCount }">
 																<input type="hidden" name="quItemAvgScore" value="${quEn.avgScore }" >
@@ -1092,7 +1092,7 @@ function substring(json) {
 															var avgScore=parseFloat("${quEn.avgScore}");
 															var bfbFloat=avgScore/"${en.paramInt02}"*100;
 															var bfbVal = bfbFloat.toFixed(2);
-															//平均分 setAvgScore  
+															//平均分 setAvgScore
 															avgScore=avgScore.toFixed(2);
 															if(avgScore==="NaN"){
 																avgScore="0.00";
@@ -1117,7 +1117,7 @@ function substring(json) {
 										<%--矩阵单选题 --%>
 										<c:when test="${en.quType eq 'CHENRADIO' }">
 													<table class="suQuTable" border="0" cellpadding="0" cellspacing="0">
-														
+
 														<c:forEach items="${en.rows }" var="rowItem" varStatus="rowI">
 														<tr class="rowItemTr">
 															<td width="15px">&nbsp;
@@ -1154,9 +1154,9 @@ function substring(json) {
 																		$("#bfbNum${en.quType }${i.count }_${rowI.count}_${colI.count}").html(bfbVal+"%");
 																		$("#bfbAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}").html("&nbsp;&nbsp;"+anCount+"次");
 																		$("#bfbTd${en.quType }${i.count }_${rowI.count}_${colI.count }").progressbar({value: bfbFloat});
-																		
+
 																		$("#coumneItemAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}").val(anCount);
-																		
+
 																	</script>
 																</c:if>
 															</c:forEach>
@@ -1183,7 +1183,7 @@ function substring(json) {
 										<%--矩阵多选题 --%>
 										<c:when test="${en.quType eq 'CHENCHECKBOX' }">
 											<table class="suQuTable" border="0" cellpadding="0" cellspacing="0">
-													
+
 													<c:forEach items="${en.rows }" var="rowItem" varStatus="rowI">
 													<tr class="rowItemTr">
 														<td width="15px">&nbsp;
@@ -1220,7 +1220,7 @@ function substring(json) {
 																			$("#bfbNum${en.quType }${i.count }_${rowI.count}_${colI.count}").html(bfbVal+"%");
 																			$("#bfbAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}").html("&nbsp;&nbsp;"+anCount+"次");
 																			$("#bfbTd${en.quType }${i.count }_${rowI.count}_${colI.count }").progressbar({value: bfbFloat});
-																			
+
 																			$("#coumneItemAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}").val(anCount);
 																		</script>
 																	</c:if>
@@ -1232,7 +1232,7 @@ function substring(json) {
 														</td>
 													</tr>
 													</c:forEach>
-													
+
 													</table>
 											<div class="reportPic">
 												<div class="chartBtnEvent">
@@ -1249,8 +1249,8 @@ function substring(json) {
 										<%--矩阵评分题 --%>
 										<c:when test="${en.quType eq 'CHENSCORE' }">
 											<table class="suQuTable" border="0" cellpadding="0" cellspacing="0">
-													
-														<%-- 
+
+														<%--
 														<c:forEach items="${en.rows }" var="rowItem" varStatus="rowI">
 														<tr class="rowItemTr">
 															<td width="15px">&nbsp;
@@ -1273,8 +1273,8 @@ function substring(json) {
 																	<div class="columnItemOptionName" style="display: none;">${columnItem.optionName }</div>
 																	<input type="hidden" name="columnItemAnCount" value="0" id="coumneItemAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}">
 															 --%>
-															
-													
+
+
 													<c:forEach items="${en.rows }" var="rowItem" varStatus="rowI">
 													<tr class="rowItemTr">
 															<td width="15px">&nbsp;
@@ -1293,12 +1293,12 @@ function substring(json) {
 														<td width="180px"><div id="bfbTd${en.quType }${i.count }_${rowI.count}_${colI.count }" class="progressbarDiv progress${rowI.index }"></div></td>
 														<td width="60px" align="right" id="bfbNum${en.quType }${i.count }_${rowI.count}_${colI.count}" class="bfbTd">0%</td>
 														<%-- <td align="left" id="bfbAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}" class="tdAnCount">&nbsp;0次</td> --%>
-														<td align="left" class="tdAnCount">&nbsp;&nbsp;平均</td> 
+														<td align="left" class="tdAnCount">&nbsp;&nbsp;平均</td>
 														<td width="40px">&nbsp;</td>
 														<td>
 																<div class="columnItemOptionName" style="display: none;">${columnItem.optionName }</div>
 																<input type="hidden" name="columnItemAnCount" value="0" id="coumneItemAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}">
-														
+
 														<c:forEach items="${en.anChenScores }" var="anItem">
 															<c:if test="${anItem.quRowId eq rowItem.id && anItem.quColId eq columnItem.id }">
 																<!-- <script type="text/javascript">
@@ -1315,14 +1315,14 @@ function substring(json) {
 																	//var bfbFloat=avgScore/"${en.paramInt02}"*100;
 																	var bfbFloat=avgScore/5*100;
 																	var bfbVal = bfbFloat.toFixed(2);
-																	//平均分 setAvgScore  
+																	//平均分 setAvgScore
 																	avgScore=avgScore.toFixed(2);
 																	if(avgScore==="NaN"){
 																		avgScore="0.00";
 																	}
 																	$("#bfbNum${en.quType }${i.count }_${rowI.count}_${colI.count}").html(avgScore+"分");
 																	$("#bfbTd${en.quType }${i.count }_${rowI.count}_${colI.count }").progressbar({value: bfbFloat});
-																	
+
 																	$("#coumneItemAnCount${en.quType }${i.count }_${rowI.count}_${colI.count}").val(avgScore);
 																</script>
 															</c:if>
@@ -1333,7 +1333,7 @@ function substring(json) {
 													</table>
 													</td>
 													</c:forEach>
-													
+
 													</table>
 											<div class="reportPic">
 												<div class="chartBtnEvent">
@@ -1425,24 +1425,24 @@ function substring(json) {
 											<div style="clear:both;"></div>
 										</c:when>
 								</c:choose>
-								
+
 							</div>
 						</div>
-						
+
 									</td>
 								</tr>
 								</c:if>
-								
+
 								</c:forEach>
 							</table>
-									
+
 								</div>
-							</div>			
+							</div>
 					</div>
-					
+
 				</div>
 			</div>
-			
+
 		</div>
 		</div>
 	</div>
@@ -1452,4 +1452,4 @@ $(document).ready(function(){
 });
 </script>
 </body>
-</html>
+</html>

+ 22 - 22
src/main/webapp/WEB-INF/page/content/diaowen-da/survey-answer-data.jsp

@@ -15,11 +15,11 @@
 </head>
 <body>
 	<input type="hidden" id="id" name="id" value="${survey.id }">
-	
+
 	<div class="creatgeSurveyStepBody">
 		<div class="creatgeSurveyStepContent bodyCenter">
 			<ul class="createSsUl">
-				<li><a href=""  class="clickHideMenu csscStep csscStep4"><span class="csscStepLeft" style="width: 36px">&nbsp;</span><span class="csscStepCenter">设计问卷</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href=""  class="clickHideMenu csscStep csscStep4"><i class="fa fa-magic" aria-hidden="true"></i><span class="csscStepCenter">设计问卷</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -32,7 +32,7 @@
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5"><span class="csscStepLeft" style="width: 36px">&nbsp;</span><span class="csscStepCenter">数据收集</span><span class="csscStepRight" >&nbsp;</span></a>
+				<li><a href="${ctx }/design/my-collect.action?surveyId=${surveyId }"  class="clickHideMenu csscStep csscStep5"><i class="fa fa-chain" aria-hidden="true"></i> <span class="csscStepCenter">数据收集</span><i class="fa fa-caret-down" aria-hidden="true"></i></a>
 					<div class="a-w-sel">
 		            	<div class="w-sel" style="margin-top: 4px;">
 		                	<div class="selc">
@@ -47,18 +47,18 @@
 		            </div>
 				</li>
 				<li><span class="csscStep csscStepLine"><span class="csscStepLeft">&nbsp;</span><span class="csscStepRight">&nbsp;</span></span></li>
-				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6 active"><span class="csscStepLeft"  style="width: 36px">&nbsp;</span><span class="csscStepCenter">数据分析</span><span class="csscStepRight">&nbsp;</span></a>
+				<li><a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}"  class="clickHideMenu csscStep csscStep6 active"> <i class="fa fa-line-chart" aria-hidden="true"></i> <span class="csscStepCenter">数据分析</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
 				</li>
 			</ul>
 		</div>
 	</div>
-	
+
 	<div style="">
 		<div class="main-tabs-content bodyCenter">
 			<div class="tab-content">
 				<div class="tab-content-collectTab">
-					<a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}" class="collectTab tabItem_1 "><span class="collectTabItemLeft">&nbsp;</span><span>默认报告</span></a>
-					<a href="${ctx }/da/my-survey-answer.action?surveyId=${surveyId}" class="collectTab tabItem_3 active"><span class="collectTabItemLeft">&nbsp;</span><span>原始数据</span></a>
+					<a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId}" class="collectTab tabItem_1">  <i class="fa fa-area-chart" aria-hidden="true"></i>  <span>默认报告</span></a>
+					<a href="${ctx }/da/my-survey-answer.action?surveyId=${surveyId}" class="collectTab tabItem_3 active"> <i class="fa fa-database" aria-hidden="true"></i> <span>原始数据</span></a>
 				</div>
 			</div>
 		</div>
@@ -68,7 +68,7 @@
 		<div id="dwBodyContent" class="bodyCenter" style="border:1px solid #C1DAEC;">
 		<div id="dwBodyUser">
 			<div class="surveyCollectMiddle">
-				
+
 				<div class="surveyCollectTop">
 					<div class="surveyCollectTitleDiv">
 						<span class="surveyCollectTitle">${survey.surveyName }</span>
@@ -84,7 +84,7 @@
 									<a href="" class="surveyStateBtn sbtn25 sbtn25_2">重新打开收集</a>
 								</c:when>
 							</c:choose>
-							
+
 						</div>
 					</div>
 					<div class="surveyCollectInfoDiv">
@@ -97,11 +97,11 @@
 						</span>
 					</div>
 				</div>
-				
+
 				<div class="surveyCollectMiddleContent">
-					
+
 					<div class="collect_1_content">
-					
+
 					<div style="padding:0px 60px;">
 						<div style="" >
 							<div style="overflow: auto;">
@@ -141,7 +141,7 @@
 									</c:forEach>
 								</table>
 							</div>
-							
+
 							<div style="padding-top: 15px;text-align: center;">
 									<div class="btn-group">
 										<c:if test="${page.pageNo > 1}">
@@ -168,20 +168,20 @@
 										<c:if test="${page.totalPage > page.pageNo}">
 											<a href="${ctx }/da/my-survey-answer.action?surveyId=${surveyId }&page.pageNo=${page.pageNo+1}" class="btn btn-default">&gt;</a>
 										</c:if>
-										
+
 									</div>
 								</div>
-							
-							
+
+
 						</div>
 					</div>
 					</div>
-					
-					
-					
+
+
+
 				</div>
 			</div>
-			
+
 		</div>
 		</div>
 	</div>
@@ -191,7 +191,7 @@ $(".scmcSurveySNSShare textarea").focus(function(){
 	$(this).css({"background-color":"#FDF9CD","border-color":"#98C5C3"});
 });
 $(".scmcSurveySNSShare textarea").blur(function(){
-	$(this).css("background-color","#F9F7D7");	
+	$(this).css("background-color","#F9F7D7");
 });
 
 $(".deleteSurveyAnswer").click(function(){
@@ -217,4 +217,4 @@ $(".deleteSurveyAnswer").click(function(){
 
 </script>
 </body>
-</html>
+</html>

+ 1 - 0
src/main/webapp/WEB-INF/page/layouts/default.jsp

@@ -8,6 +8,7 @@
 <title><sitemesh:write property='title' />&nbsp;&nbsp;调问网</title>
 
 <link href="${ctx }/js/plugs/jquery-ui-1.10.3.custom/css/mycss/jquery-ui-1.10.3.custom.css" rel="stylesheet" type="text/css" />
+<link href="${ctx }/js/plugs/font-awesome-4.2.0/css/font-awesome.css" rel="stylesheet">
 <script type="text/javascript" src="${ctx }/js/plugs/jquery-ui-1.10.3.custom/js/jquery-1.10.1.js"></script>
 <script type="text/javascript" src="${ctx }/js/plugs/jquery-ui-1.10.3.custom/js/jquery-ui-1.10.3.custom.js"></script>
 <script type="text/javascript" src="${ctx }/js/dw/responsive-width.js"></script>

+ 47 - 46
src/main/webapp/css/dw-user.css

@@ -58,7 +58,7 @@ input,select{
 	text-align: center;
 	text-decoration: none;
 	font-family: "Hiragino Sans GB","Microsoft YaHei","微软雅黑",tahoma,arial,simsun,"宋体";
-	
+
 	filter:alpha(opacity=100); /*IE滤镜,透明度50%*/
 	-moz-opacity:1; /*Firefox私有,透明度50%*/
 	opacity:1;/*其他,透明度50%*/
@@ -154,7 +154,7 @@ input,select{
 	background: #599FD1;
 	border: 1px solid #599FD1;
 	color: white;
-	
+
 	background: #FEFFFF;
     border: 1px solid transparent;
     color: rgb(27, 5, 5);
@@ -228,7 +228,7 @@ a{
 }
 .a-style-1{
 	color: #5A9ECD;
-	
+
 }
 body{
 	/* background: #EDEDEF; */
@@ -319,7 +319,7 @@ body{
 	text-align: right;
 	display: inline-block;
 	overflow: hidden;
-	
+
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
@@ -361,7 +361,7 @@ body{
 	color: #9b9a9a;
 }
 .surveyCollectInfoLeft{
-	
+
 }
 .surveyCollectInfoRight{
 	float: right;
@@ -374,7 +374,7 @@ body{
 	overflow: auto;
 }
 .surveyCollectTitleDiv{
-	
+
 }
 
 .surveyCollectMiddleTab{
@@ -423,7 +423,7 @@ body{
 	margin-top: 5px;
 }
 .surveyCollectMiddleContent{
-	
+
 }
 .collect_1_content{
 	width: 100%;
@@ -496,7 +496,7 @@ body{
 	padding: 0px;
 	font-size: 18px;
 	color: #064152;
-		
+
 	/* -moz-border-radius: 5px;
 	-khtml-border-radius: 5px;
 	-webkit-border-radius: 5px;
@@ -582,6 +582,7 @@ body{
 	padding: 0px;
 	background: #e6e6e6;
 	zoom: 1;
+	padding-top: 6px;
 }
 .creatgeSurveyStepContent{
 	text-align: center;
@@ -722,7 +723,7 @@ body{
 	-webkit-box-shadow: 0 1px 3px #e6e6e6;
 	-moz-box-shadow: 0 1px 3px #e6e6e6;
 	-o-box-shadow: 0 1px 3px #e6e6e6;
-	
+
 	padding: 0;
 	margin: 0;
 }
@@ -751,7 +752,7 @@ body{
 	/* border-top: 1px solid #202020;
 	border-bottom: 1px solid #0c0c0c;
 	background-color: #191919; */
-	
+
 	border-top: 1px solid #F1F1F1;
 	border-bottom: 1px solid #C5C5C5;
 	background-color: #e6e6e6;
@@ -785,7 +786,7 @@ body{
 	background: #F4F4F4;
 }
 .seli:hover a{
-	
+
 }
 .a-w-sel.a-w-sel-head .seli:hover a{
 	background-color: #333;
@@ -996,7 +997,7 @@ body{
 .kso_rwdContainer ul li:hover,.kso_rwdContainer ul li.active{
 	color: #61A4D3;
 	background: #FBFBFB;
-	
+
 }
 .createSurveyContent{
 	background: white;
@@ -1022,7 +1023,7 @@ body{
 	color: #6F6F6F;
 	padding: 10px 12px;
 	font-family: "微软雅黑";
-	
+
 	line-height: 1.4em;
 	margin: 0px;
 	border-left: 4px solid transparent;
@@ -1035,7 +1036,7 @@ body{
 	background: white;
 }
 .surveyUList li a{
-	color: #615c5c;	
+	color: #615c5c;
 }
 .surveyUList li:hover  a,.surveyUList li.active a{
 	color: #0F78B0;
@@ -1083,7 +1084,7 @@ body{
 .addInboxUser:hover{
 	background: #E6E6E6;
 	color: #599FD1;
-} 
+}
 .addInboxUser span{
 	display: inline-block;
 }
@@ -1108,7 +1109,7 @@ body{
 	text-align: center;
 }
 .listPageNos{
-	
+
 }
 .listPageNos .pageNo{
 	border: 1px solid #E8ECEF;
@@ -1298,12 +1299,12 @@ body{
 	margin-bottom:15px;
 	background: rgb(245, 245, 245);
   	padding: 10px 5px;
-	
+
 }
 .ui-corner-all,.ui-corner-left{
-	 -moz-border-radius: 0px; 
-	 -webkit-border-radius: 0px; 
-	 -khtml-border-radius: 0px; 
+	 -moz-border-radius: 0px;
+	 -webkit-border-radius: 0px;
+	 -khtml-border-radius: 0px;
 	 border-radius: 0px;
 	 border: none;
 }
@@ -1529,7 +1530,7 @@ body{
 	margin: 0px auto;
 	/*
 	background: #FEFDFD;
-	margin-top: 60px; 
+	margin-top: 60px;
 	border: 1px solid #BED5E7;
 	-webkit-box-shadow: 0 0 5px #C5C5C5;
 	box-shadow: 0 0 5px #C5C5C5;  */
@@ -1537,14 +1538,14 @@ body{
 }
 .dlcTitleBg{
 	background: #EFF2F9;
-	background: #24292C; 
+	background: #24292C;
 	background: #EBEAEB;
 	background: #24292C;
 	background: #111;
 	color: rgb(0, 0, 0);
 	padding: 16px 30px;
 	height: 26px;
-	
+
 }
 
 .dlcTitle{
@@ -1565,7 +1566,7 @@ body{
 .dlcTitleTab{
 	padding:20px 50px;
 	line-height: 58px;
-	height: 58px;	
+	height: 58px;
 	color: rgba(255,255,255,0.5);
 	outline: none;
 }
@@ -1668,24 +1669,24 @@ a.dlcTitleTab:HOVER{
 	padding: 8px! important;
 	outline:0;
 	vertical-align: middle;
-} 
+}
 .auth-code img,  .auth-code a{
 	vertical-align: middle;
 }
 .auth-code img{
 	margin: 2px;
 	margin-left: 3px;
-	
-	-moz-border-radius-topright: 4px; 
-	-webkit-border-top-right-radius: 4px; 
-	-khtml-border-top-right-radius: 4px; 
+
+	-moz-border-radius-topright: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-khtml-border-top-right-radius: 4px;
 	border-top-right-radius: 4px;
-	
-	-moz-border-radius-bottomright: 4px; 
-	-webkit-border-bottom-right-radius: 4px; 
-	-khtml-border-bottom-right-radius: 4px; 
+
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-khtml-border-bottom-right-radius: 4px;
 	border-bottom-right-radius: 4px;
-	
+
 	border-left: 1px solid #CCCCCC;
 	padding-left: 4px;
 }
@@ -1835,7 +1836,7 @@ a.dw_style_a_1:hover{
 	vertical-align: middle;
 	background-color: #e8f0f7;
 	border-color: #C2D4E3;
-	
+
 	border-radius: 17px;
 	border-style: solid;
 	border-width: 1px;
@@ -1845,18 +1846,18 @@ a.dw_style_a_1:hover{
 	padding: 2px 9px;
 	color: #7F7F7F;
 	outline: 0;
-	
+
 	padding-right: 25px;
-	
+
 	position: relative;
 	max-width: 465px;
 	height: 12px;
 	line-height: 12px;
 	font-size: 12px;
-	
+
 	float: left;
 	margin: 0 5px 0 0;
-	
+
 	margin-top: 7px;
 	overflow: hidden;
 }
@@ -1866,11 +1867,11 @@ a.dw_style_a_1:hover{
 	height: 12px;
 	line-height: 12px;
 	font-size: 12px;
-	
+
 	margin-right: -18px;
 	background: transparent;
 	border-color: transparent;
-	
+
 	float: left;
 	margin: 0 5px 0 0;
 
@@ -1884,10 +1885,10 @@ a.dw_style_a_1:hover{
 	padding: 2px 9px;
 	color: #7F7F7F;
 	outline: 0;
-	
+
 	margin-top: 7px;
 	overflow: hidden;
-	
+
 }
 .inboxEditableAddr-ipt {
 	position: absolute;
@@ -1903,7 +1904,7 @@ a.dw_style_a_1:hover{
 	top: -1px;
 	left: 2px;
 	-webkit-appearance: none;
-	
+
 	font: -webkit-small-control;
 	color: initial;
 	letter-spacing: normal;
@@ -1997,7 +1998,7 @@ a.dw_style_a_1:hover{
 	line-height: 1.4em;
 	font-family: "微软雅黑";
 	color: #444;
-	
+
 	filter:alpha(opacity=92); /*IE滤镜,透明度50%*/
 	-moz-opacity:0.92; /*Firefox私有,透明度50%*/
 	opacity:0.92;/*其他,透明度50%*/
@@ -2042,4 +2043,4 @@ a.dw_style_a_1:hover{
 	padding-left: 6px;
 	color: red;
 	padding-top: 12px;
-}
+}