Strona główna Odkrywaj Pomoc
Zaloguj się
CocoRoboLabs
/
pbl-teacher-table
3
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

课堂观察更新

SanHQin 2 miesięcy temu
rodzic
547d58cab9
commit
38a97868b2
8 zmienionych plików z 46 dodań i 50 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.5ad57275ccc209ee5bd67f7a77c5ee33.css
  3. 0 0
      dist/static/css/app.5ad57275ccc209ee5bd67f7a77c5ee33.css.map
  4. 0 0
      dist/static/js/app.4a5f3eba840490f85b04.js
  5. 0 0
      dist/static/js/app.4a5f3eba840490f85b04.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 34 4
      src/components/pages/classroomObservation/dialog/batchCreationClassDialog.vue
  8. 11 45
      src/components/pages/classroomObservation/tools/mixin.js

+ 1 - 1
dist/index.html
Wyświetl plik 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.d3117e7d1514e8d38e7bc9fa4bba5b80.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.bb486323f0fa002ba2e7.js></script><script type=text/javascript src=./static/js/app.036aeb21ea4903a102d9.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.5ad57275ccc209ee5bd67f7a77c5ee33.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.bb486323f0fa002ba2e7.js></script><script type=text/javascript src=./static/js/app.4a5f3eba840490f85b04.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

Plik diff jest za duży
+ 0 - 0
dist/static/css/app.5ad57275ccc209ee5bd67f7a77c5ee33.css


Plik diff jest za duży
+ 0 - 0
dist/static/css/app.5ad57275ccc209ee5bd67f7a77c5ee33.css.map


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.4a5f3eba840490f85b04.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.4a5f3eba840490f85b04.js.map


Plik diff jest za duży
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 34 - 4
src/components/pages/classroomObservation/dialog/batchCreationClassDialog.vue
Wyświetl plik 

@@ -131,7 +131,7 @@ export default {
 
       ],
 
       ],
 
       userId: this.$route.query["userid"],
 
       userId: this.$route.query["userid"],
 
       selectStatus: "99",
 
       selectStatus: "99",
 
-      show: false,
 
+      show: true,
 
       selectList: [],
 
       selectList: [],
 
       dataList: [],
 
       dataList: [],
 
       nowDoTaskId: [],
 
       nowDoTaskId: [],
 
