Merge branch 'beta'

dist/index.html

@@ -37,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.461dab523ac52a6af585d486fc8c60bb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.2c492f3d5a39df08f4a3.js></script><script type=text/javascript src=./static/js/app.4cc75e712bc9b4ae2026.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.5d43c77839d1e1529b9d10b0479dc240.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.2c492f3d5a39df08f4a3.js></script><script type=text/javascript src=./static/js/app.6a814d59d46fa62f4339.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

dist/workPage.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.f2acf0e808dd6bac2e5ede13b68184a4.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b6275e4cf468b42a92b.js></script><script type=text/javascript src=./static/js/workPage.a7289392a2458402c450.js></script></body></html><script>function stopSafari() {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.96513d9dec6a603b15175ab23d5816ac.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b6275e4cf468b42a92b.js></script><script type=text/javascript src=./static/js/workPage.79b54f7091dd1f18af9f.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

src/components/pages/studentManageNew/component/table.vue

@@ -767,6 +767,10 @@ export default {
         this.activeId = newVal;
         this.inp = "";
         this.interestType = 0;
+        // 进入页面时 activeId 尚未赋值，避免空 claid 请求
+        if (!newVal && newVal !== 0) {
+          return;
+        }
         this.refresh();
       },
       immediate: true

src/components/pages/workPage/components/kwlPage.vue

@@ -368,17 +368,17 @@ export default {
       }
 
 
-      setTimeout(() => {
-        navigator.permissions && navigator.permissions.query({ name: 'microphone' }).then(permissionStatus => {
-          if (permissionStatus.state !== "granted") {
-            this.recordObj.status = "0";
-            this.recordObj.loading = false;
-            this._cleanupTranscriber(iframe);
-            this.$message.warning(this.lang.ssKWLNoPermStop);
-            return;
-          }
-        }).catch(() => { });
-      }, 2000);
+      //setTimeout(() => {
+      //  navigator.permissions && navigator.permissions.query({ name: 'microphone' }).then(permissionStatus => {
+      //    if (permissionStatus.state !== "granted") {
+      //      this.recordObj.status = "0";
+      //      this.recordObj.loading = false;
+      //      this._cleanupTranscriber(iframe);
+      //      this.$message.warning(this.lang.ssKWLNoPermStop);
+      //      return;
+      //    }
+      //  }).catch(() => { });
+      //}, 2000);
       // } catch (err) {
       //   console.error("startRecord error:", err);
       //   this.$message.error(this.lang.ssKWLRecStartFail);

src/components/pages/workPage/components/questionsAndAnswers.vue

@@ -109,6 +109,8 @@ export default {
       handler: function (newValue, oldValue) {
         if (JSON.stringify(newValue) != JSON.stringify(oldValue)) {
           this.work = JSON.parse(JSON.stringify(this.workData.json));
+          console.log("workData", JSON.stringify(this.work));
+          this.$forceUpdate();
         }
       },
       deep: true,
@@ -187,19 +189,19 @@ export default {
       }
 
       // 预留 2 秒后的兜底权限检查（处理用户后续在浏览器设置中撤销权限的情况）
-      setTimeout(() => {
-        navigator.permissions && navigator.permissions.query({ name: 'microphone' }).then(permissionStatus => {
-          if (permissionStatus.state !== "granted") {
-            // 没有开启录音权限，直接确定停止录音
-            this.recordObj.status = "0";
-            this.recordObj.loading = false;
-            iframe.contentWindow.onSessionStopped = null;
-            this._cleanupTranscriber(iframe);
-            this.$message.success(this.lang.ssNoPermStop);
-            return;
-          }
-        })
-      }, 2000)
+      //setTimeout(() => {
+      //  navigator.permissions && navigator.permissions.query({ name: 'microphone' }).then(permissionStatus => {
+      //    if (permissionStatus.state !== "granted") {
+      //      // 没有开启录音权限，直接确定停止录音
+      //      this.recordObj.status = "0";
+      //      this.recordObj.loading = false;
+      //      iframe.contentWindow.onSessionStopped = null;
+      //      this._cleanupTranscriber(iframe);
+      //      this.$message.success(this.lang.ssNoPermStop);
+      //      return;
+      //    }
+      //  })
+      //}, 2000)
     },
     stopRecord() {
       console.log("测试测试")
@@ -245,6 +247,9 @@ export default {
         this._cleanupTranscriber(this.$refs["iframeRef"]);
         this.$message.success(this.lang.ssMicCheckStop);
       });
+    },
+    setWork() {
+      this.work = JSON.parse(JSON.stringify(this.workData.json));
     }
   },
   mounted() {

src/components/pages/workPage/components/sixHatPage.vue

@@ -1026,19 +1026,19 @@ export default {
       }
 
 
-      setTimeout(() => {
-        if (!navigator.permissions) return;
-        navigator.permissions.query({ name: 'microphone' }).then(ps => {
-          if (ps.state !== 'granted') {
-            this.recordObj.status = '0';
-            this.recordObj.loading = false;
-            this._cleanupTranscriber(iframe);
-            // iframe.contentWindow.onSessionStopped = null;
-            // iframe.contentWindow.window.onRecognizedResult = null;
-            this.$message.warning(this.lang.ssSHNoPermStop);
-          }
-        }).catch(() => { });
-      }, 2000);
+      //setTimeout(() => {
+      //  if (!navigator.permissions) return;
+      //  navigator.permissions.query({ name: 'microphone' }).then(ps => {
+      //    if (ps.state !== 'granted') {
+      //      this.recordObj.status = '0';
+      //      this.recordObj.loading = false;
+      //      this._cleanupTranscriber(iframe);
+      //      // iframe.contentWindow.onSessionStopped = null;
+      //      // iframe.contentWindow.window.onRecognizedResult = null;
+      //      this.$message.warning(this.lang.ssSHNoPermStop);
+      //    }
+      //  }).catch(() => { });
+      //}, 2000);
       // } catch (err) {
       //   console.error('startRecord error:', err);
       //   this.$message.error(this.lang.ssSHRecStartFail);

src/components/pages/workPage/index_new.vue

@@ -332,7 +332,7 @@ export default {
         }
 
         if (
-          ["3", "8", "22", "23", "831", "832", "84"].includes(params[0].type) && 
+          ["3", "8", "22", "23", "831", "832", "84"].includes(params[0].type) &&
           params[0].uid &&
           params[0].cid
         ) {
@@ -399,8 +399,10 @@ export default {
             this.loading = false;
             if (_data.length) {
               _data = _data[0];
+              console.log("select_courseWorks_workPageData",_data);
               if (["15", "45", "78", "79", "831", "832", "84"].includes(_data.atool)) {
                 let _work = JSON.parse(decodeURIComponent(_data.content));
+
                 this.studentWork = _work;
                 this.studentWorkToWorkData();
               } else {
@@ -421,8 +423,10 @@ export default {
 
         let _work = JSON.parse(JSON.stringify(this.studentWork));
         if (this.workData.type == "15") {
-          this.workData.json.answer = _work.answer;
-          this.workData.json.fileList = _work.fileList;
+          this.workData.json = {...this.workData.json,..._work}
+          console.log("this.workData.json", this.workData.json);
+          this.$refs.questionsAndAnswersRef.setWork(this.workData.json);
+          this.$forceUpdate();
         } else if (this.workData.type == "45") {
 
           this.workData.json.testJson.forEach((item, index) => {