update design

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

@@ -261,7 +261,7 @@
 										<ul class="surveyQuItemLeftToolsUl">
 											<li title="移动排序" class="dwQuMove"><div class="dwQuIcon"></div></li>
 											<li title="设置" class="dwQuSet"><div class=dwQuIcon></div></li>
-											<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>
+											<%--<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>--%>
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
@@ -320,7 +320,7 @@
 										<ul class="surveyQuItemLeftToolsUl">
 											<li title="移动排序" class="dwQuMove"><div class="dwQuIcon"></div></li>
 											<li title="设置" class="dwQuSet"><div class=dwQuIcon></div></li>
-											<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>
+											<%--<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>--%>
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
@@ -475,7 +475,7 @@
 										<ul class="surveyQuItemLeftToolsUl">
 											<li title="移动排序" class="dwQuMove"><div class="dwQuIcon"></div></li>
 											<li title="设置" class="dwQuSet"><div class=dwQuIcon></div></li>
-											<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>
+											<%--<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>--%>
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 									</div>
@@ -538,7 +538,7 @@
 										<ul class="surveyQuItemLeftToolsUl">
 											<li title="移动排序" class="dwQuMove"><div class="dwQuIcon"></div></li>
 											<li title="设置" class="dwQuSet"><div class=dwQuIcon></div></li>
-											<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>
+											<%--<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo"></div></div></li>--%>
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 									</div>
@@ -1399,7 +1399,7 @@
 										<ul class="surveyQuItemLeftToolsUl">
 											<li title="移动排序" class="dwQuMove"><div class="dwQuIcon"></div></li>
 											<li title="设置" class="dwQuSet"><div class="dwQuIcon"></div></li>
-											<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo">${fn:length(en.questionLogics) > 0?fn:length(en.questionLogics) :'' }</div></div></li>
+											<%--<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo">${fn:length(en.questionLogics) > 0?fn:length(en.questionLogics) :'' }</div></div></li>--%>
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>
@@ -1670,7 +1670,7 @@
 										<ul class="surveyQuItemLeftToolsUl">
 											<li title="移动排序" class="dwQuMove"><div class="dwQuIcon"></div></li>
 											<li title="设置" class="dwQuSet"><div class="dwQuIcon"></div></li>
-											<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo">${fn:length(en.questionLogics) > 0?fn:length(en.questionLogics) :'' }</div></div></li>
+											<%--<li title="逻辑" class="dwQuLogic"><div class="dwQuIcon"><div class="quLogicInfo">${fn:length(en.questionLogics) > 0?fn:length(en.questionLogics) :'' }</div></div></li>--%>
 											<li title="删除" class="dwQuDelete"><div class="dwQuIcon"></div></li>
 										</ul>
 								</div>

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

@@ -2703,67 +2703,23 @@ function addQuDialogLogicTr(autoClass,trueCallback,falseCallback){
 		}
 		var dwQuOptionSel=lastTr.find(".logicQuOptionSel");
 		var eachTag=true;
-		if(quType==="CHENRADIO" || quType==="CHENCHECKBOX" || quType==="CHENSCORE" || quType==="CHENFBK"){
-			var quChenColumnTds=quItemBody.find(".quChenColumnTd");
-			var quChenRowTds=quItemBody.find(".quChenRowTd");
-			$.each(quChenRowTds,function(){
-				var rowText=$(this).find(".quCoOptionEdit").text();
-				var rowQuItemId=$(this).find("input[name='quItemId']").val();	
-				$.each(quChenColumnTds,function(){
-					var colText=$(this).find(".quCoOptionEdit").text();
-					var colQuItemId=$(this).find("input[name='quItemId']").val();
-					var optionId=rowQuItemId+":"+colQuItemId;
-					eachTag=true;
-					$.each(logicQuOptionSels,function(){
-						var selOptionVal=$(this).val();
-						if(selOptionVal==optionId){
-							eachTag=false;
-							return false;
-						}
-					});
-					if(eachTag){
-						dwQuOptionSel.append("<option value='"+optionId+"'>"+rowText+":"+colText+"</option>");	
-					}
-				});
-			});
-			
-			/*
-			$.each(quItemInputCases,function(){
-//				var optionText=$(this).prev().text();
-				var optionText=$(this).parent().find("label.quCoOptionEdit").text();
-				var optionId=$(this).find("input[name='quItemId']").val();
-				eachTag=true;
-				$.each(logicQuOptionSels,function(){
-					var selOptionVal=$(this).val();
-					if(selOptionVal==optionId){
-						eachTag=false;
-						return false;
-					}
-				});
-				//alert(optionText);
-				if(eachTag){
-					dwQuOptionSel.append("<option value='"+optionId+"'>"+optionText+"</option>");	
-				}
-			});
-			*/
-		}else{
-			$.each(quItemInputCases,function(){
+		$.each(quItemInputCases,function(){
 //				var optionText=$(this).prev().text();
-				var optionText=$(this).parent().find("label.quCoOptionEdit").text();
-				var optionId=$(this).find("input[name='quItemId']").val();
-				eachTag=true;
-				$.each(logicQuOptionSels,function(){
-					var selOptionVal=$(this).val();
-					if(selOptionVal==optionId){
-						eachTag=false;
-						return false;
-					}
-				});
-				if(eachTag){
-					dwQuOptionSel.append("<option value='"+optionId+"'>"+optionText+"</option>");	
+			var optionText=$(this).parent().find("label.quCoOptionEdit").text();
+			var optionId=$(this).find("input[name='quItemId']").val();
+			eachTag=true;
+			$.each(logicQuOptionSels,function(){
+				var selOptionVal=$(this).val();
+				if(selOptionVal==optionId){
+					eachTag=false;
+					return false;
 				}
 			});
-		}
+			if(eachTag){
+				dwQuOptionSel.append("<option value='"+optionId+"'>"+optionText+"</option>");
+			}
+		});
+
 		if(logicQuOptionSels.size()==0){
 			dwQuOptionSel.append("<option value='0'>任意选项</option>");	
 		}else{
@@ -2798,7 +2754,6 @@ function addQuDialogLogicTr(autoClass,trueCallback,falseCallback){
 				}
 			}
 		});
-		logicQuSel.append("<option value='1'>正常结束（计入结果）</option><option value='2'>提前结束（不计入结果）</option>");
 		if(quType==="ORDERQU"){
 			dwQuOptionSel.empty();
 			dwQuOptionSel.append("<option value='0'>回答完成</option>");