SanHQin 1 týždeň pred
rodič
commit
65fe3f737a

+ 1 - 1
dist/index.html

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

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.dabe96200e62742cb77d24badeea491a.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.dabe96200e62742cb77d24badeea491a.css.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.6f2d4777fa4ab85de580.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.6f2d4777fa4ab85de580.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 1 - 1
src/components/pages/classroomObservation/components/chatArea.vue

@@ -1663,7 +1663,7 @@ ${JSON.stringify(_list)}
           _this.wavGetTextProgress = ((_totalTime / _duration) * 100).toFixed(
             0
           );
-        }, 2000);
+        }, 1000);
         this.transcriptionData.content = "";
         this.editorBarData.content = "";
 

+ 145 - 84
src/components/pages/classroomObservation/tools/mixin.js

@@ -245,7 +245,7 @@ ${arr.map(row => `<tr>
 
               console.log("需要上传的文件", audioFile)
               this.uploadFileMixin(audioFile).then(upload => {
-                console.log("upload=>",upload)
+                console.log("upload=>", upload)
                 resolve({ audioUrl: upload, fileObj: audioFile })
               })
             } catch (error) {
@@ -1255,92 +1255,153 @@ CH:${_CH}
 
         let timer = null;
 
-        timer = setTimeout(() => {//五分钟无响应就算报错
-          resolve({ data: 1, transcriptionContent: null, editorBarData: null, err: "转录超时" })
-        }, 180000)
 
-        // 转录中
-        iframeRef.contentWindow.onRecognizedResult = (e) => {
-          let privText = e.privText;
-          let privSpeakerId = e.privSpeakerId;
-          let copySpeakerId = e.copySpeakerId;
-          let privDuration = e.privDuration;
-          let privOffset = e.privOffset;
-
-          console.log("转录内容",e)
-          if (timer) {
-            clearTimeout(timer)
-            timer = setTimeout(() => {//五分钟无响应就算报错
-              resolve({ data: 1, transcriptionContent: null, editorBarData: null, err: "转录超时" })
-            }, 180000)
-          }
-          if (!privText || !privSpeakerId || privSpeakerId == "Unknown") {//不记录
-            return;
-          }
-
-          _endTime = (privOffset + privDuration) / 10000000;
-
-          tableList.push({
-            value: privText,
-            startTime: this.updateRecordedTimeMixin({ duration: _startTime }),
-            endTime: this.updateRecordedTimeMixin({ duration: _endTime }),
-            time: this.updateRecordedTimeMixin({ duration: _endTime - _startTime }),
-            role: privSpeakerId,
-            code: ""
-          });
-
-          _startTime = _endTime;
-          transcriptionContent += copySpeakerId + ":" + privText + "\n";
-        };
-
-        //转录结束
-        iframeRef.contentWindow.onSessionStopped = async (e) => {
-          if (timer) {
-            clearTimeout(timer)
-          }
-          tableContent = `<table
-	border="0"
-	width="100%"
-	cellpadding="0"
-	cellspacing="0"
-	style="text-align: center"
->
-	<tbody>
-		<tr>
-			<th>序号</th>
-			<th>开始时间</th>
-			<th>结束时间</th>
-			<th>发言内容</th>
-			<th>时长</th>
-			<th>说话人身份</th>
-			<th>行为编码</th>
-	</tr>`;
-          tableList.forEach((item, index) => {
-            tableContent += `<tr>
-							<td>${index + 1}</td>
-							<td>${item.startTime}</td>
-							<td>${item.endTime}</td>
-							<td>${item.value}</td>
-							<td>${item.time}</td>
-							<td>${item.role}</td>
-							<td>${item.code}</td>
-						</tr>`
-          })
-
-          // tableContent += `<tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr></tbody></table>`
-
-          var blob = new Blob([tableContent], { type: "text/plain;charset=utf-8" });
-          blob.lastModifiedDate = new Date();
-          blob.name = `classroomObservation.txt`;
-          this.uploadFileMixin(blob).then(upload => {
-            resolve({ transcriptionContent: transcriptionContent, editorBarData: { type: "0", url: upload.Location, content: tableContent, tableList: tableList } })
+        iframeRef.contentWindow.window
+          .doConversationTranscriber({ files: [file] })
+          .then(res => {
+            console.log("转录内容", res);
+
+            let _data = res.phrases;
+
+            _data.forEach(i => {
+              let _privSpeakerId = `Guest-${i.speaker}`;
+              let _privText = i.text;
+              let privOffset = i.offsetMilliseconds;
+              let privDuration = i.durationMilliseconds;
+
+              _endTime = (privOffset + privDuration) / 1000;
+              textList.push({
+                value: _privText,
+                startTime: this.updateRecordedTimeMixin({ duration: _startTime }),
+                endTime: this.updateRecordedTimeMixin({ duration: _endTime }),
+                time: this.updateRecordedTimeMixin({
+                  duration: _endTime - _startTime
+                }),
+                role: _privSpeakerId,
+                code: ""
+              });
+              _startTime = _endTime;
+              transcriptionContent +=
+                _privSpeakerId + ":" + _privText + "\n";
+            });
+            let _result = `<table border="0" width="100%" cellpadding="0" cellspacing="0" style="text-align: center"><tbody><tr><th>序号</th><th>开始时间</th><th>结束时间</th><th>发言内容</th><th>时长</th><th>说话人身份</th><th>行为编码</th></tr>`;
+            textList.forEach((item, index) => {
+              _result += `<tr><td>${index + 1}</td><td>${item.startTime}</td><td>${item.endTime}</td><td>${item.value}</td><td>${item.time}</td><td>${item.role}</td><td>${item.code}</td></tr>`;
+            });
+            _result += `</tbody></table>`;
+            // this.editorBarData.content = _result;
+            this.$forceUpdate();
+            var blob = new Blob([_result], { type: "text/plain;charset=utf-8" });
+            blob.lastModifiedDate = new Date();
+            blob.name = `classroomObservation.txt`;
+            this.uploadFileMixin(blob).then(upload => {
+              resolve({ transcriptionContent: transcriptionContent, editorBarData: { type: "0", url: upload.Location, content: _result, tableList: textList } })
+            })
+            // this.wavGetTextProgress = 100;
+            // if (this.wavFileGetTextLoading) this.$message.success("转译完成");
+            // // _this.editorBarData.content += privText;
+
+            // this.showGetTextLoading = false;
+            // this.wavGetTextLoading = false;
+            // this.uploadFileLoading = false;
+            // // this.uploadWavFile(audioFile);
+            // if (_timer) {
+            //   clearInterval(_timer);
+            // }
+            // this.saveEditorBar();
           })
-        };
+          .catch(err => {
+            resolve({ data: 1, transcriptionContent: null, editorBarData: null, err: err })
+            //     console.log(err)
+            //     this.wavGetTextLoading = false;
+            // this.showGetTextLoading = false;
+          });
+        // timer = setTimeout(() => {//五分钟无响应就算报错
+        //   resolve({ data: 1, transcriptionContent: null, editorBarData: null, err: "转录超时" })
+        // }, 180000)
 
-        //开始转录
-        iframeRef.contentWindow.ConversationTranscriber({
-          files: [file]
-        });
+        // 转录中
+        //         iframeRef.contentWindow.onRecognizedResult = (e) => {
+        //           let privText = e.privText;
+        //           let privSpeakerId = e.privSpeakerId;
+        //           let copySpeakerId = e.copySpeakerId;
+        //           let privDuration = e.privDuration;
+        //           let privOffset = e.privOffset;
+
+        //           console.log("转录内容",e)
+        //           if (timer) {
+        //             clearTimeout(timer)
+        //             timer = setTimeout(() => {//五分钟无响应就算报错
+        //               resolve({ data: 1, transcriptionContent: null, editorBarData: null, err: "转录超时" })
+        //             }, 180000)
+        //           }
+        //           if (!privText || !privSpeakerId || privSpeakerId == "Unknown") {//不记录
+        //             return;
+        //           }
+
+        //           _endTime = (privOffset + privDuration) / 10000000;
+
+        //           tableList.push({
+        //             value: privText,
+        //             startTime: this.updateRecordedTimeMixin({ duration: _startTime }),
+        //             endTime: this.updateRecordedTimeMixin({ duration: _endTime }),
+        //             time: this.updateRecordedTimeMixin({ duration: _endTime - _startTime }),
+        //             role: privSpeakerId,
+        //             code: ""
+        //           });
+
+        //           _startTime = _endTime;
+        //           transcriptionContent += copySpeakerId + ":" + privText + "\n";
+        //         };
+
+        //         //转录结束
+        //         iframeRef.contentWindow.onSessionStopped = async (e) => {
+        //           if (timer) {
+        //             clearTimeout(timer)
+        //           }
+        //           tableContent = `<table
+        // 	border="0"
+        // 	width="100%"
+        // 	cellpadding="0"
+        // 	cellspacing="0"
+        // 	style="text-align: center"
+        // >
+        // 	<tbody>
+        // 		<tr>
+        // 			<th>序号</th>
+        // 			<th>开始时间</th>
+        // 			<th>结束时间</th>
+        // 			<th>发言内容</th>
+        // 			<th>时长</th>
+        // 			<th>说话人身份</th>
+        // 			<th>行为编码</th>
+        // 	</tr>`;
+        //           tableList.forEach((item, index) => {
+        //             tableContent += `<tr>
+        // 							<td>${index + 1}</td>
+        // 							<td>${item.startTime}</td>
+        // 							<td>${item.endTime}</td>
+        // 							<td>${item.value}</td>
+        // 							<td>${item.time}</td>
+        // 							<td>${item.role}</td>
+        // 							<td>${item.code}</td>
+        // 						</tr>`
+        //           })
+
+        //           // tableContent += `<tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr></tbody></table>`
+
+        //           var blob = new Blob([tableContent], { type: "text/plain;charset=utf-8" });
+        //           blob.lastModifiedDate = new Date();
+        //           blob.name = `classroomObservation.txt`;
+        //           this.uploadFileMixin(blob).then(upload => {
+        //             resolve({ transcriptionContent: transcriptionContent, editorBarData: { type: "0", url: upload.Location, content: tableContent, tableList: tableList } })
+        //           })
+        //         };
+
+        //         //开始转录
+        //         iframeRef.contentWindow.ConversationTranscriber({
+        //           files: [file]
+        //         });
       })
 
     },

