瀏覽代碼

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

zengyicheng 2 年之前
父節點
當前提交
1c83c9de30

+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.95932a287a172891fcb189f42d621ddf.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.789a6164bd55c3336dd5.js></script><script type=text/javascript src=./static/js/app.ce0ab8888152bed23b71.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.9f91ead48da31bf7188fc7756c820a10.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.789a6164bd55c3336dd5.js></script><script type=text/javascript src=./static/js/app.2a522ca039c6d3172238.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


二進制
dist/static/img/AIprogram.eec8556.png


二進制
dist/static/img/AIprogram2.fab234d.png


二進制
dist/static/img/code.afbd0bf.png


二進制
dist/static/img/evalua.0a72e3a.png


二進制
dist/static/img/networkPanel.e06ca1d.png


二進制
dist/static/img/program.36d098e.png


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


二進制
src/assets/pzBtn.png


二進制
src/assets/pzBtn2.png


+ 15 - 11
src/components/components/audio.vue

@@ -1,23 +1,20 @@
 <template>
   <div>
-    <div style="height: 100%">
+    <div>
       <el-button type="primary" @click="startRecorder()">{{
-        !isRecord ? "开始录音" : "结束录音"
+      !isRecord ? "开始录音" : "结束录音"
       }}</el-button>
       <el-button type="primary" @click="playRecorder()">{{
-        !isPlayerRecord ? "录音播放" : "停止播放"
+      !isPlayerRecord ? "录音播放" : "停止播放"
       }}</el-button>
       <el-button type="primary" @click="getMp3Data()">上传录音</el-button>
 
-      <div
-        style="margin: 10px auto 0; display: flex; align-items: center"
-        v-if="LuAudioUrl"
-      >
+      <!-- <div style="margin: 10px auto 0; display: flex; align-items: center" v-if="LuAudioUrl">
         <span>已上传录音:</span>
         <audio :src="LuAudioUrl" controls="controls" ref="audio">
           Your browser does not support the audio element.
         </audio>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -59,7 +56,7 @@ export default {
         recorder.destroy(); // 销毁录音
         _this.isRecord = true;
         recorder.start().then(
-          () => {},
+          () => { },
           (error) => {
             _this.$message.error(`${error.name} : ${error.message}`);
             // 出错了
@@ -199,14 +196,18 @@ export default {
               if (type == 3) {
                 _this.LuAudioUrl = data.Location;
                 // _this.addWork(8);
+                _this.addPz(data.Location);
               }
               console.log(data.Location);
             }
           });
       }
     },
+    addPz(audio) {
+      this.$emit("addPz", '2',audio);
+    },
   },
-  mounted() {},
+  mounted() { },
 };
 </script>
 
@@ -223,6 +224,7 @@ export default {
   align-items: center;
   justify-content: center;
 }
+
 .progressBox {
   width: 500px;
   height: 180px;
@@ -234,6 +236,7 @@ export default {
   justify-content: center;
   flex-direction: column;
 }
+
 .progressBox .lbox {
   height: 100px;
   font-size: 19px;
@@ -246,9 +249,10 @@ export default {
   margin-right: 20px;
 }
 
-.progressBox >>> .el-progress-bar__outer {
+.progressBox>>>.el-progress-bar__outer {
   background-color: #d1dfff !important;
 }
+
 .progressBox .lbox {
   height: 100px;
   font-size: 19px;

File diff suppressed because it is too large
+ 233 - 498
src/components/studyStudent.vue


+ 2 - 2
src/components/tools/wangEnduit.vue

@@ -80,9 +80,9 @@ export default {
         // "emoticon",
         "image",
         // "video",
-        "table",
+        // "table",//表格
         // "code",
-        "splitLine",
+        // "splitLine",//分割线
         "undo",
         "redo",
       ];

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