添加多项填空题内容

src/main/java/com/key/common/utils/DiaowenProperty.java

@@ -26,15 +26,8 @@ import javax.servlet.ServletContext;
 public class DiaowenProperty extends
 		PropertyPlaceholderConfigurer {
 
-	public static String DWSTORAGETYPE = null;
-	public static String ACCESS_KEY_ID = null;
-	public static String SECRET_ACCESS_KEY = null;
-	public static String ENDPOINT = null;
 	public static String STORAGE_URL_PREFIX = null;
 
-	public static String WENJUANHTML_BACKET = null;
-	public static String UPLOADFILE_BACKET = null;
-	public static String UPLOADFILE_JM_BACKET = null;
 
 //	private static Map<String, String> ctxPropertiesMap;
 
@@ -44,16 +37,6 @@ public class DiaowenProperty extends
 			Properties props) throws BeansException {
 		super.processProperties(beanFactoryToProcess, props);
 		
-		DWSTORAGETYPE = props.getProperty("dw.storage.type");
-		ACCESS_KEY_ID = props.getProperty("dw.yunos.access_keyid");
-		SECRET_ACCESS_KEY = props.getProperty("dw.yunos.access_keysecret");
-		ENDPOINT = props.getProperty("dw.yunos.endpoint");
-//		FILE_BACKET_DOMAIN = props.getProperty("dw.yunos.file_backet_domain");
-		STORAGE_URL_PREFIX = props.getProperty("dw.storage.url_prefix");
-		
-		WENJUANHTML_BACKET = props.getProperty("dw.yunos.wenjuan_html_backet");
-		UPLOADFILE_BACKET = props.getProperty("dw.yunos.upload_file_backet");
-		UPLOADFILE_JM_BACKET = props.getProperty("dw.yunos.upload_file_jm_backet");
 		/*
 		ctxPropertiesMap = new HashMap<String, String>();
 		for (Object key : props.keySet()) {
@@ -69,7 +52,7 @@ public class DiaowenProperty extends
 	}
 */
 	public void diaowenInit(){
-		System.out.println("系统初始化方法。。。");
+		System.out.println("做点有意义事情。。。");
 		System.out.println(ServletActionContext.getContext());
 	}
 

src/main/java/com/key/common/utils/web/InitAppliction.java

@@ -23,13 +23,6 @@ public class InitAppliction implements ServletContextListener {
 		System.out.println("getContextPath:"+servletContext.getContextPath());
 		contextPath = servletContext.getContextPath();
 		
-		//云数据同步
-		if(!"local".equals(DiaowenProperty.DWSTORAGETYPE)){
-			
-			
-			
-		}
-		
 	}
 
 	

src/main/java/com/key/dwsurvey/action/QuFillblankAction.java

@@ -179,8 +179,7 @@ public class QuFillblankAction extends ActionSupport{
 		String quId = request.getParameter("quId");
 		String surveyId = request.getParameter("surveyId");
 		anPage.setPageSize(1000);
-		Criterion cri1 = Restrictions.eq("quId",quId);
-		anPage = anFillblankManager.findPage(anPage, cri1);
+		anPage = anFillblankManager.findPage(anPage, quId);
 		request.setAttribute("surveyId",surveyId);
 		return "answers";
 	}

src/main/java/com/key/dwsurvey/action/QuMultiFillblankAction.java

@@ -9,15 +9,17 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.key.common.plugs.page.Page;
+import com.key.dwsurvey.entity.*;
+import com.key.dwsurvey.service.AnDFillblankManager;
 import org.apache.struts2.convention.annotation.*;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.util.WebUtils;
 
 import com.key.common.utils.web.Struts2Utils;
 import com.key.common.QuType;
-import com.key.dwsurvey.entity.QuMultiFillblank;
-import com.key.dwsurvey.entity.Question;
-import com.key.dwsurvey.entity.QuestionLogic;
 import com.key.dwsurvey.service.QuMultiFillblankManager;
 import com.key.dwsurvey.service.QuestionManager;
 import com.opensymphony.xwork2.ActionSupport;
@@ -32,14 +34,18 @@ import com.opensymphony.xwork2.ActionSupport;
  */
 @Namespaces({@Namespace("/design")})
 @InterceptorRefs({ @InterceptorRef("paramsPrepareParamsStack") })
-@Results({})
+@Results({
+		@Result(name="answers",location="/WEB-INF/page/content/diaowen-da/dfillblank.jsp",type=Struts2Utils.DISPATCHER)
+})
 @AllowedMethods({"ajaxSave","ajaxDelete"})
 public class QuMultiFillblankAction extends ActionSupport{
 	@Autowired
 	private QuestionManager questionManager;
 	@Autowired
 	private QuMultiFillblankManager quMultiFillblankManager;
-	
+	@Autowired
+	private AnDFillblankManager anDFillblankManager;
+
 	public String ajaxSave() throws Exception {
 		HttpServletRequest request=Struts2Utils.getRequest();
 		HttpServletResponse response=Struts2Utils.getResponse();
@@ -199,4 +205,24 @@ public class QuMultiFillblankAction extends ActionSupport{
 		return null;
 	}
 
+
+	private Page<AnDFillblank> anPage = new Page<AnDFillblank>();
+	//取上传题结果
+	public String answers() throws Exception {
+		HttpServletRequest request = Struts2Utils.getRequest();
+		String quItemId = request.getParameter("quItemId");
+		String surveyId = request.getParameter("surveyId");
+		anPage.setPageSize(1000);
+		anPage = anDFillblankManager.findPage(anPage, quItemId);
+		request.setAttribute("surveyId",surveyId);
+		return "answers";
+	}
+
+	public Page<AnDFillblank> getAnPage() {
+		return anPage;
+	}
+
+	public void setAnPage(Page<AnDFillblank> anPage) {
+		this.anPage = anPage;
+	}
 }

src/main/java/com/key/dwsurvey/service/AnDFillblankManager.java

@@ -2,6 +2,7 @@ package com.key.dwsurvey.service;
 
 import java.util.List;
 
+import com.key.common.plugs.page.Page;
 import com.key.common.service.BaseService;
 import com.key.dwsurvey.entity.AnDFillblank;
 import com.key.dwsurvey.entity.Question;
@@ -17,4 +18,7 @@ public interface AnDFillblankManager extends BaseService<AnDFillblank, String>{
 	public List<AnDFillblank> findAnswer(String belongAnswerId,String quId);
 
 	public void findGroupStats(Question question);
+
+	public Page<AnDFillblank> findPage(Page<AnDFillblank> page, String quItemId);
+
 }

src/main/java/com/key/dwsurvey/service/AnFillblankManager.java

@@ -1,8 +1,10 @@
 package com.key.dwsurvey.service;
 
+import com.key.common.plugs.page.Page;
 import com.key.common.service.BaseService;
 import com.key.dwsurvey.entity.AnFillblank;
 import com.key.dwsurvey.entity.Question;
+import org.hibernate.criterion.Criterion;
 
 /**
  * 填空题
@@ -15,4 +17,6 @@ public interface AnFillblankManager extends BaseService<AnFillblank, String>{
 	public AnFillblank findAnswer(String belongAnswerId,String quId);
 
 	public void findGroupStats(Question question);
+
+	Page<AnFillblank> findPage(Page<AnFillblank> page, String quId);
 }

src/main/java/com/key/dwsurvey/service/QuMultiFillblankManager.java

@@ -2,7 +2,9 @@ package com.key.dwsurvey.service;
 
 import java.util.List;
 
+import com.key.common.plugs.page.Page;
 import com.key.common.service.BaseService;
+import com.key.dwsurvey.entity.AnDFillblank;
 import com.key.dwsurvey.entity.QuMultiFillblank;
 
 /**
@@ -23,4 +25,5 @@ public interface QuMultiFillblankManager  extends BaseService<QuMultiFillblank,
 	public void ajaxDelete(String quItemId);
 
 	public void saveAttr(String quItemId);
+
 }

src/main/java/com/key/dwsurvey/service/impl/AnDFillblankManagerImpl.java

@@ -2,7 +2,9 @@ package com.key.dwsurvey.service.impl;
 
 import java.util.List;
 
+import com.key.common.plugs.page.Page;
 import com.key.dwsurvey.dao.AnDFillblankDao;
+import com.key.dwsurvey.entity.AnFillblank;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,5 +45,10 @@ public class AnDFillblankManagerImpl extends BaseServiceImpl<AnDFillblank, Strin
 	public void findGroupStats(Question question) {
 		anDFillblankDao.findGroupStats(question);
 	}
+
+	public Page<AnDFillblank> findPage(Page<AnDFillblank> page, String quItemId){
+		Criterion cri1 = Restrictions.eq("quItemId",quItemId);
+		return findPage(page,cri1);
+	}
 	
 }

src/main/java/com/key/dwsurvey/service/impl/AnFillblankManagerImpl.java

@@ -1,5 +1,6 @@
 package com.key.dwsurvey.service.impl;
 
+import com.key.common.plugs.page.Page;
 import com.key.dwsurvey.entity.AnFillblank;
 import com.key.dwsurvey.entity.Question;
 import com.key.dwsurvey.service.AnFillblankManager;
@@ -41,5 +42,11 @@ public class AnFillblankManagerImpl extends BaseServiceImpl<AnFillblank, String>
 	public void findGroupStats(Question question) {
 		anFillblankDao.findGroupStats(question);
 	}
-	
+
+
+	@Override
+	public Page<AnFillblank> findPage(Page<AnFillblank> page, String quId) {
+		Criterion cri1 = Restrictions.eq("quId",quId);
+		return findPage(page,cri1);
+	}
 }

src/main/java/com/key/dwsurvey/service/impl/QuMultiFillblankManagerImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.key.dwsurvey.dao.QuMultiFillblankDao;
+import com.key.dwsurvey.entity.AnDFillblank;
 import com.key.dwsurvey.entity.QuMultiFillblank;
 import com.key.dwsurvey.service.QuMultiFillblankManager;
 import org.hibernate.criterion.Criterion;
@@ -111,4 +112,5 @@ public class QuMultiFillblankManagerImpl extends BaseServiceImpl<QuMultiFillblan
 		QuMultiFillblank quMultiFillblank=get(quItemId);
 		quMultiFillblankDao.save(quMultiFillblank);
 	}
+
 }

src/main/resources/conf/application.properties

@@ -9,27 +9,4 @@ hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=false
 hibernate.format_sql=true
 ###-------------------------------------DW------------------------------###
-#system settings
-dw.storage.type = local
-#yun os access
-#dw.yunos.access_keyid =
-#dw.yunos.access_keysecret =
-#dw.yunos.endpoint =
-dw.yunos.wenjuan_html_backet =
-dw.yunos.upload_file_backet =
-dw.yunos.upload_file_jm_backet =
-#baidu
-dw.yunos.access_keyid =
-dw.yunos.access_keysecret  =
-dw.yunos.endpoint =
-#diaowenwebfile.gz.bcebos.com
-#dw.storage.url_prefix =
 dw.storage.url_prefix =
-
-###-------------------------------------DW------------------------------###
-#site email settings
-#dw.mail.smtp_host = smtpcloud.sohu.com
-#dw.mail.smtp_port = 25
-#dw.mail.default_encoding = UTF-8
-#dw.mail.username = 
-#dw.mail.password = 

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

@@ -22,7 +22,6 @@
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

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

@@ -22,7 +22,6 @@
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

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

@@ -40,7 +40,6 @@
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

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

@@ -22,7 +22,6 @@
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

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

@@ -779,7 +779,6 @@ function substring(json) {
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>
@@ -1062,7 +1061,7 @@ function substring(json) {
 													<tr class="quTrOptions">
 														<td width="15px">&nbsp;</td>
 														<td width="520px">${quEn.optionName }</td>
-														<td class="bfbTd">回答数：${quEn.anCount }条&nbsp;&nbsp;<a href="#">查看</a></td></td>
+														<td class="bfbTd">回答数：${quEn.anCount }条&nbsp;&nbsp;<a href="${ctx}/design/qu-multi-fillblank!answers.action?quItemId=${quEn.id}&surveyId=${surveyId}">查看</a></td></td>
 														<td colspan="4"></td>
 													</tr>
 												</c:forEach>

src/main/webapp/WEB-INF/page/content/diaowen-da/dfillblank.jsp

@@ -0,0 +1,181 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+ <%@include file="/common/taglibs.jsp" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+
+<script type="text/javascript" src="${ctx }/js/dw/collect.js"></script>
+<link href="${ctx }/js/plugs/font-awesome-4.2.0/css/font-awesome.css" rel="stylesheet">
+<title>默认报告</title>
+<script type="text/javascript">
+
+</script>
+<style type="text/css">
+.dw_btn026{
+	border: 1px solid transparent;
+}
+.suQuTable{
+	/* border-left: 1px dashed #c5b6b6! important;
+	border-right: 1px dashed #c5b6b6! important;
+	border-bottom: 1px dashed #c5b6b6! important; */
+	border: 1px solid #c5b6b6! important;
+	width: 100%;
+}
+.anColumnTable{
+	width: 100%;
+}
+.quTrOptions  td{
+	border-top: 1px dashed #c5b6b6! important;
+}
+.rowItemTr td{
+	border-top: 1px solid #c5b6b6! important;
+}
+.columnItemTr td{
+	border-top: 1px dashed #c5b6b6! important;
+}
+
+.suQuTable .quTrOptions:FIRST-CHILD  td,.suQuTable .rowItemTr:FIRST-CHILD  td,.suQuTable .columnItemTr:FIRST-CHILD td {
+ 	border-top: none! important; 
+}
+.r-qu-body-title .quCoNum {
+    float: left;
+    padding: 5px 0px;
+    padding-left: 8px;
+}
+.r-qu-body-title .quCoTitleText {
+    float: left;
+    padding: 5px 3px;
+    cursor: text;
+    table-layout: fixed;
+    word-break: break-all;
+    display: inline-block;
+}
+#content-tableList tr td{
+	padding: 5px!important;
+}
+.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>
+					<div class="a-w-sel">
+		            	<div class="w-sel" style="margin-top: 4px;">
+		                	<div class="selc">
+		                    	<div class="selcc tbtag">
+		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
+		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
+		                        </div>
+		                    </div>
+		                </div>
+		            </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>
+					<div class="a-w-sel">
+		            	<div class="w-sel" style="margin-top: 4px;">
+		                	<div class="selc">
+		                    	<div class="selcc tbtag">
+		                            <div class="seli"><a class="nx-1" href="${ctx }/design/my-collect.action?surveyId=${surveyId}">答卷地址</a></div>
+		                            <div class="seli"><a class="nx-2" href="">社交分享</a></div>
+		                            <div class="seli"><a class="nx-3" href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=sitecomp">网站组件</a></div>
+		                            <div class="seli"><a class="nx-3" href="${ctx }/design/my-collect.action?surveyId=${surveyId}&tabId=weixin">微信收集</a></div>
+		                        </div>
+		                    </div>
+		                </div>
+		            </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>
+			</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="#" class="collectTab tabItem_3" style="display: none;"><span class="collectTabItemLeft">&nbsp;</span><span>问卷日志</span></a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div style="clear: both;"></div>
+	<div id="dwBody" >
+		<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>
+						<div class="scmTabRight" >
+							<a href="" class="sbtn25 sbtn25_2">停止收集</a>
+						</div>
+					</div>
+					<div class="surveyCollectInfoDiv">
+						<span class="surveyCollectInfoLeft">
+						状态：<span class="collectInfoSpan">收集中</span>&nbsp;&nbsp;&nbsp;&nbsp;
+						参与人数：<span class="collectInfoSpan">${fn:length(anPage.result)}${directory.answerNum }</span>
+						</span>
+						<span class="surveyCollectInfoRight">
+						创建时间：<span class="collectInfoSpan"><fmt:formatDate value="${directory.createDate }" pattern="yyyy年MM月dd日 HH:mm"/></span>
+						</span>
+					</div>
+				</div>
+				
+				<div class="surveyCollectMiddleContent">
+					<div style="padding: 15px 25px;overflow: auto;">
+							<div style="overflow: auto;">
+								<div style="float: left;" >
+									<a href="" 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> --%> 
+								</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 style="padding-top:8px;">
+								<div class="" style="border: 1px solid #D1D6DD;padding: 0px;background: rgb(245, 245, 245);">
+									<table id="content-tableList" width="100%"  cellpadding="0" cellspacing="0">
+
+								<c:forEach items="${anPage.result}" var="en" varStatus="i">
+								<tr id="quTr_${en.id }" >
+									<td style="height: 32px;text-align: center;" width="30">${i.count}</td>
+									<td>${en.answer}</td>
+								</tr>
+								</c:forEach>
+								</table>
+									
+								</div>
+							</div>			
+					</div>
+					
+				</div>
+			</div>
+			
+		</div>
+		</div>
+	</div>
+<script type="text/javascript">
+$(document).ready(function(){
+	//.quTrOptions  td
+});
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/page/content/diaowen-da/fillblank.jsp

