Halaman utama Jelajahi Bantuan
Masuk
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

Merge branch 'beta'

SanHQin 5 hari lalu
induk
8146b5ad4a 3d4880d13b
melakukan
63ffac95a1
21 mengubah file dengan 143 tambahan dan 43 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.530472fbcc0fa6213a021cb6f624773e.css.map
  3. 0 0
      dist/static/css/app.e5b068fb5f500e266acc7ab2869eef79.css
  4. 0 0
      dist/static/css/app.e5b068fb5f500e266acc7ab2869eef79.css.map
  5. 0 0
      dist/static/js/app.5e2ca6c47152d3ec45d9.js
  6. 0 0
      dist/static/js/app.5e2ca6c47152d3ec45d9.js.map
  7. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. 30 10
      src/components/components/choseWorksDetailDialog.vue
  9. 2 3
      src/components/courseDetail.vue
  10. 23 5
      src/components/easy2/studyStudent.vue
  11. 24 4
      src/components/easy3/studyStudent.vue
  12. 1 1
      src/components/index.vue
  13. 6 2
      src/components/pptEasyClass/index.vue
  14. 2 1
      src/components/pptEasyClass/index_old.vue
  15. 24 5
      src/components/studyStudent.vue
  16. 1 1
      src/components/studyStudentJiu.vue
  17. 24 4
      src/components/studySutdentClass/studyStudent.vue
  18. 2 3
      src/components/trainCourse/courseDetail.vue
  19. 1 1
      src/components/trainCourse/easy2/studyStudent.vue
  20. 1 1
      src/components/trainCourse/easy3/studyStudent.vue
  21. 1 1
      src/components/trainCourse/studyStudent.vue

+ 1 - 1
dist/index.html
Tampilan Berkas 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.530472fbcc0fa6213a021cb6f624773e.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.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.18967cc23bc6523de691.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.e5b068fb5f500e266acc7ab2869eef79.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.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.5e2ca6c47152d3ec45d9.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.530472fbcc0fa6213a021cb6f624773e.css.map


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


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


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.5e2ca6c47152d3ec45d9.js


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


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


+ 30 - 10
src/components/components/choseWorksDetailDialog.vue
Tampilan Berkas 

@@ -57,7 +57,9 @@
 
                       v-if="[72].includes(toolType)"
 
                     @click="upLoadApp">作业提交</el-button>
 
                   </div>
 
-                  <span v-if="testData.toolDetail"><span v-html="renderedFormula(testData.toolDetail)"></span></span>
 
+                  <span v-if="testData.toolDetail" class="renderedFor">
 
+                    <span v-html="renderedFormula(testData.toolDetail)"></span>
 
+                  </span>
 
 									<span v-else>无</span>
 
                 </div>
 
 
@@ -85,7 +87,10 @@
 
                         >
 
                           (多选题)
 
                         </div>
 
-                        <div style="display: flex;"><span style="flex-shrink: 0;">题目：</span><span v-html="renderedFormula(item1.teststitle)"></span></div>
 
+                        <div style="display: flex;" class="renderedFor">
 
+                          <span style="flex-shrink: 0;">题目：</span>
 
+                          <span v-html="renderedFormula(item1.teststitle)"></span>
 
+                        </div>
 
                       </div>
 
                       <img
 
                         v-if="item1.img"
 
@@ -1024,7 +1029,7 @@
 
                   v-for="(item, index) in tableData"
 
                   :key="index + 'q3'"
 
                 >
 
-                  <div class="s_b_m_b_i_m_c_title">
 
+                  <div class="s_b_m_b_i_m_c_title renderedFor" >
 
                     <span>{{ index + 1 }}</span>
 
                     <svg
 
                       width="16"
 
@@ -1040,13 +1045,13 @@
 
                     </svg>
 
 
                     <span
 
-                    style="display: flex;align-items: center;"
 
-                      >{{
 
-                        typeof item.answer === "number"
 
-                          ? "单选题："
 
-                          : "多选题："
 
-                      }}<span v-html="renderedFormula(item.title)"></span></span
 
-                    >
 
+                      style="display: flex;align-items: center;"
 
+                        >{{
 
+                          typeof item.answer === "number"
 
+                            ? "单选题："
 
+                            : "多选题："
 
+                        }}<span v-html="renderedFormula(item.title)"></span></span
 
+                      >
 
                   </div>
 
 
 									<div class="s_b_m_b_i_m_c_accuracyRate">
 
