lang

src/components/classRoomHelper/component/countdown.vue

@@ -1042,9 +1042,9 @@ export default {
       let _result = [];
 
       const viewRegex = new RegExp(`${this.lang.ssViewHomework}<span class=['"]variable['"]>(.*?)<\/span>${this.lang.ssHomeworkOf}`, 'g');
-      const likeRegex = new RegExp(`对<span class=['"]variable['"]>(.*?)<\/span>${this.lang.ssHomeworkOf}${this.lang.ssPerformLike}<span class=['"]btn['"]>点赞<\/span>`, 'g');
-      const commentRegex = new RegExp(`对<span class=['"]variable['"]>(.*?)<\/span>${this.lang.ssHomeworkOf}${this.lang.ssPerformComment}<span class=['"]btn['"]>评论<\/span>`, 'g');
-      const markRegex = new RegExp(`对<span class=['"]variable['"]>(.*?)<\/span>${this.lang.ssHomeworkOf}${this.lang.ssPerformRating}<span class=['"]btn['"]>评分<\/span>`, 'g');
+      const likeRegex = new RegExp(`${this.lang.ssPerformActionOn}<span class=['"]variable['"]>(.*?)<\/span>${this.lang.ssHomeworkOf}${this.lang.ssPerformLike}<span class=['"]btn['"]>${this.lang.ssLikeL}<\/span>`, 'g');
+      const commentRegex = new RegExp(`${this.lang.ssPerformActionOn}<span class=['"]variable['"]>(.*?)<\/span>${this.lang.ssHomeworkOf}${this.lang.ssPerformComment}<span class=['"]btn['"]>${this.lang.ssComment}<\/span>`, 'g');
+      const markRegex = new RegExp(`${this.lang.ssPerformActionOn}<span class=['"]variable['"]>(.*?)<\/span>${this.lang.ssHomeworkOf}${this.lang.ssPerformRating}<span class=['"]btn['"]>${this.lang.ssMarkScore}<\/span>`, 'g');
       data.forEach(str => {
         if (viewRegex.test(str)) {
           this.extractText(str, viewRegex).forEach(item =>
@@ -1074,24 +1074,24 @@ export default {
       }
       if (Array.from(taskTypes[this.lang.ssPerformLike]).length > 0) {
         _result.push(
-          `对<span class='variable'>${Array.from(taskTypes[this.lang.ssPerformLike]).join(
+          `${this.lang.ssPerformActionOn}<span class='variable'>${Array.from(taskTypes[this.lang.ssPerformLike]).join(
             "，"
-          )}</span>${this.lang.ssHomeworkOf}${this.lang.ssPerformLike}<span class="btn">点赞</span>`
+          )}</span>${this.lang.ssHomeworkOf}${this.lang.ssPerformLike}<span class="btn">${this.lang.ssLikeL}</span>`
         );
       }
       if (Array.from(taskTypes[this.lang.ssPerformComment]).length > 0) {
         _result.push(
-          `对<span class='variable'>${Array.from(taskTypes[this.lang.ssPerformComment]).join(
+          `${this.lang.ssPerformActionOn}<span class='variable'>${Array.from(taskTypes[this.lang.ssPerformComment]).join(
             "，"
-          )}</span>${this.lang.ssHomeworkOf}${this.lang.ssPerformComment}<span class="btn">评论</span>`
+          )}</span>${this.lang.ssHomeworkOf}${this.lang.ssPerformComment}<span class="btn">${this.lang.ssComment}</span>`
         );
       }
 
       if (Array.from(taskTypes[this.lang.ssPerformRating]).length > 0) {
         _result.push(
-          `对<span class='variable'>${Array.from(taskTypes[this.lang.ssPerformRating]).join(
+          `${this.lang.ssPerformActionOn}<span class='variable'>${Array.from(taskTypes[this.lang.ssPerformRating]).join(
             "，"
-          )}</span>${this.lang.ssHomeworkOf}${this.lang.ssPerformRating}<span class="btn">评分</span>`
+          )}</span>${this.lang.ssHomeworkOf}${this.lang.ssPerformRating}<span class="btn">${this.lang.ssMarkScore}</span>`
         );
       }
 

src/components/classRoomHelper/component/searchArea.vue

@@ -2358,8 +2358,8 @@ Language: Please use the same language as the user requirement, if the user spea
 
 ###课程说明与课程结构
 课程标题：${this.courseDetail.title ? this.courseDetail.title : ""}
-${this.lang.ssCategoryLabel}${this.courseDetail.name ? this.courseDetail.name : this.lang.ssNone}
-${this.lang.ssStudentGrade}${this.courseDetail.classname ? this.courseDetail.classname : this.lang.ssNone}
+分类：${this.courseDetail.name ? this.courseDetail.name : '无'}
+学生年级：${this.courseDetail.classname ? this.courseDetail.classname : '无'}
 学习内容：${this.exportCourse()}
 
 ## 要求
@@ -2808,10 +2808,8 @@ Instruction: Based on the context, follow "Format example", write content
 你的任务是根据“课程信息”，提供用户需要的搜索建议，将搜索建议的结果以有序列表的形式返回给用户。
 ## 课程信息
 #### 课程标题：${this.courseDetail.title ? this.courseDetail.title : ""}
-#### ${this.lang.ssCategoryLabel}${this.courseDetail.name ? this.courseDetail.name : this.lang.ssNone}
-#### ${this.lang.ssStudentGrade}${
-        this.courseDetail.classname ? this.courseDetail.classname : this.lang.ssNone
-      }
+#### 分类：${this.courseDetail.name ? this.courseDetail.name : '无'}
+#### 学生年级：${this.courseDetail.classname ? this.courseDetail.classname : '无'}
 
 ## 规则
 输出结果基于“课程信息”，避免提供无关的信息。

src/components/classRoomHelper/component/workFlowIframe.vue

@@ -22,7 +22,7 @@ export default {
             handler: function(newVal, oldVal) {
                 if (newVal) {
                     this.checkIndex = 0
-                    this.src = (newVal && newVal.length && newVal[this.checkIndex].src) ? newVal[this.checkIndex].src : ''
+                    this.src =newVal[this.checkIndex].src
                     console.log('-------------------',this.src);
                     this.$forceUpdate();
                 }

src/components/components/intelligentAnalysis/checkAi/aiLeader.vue

@@ -1332,7 +1332,7 @@ ${fileText}
               let _json = JSON.parse(i.works);
               _json.forEach((i, index) => {
                 _obj[
-                  `${this.lang.ssSort}${index + 1}(正确排序：${i.rightAnswer.join("、")})`
+                  `${this.lang.ssSort}${index + 1}(${this.lang.ssCorrectOrder}：${i.rightAnswer.join("、")})`
                 ] = i.chooseSenList.join("、");
               });
             } else if ([48, 52].includes(this.toolType)) {

src/components/easy3/studyStudent.vue

@@ -14884,7 +14884,7 @@ export default {
                   if(a[i].testJson.testCount != JSON.parse(data.content)[0].testJson.testCount){
                     continue
                   }
-                  console.log('选择题')
+                  // console.log('选择题')
                   for (var z = 0; z < checkL.length; z++) {
                     if (!this.checkJson[i][z]) {
                       this.checkJson[i].push({

src/components/scoreZong/get.vue

@@ -5,8 +5,9 @@
                 class="color">{{ num ? score ? (score / num).toFixed(1) : 0 : 0 }}</span></div>
         <div class="test_box" v-for="(item, index) in testList" :key="index">
             <div class="testTitle">{{ item.title }}</div>
-            <template v-for="(item2, index2) in item.array">
-                <div class="testContent" v-if="item.type == '1'" 
+            <template v-if="item.type == '1'">
+                <div class="testContent" 
+                    v-for="(item2, index2) in item.array"
                     :key="index + '-' + index2">
                     <div class="testContent_title">{{ index2 + 1 }}、{{ item2.title }}</div>
                     <div class="testContent_input">

src/components/scoreZong/index.vue

@@ -2,8 +2,9 @@
     <div class="sz_body" v-loading="loading" style="position: unset !important;">
         <div class="test_box" v-for="(item, index) in testList" :key="index">
             <div class="testTitle">{{ item.title }}</div>
-            <template v-for="(item2, index2) in item.array">
-                <div class="testContent" v-if="item.type == '1'" 
+            <template v-if="item.type == '1'">
+                <div class="testContent" 
+                    v-for="(item2, index2) in item.array"
                     :key="index + '-' + index2">
                     <div class="testContent_title">{{ index2 + 1 }}、{{ item2.title }}</div>
                     <div class="testContent_input">

src/components/studyStudent.vue

@@ -14809,7 +14809,7 @@ export default {
                   if(a[i].testJson.testCount != JSON.parse(data.content)[0].testJson.testCount){
                     continue
                   }
-                  console.log('选择题')
+                  // console.log('选择题')
                   for (var z = 0; z < checkL.length; z++) {
                     if (!this.checkJson[i][z]) {
                       this.checkJson[i].push({

src/components/tools/imgDraw/imgDraw.vue

@@ -17,7 +17,7 @@
             " />
         </div>
         <div :class="['tools', 'settings', isExpand ? '' : 'noExpand']">
-          <div class="tool_item" v-for="(item, index) in settings" :key="item.icon">
+          <div class="tool_item" v-for="(item, index) in settingsWithLang" :key="item.icon">
             <button v-if="index == 0">
               <svg class="icon" aria-hidden="true" :style="'color:' + defaultColor">
                 <use :xlink:href="item.icon" />
@@ -39,7 +39,7 @@
               <span>{{ item.name }}</span>
             </button>
           </div>
-          <div class="tool_item" v-for="item in btnsConfig" :key="item.icon">
+          <div class="tool_item" v-for="item in btnsWithLang" :key="item.icon">
             <button @click.stop="item.fun" v-if="item.name == lang.ssPrevious" :disabled="prevDis"
               :style="prevDis ? 'cursor:not-allowed' : ''">
               <svg class="icon" aria-hidden="true">
@@ -78,7 +78,7 @@
           <div :class="[
             'tool_item',
             activeTool == item.toolType ? 'activeTool' : '',
-          ]" v-for="item in tools" :key="item.toolType" @click.stop="handleChangeToolType(item.toolType)">
+          ]" v-for="item in toolsWithLang" :key="item.toolType" @click.stop="handleChangeToolType(item.toolType)">
             <svg class="icon" aria-hidden="true">
               <use :xlink:href="item.icon" />
             </svg>
@@ -95,10 +95,7 @@
 import cursors from "./cursor";
 import "../../../assets/drawIcon/iconfont";
 import bgA from "./img";
-import { myMixin } from "@/mixins/mixin.js"
-
 export default {
-  mixins: [myMixin],
   name: "imgDraw",
   props: {
     drawShow: {
@@ -118,37 +115,66 @@ export default {
       defaultColor: "#333333",
       cursor: `url('${cursors.pen}'),auto`,
       slide: 1,
-      settings: [
+      activeTool: 1,
+      canvas_front: null,
+      canvas_back: null,
+      canvas_base: null,
+      ctx_base: null,
+      ctx_front: null,
+      ctx_back: null,
+      currentImg: {
+        url: "",
+        width: "",
+        height: "",
+        scale: 1,
+        index: 0,
+      },
+      isExpand: 1,
+      showTools: 1,
+      canDraw: false,
+      text: "",
+      canvasStore: [""],
+      prevDis: true,
+      nextDis: true,
+      baseMap: "",
+      tl: 0,
+      tt: 0,
+    };
+  },
+  computed: {
+    settingsWithLang() {
+      return [
         {
           icon: "#icon-youqitong_huaban1",
-          name: this.lang ? this.lang.ssColor : "颜色",
+          name: this.lang.ssColor,
           fun: "",
         },
         {
           icon: "#icon-huabi_huaban1",
-          name: this.lang ? this.lang.ssThickness : "粗细",
+          name: this.lang.ssThickness,
           fun: "",
         },
         {
           icon: "#icon-fangda_huaban1",
-          name: this.lang ? this.lang.ssZoomIn : "放大",
+          name: this.lang.ssZoomIn,
           fun: () => {
             return this.handleBeLarge();
           },
         },
         {
           icon: "#icon-suoxiao_huaban1",
-          name: this.lang ? this.lang.ssZoomOut : "缩小",
+          name: this.lang.ssZoomOut,
           fun: () => {
             return this.handleBeSmall();
           },
         },
-      ],
-      activeTool: 1,
-      tools: [
+      ];
+    },
+    toolsWithLang() {
+      return [
         {
           icon: "#icon-huabi_huaban1",
-          name: this.lang ? this.lang.ssBrush : "画笔",
+          name: this.lang.ssBrush,
           toolType: 1,
         },
         // {
@@ -173,55 +199,30 @@ export default {
         // },
         {
           icon: "#icon-wenzi_huaban1",
-          name: this.lang ? this.lang.ssText : "文字",
+          name: this.lang.ssText,
           toolType: 6,
         },
-      ],
-      canvas_front: null,
-      canvas_back: null,
-      canvas_base: null,
-      ctx_base: null,
-      ctx_front: null,
-      ctx_back: null,
-      currentImg: {
-        url: "",
-        width: "",
-        height: "",
-        scale: 1,
-        index: 0,
-      },
-      isExpand: 1,
-      showTools: 1,
-      canDraw: false,
-      text: "",
-      canvasStore: [""],
-      prevDis: true,
-      nextDis: true,
-      baseMap: "",
-      tl: 0,
-      tt: 0,
-    };
-  },
-  computed: {
-    btnsConfig() {
+      ];
+    },
+    btnsWithLang() {
       return [
         {
           icon: "#icon-chexiao",
-          name: this.lang ? this.lang.ssPrevious : "上一步",
+          name: this.lang.ssPrevious,
           fun: () => {
             return this.handlePrev();
           },
         },
         {
           icon: "#icon-zhongzuo",
-          name: this.lang ? this.lang.ssNext : "下一步",
+          name: this.lang.ssNext,
           fun: () => {
             return this.handleNext();
           },
         },
         {
           icon: "#icon-lajixiang_huaban1",
-          name: this.lang ? this.lang.ssClear : "清除",
+          name: this.lang.ssClear,
           fun: () => {
             return this.handleClearCanvas();
           },
@@ -229,7 +230,7 @@ export default {
         {
           // icon: "#icon-baocun",
           icon: "",
-          name: this.lang ? this.lang.ssClose : "关闭",
+          name: this.lang.ssClose,
           fun: () => {
             // return this.handleCanvas2Img();
             // return (this.show = false);
@@ -238,7 +239,7 @@ export default {
         },
         {
           icon: "",
-          name: this.lang ? this.lang.ssSaveAnnotation : "保存批注",
+          name: this.lang.ssSaveAnnotation,
           fun: () => {
             return this.handleSave();
           },
@@ -762,16 +763,16 @@ export default {
         this.tools = [
           {
             icon: "#icon-zhixian_huaban1",
-            name: this.lang ? this.lang.ssMove : "移动",
+            name: this.lang.ssMove,
             toolType: 0,
           }, {
             icon: "#icon-huabi_huaban1",
-            name: this.lang ? this.lang.ssBrush : "画笔",
+            name: this.lang.ssBrush,
             toolType: 1,
           },
           {
             icon: "#icon-wenzi_huaban1",
-            name: this.lang ? this.lang.ssText : "文字",
+            name: this.lang.ssText,
             toolType: 6,
           },
         ]
@@ -780,12 +781,12 @@ export default {
 
         this.tools = [{
           icon: "#icon-huabi_huaban1",
-          name: this.lang ? this.lang.ssBrush : "画笔",
+          name: this.lang.ssBrush,
           toolType: 1,
         },
         {
           icon: "#icon-wenzi_huaban1",
-          name: this.lang ? this.lang.ssText : "文字",
+          name: this.lang.ssText,
           toolType: 6,
         },
         ]

src/lang/cn.json

@@ -882,5 +882,7 @@
   "ssResetTimer": "重置",
   "ssLoadingWordCloud": "小可正在努力加载ing",
   "ssWordCloudFail": "生成词云图失败",
-  "ssSubmitWork": "提交作业"
+  "ssSubmitWork": "提交作业",
+  "ssLikeL":"点赞",
+  "ssCorrectOrder": "正确排序"
 }

src/lang/en.json

@@ -880,5 +880,7 @@
   "ssResetTimer": "Reset",
   "ssLoadingWordCloud": "XiaoKe is working hard to load...",
   "ssWordCloudFail": "Failed to generate word cloud",
-  "ssSubmitWork": "Submit Work"
+  "ssSubmitWork": "Submit Work",
+  "ssLikeL":"Like",
+  "ssCorrectOrder": "Correct Order"
 }

src/lang/hk.json

@@ -880,5 +880,7 @@
   "ssResetTimer": "重置",
   "ssLoadingWordCloud": "小可正在努力加載ing",
   "ssWordCloudFail": "生成詞雲圖失敗",
-  "ssSubmitWork": "提交作業"
+  "ssSubmitWork": "提交作業",
+  "ssLikeL":"點贊",
+  "ssCorrectOrder": "正確排序"
 }