Browse Source

update--------hk

lsc 1 year ago
parent
commit
9e1d8ef440

+ 1 - 5
dist/index.html

@@ -32,11 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.0a8461205ca963f7076820933488297d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.6c4ea0d95d82bb3e7d94.js></script><script type=text/javascript src=./static/js/vendor.5ea83e876bbd9a969e78.js></script><script type=text/javascript src=./static/js/app.d4b005ba95b8935cbd72.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() {
->>>>>>> beta
+    }</style><link href=./static/css/app.18bdeff951ede99bf7a14a5cb6e9bf84.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.6c4ea0d95d82bb3e7d94.js></script><script type=text/javascript src=./static/js/vendor.5ea83e876bbd9a969e78.js></script><script type=text/javascript src=./static/js/app.d9ddc191cceecc552cd8.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/manifest.6c4ea0d95d82bb3e7d94.js.map


+ 8 - 8
src/components/pages/classroomObservation/components/messageArea.vue

@@ -1071,8 +1071,8 @@ export default {
 		addAnalysisItem(title) {
 			return new Promise((resolve, reject) => {
 				let converter = OpenCC.Converter({
-						from:'hk',
-						to:'cn'
+						from:'cn',
+						to:'hk'
 				})
 				this.dialogVisible = false;
 				let assistant = this.dialogTagDataList.find((i) => i.title == title);
@@ -1460,8 +1460,8 @@ export default {
 		saveWordFrequency({ _sentence = 0, _words = 0 }) {
 			var OpenCC = require("opencc-js");
 			let converter = OpenCC.Converter({
-					from:'hk',
-					to:'cn'
+					from:'cn',
+					to:'hk'
 			})
 			let _saveData = this.dataList.find(
 				(i) => converter(i.jsonData.name) == converter("词频词汇分析")
@@ -1492,8 +1492,8 @@ export default {
 		getReport() {
 			var OpenCC = require("opencc-js");
 			let converter = OpenCC.Converter({
-					from:'hk',
-					to:'cn'
+					from:'cn',
+					to:'hk'
 			})
 			let _empty = this.dataList.filter(
 				(i) => converter(i.jsonData.content) != "" && converter(i.jsonData.name) != converter("词频词汇分析")
@@ -1529,8 +1529,8 @@ export default {
 			return new Promise((resolve, reject) => {
 				var OpenCC = require("opencc-js");
 				let converter = OpenCC.Converter({
-						from:'hk',
-						to:'cn'
+						from:'cn',
+						to:'hk'
 				})
 				// 添加基础信息
 				let params = {

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