CrazyIter_Bin 1 year ago
parent
commit
3f975659b7

+ 4 - 4
TEAMModelOS/ClientApp/package.json

@@ -51,7 +51,7 @@
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.1",
     "oidc-client": "^1.9.1",
-    "pdfjs-dist": "^2.2.228",
+    "pdfjs-dist": "^2.4.456",
     "primeicons": "^6.0.1",
     "primevue": "^2.10.1",
     "qrcodejs2": "0.0.2",
@@ -90,7 +90,7 @@
     "xlsx": "^0.17.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.24.5",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
     "@babel/plugin-proposal-decorators": "^7.4.4",
     "@babel/plugin-proposal-export-namespace-from": "^7.5.2",
@@ -103,7 +103,7 @@
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/plugin-transform-async-to-generator": "^7.5.0",
     "@babel/plugin-transform-runtime": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-env": "^7.24.5",
     "@babel/register": "^7.8.6",
     "@babel/runtime": "^7.5.5",
     "@vue/cli-plugin-babel": "^4.0.0",
@@ -114,7 +114,7 @@
     "aspnet-webpack": "^3.0.0",
     "autoprefixer": "^9.6.5",
     "babel-eslint": "^10.0.1",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.3.0",
     "babel-plugin-component": "^1.1.1",
     "babel-plugin-import": "^1.12.0",
     "babel-polyfill": "^6.26.0",

+ 12 - 8
TEAMModelOS/Controllers/Both/KnowledgeController.cs

@@ -48,8 +48,10 @@ namespace TEAMModelOS.Controllers.Both
             _httpTrigger = httpTrigger;
         }
         [ProducesDefaultResponseType]
-        [HttpPost("item-import")]
+        [HttpPost("import")]
+#if !DEBUG
         [Authorize(Roles = "IES")]
+#endif
         [AuthToken(Roles = "admin", Permissions = "knowledge-upd")]
         public IActionResult ItemImport([FromForm] IFormFile file)
         {
@@ -142,7 +144,7 @@ namespace TEAMModelOS.Controllers.Both
         }
 
         [ProducesDefaultResponseType]
-        [HttpPost("read-knowledge")]
+        [HttpPost("read")]
 #if !DEBUG
 
         [Authorize(Roles = "IES")]
@@ -214,7 +216,7 @@ namespace TEAMModelOS.Controllers.Both
 
       
         [ProducesDefaultResponseType]
-        [HttpPost("modify-knowledge-node")]
+        [HttpPost("modify")]
 #if !DEBUG
 
         [Authorize(Roles = "IES")]
@@ -300,7 +302,7 @@ namespace TEAMModelOS.Controllers.Both
 
 
         [ProducesDefaultResponseType]
-        [HttpPost("upsert-knowledge")]
+        [HttpPost("upsert")]
 #if !DEBUG
 
         [Authorize(Roles = "IES")]
@@ -432,8 +434,10 @@ namespace TEAMModelOS.Controllers.Both
             }
         }
         [ProducesDefaultResponseType]
-        [HttpPost("find-count")]
+        [HttpPost("list")]
+#if !DEBUG
         [Authorize(Roles = "IES")]
+#endif
         [AuthToken(Roles = "teacher,admin,student", Permissions = "knowledge-read,knowledge-upd")]
         public async Task<IActionResult> FindCount(JsonElement json)
         {
@@ -473,7 +477,7 @@ namespace TEAMModelOS.Controllers.Both
                     }
                     else {
                         string   sql= $" select value c from c where c.subjectId='{subject.id}' and c.periodId='{period.id}'  ";
-                        var result = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetList<Knowledge>(sql, $"Knowledge-{school}-{subject.id}");
+                        var result = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetList<Knowledge>(sql, $"Knowledge-{school}-{subject.id}");
                         if (result.list.IsNotEmpty())
                         {
                             foreach (var item in result.list) {
@@ -508,9 +512,9 @@ namespace TEAMModelOS.Controllers.Both
                                 scope="school",
                                 pcount=0,
                                 bcount=0,
-                            };
+                            }; 
+                            datas.Add(record);
                         }
-                        datas.Add(record);
                     }
                 }
             }