Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta' into HK

lsc 2 years ago
parent
eddceed20c 357c55883a
commit
5a5c329814
11 changed files with 94 additions and 25 deletions
Split View Show Diff Stats
  1. 4 0
      dist/index.html
  2. 1 0
      dist/static/css/app.63e4018e847db7a006e355a6fabd8928.css
  3. 0 0
      dist/static/css/app.63e4018e847db7a006e355a6fabd8928.css.map
  4. 1 0
      dist/static/css/app.a9bd5bc4cc9830dcacb36c9285f24734.css
  5. 0 0
      dist/static/js/app.6a619d5622c0d7a8a6e6.js.map
  6. 0 0
      dist/static/js/app.f0d72c920368b14913ba.js
  7. 1 0
      dist/static/js/app.f0d72c920368b14913ba.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 28 5
      src/components/easy2/studyStudent.vue
  10. 28 5
      src/components/easy3/studyStudent.vue
  11. 31 15
      src/components/studyStudent.vue

+ 4 - 0
dist/index.html
View File 

@@ -18,7 +18,11 @@
 
       border-radius: 10px;
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       background-color: rgba(0, 0, 0, 0.1);
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.a9bd5bc4cc9830dcacb36c9285f24734.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.6a619d5622c0d7a8a6e6.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.63e4018e847db7a006e355a6fabd8928.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.f0d72c920368b14913ba.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.63e4018e847db7a006e355a6fabd8928.css


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


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


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


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


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


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


+ 28 - 5
src/components/easy2/studyStudent.vue
View File 

@@ -369,11 +369,11 @@
 
                           vChapterData[taskCount].length > 0 ||
 
                           fileC[taskCount].length > 0
 
                         "
 
-                        style="padding: 10px 0 20px 0"
 
+                        style="padding: 10px 0 25px 0"
 
                       >
 
                         <div
 
                           class="vedioTimeBox"
 
-                          v-for="(vitem, vindex) in vChapterData[0]"
 
+                          v-for="(vitem, vindex) in vChapterData[taskCount]"
 
                           :key="vindex + '1'"
 
                         >
 
                           <div class="navListItem" v-if="vitem.type == 2">
 
@@ -550,13 +550,33 @@
 
             </div>
 
           </div>
 
 
-          <div class="student_body" v-resize="resize" :style="{borderRadius:(vChapterData[taskCount].length == 0 && fileC[taskCount].length == 0) ? '0 0 20px 20px' : '20px'}">
 
+          <div
 
+            class="student_body"
 
+            v-resize="resize"
 
+            :style="{
 
+              borderRadius:
 
+                vChapterData[taskCount].length == 0 &&
 
+                fileC[taskCount].length == 0
 
+                  ? '0 0 20px 20px'
 
+                  : '20px',
 
+            }"
 
+          >
 
             <div
 
               class="taskBox"
 
               v-if="
 
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                   .taskDetail != ''
 
               "
 
+              :style="
 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool &&
 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool.length &&
 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool.length > 0
 
+                  ? 'border-bottom: 1px solid #cad1dc'
 
+                  : ''
 
+              "
 
             >
 
               <div
 
                 style="
 
