瀏覽代碼

无所谓的冲突

SanHQin 10 月之前
父節點
當前提交
f9539ebbe3

+ 4 - 0
dist/index.html

@@ -32,7 +32,11 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
+<<<<<<< HEAD
     }</style><link href=./static/css/app.ae42e894bd9dc960fd7c14c14b183ff2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.b8ca4864f3f84bfe39d6.js></script><script type=text/javascript src=./static/js/app.944e1e997768903315b3.js></script></body></html><script>function stopSafari() {
+=======
+    }</style><link href=./static/css/app.ac9cc624e725fbc8a3aec71c48baf3d0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.d5f0d79dbb0d92c052d4.js></script><script type=text/javascript src=./static/js/app.1a546da32a74eafae154.js></script></body></html><script>function stopSafari() {
+>>>>>>> f17e7ca1fc7f442e78e18c9d5d85fe68297996c2
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ac9cc624e725fbc8a3aec71c48baf3d0.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.ac9cc624e725fbc8a3aec71c48baf3d0.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1a546da32a74eafae154.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1a546da32a74eafae154.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.b8ca4864f3f84bfe39d6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.b8ca4864f3f84bfe39d6.js.map


File diff suppressed because it is too large
+ 1 - 19236
package-lock.json


+ 14 - 8
src/components/pages/aiAddCourse/addCourse.vue

@@ -5282,6 +5282,12 @@ import { v4 as uuidv4 } from "uuid";
 import MarkdownIt from "markdown-it";
 import aiCreateDialog from './aiCreateDialog.vue'
 import aiCreateVideoDialog from './aiCreateVideoDialog.vue'
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
+
 
 export default {
   components: {
@@ -13449,7 +13455,7 @@ ${message} 以及##参考资料 以文本格式输出项目概况,驱动性问
         // if (data.choices && data.choices.length && data.choices[0].message) {
         //   _this.courseText = data.choices[0].message.content
         // }
-        if (response.data.FunctionResponse.result == "发送成功") {
+        if (converter(response.data.FunctionResponse.result) == converter("发送成功")) {
         } else {
           this.$message.warning(response.data.FunctionResponse.result);
         }
@@ -13886,10 +13892,10 @@ ${message} 以及##参考资料 以文本格式输出项目概况,驱动性问
                       askJson: [{ askstitle: "", askItem: 1, checkList: [] }],
                     }
                   
-                  if(_task.toolChoose[j].tool == '问答'){
+                  if(converter(_task.toolChoose[j].tool) == converter('问答')){
                     let answerQ = await _this.aiCreateQuestion(15, i)
                     _json.answerQ = answerQ.answerQ 
-                  }else if(_task.toolChoose[j].tool == '选择题'){
+                  }else if(converter(_task.toolChoose[j].tool) == converter('选择题')){
                     let testJson = await _this.aiCreateQuestion(45, i)
                     _json.testJson = {"testCount":testJson.length,"testTitle":"","testJson":testJson} 
                   }
@@ -14387,7 +14393,7 @@ ${msg} 及#教学任务描述 以文本格式输出任务设计和评价标准
         //   _this.$forceUpdate()
         // }
 
-        if (response.data.FunctionResponse.result == "发送成功") {
+        if (converter(response.data.FunctionResponse.result) == converter("发送成功")) {
         } else {
           this.$message.warning(response.data.FunctionResponse.result);
         }
@@ -14525,7 +14531,7 @@ ${msg}
         //   _this.$forceUpdate()
         // }
         // _this.taskDetailLoading2.splice(_this.taskDetailLoading.indexOf(_tindex), 1)
-        if (response.data.FunctionResponse.result == "发送成功") {
+        if (converter(response.data.FunctionResponse.result) == converter("发送成功")) {
         } else {
           this.$message.warning(response.data.FunctionResponse.result);
         }
@@ -14663,7 +14669,7 @@ ${msg} 输出格式和内容要求参考#格式与要求
         //   _this.$forceUpdate()
         // }
         // _this.taskDetailLoading3.splice(_this.taskDetailLoading3.indexOf(_tindex), 1)
-        if (response.data.FunctionResponse.result == "发送成功") {
+        if (converter(response.data.FunctionResponse.result) == converter("发送成功")) {
         } else {
           this.$message.warning(response.data.FunctionResponse.result);
         }
@@ -14947,7 +14953,7 @@ ${_text2}`
         //   _this.$forceUpdate()
         // }
         // _this.taskDetailLoading2.splice(_this.taskDetailLoading.indexOf(_tindex), 1)
-        if (response.data.FunctionResponse.result == "发送成功") {
+        if (converter(response.data.FunctionResponse.result) == converter("发送成功")) {
         } else {
           this.$message.warning(response.data.FunctionResponse.result);
         }
@@ -15107,7 +15113,7 @@ ${this.aitype == 'aiCpote4' ? '## 目标层\n'+this.cpote['cpote3'] : ''}`
         //   _this.$forceUpdate()
         // }
         // _this.taskDetailLoading2.splice(_this.taskDetailLoading.indexOf(_tindex), 1)
-        if (response.data.FunctionResponse.result == "发送成功") {
+        if (converter(response.data.FunctionResponse.result) == converter("发送成功")) {
         } else {
           this.$message.warning(response.data.FunctionResponse.result);
         }

+ 8 - 1
src/components/pages/classroomObservation/components/analysis.vue

@@ -55,7 +55,7 @@
 import analysisItem from "./analysisItem";
 import analysisSpecialItem from './analysisSpecialItem'
 var OpenCC = require("opencc-js");
-let converter = OpenCC.Converter({
+let converter2 = OpenCC.Converter({
 		from:'hk',
 		to:'cn'
 })
@@ -105,6 +105,13 @@ export default {
 		analysisItem,
 		analysisSpecialItem
 	},
+	computed: {
+		converter() {
+			return function (word) {
+				return converter2(word);
+			};
+		},
+	},
 	data() {
 		return {
 			showDialog: false,

Some files were not shown because too many files changed in this diff