@@ -73,7 +73,6 @@
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

src/main/webapp/WEB-INF/page/content/diaowen-da/line-chart.jsp

@@ -217,7 +217,6 @@ function buildPieChart(resultJson,quId){
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

src/main/webapp/WEB-INF/page/content/diaowen-da/pie-chart.jsp

@@ -218,7 +218,6 @@ function substring(json) {
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

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

@@ -25,7 +25,6 @@
 		                	<div class="selc">
 		                    	<div class="selcc tbtag">
 		                            <div class="seli"><a class="nx-1 sur_collectSet" href="#collectSet">收集规则</a></div>
-		                            <div class="seli"><a class="nx-2" href="${ctx }/design/my-survey-design!previewDev.action?surveyId=${surveyId}">样式设置</a></div>
 		                            <div class="seli"><a class="nx-6 sur_edit" href="${ctx }/design/my-survey-design.action?surveyId=${surveyId}">问卷编辑</a></div>
 		                        </div>
 		                    </div>

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

@@ -126,7 +126,7 @@ button {
 										</td>
 										<td align="left">${empty(en.answerNum) ? '0':en.answerNum  }&nbsp;</td>
 										<td align="left" >
-											${en.surveyState eq 0 ? '设计':en.surveyState eq 1?'收集':en.surveyState eq 2?'收集完成':'' }
+											${en.surveyState eq 0 ? '设计':en.surveyState eq 1?'发布':en.surveyState eq 2?'收集完成':'' }
 										</td>
 										<td align="left">
 											<div class="btn-group surveyLeftBtnGroup">

src/main/webapp/js/dw/dw-design-init.js

@@ -952,7 +952,7 @@ $(document).ready(function(){
 		
 		saveSurvey(function(){
 			isSaveProgress=false;
-			window.location.href=ctx+"/design/my-survey-design!previewDev.action?surveyId="+questionBelongId;
+			window.location.href=ctx+"/design/my-survey-design!devSurvey.action?surveyId="+questionBelongId;
 		});
 		/*
 		var fristQuItemBody=$("#dwSurveyQuContent .li_surveyQuItemBody").first();