Merge branch 'beta' into HK

src/components/classRoomHelper/component/searchArea.vue

@@ -577,7 +577,8 @@ export default {
       },
       lookStudentData: {},
       taskList: [],
-      userList: []
+      userList: [],
+      tools: JSON.parse(converter(JSON.stringify(tools))),
     };
   },
   computed: {

src/components/classRoomHelper/component/taskArea.vue

@@ -233,7 +233,8 @@ export default {
       saveUid: "",
       allStudent: [],
       tcid: this.$route.query.tcid,
-      oid: this.$route.query.oid
+      oid: this.$route.query.oid,
+      tools: JSON.parse(converter(JSON.stringify(tools))),
     };
   },
   computed: {

src/components/courseDetail.vue

@@ -1090,6 +1090,12 @@ import JSZip from "jszip";
 import FileSaver from "file-saver";
 import scoreZong from './scoreZong/get.vue'
 
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
+
 const getFile = (url) => {
   return new Promise((resolve, reject) => {
     var credentials = {
@@ -1178,7 +1184,7 @@ export default {
       followC: "",
       dialogVisibleQR: false,
       checkStage: 0,
-      tools: tools,
+      tools: JSON.parse(converter(JSON.stringify(tools))),
     };
   },
   methods: {

src/components/trainCourse/courseDetail.vue

@@ -1062,6 +1062,12 @@ import axios from "axios";
 import JSZip from "jszip";
 import FileSaver from "file-saver";
 
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
+
 const getFile = (url) => {
   return new Promise((resolve, reject) => {
     var credentials = {
@@ -1149,7 +1155,7 @@ export default {
       followC: "",
       dialogVisibleQR: false,
       checkStage: 0,
-      tools: tools,
+      tools: JSON.parse(converter(JSON.stringify(tools))),
     };
   },
   methods: {