Accueil Explorer Aide
Connexion
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

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

zengyicheng il y a 2 ans
Parent
0f476c99c3 fd40b239d7
commit
f4a22e8afc
11 fichiers modifiés avec 52 ajouts et 12 suppressions
Vue unifiée Afficher les stats Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.94e1aa384a7eff4d283888ef95a4f1ab.css
  3. 0 0
      dist/static/css/app.94e1aa384a7eff4d283888ef95a4f1ab.css.map
  4. 0 0
      dist/static/js/app.3d61d21975430878b351.js
  5. 0 0
      dist/static/js/app.3d61d21975430878b351.js.map
  6. 0 0
      dist/static/js/app.53e6171c27c1a14a8b4f.js
  7. 0 0
      dist/static/js/app.53e6171c27c1a14a8b4f.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 0 0
      dist/static/js/vendor.5d42a5a824f61b8553ef.js.map
  10. 50 10
      src/components/liveProjectDetail.vue
  11. 1 1
      src/components/liveRoom.vue

+ 1 - 1
dist/index.html
Voir le fichier 

@@ -18,4 +18,4 @@
 
       border-radius: 10px;
 
       border-radius: 10px;
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       background-color: rgba(0, 0, 0, 0.1);
 
       background-color: rgba(0, 0, 0, 0.1);
 
-    }</style><link href=./static/css/app.f01c4aef8615c402f1bc1c4ad9edc10e.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.5d42a5a824f61b8553ef.js></script><script type=text/javascript src=./static/js/app.3d61d21975430878b351.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
 
+    }</style><link href=./static/css/app.94e1aa384a7eff4d283888ef95a4f1ab.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.5d42a5a824f61b8553ef.js></script><script type=text/javascript src=./static/js/app.53e6171c27c1a14a8b4f.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.94e1aa384a7eff4d283888ef95a4f1ab.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.94e1aa384a7eff4d283888ef95a4f1ab.css.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.3d61d21975430878b351.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.3d61d21975430878b351.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.53e6171c27c1a14a8b4f.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.53e6171c27c1a14a8b4f.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/vendor.5d42a5a824f61b8553ef.js.map


+ 50 - 10
src/components/liveProjectDetail.vue
Voir le fichier 

@@ -227,6 +227,42 @@
 
                   <div>思维网格</div>
 
                   <div>思维网格</div>
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
+              <div
 
+                v-if="tools[ppage - 1].tools && tools[ppage - 1].tools.indexOf(16) != -1"
 
+                @click="addImg($event)"
 
+                class="toolCss"
 
+              >
 
+                <div class="toolImg">
 
+                  <img src="../assets/icon/firstToolList/myMessage.png" alt />
 
+                  <div>
 
+                    上传文件
 
+                    <input
 
+                      type="file"
 
+                      accept="image/png, image/gif, image/jpeg"
 
+                      style="display: none"
 
+                      @change="beforeUpload1($event, 1)"
 
+                    />
 
+                  </div>
 
+                </div>
 
+              </div>
 
+              <div
 
+                v-if="tools[ppage - 1].tools && tools[ppage - 1].tools.indexOf(29) != -1"
 
+                @click="addImg($event)"
 
+                class="toolCss"
 
+              >
 
+                <div class="toolImg">
 
+                  <img src="../assets/icon/firstToolList/myMessage.png" alt />
 
+                  <div>
 
+                    上传视频
 
+                    <input
 
+                      type="file"
 
+                      accept="video/mp4, video/quicktime, video/x-msvideo"
 
+                      style="display: none"
 
+                      @change="beforeUpload1($event, 2)"
 
+                    />
 
+                  </div>
 
+                </div>
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
           <div
 
           <div
 
@@ -450,8 +486,7 @@
 
                   :class="{
 
                   :class="{
 
                     tfalse: tiankongAnswer[tIndex] != tkAnswer[tIndex],
 
                     tfalse: tiankongAnswer[tIndex] != tkAnswer[tIndex],
 
                   }"
 
                   }"
 
-                >
 
-                  正确答案：{{ tiankongAnswer[tIndex] }}</span
 
+                  >正确答案：{{ tiankongAnswer[tIndex] }}</span
 
                 >
 
                 >
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
@@ -460,7 +495,7 @@
 
               class="dialog-footer sztFooter"
 
               class="dialog-footer sztFooter"
 
               style="padding: 0 0 30px 0px; position: absolute; right: 20px; bottom: 0"
 
               style="padding: 0 0 30px 0px; position: absolute; right: 20px; bottom: 0"
 
             >
 
             >
 
-              <el-button @click="isBlock = 0">取消</el-button>
 
+              <!-- <el-button @click="isBlock = 0">取消</el-button> -->
 
               <el-button type="primary" @click="addWork(5)">提交</el-button>
 
               <el-button type="primary" @click="addWork(5)">提交</el-button>
 
             </span>
 
             </span>
 
           </div>
 
           </div>
 
@@ -545,7 +580,7 @@
 
           <div class="answerBox" :class="{ fullStyle: full }" v-if="isBlock == 9">
 
           <div class="answerBox" :class="{ fullStyle: full }" v-if="isBlock == 9">
 
             <div style="height: 70%; width: 100%">
 
             <div style="height: 70%; width: 100%">
 
               <div class="wheel">
 
               <div class="wheel">
 
-                <div class="workd_media" style="height: 100%">
 
