Преглед на файлове

更新未答题也显示在页面上

ting.yin преди 4 години
родител
ревизия
a23c37a89a
променени са 2 файла, в които са добавени 22 реда и са изтрити 18 реда
  1. 1 1
      stmms-web/src/main/webapp/WEB-INF/application.properties
  2. 21 17
      stmms-web/src/main/webapp/WEB-INF/views/modules/exam/jsonView.jsp

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -1,6 +1,6 @@
 #\u6570\u636e\u5e93\u914d\u7f6e
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/stmms_ft_new?useUnicode=true&characterEncoding=UTF-8
+jdbc.url=jdbc:mysql://localhost:3306/stmms_ft_20200828?useUnicode=true&characterEncoding=UTF-8
 jdbc.username=root
 jdbc.password=root
 jdbc.maxActive=50

+ 21 - 17
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/jsonView.jsp

@@ -52,18 +52,20 @@
                         //var data ='[{"mainNumber": 6,"subNumber": 1,"body": {"sections": [{ "blocks":[{"type": "text","value": "我是题目我是题目我是题目"}]}]},"answer": {"sections": [{"blocks":[{"type": "audio","value": "https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"studentAnswer": {"sections": [{"blocks":[{"type": "image","value": "https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"type": "image","value": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1582709869784&di=39683b1330bd09bebd93c95fe925ca70&imgtype=0&src=http%3A%2F%2Fn.sinaimg.cn%2Fsinacn10108%2F170%2Fw600h370%2F20190222%2Fd6de-htknpmh2595255.jpg"}]}]}}]';
                         //data = JSON.parse(data);
                         let questions = data || [];
-                        for (var j in questions) {
-                        	var question = questions[j];
-                        	var subNumber = question.subIndex==null?question.subNumber:question.subNumber+"-"+question.subIndex;
-                        	let jsons = findJson(question.mainNumber, subNumber, questions)
-                        	let paperQuestion = findQuestion(question.mainNumber, subNumber, paperqQuestions)
+                        for (var j in questionArr) {
+                        	var mainNumber = j.split(".")[0];
+                        	var subNumber = j.split(".")[1];
+                        	let jsons = findJson(mainNumber, subNumber, questions)
+                        	let paperQuestion = findQuestion(mainNumber, subNumber, paperqQuestions)
                             // 按题号过滤
-                            if (questionArr[question.mainNumber + "." + subNumber] === true || questionNumbers == "") {
-                                let numberTitle = {
+                            if (questionArr[mainNumber + "." + subNumber] === true) {
+                                
+                            }
+                        	let numberTitle = {
                                     "blocks": [{
                                         "type": "text",
                                         "param": {"bold": true},
-                                        "value": "题号:" + question.mainNumber + "-" + subNumber
+                                        "value": "题号:" + mainNumber + "-" + subNumber
                                     }]
                                 };
                                 let bodyTitle = {
@@ -103,17 +105,19 @@
                                 
                                 $(renderRichText(paperQuestion.body)).appendTo(this.holder);
                                 $(renderSection(answerTitle)).appendTo(this.holder);
-                                let questionAnswer =renderRichText(question.answer);
-                                questionAnswer.forEach(node => {
-                                    $(node).appendTo(this.holder);
-                                })
+                                if(jsons.length > 0){
+                                	jsons.forEach(node => {
+                                		node.answer.forEach(node => {
+                                			$(renderRichText(node)).appendTo(this.holder);
+                                		});
+                                	})
+                                }
                                 $(renderSection(standardTitle)).appendTo(this.holder);
                                 let nodes =renderRichText(paperQuestion.answer);
                                 nodes.forEach(node => {
                                     $(node).appendTo(this.holder);
                                 })
-                            }
-                        }
+                       		}
                         if (this.viewer != undefined) {
                             this.viewer.destroy();
                         }
@@ -156,7 +160,7 @@
         jsonData = Array.isArray(jsonData) ? jsonData : {}
         let result = []
         for (let i in jsonData) {
-            if (jsonData[i].mainNumber === mainNumber && jsonData[i].subNumber == subNumber) {
+            if (jsonData[i].mainNumber == mainNumber && jsonData[i].subNumber == subNumber) {
                 result.push(jsonData[i])
             }
         }
@@ -168,7 +172,7 @@
         if (Array.isArray(paperData.details)) {
             for (let i in paperData.details) {
                 let detail = paperData.details[i]
-                if (detail.number === mainNumber && Array.isArray(detail.questions)) {
+                if (detail.number == mainNumber && Array.isArray(detail.questions)) {
                     for (let j in detail.questions) {
                         if (detail.questions[j].number == subNumber) {
                             return detail.questions[j]
@@ -188,7 +192,7 @@
             }
         } else if (Array.isArray(paperData.questions)) {
             for (let j in paperData.questions) {
-                if (paperData.questions[j].mainNumber === mainNumber && paperData.questions[j].subNumber == subNumber) {
+                if (paperData.questions[j].mainNumber == mainNumber && paperData.questions[j].subNumber == subNumber) {
                     return paperData.questions[j]
                 }
             }