@@ -4414,4 +4419,19 @@ ol {
 
     white-space: normal !important;
 
     display: inline !important;
 
 }
 
+.renderedFor >>> .katex {
 
+  font-size: 18px;
 
+  width: 100%;
 
+  white-space: normal;
 
+  font-family: '黑体' !important;
 
+}
 
+.renderedFor >>> .katex .base{
 
+  display: inline !important;
 
+  display: contents !important;
 
+}
 
+
 
+.renderedFor>>> .katex .base .cjk_fallback{
 
+    white-space: normal !important;
 
+    display: inline !important;
 
+}
 
 </style>

+ 2 - 3
src/components/courseDetail.vue
Tampilan Berkas 

@@ -169,19 +169,18 @@
 
                     }}
 
                   </div>
 
                 </div>
 
-                <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
+                <!-- <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../assets/icon/newIcon/CourseInfo.png" alt="" />
 
                   </div>
 
                   <div>导出信息</div>
 
                 </div>
 
-                <!--  -->
 
                 <div class="now_study" @click="uploadCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../assets/icon/newIcon/uploadCourse.png" alt="" />
 
                   </div>
 
                   <div>导出文件</div>
 
-                </div>
 
+                </div> -->
 
                 <!-- <div
 
                   class="now_group"
 
                   v-if="groupInfo && courseDetail.state == 1"

+ 23 - 5
src/components/easy2/studyStudent.vue
Tampilan Berkas 

@@ -106,7 +106,7 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>
 
