Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/EarlyWarning.vue

@@ -346,8 +346,8 @@
                                 normal: { // 渐变色
                                     color: 'rgb(102,204,204)'
                                 },
-                                width: 20
                             },
+							barMaxWidth: 40,
                             markPoint: {
                                 data: [
                                     { type: 'max', name: '最大值' },

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/TestAnalysis/QuestionList.vue

@@ -270,6 +270,7 @@
 			
 			let curExam = JSON.parse(localStorage.getItem('curExam'))
 			let curSubjectIndex = curExam.subjects.map(i => i.name).indexOf(this.$store.state.totalAnalysis.currentSubject)
+			console.log(curSubjectIndex)
 			console.log('当前的评测数据',curExam)
 			let curPaper = curExam.papers[curSubjectIndex]
 			this.initFullPaper(curPaper)
@@ -314,6 +315,7 @@
         methods: {
 			
 			async initFullPaper(examPaper){
+				console.log(examPaper.name)
 				let fullPaperJson =  await this.$evTools.getFullPaper(examPaper)
 				this.questionList = fullPaperJson.item
 				this.SingleList = this.questionList.filter(item => item.type === 'single')

TEAMModelOS/Controllers/Core/ImportController.cs

@@ -45,12 +45,12 @@ namespace TEAMModelOS.Controllers
         private readonly AzureStorageFactory _azureStorage;
         private readonly IWebHostEnvironment _webHostEnvironment;
         private readonly IHttpClientFactory _clientFactory;
-        public HTML2ITEMV2Translator _HTML2ITEMV2Translator { get; set; }
+        public HTML2ITEMV3Translator _HTML2ITEMV3Translator { get; set; }
         public ImportController(
             PPTX2HTEXTranslator PPTX2HTEXTranslator, IHttpClientFactory clientFactory,
-            DOXC2HTMLTranslator DOXC2HTMLTranslator, HTML2ITEMV2Translator HTML2ITEMV2Translator)
+            DOXC2HTMLTranslator DOXC2HTMLTranslator, HTML2ITEMV3Translator HTML2ITEMV3Translator)
         {
-            _HTML2ITEMV2Translator = HTML2ITEMV2Translator;
+            _HTML2ITEMV3Translator = HTML2ITEMV3Translator;
             _DOXC2HTMLTranslator = DOXC2HTMLTranslator;
             _clientFactory = clientFactory;
             this._PPTX2HTEXTranslator = PPTX2HTEXTranslator;
@@ -261,8 +261,7 @@ namespace TEAMModelOS.Controllers
         public IActionResult AnalyzeHtml(JsonElement request)
         {
             if (!request.TryGetProperty("htmlString", out JsonElement htmlString)) { return BadRequest(); }
-            request.TryGetProperty("lang", out JsonElement lang);
-            var exercises = _HTML2ITEMV2Translator.Translate(htmlString.GetString(), lang);
+            var exercises = _HTML2ITEMV3Translator.Translate(htmlString.GetString());
             return Ok(exercises);
         }
 

TEAMModelOS/JsonFile/Core/LangConfigV3.json

@@ -0,0 +1,79 @@
+{
+  "Options": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+  "Start": "{",
+  "End": "}",
+  "LangConfig": [
+    {
+      "Lang": "简体",
+      "Alias": "简体中文",
+      "Item": {
+        "Type": {
+          "compose": "综合题",
+          "single": "单选题",
+          "multiple": "多选题",
+          "judge": "判断题",
+          "complete": "填空题",
+          "subjective": "问答题",
+          "connector": "连线题",
+          "correct": "改错题"
+        },
+        "Answer": "答案",
+        "Analysis": "解析",
+        "Score": "配分",
+        "Point": "知识点",
+        "Filed": "知识|理解|应用|分析|综合|评鉴",
+        "Judge": "对|错",
+        "Ended": "结束",
+        "Level": "难度"
+      }
+    },
+    {
+      "Lang": "繁體",
+      "Alias": "繁體中文",
+      "Item": {
+        "Type": {
+          "compose": "綜合題",
+          "single": "選擇題",
+          "multiple": "複選題",
+          "judge": "是非題",
+          "complete": "填充題",
+          "subjective": "問答題",
+          "connector": "連綫題",
+          "correct": "改錯題"
+        },
+        "Answer": "答案",
+        "Analysis": "解析",
+        "Score": "配分",
+        "Point": "知識點",
+        "Filed": "知識|理解|應用|分析|綜合|評鑒",
+        "Judge": "對|錯",
+        "Ended": "結束",
+        "Level": "難度"
+      }
+    },
+    {
+      "Lang": "EN",
+      "Alias": "English",
+      "Item": {
+        "Type": {
+          "compose": "QuestionGroup",
+          "single": "MultipleChoice",
+          "multiple": "MultipleAnswers",
+          "judge": "TrueFalse",
+          "complete": "Blank",
+          "subjective": "Essay",
+          "connector": "Connector",
+          "correct": "Correct"
+        },
+        "Answer": "Answer",
+        "Analysis": "Explain",
+        "Score": "Score",
+        "Point": "Point",
+        "Filed": "Knowledge|Understand|Using|Analyse|Synthesize|Discern",
+        "Judge": "True|False",
+        "Ended": "Ended",
+        "Level": "Level"
+      }
+    }
+  ]
+}

TEAMModelOS/TEAMModelOS.csproj

@@ -7,7 +7,7 @@
     <PackageReference Include="Caching.CSRedis" Version="3.6.50" />
     <PackageReference Include="CSRedisCore" Version="3.6.5" />
     <PackageReference Include="DotNetZip" Version="1.15.0" />
-    <PackageReference Include="HTEXLib" Version="2.2.8" />
+    <PackageReference Include="HTEXLib" Version="2.2.9" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
       <PackageReference Include="VueCliMiddleware" Version="3.1.2" />  </ItemGroup>
   <PropertyGroup>