Quellcode durchsuchen

实现日期时间选择功能

keyuan vor 4 Jahren
Ursprung
Commit
1d8776475f

+ 8 - 3
src/main/java/com/key/dwsurvey/action/question/QuFillblankAction.java

@@ -15,6 +15,7 @@ import com.key.dwsurvey.entity.Question;
 import com.key.dwsurvey.entity.QuestionLogic;
 
 import com.key.dwsurvey.service.AnFillblankManager;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.struts2.convention.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.util.WebUtils;
@@ -43,7 +44,7 @@ public class QuFillblankAction extends ActionSupport{
 	private QuestionManager questionManager;
 	@Autowired
 	private AnFillblankManager anFillblankManager;
-	
+
 	public String ajaxSave() throws Exception {
 		HttpServletRequest request=Struts2Utils.getRequest();
 		HttpServletResponse response=Struts2Utils.getResponse();
@@ -58,7 +59,7 @@ public class QuFillblankAction extends ActionSupport{
 		}
 		return null;
 	}
-	
+
 	private Question ajaxBuildSaveOption(HttpServletRequest request) throws UnsupportedEncodingException {
 		String quId=request.getParameter("quId");
 		String belongId=request.getParameter("belongId");
@@ -74,6 +75,8 @@ public class QuFillblankAction extends ActionSupport{
 		String hv=request.getParameter("hv");
 		String randOrder=request.getParameter("randOrder");
 		String cellCount=request.getParameter("cellCount");
+		String paramInt01=request.getParameter("paramInt01");
+		//System.out.println("paramInt01:"+paramInt01);
 		if("".equals(quId)){
 			quId=null;
 		}
@@ -95,6 +98,7 @@ public class QuFillblankAction extends ActionSupport{
 		entity.setContactsField(contactsField);
 		answerInputWidth=(answerInputWidth==null || "".equals(answerInputWidth))?"300":answerInputWidth;
 		answerInputRow=(answerInputRow==null || "".equals(answerInputRow))?"1":answerInputRow;
+		paramInt01=(StringUtils.isEmpty(paramInt01))?"0":paramInt01;
 		entity.setAnswerInputWidth(Integer.parseInt(answerInputWidth));
 		entity.setAnswerInputRow(Integer.parseInt(answerInputRow));
 		entity.setIsRequired(Integer.parseInt(isRequired));
@@ -103,6 +107,7 @@ public class QuFillblankAction extends ActionSupport{
 		entity.setCellCount(Integer.parseInt(cellCount));
 		checkType=(checkType==null || "".equals(checkType))?"NO":checkType;
 		entity.setCheckType(CheckType.valueOf(checkType));
+		entity.setParamInt01(Integer.parseInt(paramInt01));
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -124,7 +129,7 @@ public class QuFillblankAction extends ActionSupport{
 		entity.setQuestionLogics(quLogics);
 		return entity;
 	}
-	
+
 	public static String buildResultJson(Question entity){
 		StringBuffer strBuf=new StringBuffer();
 		strBuf.append("{id:'").append(entity.getId());

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

@@ -10,6 +10,8 @@
 <link rel="stylesheet" href="${ctx }/js/plugs/jquery.mobile-1.4.5/jquery.mobile-1.4.5.min.css">
 <script type="text/javascript" src="${ctx }/js/plugs/jquery-ui-1.10.3.custom/js/jquery-1.10.1.js"></script>
 <%--<script src="${ctx }/js/plugs/jquery.mobile-1.4.5/jquery.mobile-1.4.5.min.js"></script>--%>
+<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/laydate/laydate.js"></script>
+<script type="text/javascript" src="${ctx }/js/common/ans-common.js"></script>
 <script type="text/javascript" src="${ctx }/js/common/common.js"></script>
 <script src="${ctx }/js/common/ans-m.js"></script>
 <link href="${ctx }/js/plugs/font-awesome-4.2.0/css/font-awesome.css" rel="stylesheet">
@@ -145,7 +147,9 @@
 								<input type="hidden" class="quId" value="${en.id }">
 								<input type="hidden" class="orderById" value="${en.orderById }"/>
 								<input type="hidden" class="isRequired" value="${en.isRequired }">
+								<input type="hidden" class="checkType" value="${en.checkType }">
 								<input type="hidden" class="answerTag" value="0" >
+								<input type="hidden" class="paramInt01" value="${en.paramInt01}">
 								<div class="quLogicInputCase">
 									<c:forEach items="${en.questionLogics }" var="quLogicEn" varStatus="logicSts">
 									<div class="quLogicItem quLogicItem_${logicSts.count }">
@@ -169,7 +173,7 @@
 
 										 <c:choose>
 											 <c:when test="${en.checkType eq 'DATE'}">
-												 <input type="date" name="qu_${en.quType }_${en.id }" class="inputSytle_1 fillblankInput" style="margin-top: 10px;"  >
+												 <input type="text" name="qu_${en.quType }_${en.id }" class="inputSytle_1 fillblankInput" readonly style="margin-top: 10px;"  >
 											 </c:when>
 											 <c:when test="${en.answerInputRow > 1 }">
 												 <textarea name="qu_${en.quType }_${en.id }" rows="${en.answerInputRow }" class="inputSytle_2 fillblankInput" style="margin-top: 10px;"  > ></textarea>

+ 6 - 3
src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-p.jsp

@@ -13,8 +13,10 @@
 <link href="${ctx }/js/plugs/uploadify-v3.1/uploadify.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="${ctx }/js/plugs/uploadify-v3.1/jquery.uploadify-3.1.js"></script>
 <script type="text/javascript" src="${ctx }/js/dw/uploadify.js"></script>
-	<script type="text/javascript" src="${ctx }/js/common/common.js"></script><script type="text/javascript" src="${ctx }/js/common/ans-p.js"></script>
-<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/My97DatePickerBeta/My97DatePicker/WdatePicker.js"></script>
+<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/laydate/laydate.js"></script>
+<script type="text/javascript" src="${ctx }/js/common/ans-common.js"></script>
+<script type="text/javascript" src="${ctx }/js/common/common.js"></script><script type="text/javascript" src="${ctx }/js/common/ans-p.js"></script>
+<%--<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/My97DatePickerBeta/My97DatePicker/WdatePicker.js"></script>--%>
 <link href="${ctx }/css/preview-dev.css" rel="stylesheet" type="text/css" />
 <link rel="stylesheet" href="${ctx }/js/plugs/colpick-jQuery/css/colpick.css" type="text/css"/>
 <link href="${ctx}/js/plugs/validate/jquery.validate.css" type="text/css" rel="stylesheet" />
@@ -298,6 +300,7 @@ label.error{
 									<input type="hidden" class="isRequired" value="${en.isRequired }">
 									<input type="hidden" class="checkType" value="${en.checkType }">
 									<input type="hidden" class="answerTag" value="0" >
+									<input type="hidden" class="paramInt01" value="${en.paramInt01}">
 									<div class="quLogicInputCase">
 										<c:forEach items="${en.questionLogics }" var="quLogicEn" varStatus="logicSts">
 											<div class="quLogicItem quLogicItem_${logicSts.count }">
@@ -321,7 +324,7 @@ label.error{
 														<%-- <input type="text" name="qu_${en.quType }_${en.id }" style="width:200px;padding:5px;" class="inputSytle_1 fillblankInput"> --%>
 													<c:choose>
 														<c:when test="${en.checkType eq 'DATE'}">
-															<input type="text" name="qu_${en.quType }_${en.id }" style="width: 300px;padding: 6px 10px 5px;border: 1px solid #83ABCB;outline: none;" class=" fillblankInput Wdate" onClick="WdatePicker()" >
+															<input type="text" name="qu_${en.quType }_${en.id }" style="width: 300px;padding: 6px 10px 5px;border: 1px solid #83ABCB;outline: none;" class=" fillblankInput" >
 														</c:when>
 														<c:when test="${en.answerInputRow > 1 }">
 															<textarea name="qu_${en.quType }_${en.id }" rows="${en.answerInputRow }" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;"class="inputSytle_2 fillblankInput" ></textarea>

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

@@ -18,7 +18,6 @@
 <!--建议手动加在语言,避免在ie下有时因为加载语言失败导致编辑器加载失败-->
 <!--这里加载的语言文件会覆盖你在配置项目里添加的语言类型,比如你在配置项目里配置的是英文,这里加载的中文,那最后就是中文-->
 <script type="text/javascript" charset="utf-8" src="${ctx }/js/plugs/ueditor1_4_2-utf8-jsp/lang/zh-cn/zh-cn.js"></script>
-<script type="text/javascript" src="${ctx }/js/dw/dwsurvey-design-qu.js"></script>
 <script type="text/javascript" src="${ctx }/js/dw/dwsurvey-design.js"></script>
 <script type="text/javascript" src="${ctx }/js/dw/address.js"></script>
 <%--<script language="javascript" type="text/javascript" src="${ctx }/js/plugs/My97DatePickerBeta/My97DatePicker/WdatePicker.js"></script>--%>

+ 2 - 2
src/main/webapp/js/common/ans-common.js

@@ -1,5 +1,5 @@
 function bindDateEvent(){
-    var checkTypeDates = $("#dwSurveyQuContent input[name='checkType'][value='DATE']");
+    var checkTypeDates = $("#dwSurveyQuContent .checkType[value='DATE']");
     $.each(checkTypeDates,function(){
         var surveyQuItemBody = $(this).parents(".surveyQuItemBody");
         var paramInt01 = surveyQuItemBody.find(".paramInt01");
@@ -29,7 +29,7 @@ function bindDateEvent(){
         }
         console.debug("dateType:"+dateType);
         laydate.render({
-            elem: surveyQuItemBody.find("input[type='text']")[0] //指定元素
+            elem: surveyQuItemBody.find("input.fillblankInput")[0] //指定元素
             ,type: 'datetime'
             ,format: dateFmt
             ,type: dateType

+ 2 - 0
src/main/webapp/js/common/ans-m.js

@@ -282,6 +282,8 @@ $(document).ready(function(){
         hidQuItemBody.addClass("hidFor"+logicId);
         hidQuItemBody.find(".answerTag").attr("disabled",true);
     });
+
+    bindDateEvent();
 });
 
 

+ 3 - 1
src/main/webapp/js/common/ans-p.js

@@ -393,4 +393,6 @@ $(document).ready(function(){
         return false;
     });
 
-});
+    bindDateEvent();
+
+});

+ 1 - 0
src/main/webapp/js/dw/dwsurvey-design.js

@@ -543,6 +543,7 @@ $(document).ready(function(){
 				}else{
 					quItemBody.find(".quInputCase").append("<input type=\"hidden\" name=\"paramInt01\" value=\""+option_range_date.val()+"\">");
 				}
+				quItemBody.find("input[name='saveTag']").val(0);
 			}
 		}