默认保存填空题完成

skyeye-promote/src/main/java/com/skyeye/eve/service/impl/DwSurveyDirectoryServiceImpl.java

@@ -193,9 +193,14 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
 	public void addQuFillblankMation(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
 		map.put("quType", QuType.FILLBLANK.getIndex());
-		map.put("checkType", CheckType.valueOf(map.get("checkType").toString()));
+		map.put("checkType", CheckType.valueOf(map.get("checkType").toString()).getIndex());
 		if(ToolUtil.isBlank(map.get("quId").toString())){
 			map.put("id", ToolUtil.getSurFaceId());
+			map.put("paramInt01", 3);
+			map.put("paramInt02", 10);
+			map.put("quTag", 1);
+			map.put("visibility", 1);
+			map.put("createTime", ToolUtil.getTimeAndToString());
 			dwSurveyDirectoryDao.addQuestionMation(map);
 		}else{
 			
@@ -220,6 +225,7 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
 			}
 			dwSurveyDirectoryDao.addQuestionLogicsMationList(quLogics);
 		}
+		outputObject.setBean(map);
 	}
 	
 }

skyeye-promote/src/main/resources/dbmapper/DwSurveyDirectoryMapper.xml

@@ -331,7 +331,8 @@
 	     (id, title, cg_qu_item_id, ck_qu_id, qu_logic_id, ge_le, logic_type, score_num, sk_qu_id, visibility, create_id, create_time)
 	     values
 		<foreach collection="list" item="item" index="index" separator="," >  
-			(#{item.id}, #{item.title}, #{item.ckQuId}, #{item.quLogicId}, #{quLogicId}, #{geLe}, #{logicType}, #{scoreNum}, #{skQuId}, #{visibility}, #{item.createId}, #{item.createTime})  
+			(#{item.id}, #{item.title}, #{item.cgQuItemId}, #{item.ckQuId}, #{item.quLogicId}, #{item.geLe}, #{item.logicType}, 
+					#{item.scoreNum}, #{item.skQuId}, #{item.visibility}, #{item.createId}, #{item.createTime})  
 		</foreach>  
 	</insert>
 	

skyeye-promote/src/main/resources/template/js/dwsurveydesign/dwsurveydesign.js

@@ -79,6 +79,9 @@ layui.config({
 		 	pagination: false,
 		 	template: getFileContent('tpl/dwsurveydesign/dwsurveydesignbean.tpl'),
 		 	ajaxSendLoadBefore: function(hdb){
+		 		hdb.registerHelper("showIndex",function(index, options){
+		 			return parseInt(index) + 1;
+		 		});
 		 		hdb.registerHelper('compare1', function(v1, v2, options) {
 		 			if(v1 == v2){
 		 				return options.fn(this);
@@ -1984,60 +1987,47 @@ layui.config({
 	    function saveFillblank(quItemBody, callback) {
 	    	var saveTag = quItemBody.find("input[name='saveTag']").val();
 	    	if(saveTag == 0) {
-	    		var quType = quItemBody.find("input[name='quType']").val();
-	    		var quId = quItemBody.find("input[name='quId']").val();
-	    		var orderById = quItemBody.find("input[name='orderById']").val();;
-	    		var isRequired = quItemBody.find("input[name='isRequired']").val();
-	    		var hv = quItemBody.find("input[name='hv']").val();
-	    		var randOrder = quItemBody.find("input[name='randOrder']").val();
-	    		var cellCount = quItemBody.find("input[name='cellCount']").val();
-
-	    		var answerInputWidth = quItemBody.find("input[name='answerInputWidth']").val();
-	    		var answerInputRow = quItemBody.find("input[name='answerInputRow']").val();
-
-	    		var contactsAttr = quItemBody.find("input[name='contactsAttr']").val();
-	    		var contactsField = quItemBody.find("input[name='contactsField']").val();
-
-	    		var checkType = quItemBody.find("input[name='checkType']").val();
-
-	    		var data = "belongId=" + parent.rowId + "&orderById=" + orderById + "&tag=" + svTag + "&quType=" + quType + "&quId=" + quId;
-	    		data += "&isRequired=" + isRequired + "&hv=" + hv + "&randOrder=" + randOrder + "&cellCount=" + cellCount;
-	    		data += "&answerInputWidth=" + answerInputWidth + "&answerInputRow=" + answerInputRow;
-	    		data += "&contactsAttr=" + contactsAttr + "&contactsField=" + contactsField + "&checkType=" + checkType;
+	    		var data = {
+    				belongId: parent.rowId,
+    				orderById: quItemBody.find("input[name='orderById']").val(),
+    				tag: svTag,
+    				quType: quItemBody.find("input[name='quType']").val(),
+    				quId: quItemBody.find("input[name='quId']").val(),
+    				isRequired: quItemBody.find("input[name='isRequired']").val(),
+    				hv: quItemBody.find("input[name='hv']").val(),
+    				randOrder: quItemBody.find("input[name='randOrder']").val(),
+    				cellCount: quItemBody.find("input[name='cellCount']").val(),
+    				answerInputWidth: quItemBody.find("input[name='answerInputWidth']").val(),
+    				answerInputRow: quItemBody.find("input[name='answerInputRow']").val(),
+    				contactsAttr: quItemBody.find("input[name='contactsAttr']").val(),
+    				contactsField: quItemBody.find("input[name='contactsField']").val(),
+    				checkType: quItemBody.find("input[name='checkType']").val(),
+    				quTitle: '',
+	    		};
 
 	    		var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
 	    		if(quTitleSaveTag == 0) {
 	    			var quTitle = quItemBody.find(".quCoTitleEdit").html();
-	    			quTitle = escape(encodeURIComponent(quTitle));
-	    			data += "&quTitle=" + quTitle;
+	    			data.quTitle = encodeURI(quTitle);
 	    		}
 	    		//逻辑选项
 	    		var quLogicItems = quItemBody.find(".quLogicItem");
 	    		var list = [];
 	    		$.each(quLogicItems, function(i) {
-	    			var thClass = $(this).attr("class");
-	    			thClass = thClass.replace("quLogicItem quLogicItem_", "");
-
-	    			var quLogicId = $(this).find("input[name='quLogicId']").val();
-	    			var cgQuItemId = $(this).find("input[name='cgQuItemId']").val();
-	    			var skQuId = $(this).find("input[name='skQuId']").val();
 	    			var logicSaveTag = $(this).find("input[name='logicSaveTag']").val();
-	    			var visibility = $(this).find("input[name='visibility']").val();
-	    			var logicType = $(this).find("input[name='logicType']").val();
-	    			var itemIndex = thClass;
 	    			if(logicSaveTag == 0) {
 	    				var s = {
-    						quLogicId: quLogicId,
-    						cgQuItemId: cgQuItemId,
-    						skQuId: skQuId,
-    						visibility: visibility,
-    						logicType: logicType,
-    						key: itemIndex,
+    						quLogicId: $(this).find("input[name='quLogicId']").val(),
+    						cgQuItemId: $(this).find("input[name='cgQuItemId']").val(),
+    						skQuId: $(this).find("input[name='skQuId']").val(),
+    						visibility: $(this).find("input[name='visibility']").val(),
+    						logicType: $(this).find("input[name='logicType']").val(),
+    						key: $(this).attr("class").replace("quLogicItem quLogicItem_", ""),
     	    			};
     	    			list.push(s);
 	    			}
 	    		});
-	    		data += "&logic=" + JSON.stringify(list);
+	    		data.logic = JSON.stringify(list);
 	    		AjaxPostUtil.request({url:reqBasePath + "dwsurveydirectory006", params:data, type:'json', callback:function(json){
 	 	   			if(json.returnCode == 0){
 		 	   			var quId = json.bean.id;

skyeye-promote/src/main/resources/template/tpl/dwsurveydesign/dwsurveydesignbean.tpl

@@ -33,6 +33,7 @@
 			<div id="dwSurveyNoteEdit" class="editAble dwSvyNoteEdit">{{surveyNote}}</div>
 			<input type="hidden" name="svyNoteSaveTag" value="1">
 		</div>
+{{/bean}}
 		<div id="dwSurveyQuContent" style="min-height: 500px;">
 			<ul id="dwSurveyQuContentAppUl">
 				{{#each rows}}
@@ -350,7 +351,7 @@
 													<input type="hidden" name="contactsField" value="{{contactsField}}">
 													<div class="quLogicInputCase">
 														<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-														{{#each questionLogics}}
+														{{#each questionLogic}}
 															<div class="quLogicItem quLogicItem_{{count}}">
 																<input type="hidden" name="quLogicId" value="{{id}}" />
 																<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -395,7 +396,7 @@
 													</div>
 													<div class="surveyQuItemContent">
 														<div class="quCoTitle">
-															<div class="quCoNum">{{count}}、</div>
+															<div class="quCoNum">{{showIndex @index}}、</div>
 															<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 															<input type="hidden" name="quTitleSaveTag" value="1">
 														</div>
@@ -403,16 +404,15 @@
 															<ul>
 																<li class="quCoItemUlLi">
 																	<div class="quFillblankItem">
-																		<c:choose>
-																			<c:when test="${answerInputRow > 1}}">
-																				<input type="text" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;padding:5px;display: none;" class="quFillblankAnswerInput">
-																				<textarea rows="{{answerInputRow}}" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;" class="quFillblankAnswerTextarea"></textarea>
-																			</c:when>
-																			<c:otherwise>
-																				<input type="text" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;padding:5px;" class="quFillblankAnswerInput">
-																				<textarea rows="${empty(en.answerInputRow)?'1':en.answerInputRow}}" style="width:${empty(en.answerInputWidth)?'300':en.answerInputWidth}px;display: none;" class="quFillblankAnswerTextarea"></textarea>
-																			</c:otherwise>
-																		</c:choose>
+																		{{#if answerInputRow}}
+																			{{#compare1 answerInputRow '1'}}
+																					<input type="text" style="width:{{answerInputWidth}}px;padding:5px;" class="quFillblankAnswerInput">
+																					<textarea rows="{{answerInputRow}}" style="width:{{answerInputWidth}}px;display: none;" class="quFillblankAnswerTextarea"></textarea>
+																				{{else}}
+																					<input type="text" style="width:{{answerInputWidth}}px;padding:5px;display: none;" class="quFillblankAnswerInput">
+																					<textarea rows="{{answerInputRow}}" style="width:{{answerInputWidth}}px;" class="quFillblankAnswerTextarea"></textarea>
+																			{{/compare1}}
+																		{{/if}}
 																		<div class="dwFbMenuBtn"></div>
 																	</div>
 																</li>
@@ -1309,4 +1309,3 @@
 			</ul>
 		</div>
 	</div>
-{{/bean}}
\ No newline at end of file