+                <div style="height: 100%">
 
                   <audio
 
                   <audio
 
                     style="margin: 0 auto; display: block"
 
                     style="margin: 0 auto; display: block"
 
                     :src="audioUrl"
 
                     :src="audioUrl"
 
@@ -566,7 +601,7 @@
 
     </div>
 
     </div>
 
 
 
     <div class="blackBottomB">
 
     <div class="blackBottomB">
 
-      <div
 
+      <!-- <div
 
         class="nextStepOne"
 
         class="nextStepOne"
 
         style="float: right"
 
         style="float: right"
 
         @click="addImg($event)"
 
         @click="addImg($event)"
 
@@ -593,7 +628,7 @@
 
           style="display: none"
 
           style="display: none"
 
           @change="beforeUpload1($event, 2)"
 
           @change="beforeUpload1($event, 2)"
 
         />
 
         />
 
-      </div>
 
+      </div>-->
 
     </div>
 
     </div>
 
     <div v-if="proVisible" class="mask">
 
     <div v-if="proVisible" class="mask">
 
       <div class="progressBox">
 
       <div class="progressBox">
 
@@ -638,6 +673,7 @@
 
       :append-to-body="true"
 
       :append-to-body="true"
 
       width="500px"
 
       width="500px"
 
       class="dialog_diy"
 
       class="dialog_diy"
 
+      :close-on-click-modal="false"
 
     >
 
     >
 
       <div style="text-align: center; padding: 20px 0 50px 0; font-size: 18px">
 
       <div style="text-align: center; padding: 20px 0 50px 0; font-size: 18px">
 
         你被老师点名起来回答了！！！
 
         你被老师点名起来回答了！！！
 
@@ -674,7 +710,7 @@ export default {
 
     return {
 
     return {
 
       iframeInnerHtml: "",
 
       iframeInnerHtml: "",
 
       pdfUrl:
 
       pdfUrl:
 
-        "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E4%B8%8A%E8%AF%BE%E8%AF%BE%E4%BB%B6---%E4%BA%94%E4%B8%8Bintroduce%20a%20festival%20%28Final%20%29_202208251543361661413469082.pdf",
 
+        "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E4%B8%8A%E8%AF%BE%E8%AF%BE%E4%BB%B6---%E4%BA%94%E4%B8%8Bintroduce%20a%20festival%20%28Final%20%29%281%291661829428281.pdf",
 
       pptImgUrl: "",
 
       pptImgUrl: "",
 
       ppage: 2,
 
       ppage: 2,
 
       full: false,
 
       full: false,
 
@@ -733,7 +769,7 @@ export default {
 
             },
 
             },
 
           ],
 
           ],
 
         },
 
         },
 
-        { tools: [9] }, //问答题
 
+        "", //问答题
 
         { tools: [9] },
 
         { tools: [9] },
 
         { tools: [9] }, //协同文档
 
         { tools: [9] }, //协同文档
 
         { tools: [9] }, //思维导图
 
         { tools: [9] }, //思维导图
 
@@ -762,7 +798,6 @@ export default {
 
           ],
 
           ],
 
         },
 
         },
 
         { tools: [9] },
 
         { tools: [9] },
 
-        "",
 
         { tools: [3, 28] },
 
         { tools: [3, 28] },
 
         { tools: [16] },
 
         { tools: [16] },
 
         { tools: [14] },
 
         { tools: [14] },
 
@@ -1395,6 +1430,8 @@ export default {
 
             this.tools[this.ppage - 1].tools.indexOf(6) != -1 ||
 
             this.tools[this.ppage - 1].tools.indexOf(6) != -1 ||
 
             this.tools[this.ppage - 1].tools.indexOf(7) != -1 ||
 
             this.tools[this.ppage - 1].tools.indexOf(7) != -1 ||
 
             this.tools[this.ppage - 1].tools.indexOf(10) != -1 ||
 
             this.tools[this.ppage - 1].tools.indexOf(10) != -1 ||
 
+            this.tools[this.ppage - 1].tools.indexOf(16) != -1 ||
 
+            this.tools[this.ppage - 1].tools.indexOf(29) != -1 ||
 
             this.tools[this.ppage - 1].tools.indexOf(13) != -1)
 
             this.tools[this.ppage - 1].tools.indexOf(13) != -1)
 
         ) {
 
         ) {
 
           this.isBlock = 4;
 
           this.isBlock = 4;
 
@@ -1438,8 +1475,11 @@ export default {
 
         });
 
         });
 
     },
 
     },
 
     setPage() {
 
     setPage() {
 
+      let params = {
 
+        id: this.cid,
 
+      };
 
       this.ajax
 
       this.ajax
 
-        .get(this.$store.state.api + "selectPptPage", "")
 
+        .get(this.$store.state.api + "selectPptPage", params)
 
         .then((res) => {
 
         .then((res) => {
 
           if (res.data[0].length > 0) {
 
           if (res.data[0].length > 0) {
 
             if (
 
             if (

+ 1 - 1
src/components/liveRoom.vue
Voir le fichier 

@@ -72,7 +72,7 @@
 
                   "
 
                   "
 
                   alt=""
 
                   alt=""
 
                 /> -->
 
                 /> -->
 
-                <img :src="mpj" alt="" />
 
+                <img :src="item.poster ? item.poster : mpj" alt="" />
 
               </div>
 
               </div>
 
               <div class="projct_nav">
 
               <div class="projct_nav">
 
                 <div style="font-size: 18px">
 
                 <div style="font-size: 18px">

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff