Domů Procházet Nápověda
Přihlásit se
CocoRoboLabs
/
pbl-student-table
3
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

Merge branch 'beta' into alpha

lsc před 5 měsíci
rodič
a44d064e68 edb7e35e4f
revize
ad7cc70f3a
14 změnil soubory, kde provedl 19 přidání a 19 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css
  3. 0 0
      dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css.map
  4. 0 0
      dist/static/img/aiTalk.2196c9f.svg
  5. 0 0
      dist/static/img/aiVanish.9288360.svg
  6. 0 0
      dist/static/img/aiWait2.d0390d3.svg
  7. 0 0
      dist/static/img/practice.01fb3fa.svg
  8. 0 0
      dist/static/img/robot3.e6b4e70.svg
  9. 0 0
      dist/static/js/app.c5adf6495f99c2c4e9e3.js
  10. 0 0
      dist/static/js/app.c5adf6495f99c2c4e9e3.js.map
  11. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  12. 6 6
      src/components/easy2/studyStudent.vue
  13. 6 6
      src/components/easy3/studyStudent.vue
  14. 6 6
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
Zobrazit soubor 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.9540294b2ad4dc013678d50882150826.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.4abf41ee5d0da9791dd5.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.dc47f591b6b6eadadfd41709629ede28.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.c5adf6495f99c2c4e9e3.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css.map


+ 0 - 0
dist/static/img/aiTalk.1469289.svg → dist/static/img/aiTalk.2196c9f.svg
Zobrazit soubor


+ 0 - 0
dist/static/img/aiVanish.cc2e3bf.svg → dist/static/img/aiVanish.9288360.svg
Zobrazit soubor


+ 0 - 0
dist/static/img/aiWait2.c8d31c6.svg → dist/static/img/aiWait2.d0390d3.svg
Zobrazit soubor


+ 0 - 0
dist/static/img/practice.25766a7.svg → dist/static/img/practice.01fb3fa.svg
Zobrazit soubor


+ 0 - 0
dist/static/img/robot3.c50070a.svg → dist/static/img/robot3.e6b4e70.svg
Zobrazit soubor


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/app.c5adf6495f99c2c4e9e3.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/app.c5adf6495f99c2c4e9e3.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 6 - 6
src/components/easy2/studyStudent.vue
Zobrazit soubor 

@@ -224,10 +224,10 @@
 
           </div>
 
         </div>
 
       </div>
 
-      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) ? '100%' : 'calc(100% - 745px)'}">
 
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType)? '100%' : 'calc(100% - 745px)'}">
 
             <div>任务{{ taskCount + 1 }}</div>
 
             <el-tooltip
 
               effect="light"
 
@@ -244,7 +244,7 @@
 
               </div>
 
             </el-tooltip>
 
           </div>
 
-          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid)">
 
+          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid) || ['2'].includes(tType)">
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -9176,7 +9176,7 @@
 
       </div>
 
     </div>
 
 		<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
-		<classRoomHelper :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+		<classRoomHelper v-if="!['2'].includes(tType)" :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       '&oid=' +

+ 6 - 6
src/components/easy3/studyStudent.vue
Zobrazit soubor 

@@ -224,10 +224,10 @@
 
           </div>
 
         </div>
 
       </div>
 
-      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) ? '100%' : 'calc(100% - 745px)'}">
 
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
 
             <div>任务{{ taskCount + 1 }}</div>
 
             <el-tooltip
 
               effect="light"
 
@@ -245,7 +245,7 @@
 
             </el-tooltip>
 
           </div>
 
 					<!-- v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'" -->
 
-          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid)">
 
+          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid) || ['2'].includes(tType)">
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -8112,7 +8112,7 @@
 
       </div>
 
     </div>
 
 				<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
-		<classRoomHelper :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+		<classRoomHelper v-if="!['2'].includes(tType)" :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       '&oid=' +

+ 6 - 6
src/components/studyStudent.vue
Zobrazit soubor 

@@ -238,10 +238,10 @@
 
         </div>
 
       </div>
 
       <!-- :class="{ navLeftCss: !mlDialog }" -->
 
-      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) ? '100%' : 'calc(100% - 745px)'}">
 
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
 
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }"></div>
 
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
 
+          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
 
             <div>任务{{ taskCount + 1 }}</div>
 
             <el-tooltip
 
               effect="light"
 
@@ -258,7 +258,7 @@
 
               </div>
 
             </el-tooltip>
 
           </div>
 
-          <div class="btnAll"  v-show="!orgArray.includes(org) && !oidArray.includes(oid)"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
 
+          <div class="btnAll"  v-show="!orgArray.includes(org) && !oidArray.includes(oid) || ['2'].includes(tType)"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -8080,7 +8080,7 @@
 
         </el-dialog>
 
       </div>
 
 			<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
-      <classRoomHelper :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+      <classRoomHelper v-if="!['2'].includes(tType)" :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       '&oid=' +

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů