问卷调查客户展示完成

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

@@ -128,6 +128,9 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
 			List<Map<String, Object>> questionChenRow = dwSurveyDirectoryDao.queryQuestionChenRowListByQuestionId(question);//获取行选项
 			List<Map<String, Object>> questionChenColumn = dwSurveyDirectoryDao.queryQuestionChenColumnListByQuestionId(question);//获取列选项
 			for(Map<String, Object> bean : questionChenRow){
+				for(Map<String, Object> item : questionChenColumn){
+					item.put("rowId", bean.get("id"));
+				}
 				bean.put("questionChenColumn", questionChenColumn);
 			}
 			question.put("questionChenRow", questionChenRow);
@@ -1187,10 +1190,19 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
 	public void queryDwSurveyDirectoryMationByIdToHTML(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
 		List<Map<String, Object>> questions = dwSurveyDirectoryDao.queryQuestionListByBelongId(map);//获取问卷中的题
+		int pageNo = 1;
+		for(Map<String, Object> question : questions){
+			String quType = QuType.getActionName(Integer.parseInt(question.get("quType").toString()));
+			if(quType.equals(QuType.PAGETAG.getActionName())){
+				pageNo++;
+			}
+		}
 		for(Map<String, Object> question : questions){
+			question.put("pageNo", pageNo);
 			getQuestionOptionListMation(question);
 		}
 		Map<String, Object> surveyMation = dwSurveyDirectoryDao.querySurveyMationById(map);//获取问卷信息
+		surveyMation.put("pageNo", pageNo);
 		outputObject.setBean(surveyMation);
 		outputObject.setBeans(questions);
 		outputObject.settotal(1);

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

@@ -96,7 +96,8 @@
 			a.option_name optionName,
 			a.order_by_id orderById,
 			a.qu_id quId,
-			a.visibility
+			a.visibility,
+			#{quType} quType
 		FROM
 			dw_qu_chen_row a
 		WHERE
@@ -112,7 +113,8 @@
 			a.option_name optionName,
 			a.order_by_id orderById,
 			a.qu_id quId,
-			a.visibility
+			a.visibility,
+			#{quType} quType
 		FROM
 			dw_qu_chen_column a
 		WHERE
@@ -129,8 +131,9 @@
 			a.option_name optionName,
 			a.option_title optionTitle,
 			a.order_by_id orderById,
-			a.qu_id qu_id,
-			a.visibility
+			a.qu_id quId,
+			a.visibility,
+			#{quType} quType
 		FROM
 			dw_qu_multi_fillblank a
 		WHERE
@@ -221,7 +224,8 @@
 			a.option_name optionName,
 			a.option_title optionTitle,
 			a.order_by_id orderById,
-			a.visibility
+			a.visibility,
+			#{quType} quType
 		FROM
 			dw_qu_orderby a
 		WHERE

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

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>template</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1546917548698</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/assets/lib/winui/css/winui.css

@@ -5621,11 +5621,15 @@ li.addMoreOption .dwQuIcon,li.addMoreColumnOption .dwQuIcon,li.addMoreRowOption
 	border: 1px solid #DDE1E7;
 	width: 300px;
 	margin-top: 2px;
+	background: url("../../../images/piont_lv.png");
+	background-repeat: repeat;
 }
 .scoreNumTable tr td{
 	text-align: center;
 	font-size: 12px;
 	padding: 0px;
+	border: solid 1px white;
+	cursor: pointer;
 }
 .quOptionEditTd .editAble{
 	width: 100%;
@@ -5841,6 +5845,88 @@ select option{
 	visibility: visible;
 }
 
+.sbtn24{
+	background: url(../../../images/btn24.png) no-repeat 999px 999px;
+	width: 88px;
+	height: 30px;
+	color: #777;
+	background-position: 0 -240px;
+	font-size: 12px;
+	border: 0;
+	cursor: pointer;
+	display: inline-block;
+	zoom: 1;
+	line-height: 30px;
+	text-align: center;
+	text-decoration: none;
+	font-family: "Hiragino Sans GB","Microsoft YaHei","微软雅黑",tahoma,arial,simsun,"宋体";
+}
+.sbtn24{
+	margin-left: 10px;
+	letter-spacing: 3px;
+}
+.sbtn24_0{
+	background-position: 0 -200px;
+	color: #fff;
+}
+.sbtn24_1{
+	color: #333333;
+}
+.sbtn24_0:hover{
+	background-position: -98px -200px;
+}
+.sbtn24_1:hover{
+	background-position: -98px -240px;
+}
+
+.footer-copyright{
+	margin-top:20px;
+	width: 100%;
+	height: 30px;
+	text-align: center;
+}
+
+/**  单选样式***/
+.dwQuOptionItemContent .dwRedioStyle {
+  background: transparent url(../../../images/answer-icon-1.png) no-repeat center top;
+  vertical-align: middle;
+  height: 20px;
+  width: 22px;
+  background-position: -2px -6px;
+}
+.dwQuOptionItemContent .dwRedioStyle.checked{
+  background-position: -2px -31px;
+}
+
+/**多选样式**/
+.dwQuOptionItemContent .dwCheckboxStyle {
+  background: transparent url(../../../images/answer-icon-1.png) no-repeat center top;
+  vertical-align: middle;
+  height: 22px;
+  width: 22px;
+  background-position: -2px -60px;
+}
+.dwQuOptionItemContent .dwCheckboxStyle.checked{
+  background-position: -2px -87px;
+}
+
+.dwQuOptionItemContent input[type='radio'], .dwQuOptionItemContent input[type='checkbox'] {
+    display: none;
+}
+
+.ui-progressbar .ui-progressbar-value {
+    margin: 0px;
+}
+.progressbarDiv .ui-progressbar-value {
+    background: #83AE00! important;
+    border: none;
+}
+
+.ui-progressbar .ui-progressbar-value {
+    margin: -1px;
+    height: 100%;
+}
+
 /*******************************************自定义样式end********************************************/