+ 1 - 1
src/components/pages/liyuan/aiOffice.vue

@@ -26,7 +26,7 @@ export default {
     return {
       role: this.$route.query.role,
       cardArray: [
-        { title: '资料收集', icon: require('../../../assets/icon/liyuan/zlsj.svg'), type: 1, to: "/teadTest",role:0,sortId:'e18d88b3-e828-11ef-b508-005056924926'},
+        { title: '资料收集', icon: require('../../../assets/icon/liyuan/zlsj.svg'), type: 1, to: "/teadTest",role:0,sortId:'cd006687-8a00-11f0-9c7b-005056924926'},
         { title: '会议妙记', icon: require('../../../assets/icon/liyuan/hymj.svg'), type: 2, to: `/aigpt/#/cocoFlowConferenceTrick?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&role=${this.$route.query.role}&tType=${this.$route.query.tType}&org=${this.$route.query.org}&gotype=1`,role:0 },
         { title: '教师管理', icon: require('../../../assets/icon/liyuan/teamange.svg'), type: 1, to: "/teacher",role:1 },
         { title: '学生管理', icon: require('../../../assets/icon/liyuan/stumange.svg'), type: 1, to: "/Listudent",role:0 },

+ 1 - 1
src/components/pages/liyuan/page/teadTest.vue

@@ -294,7 +294,7 @@ export default {
             let params = {
                 oid: "",//this.oid
             };
-            let inte = (this.sortId == 'eefb7195-8ee7-11f0-9c7b-005056924926') ? 'selectTestType_liYuan' : 'selectTestType'
+            let inte = (['eefb7195-8ee7-11f0-9c7b-005056924926','cd006687-8a00-11f0-9c7b-005056924926'].includes(this.sortId)) ? 'selectTestType_liYuan' : 'selectTestType'
             this.ajax
                 .get(this.$store.state.api + inte, params)
                 .then(res => {

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov