SanHQin 2 bulan lalu
induk
melakukan
547d58cab9

+ 1 - 1
dist/index.html

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

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.d3117e7d1514e8d38e7bc9fa4bba5b80.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.d3117e7d1514e8d38e7bc9fa4bba5b80.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.036aeb21ea4903a102d9.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.036aeb21ea4903a102d9.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 6 - 6
src/components/pages/classroomObservation/dialog/batchCreationClassDialog.vue

@@ -314,7 +314,7 @@ export default {
               progress: "0"
             }
           ];
-        } else if (["audio/wav",'audio/x-m4a'].includes(i.type) ) {
+        } else if (["audio/wav",'audio/x-m4a','audio/mpeg'].includes(i.type) ) {
           data.jsonData.baseMessage.imageList.fileList = [
             {
               name: i.name,
@@ -828,9 +828,7 @@ export default {
               console.log(`${_startData.id}:已获取转录文稿(txt)`);
               console.log("data👉",JSON.parse(JSON.stringify(_startData)))
             } else if (
-              fileData.type === "video/mp4" ||
-              fileData.type === "audio/wav" ||
-              fileData.type === "audio/x-m4a"
+              ['video/mp4','audio/wav','audio/x-m4a','audio/mpeg'].includes(fileData.type)
             ) {
               //mp4与wav文件
               _stepList[i].status = "2";
@@ -844,12 +842,14 @@ export default {
                 let _type = _startData.jsonData.fileData.type.split('/')[1];
                 if(_type=='x-m4a'){
                   _type="m4a"
+                }else if(_type=="mpeg"){
+                  _type = "mp3"
                 }
                 _file = new File([fileBody.data], `audio.${_type}`, { type: _startData.jsonData.fileData.type });
               }
 
-              if (_file.type === "audio/x-m4a") {
-                let _data = await this.m4aToWavMixin(_file);
+              if (["audio/x-m4a","audio/mpeg"].includes(_file.type)) {
+                let _data = await this.audioToWavMixin(_file);
                 if(_data!==1){
                   _file = _data.data;
                 }else{

+ 7 - 5
src/components/pages/classroomObservation/dialog/uploadFileToCreateClassDialog.vue

@@ -29,7 +29,7 @@
                   />
 
                   <img
-                   v-if="['audio/wav','audio/x-m4a'].includes(item.type)"
+                   v-if="['audio/wav','audio/x-m4a','audio/mpeg'].includes(item.type)"
                     src="../../../../assets/icon/classroomObservation/audio_file.svg"
                   />
 
@@ -80,7 +80,7 @@
               <img
                 src="../../../../assets/icon/classroomObservation/file_processing.svg"
               />
-              <span>文件格式支持:mp4、wav、m4a、txt 文件</span>
+              <span>文件格式支持:mp4、mp3、wav、m4a、txt 文件</span>
             </div>
           </div>
           <div class="b_m_right">
@@ -230,7 +230,7 @@ export default {
     addFile() {
       let input = document.createElement("input");
       input.type = "file";
-      input.accept = "video/mp4, audio/wav, audio/x-m4a, text/plain";
+      input.accept = "video/mp4, audio/wav, audio/x-m4a, audio/mpeg, text/plain";
       input.multiple = true; // 支持多文件上传
       input.style.display = "none";
 
@@ -238,9 +238,11 @@ export default {
 
       input.addEventListener("change", e => {
         let files = e.target.files;
+        console.log(files)
         for (let i = 0; i < files.length; i++) {
+
           if (
-            ["video/mp4", "audio/wav", "audio/x-m4a", "text/plain"].includes(files[i].type)
+            ["video/mp4", "audio/wav", "audio/x-m4a", "text/plain","audio/mpeg"].includes(files[i].type)
           ) {
             this.fileList.push({
               file: files[i],
@@ -253,7 +255,7 @@ export default {
               status: "wait"
             });
           } else {
-            this.$message.info("文件格式不支持,仅支持mp4、wav、m4a、txt文件。");
+            this.$message.info("文件格式不支持,仅支持mp4、mp3、wav、m4a、txt文件。");
           }
         }
         if (!this.fileList.some(i => i.status === "uploading")) {

+ 1 - 1
src/components/pages/classroomObservation/newComponents/batchClassCard.vue

@@ -12,7 +12,7 @@
               src="../../../../assets/icon/classroomObservation/file_icon.svg"
             />
             <img
-              v-if="['audio/wav','audio/x-m4a'].includes(cardData.jsonData.fileData.type)"
+              v-if="['audio/wav','audio/x-m4a','audio/mpeg'].includes(cardData.jsonData.fileData.type)"
               src="../../../../assets/icon/classroomObservation/audio_file.svg"
             />
             <img

+ 1 - 1
src/components/pages/classroomObservation/tools/mixin.js

@@ -1477,7 +1477,7 @@ CH:${_CH}
       });
     },
     //m4a转wav
-    m4aToWavMixin(fileObj) {
+    audioToWavMixin(fileObj) {
       return new Promise((resolve) => {
         const audioContext = new (window.AudioContext || window.webkitAudioContext)();
 

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini