问题展示序列号修改

skyeye-promote/src/main/java/com/skyeye/common/constans/QuType.java

@@ -92,6 +92,15 @@ public enum QuType {
 		return null;
 	}
 	
+	public static String getCName(int index){
+		for (QuType q : QuType.values()){
+			if(q.getIndex() == index){
+				return q.cnName;
+			}
+		}
+		return null;
+	}
+	
 	public static String getTableName(int index){
 		for (QuType q : QuType.values()){
 			if(q.getIndex() == index){

skyeye-promote/src/main/resources/template/.project

@@ -24,5 +24,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1547000374181</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

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

 
+var quIndex = 0;//问题序号
+
 var ueEditObj = null;//即将编辑的内容
 
 var quOptionDesign = null;//问题选项设置
@@ -79,10 +81,18 @@ 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("showIndex",function(v1, options){
+		 			return parseInt(v1) + 1;
 		 		});
 		 		
+		 		hdb.registerHelper("showQuestionIndex", function(v1, options) {
+					if(v1 == '16' || v1 == '17'){
+					}else{
+						quIndex++;
+						return quIndex;
+					}
+				});
+		 		
 		 		hdb.registerHelper("showParamInt02",function(v1, options){
 		 			var str = "";
 		 			for(var i = 1; i <= v1; i++){

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

@@ -29,7 +29,7 @@ layui.config({
 	        { field:'surveyState', width:120, title: '状态'},
 	        { field:'userName', width:120, title: '创建人'},
 	        { field: 'createTime', title: '创建时间', width: 180 },
-	        { title: '操作', fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
+	        { title: '操作', fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar'}
 	    ]]
 	});
 	
@@ -111,7 +111,18 @@ layui.config({
 	
 	//分析报告
 	function fxWj(data){
-		
+		rowId = data.id;
+		_openNewWindows({
+			url: "../../tpl/dwsurveydesign/surveyReport.html", 
+			title: "分析报告",
+			pageId: "surveyReport",
+			maxmin: true,
+			callBack: function(refreshCode){
+                if (refreshCode == '0') {
+                } else if (refreshCode == '-9999') {
+                	top.winui.window.msg("操作失败", {icon: 2,time: 2000});
+                }
+			}});
 	}
 	
 	//发布

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

@@ -102,7 +102,7 @@
 									</div>
 									<div class="surveyQuItemContent">
 										<div class="quCoTitle">
-											<div class="quCoNum">{{showIndex @index}}、</div>
+											<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 											<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 											<input type="hidden" name="quTitleSaveTag" value="1">
 										</div>
@@ -230,7 +230,7 @@
 											</div>
 											<div class="surveyQuItemContent">
 												<div class="quCoTitle">
-													<div class="quCoNum">{{showIndex @index}}、</div>
+													<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 													<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 													<input type="hidden" name="quTitleSaveTag" value="1">
 												</div>
@@ -361,7 +361,7 @@
 													</div>
 													<div class="surveyQuItemContent">
 														<div class="quCoTitle">
-															<div class="quCoNum">{{showIndex @index}}、</div>
+															<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 															<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 															<input type="hidden" name="quTitleSaveTag" value="1">
 														</div>
@@ -443,7 +443,7 @@
 															</div>
 															<div class="surveyQuItemContent">
 																<div class="quCoTitle">
-																	<div class="quCoNum">{{showIndex @index}}、</div>
+																	<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																	<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 																	<input type="hidden" name="quTitleSaveTag" value="1">
 																</div>
@@ -591,7 +591,7 @@
 																			</div>
 																			<div class="surveyQuItemContent" style="min-height: 45px;">
 																				<div class="quCoTitle">
-																					<div class="quCoNum" style="display: none;">{{showIndex @index}}、</div>
+																					<div class="quCoNum" style="display: none;">{{showQuestionIndex quType}}、</div>
 																					<div class="editAble quCoTitleEdit">{{{quTitle}}}</div>
 																					<input type="hidden" name="quTitleSaveTag" value="1">
 																				</div>
@@ -662,7 +662,7 @@
 																					</div>
 																					<div class="surveyQuItemContent">
 																						<div class="quCoTitle">
-																							<div class="quCoNum">{{showIndex @index}}、</div>
+																							<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																							<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 																							<input type="hidden" name="quTitleSaveTag" value="1">
 																						</div>
@@ -753,7 +753,7 @@
 																							</div>
 																							<div class="surveyQuItemContent">
 																								<div class="quCoTitle">
-																									<div class="quCoNum">{{showIndex @index}}、</div>
+																									<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																									<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 																									<input type="hidden" name="quTitleSaveTag" value="1">
 																								</div>
@@ -867,7 +867,7 @@
 																									</div>
 																									<div class="surveyQuItemContent">
 																										<div class="quCoTitle">
-																											<div class="quCoNum">{{showIndex @index}}、</div>
+																											<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																											<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 																											<input type="hidden" name="quTitleSaveTag" value="1">
 																										</div>
@@ -981,7 +981,7 @@
 																											</div>
 																											<div class="surveyQuItemContent">
 																												<div class="quCoTitle">
-																													<div class="quCoNum">{{showIndex @index}}、</div>
+																													<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																													<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 																													<input type="hidden" name="quTitleSaveTag" value="1">
 																												</div>
@@ -1090,7 +1090,7 @@
 																													</div>
 																													<div class="surveyQuItemContent">
 																														<div class="quCoTitle">
-																															<div class="quCoNum">{{showIndex @index}}、</div>
+																															<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																															<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 																															<input type="hidden" name="quTitleSaveTag" value="1">
 																														</div>
@@ -1206,7 +1206,7 @@
 																															</div>
 																															<div class="surveyQuItemContent">
 																																<div class="quCoTitle">
-																																	<div class="quCoNum">{{showIndex @index}}、</div>
+																																	<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																																	<div class="editAble quCoTitleEdit">{{quTitle}}</div>
 																																	<input type="hidden" name="quTitleSaveTag" value="1">
 																																</div>

skyeye-promote/src/main/resources/template/tpl/dwsurveydesign/surveyModelTemplate.html

@@ -127,7 +127,7 @@
 		<script src="../../assets/lib/layui/layui.js"></script>
 		<script src="../../assets/lib/layui/custom.js"></script>
 		<script type="text/javascript">
-			var index = 0;//问题序号
+			var quIndex = 0;//问题序号
 			var pageNum = 1;//模拟页码
 			var nowPageNum = 1;//当前页码
 			layui.config({
@@ -149,11 +149,15 @@
 						pagination: false,
 						template: getFileContent('tpl/dwsurveydesign/surveyModelTemplate.tpl'),
 						ajaxSendLoadBefore: function(hdb) {
-							hdb.registerHelper("showIndex", function(v1, options) {
+							hdb.registerHelper("showIndex",function(v1, options){
+					 			return parseInt(v1) + 1;
+					 		});
+							
+							hdb.registerHelper("showQuestionIndex", function(v1, options) {
 								if(v1 == '16' || v1 == '17'){
 								}else{
-									index++;
-									return index;
+									quIndex++;
+									return quIndex;
 								}
 							});
 

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

@@ -43,7 +43,7 @@
 											<div class="surveyQuItem">
 												<div class="surveyQuItemContent">
 													<div class="quCoTitle">
-														<div class="quCoNum">{{showIndex quType}}、</div>
+														<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 														<div class="quCoTitleEdit" >{{quTitle}}</div>
 													</div>
 													<div class="quCoItem">
@@ -119,7 +119,7 @@
 													<div class="surveyQuItem">
 														<div class="surveyQuItemContent">
 															<div class="quCoTitle">
-																<div class="quCoNum">{{showIndex quType}}、</div>
+																<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																<div class="quCoTitleEdit" >{{quTitle}}</div>
 															</div>
 															<div class="quCoItem">
@@ -194,7 +194,7 @@
 															<div class="surveyQuItem">
 																<div class="surveyQuItemContent">
 																	<div class="quCoTitle">
-																		<div class="quCoNum">{{showIndex quType}}、</div>
+																		<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																		<div class="quCoTitleEdit" >{{quTitle}}</div>
 																	</div>
 																	<div class="quCoItem"><ul>
@@ -243,7 +243,7 @@
 																	<div class="surveyQuItem">
 																		<div class="surveyQuItemContent">
 																			<div class="quCoTitle">
-																				<div class="quCoNum">{{showIndex quType}}、</div>
+																				<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																				<div class="quCoTitleEdit">{{quTitle}}</div>
 																			</div>
 																			<div class="quCoItem quOrderByCoItem">
@@ -358,7 +358,7 @@
 																							<div class="surveyQuItem">
 																								<div class="surveyQuItemContent">
 																									<div class="quCoTitle">
-																										<div class="quCoNum">{{showIndex quType}}、</div>
+																										<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																										<div class="quCoTitleEdit" >{{quTitle}}</div>
 																									</div>
 																									<div class="quCoItem">
@@ -402,7 +402,7 @@
 																									<div class="surveyQuItem">
 																										<div class="surveyQuItemContent">
 																											<div class="quCoTitle">
-																												<div class="quCoNum">{{showIndex quType}}、</div>
+																												<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																												<div class="quCoTitleEdit">{{quTitle}}</div>
 																											</div>
 																											<div class="quCoItem">
@@ -463,7 +463,7 @@
 																											<div class="surveyQuItem">
 																												<div class="surveyQuItemContent">
 																													<div class="quCoTitle">
-																														<div class="quCoNum">{{showIndex quType}}、</div>
+																														<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																														<div class="quCoTitleEdit" >{{quTitle}}</div>
 																													</div>
 																													<div class="quCoItem">
@@ -525,7 +525,7 @@
 																													<div class="surveyQuItem">
 																														<div class="surveyQuItemContent">
 																															<div class="quCoTitle">
-																																<div class="quCoNum">{{showIndex quType}}、</div>
+																																<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																																<div class="quCoTitleEdit" >{{quTitle}}</div>
 																															</div>
 																															<div class="quCoItem">
@@ -585,7 +585,7 @@
 																															<div class="surveyQuItem">
 																																<div class="surveyQuItemContent">
 																																	<div class="quCoTitle">
-																																		<div class="quCoNum">{{showIndex quType}}、</div>
+																																		<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																																		<div class="quCoTitleEdit" >{{quTitle}}</div>
 																																	</div>
 																																	<div class="quCoItem">
@@ -650,7 +650,7 @@
 																																	<div class="surveyQuItem">
 																																		<div class="surveyQuItemContent">
 																																			<div class="quCoTitle">
-																																				<div class="quCoNum">{{showIndex quType}}、</div>
+																																				<div class="quCoNum">{{showQuestionIndex @index}}、</div>
 																																				<div class="quCoTitleEdit" >{{quTitle}}</div>
 																																			</div>
 																																			<div class="quCoItem">

skyeye-promote/src/main/resources/template/tpl/dwsurveydesign/surveyTemplate.html

@@ -77,7 +77,7 @@
 		<script src="../../assets/lib/layui/layui.js"></script>
 		<script src="../../assets/lib/layui/custom.js"></script>
 		<script type="text/javascript">
-			var index = 0;//问题序号
+			var quIndex = 0;//问题序号
 			var pageNum = 1;//模拟页码
 			var nowPageNum = 1;//当前页码
 			layui.config({
@@ -99,13 +99,17 @@
 						pagination: false,
 						template: getFileContent('tpl/dwsurveydesign/surveyTemplate.tpl'),
 						ajaxSendLoadBefore: function(hdb) {
-							hdb.registerHelper("showIndex", function(v1, options) {
+							hdb.registerHelper("showQuestionIndex", function(v1, options) {
 								if(v1 == '16' || v1 == '17'){
 								}else{
-									index++;
-									return index;
+									quIndex++;
+									return quIndex;
 								}
 							});
+							
+							hdb.registerHelper("showXhIndex", function(v1, options) {
+								return parseInt(v1) + 1;
+							});
 
 							hdb.registerHelper("showParamInt02", function(v1, options) {
 								var str = "";
@@ -1102,7 +1106,7 @@
 							answerQuSize = answerTag1.size();
 						}
 						var newValue = parseInt(answerQuSize / totalQuSize * 100);
-						console.log(answerQuSize + "/" + totalQuSize + "=" + newValue);
+						//console.log(answerQuSize + "/" + totalQuSize + "=" + newValue);
 						$("#resultProgressRoot .progress-label").text("完成度：" + newValue + "%");
 						$("#resultProgress").progressbar("option", "value", newValue);
 					}

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

@@ -31,7 +31,7 @@
 												<input type="hidden" class="answerTag" value="0" >
 												<div class="quLogicInputCase">
 													{{#each questionLogic}}
-														<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+														<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 															<input type="hidden" class="logicId" value="{{id}}" />
 															<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 															<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -43,7 +43,7 @@
 											<div class="surveyQuItem">
 												<div class="surveyQuItemContent">
 													<div class="quCoTitle">
-														<div class="quCoNum">{{showIndex quType}}、</div>
+														<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 														<div class="quCoTitleEdit" >{{quTitle}}</div>
 													</div>
 													<div class="quCoItem">
@@ -106,7 +106,7 @@
 														<input type="hidden" class="answerTag" value="0" >
 														<div class="quLogicInputCase">
 															{{#each questionLogic}}
-																<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																	<input type="hidden" class="logicId" value="{{id}}" />
 																	<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																	<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -119,7 +119,7 @@
 													<div class="surveyQuItem">
 														<div class="surveyQuItemContent">
 															<div class="quCoTitle">
-																<div class="quCoNum">{{showIndex quType}}、</div>
+																<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																<div class="quCoTitleEdit" >{{quTitle}}</div>
 															</div>
 															<div class="quCoItem">
@@ -182,7 +182,7 @@
 																<input type="hidden" class="answerTag" value="0" >
 																<div class="quLogicInputCase">
 																	{{#each questionLogic}}
-																		<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																		<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																			<input type="hidden" class="logicId" value="{{id}}" />
 																			<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																			<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -194,7 +194,7 @@
 															<div class="surveyQuItem">
 																<div class="surveyQuItemContent">
 																	<div class="quCoTitle">
-																		<div class="quCoNum">{{showIndex quType}}、</div>
+																		<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																		<div class="quCoTitleEdit" >{{quTitle}}</div>
 																	</div>
 																	<div class="quCoItem"><ul>
@@ -232,7 +232,7 @@
 																		<input type="hidden" class="answerTag" value="0" >
 																		<div class="quLogicInputCase">
 																			{{#each questionLogic}}
-																				<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																				<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																					<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																					<input type="hidden" class="skQuId" value="{{skQuId}}" />
 																				</div>
@@ -243,7 +243,7 @@
 																	<div class="surveyQuItem">
 																		<div class="surveyQuItemContent">
 																			<div class="quCoTitle">
-																				<div class="quCoNum">{{showIndex quType}}、</div>
+																				<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																				<div class="quCoTitleEdit">{{quTitle}}</div>
 																			</div>
 																			<div class="quCoItem quOrderByCoItem">
@@ -251,7 +251,7 @@
 																					<table class="quOrderByTable" style="padding:5px;">
 																						{{#each questionOrderBy}}
 																							<tr class="quOrderByTableTr">
-																								<td class="quOrderyTableTd">{{showIndex @index}}</td>
+																								<td class="quOrderyTableTd">{{showXhIndex @index}}</td>
 																								<td class="quOrderTabConnect"></td>
 																							</tr>
 																						{{/each}}
@@ -285,7 +285,7 @@
 																				<input type="hidden" name="isRequired" value="{{isRequired}}">
 																				<div class="quLogicInputCase">
 																					{{#each questionLogic}}
-																						<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																						<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																							<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																							<input type="hidden" class="skQuId" value="{{skQuId}}" />
 																						</div>
@@ -318,7 +318,7 @@
 																						<input type="hidden" name="isRequired" value="{{isRequired}}">
 																						<div class="quLogicInputCase">
 																							{{#each questionLogic}}
-																								<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																								<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																									<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																									<input type="hidden" class="skQuId" value="{{skQuId}}" />
 																								</div>
@@ -345,7 +345,7 @@
 																								<input type="hidden" name="isRequired" value="{{isRequired}}">
 																								<div class="quLogicInputCase">
 																									{{#each questionLogic}}
-																										<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																										<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																											<input type="hidden" class="logicId" value="{{id}}" />
 																											<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																											<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -358,7 +358,7 @@
 																							<div class="surveyQuItem">
 																								<div class="surveyQuItemContent">
 																									<div class="quCoTitle">
-																										<div class="quCoNum">{{showIndex quType}}、</div>
+																										<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																										<div class="quCoTitleEdit" >{{quTitle}}</div>
 																									</div>
 																									<div class="quCoItem">
@@ -389,7 +389,7 @@
 																										<input type="hidden" name="isRequired" value="{{isRequired}}">
 																										<div class="quLogicInputCase">
 																											{{#each questionLogic}}
-																												<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																												<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																													<input type="hidden" class="logicId" value="{{id}}" />
 																													<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																													<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -402,7 +402,7 @@
 																									<div class="surveyQuItem">
 																										<div class="surveyQuItemContent">
 																											<div class="quCoTitle">
-																												<div class="quCoNum">{{showIndex quType}}、</div>
+																												<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																												<div class="quCoTitleEdit">{{quTitle}}</div>
 																											</div>
 																											<div class="quCoItem">
@@ -450,7 +450,7 @@
 																												<input type="hidden" name="isRequired" value="{{isRequired}}">
 																												<div class="quLogicInputCase">
 																													{{#each questionLogic}}
-																														<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																														<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																															<input type="hidden" class="logicId" value="{{id}}" />
 																															<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																															<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -463,7 +463,7 @@
 																											<div class="surveyQuItem">
 																												<div class="surveyQuItemContent">
 																													<div class="quCoTitle">
-																														<div class="quCoNum">{{showIndex quType}}、</div>
+																														<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																														<div class="quCoTitleEdit" >{{quTitle}}</div>
 																													</div>
 																													<div class="quCoItem">
@@ -512,7 +512,7 @@
 																														<input type="hidden" name="isRequired" value="{{isRequired}}">
 																														<div class="quLogicInputCase">
 																															{{#each questionLogic}}
-																																<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																																<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																																	<input type="hidden" class="logicId" value="{{id}}" />
 																																	<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																																	<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -525,7 +525,7 @@
 																													<div class="surveyQuItem">
 																														<div class="surveyQuItemContent">
 																															<div class="quCoTitle">
-																																<div class="quCoNum">{{showIndex quType}}、</div>
+																																<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																																<div class="quCoTitleEdit" >{{quTitle}}</div>
 																															</div>
 																															<div class="quCoItem">
@@ -572,7 +572,7 @@
 																																<input type="hidden" name="isRequired" value="{{isRequired}}">
 																																<div class="quLogicInputCase">
 																																	{{#each questionLogic}}
-																																		<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																																		<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																																			<input type="hidden" class="logicId" value="{{id}}" />
 																																			<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																																			<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -585,7 +585,7 @@
 																															<div class="surveyQuItem">
 																																<div class="surveyQuItemContent">
 																																	<div class="quCoTitle">
-																																		<div class="quCoNum">{{showIndex quType}}、</div>
+																																		<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																																		<div class="quCoTitleEdit" >{{quTitle}}</div>
 																																	</div>
 																																	<div class="quCoItem">
@@ -635,7 +635,7 @@
 																																		<input type="hidden" name="isRequired" value="{{isRequired}}">
 																																		<div class="quLogicInputCase">
 																																			{{#each questionLogic}}
-																																				<div class="quLogicItem quLogicItem_{{showIndex @index}}">
+																																				<div class="quLogicItem quLogicItem_{{showXhIndex @index}}">
 																																					<input type="hidden" class="logicId" value="{{id}}" />
 																																					<input type="hidden" class="cgQuItemId" value="{{cgQuItemId}}" />
 																																					<input type="hidden" class="skQuId" value="{{skQuId}}" />
@@ -650,7 +650,7 @@
 																																	<div class="surveyQuItem">
 																																		<div class="surveyQuItemContent">
 																																			<div class="quCoTitle">
-																																				<div class="quCoNum">{{showIndex quType}}、</div>
+																																				<div class="quCoNum">{{showQuestionIndex quType}}、</div>
 																																				<div class="quCoTitleEdit" >{{quTitle}}</div>
 																																			</div>
 																																			<div class="quCoItem">