Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Question/AnalysisQuestionTypeModule.cs

@@ -65,6 +65,14 @@ namespace Edu.Module.Question
                 case "matching":
                     obj = Common.Plugin.JsonHelper.DeserializeObject<List<List<matchingItem>>>(data);
                     break;
+                //排序题
+                case "sorting-problem":
+                    obj = Common.Plugin.JsonHelper.DeserializeObject<List<List<matchingItem>>>(data);
+                    break;
+                //完型填空
+                case "cloze":
+                    obj = Common.Plugin.JsonHelper.DeserializeObject<List<List<optionItem>>>(data);
+                    break;
             }
             return obj;
         }

Edu.WebApi/Controllers/Course/QuestionController.cs

@@ -87,6 +87,7 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [HttpGet]
         public ApiResult GetDifficultyType()
         {
             var list = Common.Plugin.EnumHelper.EnumToList(typeof(DifficultyTypeEnum));

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1410,5 +1410,10 @@ namespace Edu.WebApi.Controllers.OKR
 
         #endregion
 
+
+        #region 数据看板
+
+        #endregion
+
     }
 }