@@ -16959,7 +16979,9 @@ export default {
 
           let elink = document.createElement("a");
 
           elink.download = f.name;
 
           elink.style.display = "none";
 
-          let blob = new Blob([ab], { type: res.data.response.headers['content-type']+';charset=UTF-8'});
 
+          let blob = new Blob([ab], {
 
+            type: res.data.response.headers["content-type"] + ";charset=UTF-8",
 
+          });
 
           elink.href = URL.createObjectURL(blob);
 
           document.body.appendChild(elink);
 
           elink.click();
 
@@ -19116,7 +19138,6 @@ export default {
 
 .taskBox {
 
   width: 95%;
 
   margin: 0 auto;
 
-  border-bottom: 1px solid #cad1dc;
 
 }
 
 
 .vedioTaskBox {
 
@@ -21384,6 +21405,8 @@ ol {
 
   border-top: 1px solid #cdcdcd;
 
   font-size: 14px;
 
   color: #868686;
 
+  width: 88%;
 
+  margin: 0 auto;
 
 }
 
 
 .pl_select_box {

+ 28 - 5
src/components/easy3/studyStudent.vue
View File 

@@ -358,7 +358,7 @@
 
                         v-show="
 
                           vChapterData[0].length > 0 || fileC[0].length > 0
 
                         "
 
-                        style="padding: 10px 0 20px 0"
 
+                        style="padding: 10px 0 25px 0"
 
                       >
 
                         <div
 
                           class="vedioTimeBox"
 
@@ -530,13 +530,32 @@
 
             </div>
 
           </div>
 
 
-          <div class="student_body" v-resize="resize" :style="{borderRadius:(vChapterData[0].length == 0 && fileC[0].length == 0) ? '0 0 20px 20px' : '20px'}">
 
+          <div
 
+            class="student_body"
 
+            v-resize="resize"
 
+            :style="{
 
+              borderRadius:
 
+                vChapterData[0].length == 0 && fileC[0].length == 0
 
+                  ? '0 0 20px 20px'
 
+                  : '20px',
 
+            }"
 
+          >
 
             <div
 
               class="taskBox"
 
               v-if="
 
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                   .taskDetail != ''
 
               "
 
+              :style="
 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool &&
 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool.length &&
 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool.length > 0
 
+                  ? 'border-bottom: 1px solid #cad1dc'
 
+                  : ''
 
+              "
 
             >
 
               <div
 
                 style="
 
@@ -15283,7 +15302,8 @@ export default {
 
       this.ajax
 
         .get(this.$store.state.api + "selectCourseSLook", params)
 
         .then((res) => {
 
-          this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
+          // this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
+          this.sIsOpen = true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           if (!this.IsLookOpen) {
 
@@ -16814,7 +16834,9 @@ export default {
 
           let elink = document.createElement("a");
 
           elink.download = f.name;
 
           elink.style.display = "none";
 
-          let blob = new Blob([ab], { type: res.data.response.headers['content-type']+';charset=UTF-8'});
 
+          let blob = new Blob([ab], {
 
+            type: res.data.response.headers["content-type"] + ";charset=UTF-8",
 
+          });
 
           elink.href = URL.createObjectURL(blob);
 
           document.body.appendChild(elink);
 
           elink.click();
 
@@ -18966,7 +18988,6 @@ export default {
 
 .taskBox {
 
   width: 95%;
 
   margin: 0 auto;
 
-  border-bottom: 1px solid #cad1dc;
 
 }
 
 
 .vedioTaskBox {
 
@@ -21236,6 +21257,8 @@ ol {
 
   border-top: 1px solid #cdcdcd;
 
   font-size: 14px;
 
   color: #868686;
 
+  width: 88%;
 
+  margin: 0 auto;
 
 }
 
 
 .pl_select_box {

+ 31 - 15
src/components/studyStudent.vue
View File 

@@ -403,7 +403,7 @@
 
                           vChapterData[taskCount].length > 0 ||
 
                           fileC[taskCount].length > 0
 
                         "
 
-                        style="padding: 10px 0 20px 0"
 
+                        style="padding: 10px 0 25px 0"
 
                       >
 
                         <div
 
                           class="vedioTimeBox"
 
@@ -570,12 +570,16 @@
 
           <div class="student_body" v-resize="resize">
 
             <div
 
               class="vedioBox"
 
-              :style="{borderRadius:(vChapterData[taskCount].length == 0 && fileC[taskCount].length == 0) ? '0 0 20px 20px' : '20px'}"
 
+              :style="{
 
+                borderRadius:
 
+                  vChapterData[taskCount].length == 0 &&
 
+                  fileC[taskCount].length == 0
 
+                    ? '0 0 20px 20px'
 
+                    : '20px',
 
+              }"
 
               v-if="
 
                 (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                   .toolChoose[0].tool &&
 
-                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
-                  .toolChoose[0].tool.length &&
 
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                   .toolChoose[0].tool.length > 0) || (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                     .taskDetail != '')
 
@@ -587,6 +591,12 @@
 
                   chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                     .taskDetail != ''
 
                 "
 
+                :style="(chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool &&
 
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                    .toolChoose[0].tool.length &&
 
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                    .toolChoose[0].tool.length > 0) ? 'border-bottom: 1px solid #cad1dc' : ''"
 
               >
 
                 <div
 
                   style="
 
@@ -1300,12 +1310,18 @@
 
                   </div>
 
                 </div>
 
               </div>
 
-              <div class="toolHeng2" style="position: relative" v-if="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
-                  .toolChoose[0].tool &&
 
-                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
-                  .toolChoose[0].tool.length &&
 
-                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
-                  .toolChoose[0].tool.length > 0">
 
+              <div
 
+                class="toolHeng2"
 
+                style="position: relative"
 
+                v-if="
 
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                    .toolChoose[0].tool &&
 
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                    .toolChoose[0].tool.length &&
 
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                    .toolChoose[0].tool.length > 0
 
+                "
 
+              >
 
                 <div class="workNav">工作区</div>
 
                 <div
 
                   class="filebox"
 
@@ -14518,8 +14534,7 @@ export default {
 
       this.ajax
 
         .get(this.$store.state.api + "selectCourseSLook", params)
 
         .then((res) => {
 
-          // this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
-          this.sIsOpen = true;
 
+          this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           if (!this.IsLookOpen) {
 
@@ -18153,7 +18168,6 @@ export default {
 
 .taskBox {
 
   width: 95%;
 
   margin: 0 auto;
 
-  border-bottom: 1px solid #cad1dc;
 
 }
 
 
 .vedioTaskBox {
 
@@ -20245,6 +20259,8 @@ ol {
 
   font-size: 14px;
 
   font-weight: 400;
 
   color: #cad1dc;
 
+  width: 88%;
 
+  margin: 0 auto;
 
 }
 
 
 .pl_select_box {
 
@@ -20448,8 +20464,8 @@ ol {
 
   height: 20px;
 
 }
 
 .lockTaskIcon {
 
-  width: 25px;
 
-  height: 25px;
 
+  width: 20px;
 
+  height: 20px;
 
   position: absolute;
 
   right: 0;
 
   top: 23px;

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