lsc 1 vuosi sitten
vanhempi
commit
1d34b8b2c0

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 254 - 560
src/components/easy2/studyStudent.vue


+ 40 - 20
src/components/easy3/studyStudent.vue

@@ -138,18 +138,9 @@
         </div>
       </div>
       <div class="body_student" :class="{ navLeftCss: !mlDialog }">
+        <div class="new_topFixed"></div>
         <div
           class="new_top"
-          style="
-            position: fixed;
-            top: 20px;
-            left: 22%;
-            width: 77%;
-            z-index: 999;
-            border-radius: 12px 12px 0 0;
-            border-bottom: 1px solid #cad1dc;
-            padding: 10px 0;
-          "
           :class="{ navLeftCss: !mlDialog }"
         >
           <div class="courseIndex">
@@ -666,6 +657,15 @@
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
                   .toolChoose[0].tool.length > 0
               "
+              :style="{
+                borderRadius:
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                  .taskDetail == '' &&
+                vChapterData[0].length == 0 &&
+                fileC[0].length == 0
+                      ? '0 0 20px 20px'
+                      : '20px',
+                }"
             >
               <div
                 class="queTop"
@@ -7918,6 +7918,19 @@
               (courseDetail.course_teacher &&
                 courseDetail.course_teacher.indexOf(userid) != -1)
             "
+            :style="{
+                borderRadius:
+                !(chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                  .toolChoose[0].tool &&
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                    .toolChoose[0].tool.length > 0) && 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .taskDetail == '' &&
+              vChapterData[0].length == 0 &&
+              fileC[0].length == 0
+                    ? '0 0 20px 20px'
+                    : '20px',
+              }"
           >
             <div
               class="queTop"
@@ -18730,17 +18743,24 @@ export default {
   justify-content: flex-start;
   align-items: center;
   height: 60px;
-  position: relative;
+  position: fixed;
+  top: 20px;
+  left: 22%;
+  width: 77%;
+  z-index: 999;
+  border-radius: 12px 12px 0 0;
+  border-bottom: 1px solid #cad1dc;
+  padding: 10px 0;
 }
 
-.new_top::before {
-  content: "";
+.new_topFixed {
   width: 100%;
-  height: 20px;
-  position: absolute;
-  top: -20px;
+  height: 40px;
+  position: fixed;
+  top: 0px;
   display: block;
   background: #f2f2f2;
+  z-index: 998;
 }
 
 .before {
@@ -18754,7 +18774,7 @@ export default {
   display: flex;
   flex-direction: row;
   align-items: center;
-  width: calc(100% - 600px);
+  width: calc(100% - 650px);
 }
 
 .courseIndex > div:nth-child(1) {
@@ -19408,7 +19428,7 @@ export default {
 }
 
 .vedioBox {
-  border-radius: 20px;
+  border-radius: 0 0 20px 20px;
   background: #fff;
   overflow: auto;
 }
@@ -19432,7 +19452,7 @@ export default {
 }
 
 .toolBox {
-  padding: 0 60px 15px;
+  padding: 0 60px 0;
   display: flex;
   position: relative;
 }
@@ -20429,7 +20449,7 @@ export default {
 }
 
 .zuoyeYulan {
-  padding-top: 15px;
+  padding-top: 0;
   font-size: 18px;
   display: flex;
   align-items: flex-end;

+ 37 - 23
src/components/studyStudent.vue

@@ -141,18 +141,9 @@
         </div>
       </div>
       <div class="body_student" :class="{ navLeftCss: !mlDialog }">
+        <div class="new_topFixed"></div>
         <div
           class="new_top"
-          style="
-            position: fixed;
-            top: 20px;
-            left: 22%;
-            width: 77%;
-            z-index: 999;
-            border-radius: 12px 12px 0 0;
-            border-bottom: 1px solid #cad1dc;
-            padding: 10px 0;
-          "
           :class="{ navLeftCss: !mlDialog }"
         >
           <div class="courseIndex">
@@ -662,8 +653,10 @@
               class="vedioBox"
               :style="{
                 borderRadius:
-                  vChapterData[taskCount].length == 0 &&
-                  fileC[taskCount].length == 0
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .taskDetail == '' &&
+              vChapterData[taskCount].length == 0 &&
+              fileC[taskCount].length == 0
                     ? '0 0 20px 20px'
                     : '20px',
               }"
@@ -6341,6 +6334,19 @@
                 (courseDetail.course_teacher &&
                   courseDetail.course_teacher.indexOf(userid) != -1)
               "
+              :style="{
+                borderRadius:
+                !(chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                  .toolChoose[0].tool &&
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                    .toolChoose[0].tool.length > 0) && 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .taskDetail == '' &&
+              vChapterData[taskCount].length == 0 &&
+              fileC[taskCount].length == 0
+                    ? '0 0 20px 20px'
+                    : '20px',
+              }"
             >
               <div
                 class="queTop"
@@ -7014,7 +7020,7 @@
             </div>
             <div
               class="vedioBox"
-              style="margin-top: 10px"
+              style="margin-top: 10px;border-radius:20px"
               v-if="
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
                   .eList &&
@@ -17941,17 +17947,24 @@ export default {
   justify-content: flex-start;
   align-items: center;
   height: 60px;
-  position: relative;
+  position: fixed;
+  top: 20px;
+  left: 22%;
+  width: 77%;
+  z-index: 999;
+  border-radius: 12px 12px 0 0;
+  border-bottom: 1px solid #cad1dc;
+  padding: 10px 0;
 }
 
-.new_top::before {
-  content: "";
+.new_topFixed {
   width: 100%;
-  height: 20px;
-  position: absolute;
-  top: -20px;
+  height: 40px;
+  position: fixed;
+  top: 0px;
   display: block;
   background: #f2f2f2;
+  z-index: 998;
 }
 
 .before {
@@ -17965,7 +17978,7 @@ export default {
   display: flex;
   flex-direction: row;
   align-items: center;
-  width: calc(100% - 600px);
+  width: calc(100% - 650px);
 }
 
 .courseIndex > div:nth-child(1) {
@@ -18663,7 +18676,7 @@ export default {
 }
 
 .vedioBox {
-  border-radius: 20px;
+  border-radius: 0 0 20px 20px;
   background: #fff;
   overflow: auto;
 }
@@ -18687,7 +18700,7 @@ export default {
 }
 
 .toolBox {
-  padding: 30px 0 0 25px;
+  padding: 15px 0 0 25px;
   display: flex;
   position: relative;
 }
@@ -19247,6 +19260,7 @@ export default {
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: flex-start;
+  padding:0 0 20px;
 }
 
 .cru_line {
@@ -19607,7 +19621,7 @@ export default {
 }
 
 .zuoyeYulan {
-  padding-top: 15px;
+  padding-top: 0;
   font-size: 18px;
   display: flex;
   align-items: flex-end;

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä