ting.yin 5 lat temu
rodzic
commit
848f8bbad5

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/include/jsonView.jsp

@@ -46,7 +46,7 @@ function initJsonPopoverContent(title,url,questionNumbers){
         dataType:"json",  
         dataType:"json",  
         success:function(data){   
         success:function(data){   
          	//var data='[{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"adwe"}]}]},"subNumber":15},{"mainNumber":4,"body":{"sections":[{"blocks":[]}]},"subNumber":16},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfdsf"}]}]},"subNumber":17},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfs##sdf"}]}]},"subNumber":18},{"mainNumber":6,"body":{"sections":[{"blocks":[{"type":"audio","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"subNumber":1},{"mainNumber":6,"body":{"sections":[{"blocks":[{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889895204.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889573137.jpeg"}]}]},"subNumber":20},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":23},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":24}]';
          	//var data='[{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"adwe"}]}]},"subNumber":15},{"mainNumber":4,"body":{"sections":[{"blocks":[]}]},"subNumber":16},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfdsf"}]}]},"subNumber":17},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfs##sdf"}]}]},"subNumber":18},{"mainNumber":6,"body":{"sections":[{"blocks":[{"type":"audio","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"subNumber":1},{"mainNumber":6,"body":{"sections":[{"blocks":[{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889895204.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889573137.jpeg"}]}]},"subNumber":20},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":23},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":24}]';
-         	data = JSON.parse(data);
+         	//data = JSON.parse(data);
          	let questions = data || [];
          	let questions = data || [];
          	
          	
          	if(questionNumbers != undefined){
          	if(questionNumbers != undefined){

+ 3 - 1
stmms-web/src/main/webapp/static/mark-json/js/json-loader.js

@@ -17,9 +17,11 @@ JsonLoader.prototype.build = function (task, callback) {
 //        var result='[{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"adwe"}]}]},"subNumber":15},{"mainNumber":4,"body":{"sections":[{"blocks":[]}]},"subNumber":16},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfdsf"}]}]},"subNumber":17},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfs##sdf"}]}]},"subNumber":18},{"mainNumber":6,"body":{"sections":[{"blocks":[{"type":"audio","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"subNumber":1},{"mainNumber":6,"body":{"sections":[{"blocks":[{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889895204.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889573137.jpeg"}]}]},"subNumber":20},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":23},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":24}]';
 //        var result='[{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"adwe"}]}]},"subNumber":15},{"mainNumber":4,"body":{"sections":[{"blocks":[]}]},"subNumber":16},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfdsf"}]}]},"subNumber":17},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfs##sdf"}]}]},"subNumber":18},{"mainNumber":6,"body":{"sections":[{"blocks":[{"type":"audio","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"subNumber":1},{"mainNumber":6,"body":{"sections":[{"blocks":[{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889895204.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889573137.jpeg"}]}]},"subNumber":20},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":23},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":24}]';
     	var url = this.answerServer + this.task.answerUrl;
     	var url = this.answerServer + this.task.answerUrl;
         $.get(url, function (result) {
         $.get(url, function (result) {
-            task.jsonData = JSON.parse(result);
+//            task.jsonData = JSON.parse(result);
+            task.jsonData = result;
             callback();
             callback();
         }).error(function () {
         }).error(function () {
+        	console.log('json load error');
             callback('json load error');
             callback('json load error');
         });
         });
     }
     }