@@ -16405,6 +16405,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       startTime: "",
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
@@ -16875,6 +16877,21 @@ export default {
 
     }
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     getAIJ() {
 
       this.ajax.get(this.$store.state.api + "getAIJ", "").then(res => {
 
         let oid = res.data[0];
 
@@ -26630,6 +26647,7 @@ export default {
 
     
   },
 
   mounted() {
 
+    this.setoTime("1");
 
     this.startTime = new Date().toLocaleString("zh-CN", { 
       hour12: false, 
       timeZone: "Asia/Shanghai" 
@@ -26654,7 +26672,7 @@ export default {
 
       console.log(error)
 
     }
 
 
-
 
+    this.getCode2()
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -26683,15 +26701,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
   }
 
 };
 
 </script>

+ 24 - 4
src/components/easy3/studyStudent.vue
Tampilan Berkas 

@@ -103,7 +103,8 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
+              <!-- <span>识别码：{{ inviteCode }}</span> -->
 
             </div>
 
           </div>
 
         </div>
 
@@ -12758,6 +12759,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       startTime: "",
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
@@ -13152,6 +13155,21 @@ export default {
 
     };
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     //查看应用中心作业
 
     openCocoFlow(w){
 
       this.$refs.cocoFlowDiaRef.openAppWork(w)
 
@@ -21941,6 +21959,7 @@ export default {
 
 
   },
 
   mounted() {
 
+    this.setoTime("1");
 
     this.startTime = new Date().toLocaleString("zh-CN", { 
       hour12: false, 
       timeZone: "Asia/Shanghai" 
@@ -21967,6 +21986,7 @@ export default {
 
     } catch (error) {
 
       console.log(error)
 
     }
 
+    this.getCode2()
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -21996,15 +22016,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
   },
 
 };
 
 </script>

+ 1 - 1
src/components/index.vue
Tampilan Berkas 

@@ -3,7 +3,7 @@
 
     <div class="pb_content_body" :style="{marginTop : gotype ? '75px' : 0}">
 
       <div v-if="gotype" class="r_pub_button_retrun" @click.stop="backliyuan">
 
         <img src="../assets/icon/course/backPage.svg" alt="">
 
-        课程中心
 
+        AI通识课
 
       </div>
 
       <div class="student_head" v-else>

+ 6 - 2
src/components/pptEasyClass/index.vue
Tampilan Berkas 

@@ -31,6 +31,9 @@
 
               @change="onFreeBrowseChange"
 
             ></el-switch>
 
           </div>
 
+          <div class="free-browse-switch" v-if="tType == 2">
 
+            <span class="switch-label" :class="{ active: freeBrowse }">{{ freeBrowse ? '自由浏览' : '跟随模式' }}</span>
 
+          </div>
 
         </div>
 
         <div class="pec_h_right">
 
           <div class="pec_h_r_btnArea">
 
@@ -271,6 +274,7 @@ export default {
 
     }
 
   },
 
   mounted() {
 
+    this.setoTime("1");
 
     this.startTime = new Date().toLocaleString("zh-CN", {
 
       hour12: false,
 
       timeZone: "Asia/Shanghai"
 
@@ -305,7 +309,7 @@ export default {
 
 
 .pec_header {
 
   width: 100%;
 
-  height: 50px;
 
+  height: 60px;
 
   background: #FCCF00;
 
   box-sizing: border-box;
 
   display: flex;
 
@@ -432,7 +436,7 @@ export default {
 
 
 .pec_content {
 
   width: 100%;
 
-  height: calc(100% - 50px);
 
+  height: calc(100% - 60px);
 
   border-radius: 0 0 12px 12px;
 
   background-color: #fff;
 
 }

+ 2 - 1
src/components/pptEasyClass/index_old.vue
Tampilan Berkas 

@@ -8,7 +8,7 @@
 
           </div>
 
 
           <div v-if="tcid && inviteCode" class="inviteBox" style="margin-left: 20px;">
 
-              <span>随机码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ inviteCode }}</span>
 
             </div>
 
         </div>
 
 
@@ -227,6 +227,7 @@ export default {
 
     }
 
   },
 
   mounted() {
 
+    this.setoTime("1");
 
     this.startTime = new Date().toLocaleString("zh-CN", {
 
       hour12: false,
 
       timeZone: "Asia/Shanghai"

+ 24 - 5
src/components/studyStudent.vue
Tampilan Berkas 

@@ -75,7 +75,8 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <!-- <span>识别码：{{ inviteCode }}</span> -->
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>
 
@@ -12686,6 +12687,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       startTime: "",
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
@@ -13079,6 +13082,21 @@ export default {
 
     };
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     //查看应用中心作业
 
     openCocoFlow(w){
 
       this.$refs.cocoFlowDiaRef.openAppWork(w)
 
@@ -21876,6 +21894,7 @@ export default {
 
 
   },
 
   mounted() {
 
+    this.setoTime("1");
 
     this.startTime = new Date().toLocaleString("zh-CN", { 
       hour12: false, 
       timeZone: "Asia/Shanghai" 
@@ -21892,7 +21911,7 @@ export default {
 
         this.updateToolDetail(this.toolDetailIndex);
 
       }
 
     });
 
-
 
+    this.getCode2()
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -21924,15 +21943,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
     try{
 
       if (this.screenType == 2) {
 
         window.topU.postMessage({ allScreen: 4 }, "*");

+ 1 - 1
src/components/studyStudentJiu.vue
Tampilan Berkas 

@@ -73,7 +73,7 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>随机码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>

+ 24 - 4
src/components/studySutdentClass/studyStudent.vue
Tampilan Berkas 

@@ -103,7 +103,8 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
+              <!-- <span>识别码：{{ inviteCode }}</span> -->
 
             </div>
 
           </div>
 
         </div>
 
@@ -16000,6 +16001,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
       homeWorkLoading:false,
 
@@ -16454,6 +16457,21 @@ export default {
 
     }
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     //查看应用中心作业
 
     openCocoFlow(w){
 
       this.$refs.cocoFlowDiaRef.openAppWork(w)
 
@@ -25998,6 +26016,8 @@ export default {
 
     } catch (error) {
 
       console.log(error)
 
     }
 
+    this.getCode2()
 
+
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -26027,15 +26047,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
   },
 
 };
 
 </script>

+ 2 - 3
src/components/trainCourse/courseDetail.vue
Tampilan Berkas 

@@ -168,19 +168,18 @@
 
                     }}
 
                   </div>
 
                 </div>
 
-                <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
+                <!-- <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../../assets/icon/newIcon/CourseInfo.png" alt="" />
 
                   </div>
 
                   <div>导出信息</div>
 
                 </div>
 
-                <!--  -->
 
                 <div class="now_study" @click="uploadCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../../assets/icon/newIcon/uploadCourse.png" alt="" />
 
                   </div>
 
                   <div>导出文件</div>
 
-                </div>
 
+                </div> -->
 
                 <!-- <div
 
                   class="now_group"
 
                   v-if="groupInfo && courseDetail.state == 1"

+ 1 - 1
src/components/trainCourse/easy2/studyStudent.vue
Tampilan Berkas 

@@ -102,7 +102,7 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>随机码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>

+ 1 - 1
src/components/trainCourse/easy3/studyStudent.vue
Tampilan Berkas 

@@ -102,7 +102,7 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>随机码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>

+ 1 - 1
src/components/trainCourse/studyStudent.vue
Tampilan Berkas 

@@ -73,7 +73,7 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>随机码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>

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