Browse Source

列表页面链接错误,答卷结束只显示本页内容

KeYuan 7 years ago
parent
commit
3796ae3d5b

+ 0 - 1
src/main/java/com/key/common/utils/DiaowenProperty.java

@@ -52,7 +52,6 @@ public class DiaowenProperty extends
 	}
 */
 	public void diaowenInit(){
-		System.out.println("做点有意义事情。。。");
 		System.out.println(ServletActionContext.getContext());
 	}
 

+ 0 - 4
src/main/resources/conf/applicationContext.xml

@@ -20,10 +20,6 @@
 			<list>
 				<!-- 标准配置 -->
 				<value>classpath*:/conf/application.properties</value>
-				<!-- 本地开发环境配置 -->
-				<value>classpath*:/conf/application.local.properties</value>
-				<!-- 服务器生产环境配置 -->
-				<value>classpath*:/conf/site/site.properties</value>
 			</list>
 		</property>
 	</bean>

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

@@ -122,7 +122,7 @@
 									<!-- <span  id="clipLinkSpan"   style="display: none;font-size:16px;color:#80AA00;">复制成功</span> -->
 									</div>
 									<div class="scmcRightTopLeftNote">复制下面的问卷链接到QQ,Email等工具中直接发给被用户</div>
-									<div><span style="color: #d15985;line-height: 36px;">找不到人填问卷?加QQ群:811287103 互填互助快速完成调研</span></div>
+									<div><span style="color: #d15985;line-height: 36px;">找不到人填问卷?加QQ群:457647860 互填互助快速完成调研</span></div>
 								</div>
 							</div>
 							<div style="clear: both;"></div>

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-design/design-survey.jsp

@@ -56,7 +56,7 @@
 <div id="tools">
 <div class="tools_tabs">
 	<div class="tools_tabs_left"><ul><li class="current" id="tools_tab1_li">基本</li></ul></div>
-	<div class="tools_tabs_right"><ul><li style="padding: 0px;font-size: 12px;line-height: 28px;"><a href="http://www.dwsurvey.net/newbuy.html" target="_black" style="text-decoration: none;color: gray;">升级到高级版</a></li></ul></div>
+	<div class="tools_tabs_right"><ul><li style="padding: 0px;font-size: 12px;line-height: 28px;"><a href="http://www.diaowen.net/buy2.jsp" target="_black" style="text-decoration: none;color: gray;">升级到高级版</a></li></ul></div>
 </div>
 
 <div class="tools_contents">

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-design/list.jsp

@@ -111,7 +111,7 @@ button {
 										<td align="center">
 											<input type="hidden" name='surveyId' value="${en.id }">
 										</td>
-										<td align="left"><a target="_blank" href="${ctx }/wenjuan/${en.sid }.html" class="titleTag">${en.surveyName }</a></td>
+										<td align="left"><a target="_blank" href="${ctx }/dwsurvey/${en.sid }.html" class="titleTag">${en.surveyName }</a></td>
 										<td align="left" width="100" >${en.userName }</td>
 										<td align="left">
 											<fmt:formatDate value="${en.createDate }" pattern="yyyy年MM月dd日 HH:mm"/>

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

@@ -9,7 +9,7 @@
 
 	<!-- 必须保留声明 -->
 	<div class="footer-copyright" style="color: gray;padding-top: 0px;font-size: 16px;">
-		Powered by <a href="http://www.dwsurvey.net" style="text-decoration: none;color: gray;">DWSurvey</a>
+		Powered by <a href="http://www.diaowen.net" style="text-decoration: none;color: gray;">DWSurvey</a>
 		&nbsp;&nbsp;&nbsp;Copyright © 2012-2016
 		<a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">调问网</a>
 	</div>

+ 2 - 2
src/main/webapp/WEB-INF/page/layouts/header.jsp

@@ -39,7 +39,7 @@
 					<li><a href="${ctx }/sy/user/user-admin.action" id="usermanager">用户</a></li>
 					<li><a href="${ctx }/sy/system/sys-property!input.action" id="systemset">设置</a></li>
 						</shiro:hasRole>
-					<li><a href="http://www.dwsurvey.net/">帮助</a></li>
+					<li><a href="http://www.diaowen.net/">帮助</a></li>
 					</ul>
 				</div>
 				<div class="header_Item header_user" style="float: right;margin-top: 12px;position: relative;zoom: 1;z-index: 165;">
@@ -54,7 +54,7 @@
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1" href="${ctx }/ic/user!myaccount.action">修改密码</a></div>
-		                            <div class="seli"><a class="nx-7" href="http://www.dwsurvey.net/">帮助及反馈</a></div>
+		                            <div class="seli"><a class="nx-7" href="http://www.diaowen.net/">帮助及反馈</a></div>
 		                            <div class="seli"><a class="nx-8" href="${ctx }/login!logout.action">退出</a></div>
 		                        </div>
 		                    </div>

+ 1 - 0
src/main/webapp/WEB-INF/sitemesh3.xml

@@ -6,4 +6,5 @@
  	<mapping path="/survey.*" exclue="true"/>
  	<mapping path="/dwsurvey*" exclue="true"/>
  	<!-- <mapping path="/da/my-survey-answer!responseAnswer.action" exclue="true"/> -->
+    <mapping path="/dws-answer*" exclue="true"/>
 </sitemesh>