@@ -253,7 +253,7 @@ export default {
 
           create_at: "2025-05-07 16.05.03",
 
           create_at: "2025-05-07 16.05.03",
 
           remarks: "备注",
 
           remarks: "备注",
 
           batch: batch,
 
           batch: batch,
 
-          status: "3",
 
+          status: "0",
 
           createId: "",
 
           createId: "",
 
           jsonData: {
 
           jsonData: {
 
             file_ids: "",
 
             file_ids: "",
 
@@ -464,6 +464,9 @@ export default {
 
       Promise.all(promiseList)
 
       Promise.all(promiseList)
 
         .then(res => {
 
         .then(res => {
 
           this.$message.success("创建成功");
 
           this.$message.success("创建成功");
 
+          if(!this.dataList.find(i =>i.status == 1)){
 
+            this.startTask(this.dataList.find(i =>i.status == 0).id);
 
+          }
 
         })
 
         })
 
         .catch(err => {
 
         .catch(err => {
 
           console.log("创建出错", err);
 
           console.log("创建出错", err);
 
@@ -626,6 +629,10 @@ export default {
 
             delete dataCopy.jsonData.baseMessage.editorBarData.tableList;
 
             delete dataCopy.jsonData.baseMessage.editorBarData.tableList;
 
           }
 
           }
 
 
 
+          if(dataCopy.jsonData.errorMessage){
 
+            delete dataCopy.jsonData.errorMessage;
 
+          }
 
+
 
           console.log("dataCopy", dataCopy);
 
           console.log("dataCopy", dataCopy);
 
           let params = [
 
           let params = [
 
             {
 
             {
 
@@ -777,6 +784,16 @@ export default {
 
             ).jsonData.steps = _stepList;
 
             ).jsonData.steps = _stepList;
 
             let _fileData = _startData.jsonData.fileData;
 
             let _fileData = _startData.jsonData.fileData;
 
             let audioFile = await this.getVideoToVoiceAndUploadMixin(_fileData);
 
             let audioFile = await this.getVideoToVoiceAndUploadMixin(_fileData);
 
+            if(audioFile.data==3){
 
+              this.dataList.find(
 
+                i => i.id === _startData.id
 
+              ).jsonData.errorMessage = {content:"视频提取音频失败",err:audioFile.err};
 
+
 
+              this.dataList.find(
 
+                i => i.id === _startData.id
 
+              ).status = "3"
 
+              break;
 
+            }
 
             if(!this.nowDoTaskId.includes(_startData.id))break;
 
             if(!this.nowDoTaskId.includes(_startData.id))break;
 
             _startData.jsonData.fileData.videoUrl = _fileData.url;
 
             _startData.jsonData.fileData.videoUrl = _fileData.url;
 
             _startData.jsonData.fileData.fileObj = audioFile.fileObj;
 
             _startData.jsonData.fileData.fileObj = audioFile.fileObj;
 
@@ -1088,6 +1105,17 @@ export default {
 
             //创建课堂   赋值好fileid   替换创建后课堂的基础数据  继续下一个任务
 
             //创建课堂   赋值好fileid   替换创建后课堂的基础数据  继续下一个任务
 
             let newOption = await this.createClassMixin(_startData.jsonData);
 
             let newOption = await this.createClassMixin(_startData.jsonData);
 
 
 
+            if([1,2,3].includes(newOption.data)){
 
+              this.dataList.find(
 
+                i => i.id === _startData.id
 
+              ).jsonData.errorMessage = {content:"创建课堂失败",err:data.err};
 
+
 
+              this.dataList.find(
 
+                i => i.id === _startData.id
 
+              ).status = "3"
 
+              break;
 
+
 
+            }
 
             if(!this.nowDoTaskId.includes(_startData.id))break;
 
             if(!this.nowDoTaskId.includes(_startData.id))break;
 
 
 
             this.$emit("addNewCourseOption", newOption.data);
 
             this.$emit("addNewCourseOption", newOption.data);
 
@@ -1259,7 +1287,8 @@ export default {
 
 }
 
 }
 
 
 
 .b_n_left {
 
 .b_n_left {
 
-  width: calc(100% - 60px);
 
+  flex: 1;
 
+  /* width: calc(100% - 60px); */
 
   height: 100%;
 
   height: 100%;
 
   display: flex;
 
   display: flex;
 
   align-items: center;
 
   align-items: center;
 
@@ -1298,13 +1327,14 @@ export default {
 
 }
 
 }
 
 
 
 .b_n_right {
 
 .b_n_right {
 
-  width: 60px;
 
+  width: auto;
 
   height: 100%;
 
   height: 100%;
 
   display: flex;
 
   display: flex;
 
   align-items: center;
 
   align-items: center;
 
   justify-content: flex-end;
 
   justify-content: flex-end;
 
   color: rgba(150, 155, 163, 1);
 
   color: rgba(150, 155, 163, 1);
 
   font-size: 16px;
 
   font-size: 16px;
 
+  white-space: nowrap;
 
 }
 
 }
 
 
 
 .b_bottom {
 
 .b_bottom {

+ 11 - 45
src/components/pages/classroomObservation/tools/mixin.js
Wyświetl plik 

@@ -147,7 +147,7 @@ ${arr.map(row => `<tr>
 
           // 把uint8Array转换为视频文件
 
           // 把uint8Array转换为视频文件
 
           _file = new File([videoRes.data], 'video.mp4', { type: 'video/mp4' });
 
           _file = new File([videoRes.data], 'video.mp4', { type: 'video/mp4' });
 
         }
 
         }
 
-        if (!_file) return resolve({ data: 0 })
 
+        if (!_file) return resolve({ data: 2,err:"未找到文件" })
 
         console.log("需要处理的文件👉", _file)
 
         console.log("需要处理的文件👉", _file)
 
         try {
 
         try {
 
           const reader = new FileReader();
 
           const reader = new FileReader();
 
@@ -179,14 +179,14 @@ ${arr.map(row => `<tr>
 
               })
 
               })
 
             } catch (error) {
 
             } catch (error) {
 
               console.log("👉", error);
 
               console.log("👉", error);
 
-              return resolve({ data: 2 })
 
+              return resolve({ data: 2,err:error })
 
             }
 
             }
 
 
 
           }
 
           }
 
           reader.readAsArrayBuffer(_file);
 
           reader.readAsArrayBuffer(_file);
 
         } catch (error) {
 
         } catch (error) {
 
           console.log("👉", error);
 
           console.log("👉", error);
 
-          return resolve({ data: 2 })
 
+          return resolve({ data: 2,err:error })
 
         }
 
         }
 
       })
 
       })
 
     },
 
     },
 
@@ -1149,51 +1149,13 @@ CH：${_CH}
 
                         Promise.all(promises).then(res => {
 
                         Promise.all(promises).then(res => {
 
                           resolve({ data: newOption, tid: params.tid })
 
                           resolve({ data: newOption, tid: params.tid })
 
                         })
 
                         })
 
-
 
-                        // promises.push(new Promise((resolve)=>{
 
-                        //    this.ajax
 
-                        //   .post("https://gpt4.cocorobo.cn/update_classroom_observation", {
 
-                        //     id: _bmData.id,
 
-                        //     json_data: JSON.stringify(_bmData.jsonData)
 
-                        //   })
 
-                        //   .then(res => {
 
-                        //     resolve({ data: newOption,tid:params.tid })
 
-                        //   })
 
-                        //   .catch(e => {
 
-                        //     console.log("保存失败", e);
 
-                        //     resolve({ data: newOption,tid:params.tid })
 
-                        //   });
 
-                        // }))
 
-
 
-
 
-                        // Promise.all(()=>{
 
-
 
-                        // },)
 
-                        // promises.push(new Promise((resolve)=>{
 
-
 
-                        // }))
 
-
 
-
 
-                        // 保存修改信息
 
-                        // this.ajax
 
-                        //   .post("https://gpt4.cocorobo.cn/update_classroom_observation", {
 
-                        //     id: _bmData.id,
 
-                        //     json_data: JSON.stringify(_bmData.jsonData)
 
-                        //   })
 
-                        //   .then(res => {
 
-                        //     resolve({ data: newOption,tid:params.tid })
 
-                        //   })
 
-                        //   .catch(e => {
 
-                        //     console.log("保存失败", e);
 
-                        //     resolve({ data: newOption,tid:params.tid })
 
-                        //   });
 
                       }).catch(err => {
 
                       }).catch(err => {
 
                         console.log("修改基础信息失败", err)
 
                         console.log("修改基础信息失败", err)
 
-                        resolve({ data: 1, err: err })
 
+                        resolve({ data: 3, err: err })
 
                       })
 
                       })
 
                   }
 
                   }
 
                 }).catch(err => {
 
                 }).catch(err => {
 
-                  resolve({ data: 1, err: err })
 
+                  resolve({ data: 2, err: err })
 
                   console.log("存储fileId失败")
 
                   console.log("存储fileId失败")
 
                   console.log(err)
 
                   console.log(err)
 
                 })
 
                 })
 
@@ -1491,9 +1453,13 @@ CH：${_CH}
 
             .then(audioBuffer => {
 
             .then(audioBuffer => {
 
 
 
               let wavBlob = this.bufferToWav(audioBuffer);
 
               let wavBlob = this.bufferToWav(audioBuffer);
 
+
 
+              let _wavFile = new File([wavBlob], "audio.wav", {
 
+                type: "audio/wav"
 
+              })
 
               // 在控制台输出WAV文件对象
 
               // 在控制台输出WAV文件对象
 
-              resolve({ data: wavBlob })
 
-              console.log('转换后的WAV文件对象:', wavBlob);
 
+              resolve({ data: _wavFile })
 
+              console.log('转换后的WAV文件对象:', _wavFile);
 
             })
 
             })
 
             .catch(err => {
 
             .catch(err => {
 
               resolve({ data: 1, err: err })
 
               resolve({ data: 1, err: err })

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików