Browse Source

修改样式及功能

zengyicheng 2 years ago
parent
commit
e046b36895

+ 1 - 1
src/App.vue

@@ -212,7 +212,7 @@ body {
   height: calc(100% - 67.5px);
   height: calc(100% - 67.5px);
   /* height: calc(100% - 67.5px - 226px); */
   /* height: calc(100% - 67.5px - 226px); */
   min-height: 750px;
   min-height: 750px;
-  background: #f2f2f2;
+  background: #e6e6e6;
   /* border-radius: 5px; */
   /* border-radius: 5px; */
   position: relative;
   position: relative;
   overflow: auto;
   overflow: auto;

BIN
src/assets/icon/newIcon/allScreen.png


+ 55 - 13
src/components/courseDetail.vue

@@ -730,12 +730,39 @@
                         >
                         >
                           {{ item.time }}
                           {{ item.time }}
                         </div>
                         </div>
-                        <div class="yuan"></div>
-                        <div class="stage">
+                        <div
+                          class="yuan"
+                          :class="
+                              item.chapter.length == 1 &&
+                              item.chapter[0].task.length == 1 &&
+                              item.chapter[0].task[0].works.length == 0
+                                ? 'bgCss'
+                                : ''
+                          "
+                        ></div>
+                        <div
+                          class="stage"
+                          :style="{
+                            background:
+                              item.chapter.length == 1 &&
+                              item.chapter[0].task.length == 1 &&
+                              item.chapter[0].task[0].works.length == 0
+                                ? '#ccc'
+                                : '',
+                          }"
+                        >
                           第{{ index + 1 }}阶段 {{ item.name }}
                           第{{ index + 1 }}阶段 {{ item.name }}
                         </div>
                         </div>
                         <div
                         <div
                           class="s_up"
                           class="s_up"
+                          :style="{
+                            disPlay:
+                              item.chapter.length == 1 &&
+                              item.chapter[0].task.length == 1 &&
+                              item.chapter[0].task[0].works.length == 0
+                                ? 'none'
+                                : '',
+                          }"
                           :class="{ s_up2: !item.is }"
                           :class="{ s_up2: !item.is }"
                           @click="item.is = !item.is"
                           @click="item.is = !item.is"
                         >
                         >
@@ -1036,7 +1063,7 @@ export default {
       isFollow: "",
       isFollow: "",
       followC: "",
       followC: "",
       dialogVisibleQR: false,
       dialogVisibleQR: false,
-      checkStage:0
+      checkStage: 0,
     };
     };
   },
   },
   methods: {
   methods: {
@@ -1064,7 +1091,9 @@ export default {
       if (this.courseDetail.state == 1) {
       if (this.courseDetail.state == 1) {
         if (this.classList.length) {
         if (this.classList.length) {
           this.goTo(
           this.goTo(
-            "/studyStudent?type="+this.checkStage+"&courseId=" +
+            "/studyStudent?type=" +
+              this.checkStage +
+              "&courseId=" +
               this.id +
               this.id +
               "&userid=" +
               "&userid=" +
               this.userid +
               this.userid +
@@ -1083,7 +1112,9 @@ export default {
           );
           );
         } else {
         } else {
           this.goTo(
           this.goTo(
-            "/studyStudent?type="+this.checkStage+"&courseId=" +
+            "/studyStudent?type=" +
+              this.checkStage +
+              "&courseId=" +
               this.id +
               this.id +
               "&userid=" +
               "&userid=" +
               this.userid +
               this.userid +
@@ -1102,7 +1133,9 @@ export default {
       } else if (this.courseDetail.state == 2) {
       } else if (this.courseDetail.state == 2) {
         if (this.classList.length) {
         if (this.classList.length) {
           this.goTo(
           this.goTo(
-            "/studystudentE2?type="+this.checkStage+"&courseId=" +
+            "/studystudentE2?type=" +
+              this.checkStage +
+              "&courseId=" +
               this.id +
               this.id +
               "&userid=" +
               "&userid=" +
               this.userid +
               this.userid +
@@ -1121,7 +1154,9 @@ export default {
           );
           );
         } else {
         } else {
           this.goTo(
           this.goTo(
-            "/studystudentE2?type="+this.checkStage+"&courseId=" +
+            "/studystudentE2?type=" +
+              this.checkStage +
+              "&courseId=" +
               this.id +
               this.id +
               "&userid=" +
               "&userid=" +
               this.userid +
               this.userid +
@@ -1140,7 +1175,9 @@ export default {
       } else if (this.courseDetail.state == 3) {
       } else if (this.courseDetail.state == 3) {
         if (this.classList.length) {
         if (this.classList.length) {
           this.goTo(
           this.goTo(
-            "/studystudentE3?type="+this.checkStage+"&courseId=" +
+            "/studystudentE3?type=" +
+              this.checkStage +
+              "&courseId=" +
               this.id +
               this.id +
               "&userid=" +
               "&userid=" +
               this.userid +
               this.userid +
@@ -1159,7 +1196,9 @@ export default {
           );
           );
         } else {
         } else {
           this.goTo(
           this.goTo(
-            "/studystudentE3?type="+this.checkStage+"&courseId=" +
+            "/studystudentE3?type=" +
+              this.checkStage +
+              "&courseId=" +
               this.id +
               this.id +
               "&userid=" +
               "&userid=" +
               this.userid +
               this.userid +
@@ -1185,7 +1224,7 @@ export default {
       }
       }
     },
     },
     goToStudyRate(i) {
     goToStudyRate(i) {
-      this.checkStage = i
+      this.checkStage = i;
       if (this.tType == 2) {
       if (this.tType == 2) {
         this.addUserRate(i);
         this.addUserRate(i);
       } else {
       } else {
@@ -2158,7 +2197,7 @@ export default {
 }
 }
 
 
 .jd {
 .jd {
-  background: #e0eafb;
+  background: #ddebf8;
   margin-left: 12px;
   margin-left: 12px;
   border-radius: 4px;
   border-radius: 4px;
   font-size: 14px;
   font-size: 14px;
@@ -2614,6 +2653,9 @@ export default {
   margin-right: 10px;
   margin-right: 10px;
 }
 }
 
 
+.bgCss::before{
+  background: #ccc !important;
+}
 .c_box .stage_box .yuan::before {
 .c_box .stage_box .yuan::before {
   content: "";
   content: "";
   width: 15px;
   width: 15px;
@@ -2735,10 +2777,10 @@ export default {
 .classBox > div {
 .classBox > div {
   width: 106px;
   width: 106px;
   height: 32px;
   height: 32px;
-  background: #f0f4fa;
+  background: #3681fc;
   border-radius: 4px;
   border-radius: 4px;
   font-weight: 400;
   font-weight: 400;
-  color: #717c8d;
+  color: #fff;
   font-size: 14px;
   font-size: 14px;
   text-align: center;
   text-align: center;
   line-height: 32px;
   line-height: 32px;

+ 33 - 23
src/components/easy2/studyStudent.vue

@@ -62,7 +62,15 @@
           style="border-bottom: 1px solid #cad1dc; padding: 15px 0; width: 100%"
           style="border-bottom: 1px solid #cad1dc; padding: 15px 0; width: 100%"
         >
         >
           <div class="courseTitle">
           <div class="courseTitle">
-            <div style="max-width: calc(100% - 40px); width: auto">
+            <div style="
+                max-width: calc(100% - 40px);
+                width: auto;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                word-break: break-word;
+                display: block;
+              ">
               <el-tooltip
               <el-tooltip
                 effect="light"
                 effect="light"
                 :content="courseDetail.title"
                 :content="courseDetail.title"
@@ -507,6 +515,9 @@
                               <span v-if="vitem.text">{{ vitem.text }}-</span
                               <span v-if="vitem.text">{{ vitem.text }}-</span
                               >{{ vitem.name }}
                               >{{ vitem.name }}
                             </div>
                             </div>
+                            <div class="downIcon" @click="downloadFile2(vitem)">
+                              <img src="../../assets/icon/newIcon/down.png" alt />
+                            </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
                               @click="checkFileFull1(vitem.type, vitem)"
                               @click="checkFileFull1(vitem.type, vitem)"
@@ -516,15 +527,16 @@
                                 alt
                                 alt
                               />
                               />
                             </div>
                             </div>
-                            <div class="downIcon" @click="downloadFile2(vitem)">
-                              <img src="../../assets/icon/newIcon/down.png" alt />
-                            </div>
+                            
                           </div>
                           </div>
                           <div class="navListItem" v-if="vitem.type == 12">
                           <div class="navListItem" v-if="vitem.type == 12">
                             <div class="navText" @click="downloadFile2(vitem)">
                             <div class="navText" @click="downloadFile2(vitem)">
                               <span v-if="vitem.text">{{ vitem.text }}-</span
                               <span v-if="vitem.text">{{ vitem.text }}-</span
                               >{{ vitem.name }}
                               >{{ vitem.name }}
                             </div>
                             </div>
+                            <div class="downIcon" @click="downloadFile2(vitem)">
+                              <img src="../../assets/icon/newIcon/down.png" alt />
+                            </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
                               @click="checkFileFull1(vitem.type, vitem)"
                               @click="checkFileFull1(vitem.type, vitem)"
@@ -534,9 +546,7 @@
                                 alt
                                 alt
                               />
                               />
                             </div>
                             </div>
-                            <div class="downIcon" @click="downloadFile2(vitem)">
-                              <img src="../../assets/icon/newIcon/down.png" alt />
-                            </div>
+                            
                           </div>
                           </div>
                           <div class="navListItem" v-if="vitem.type == 13">
                           <div class="navListItem" v-if="vitem.type == 13">
                             <div
                             <div
@@ -583,9 +593,8 @@
               <div style="width: calc(100% - 315px)">
               <div style="width: calc(100% - 315px)">
                 <div
                 <div
                   style="padding: 10px 0 0; width: 95%; margin: 0 auto"
                   style="padding: 10px 0 0; width: 95%; margin: 0 auto"
-                  v-if="showType == 2 || showType == 3"
                 >
                 >
-                  <el-button
+                  <!-- <el-button
                     type="primary"
                     type="primary"
                     class="newButton"
                     class="newButton"
                     @click="checkFileFull(showType, pptImgUrl1)"
                     @click="checkFileFull(showType, pptImgUrl1)"
@@ -597,7 +606,7 @@
                     @click="downloadFile(pptImgUrl1)"
                     @click="downloadFile(pptImgUrl1)"
                     v-if="showType != 2"
                     v-if="showType != 2"
                     >文件下载</el-button
                     >文件下载</el-button
-                  >
+                  > -->
                   <el-button
                   <el-button
                     v-if="
                     v-if="
                       showType == 2 &&
                       showType == 2 &&
@@ -611,7 +620,7 @@
                     >打开链接
                     >打开链接
                   </el-button>
                   </el-button>
                 </div>
                 </div>
-                <div
+                <!-- <div
                   style="padding: 10px 0 0; width: 95%; margin: 0 auto"
                   style="padding: 10px 0 0; width: 95%; margin: 0 auto"
                   v-if="showType == 1"
                   v-if="showType == 1"
                 >
                 >
@@ -621,7 +630,7 @@
                     @click="checkFileFull(showType, text)"
                     @click="checkFileFull(showType, text)"
                     >全屏查看</el-button
                     >全屏查看</el-button
                   >
                   >
-                </div>
+                </div> -->
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
@@ -878,14 +887,14 @@
                             />
                             />
                             <div style="margin: 5px 0">编程平台</div>
                             <div style="margin: 5px 0">编程平台</div>
                           </div>
                           </div>
-                          <div v-show="tooC == 22">
+                          <!-- <div v-show="tooC == 22">
                             <img
                             <img
                               @click="addTools(tooC, toolIndex, taskCount)"
                               @click="addTools(tooC, toolIndex, taskCount)"
                               src="../../assets/icon/fourthToolList/program.png"
                               src="../../assets/icon/fourthToolList/program.png"
                               alt
                               alt
                             />
                             />
                             <div style="margin: 5px 0">AI体验</div>
                             <div style="margin: 5px 0">AI体验</div>
-                          </div>
+                          </div> -->
                           <div v-show="tooC == 23">
                           <div v-show="tooC == 23">
                             <img
                             <img
                               @click="addTools(tooC, toolIndex, taskCount)"
                               @click="addTools(tooC, toolIndex, taskCount)"
@@ -7774,6 +7783,7 @@
             </div>
             </div>
             <div
             <div
               class="vedioBox"
               class="vedioBox"
+              style="margin-top: 10px;"
               v-if="
               v-if="
                 courseDetail.userid == userid ||
                 courseDetail.userid == userid ||
                 (courseDetail.course_teacher &&
                 (courseDetail.course_teacher &&
@@ -7813,6 +7823,7 @@
                     style="margin: 0 30px 0 auto"
                     style="margin: 0 30px 0 auto"
                     type="primary"
                     type="primary"
                     size="small"
                     size="small"
+                    v-if="isClose == 1"
                     @click="addToolChoose"
                     @click="addToolChoose"
                     >确定</el-button
                     >确定</el-button
                   >
                   >
@@ -8138,7 +8149,7 @@
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
-                      <div class="tool">
+                      <!-- <div class="tool">
                         <div class="whiteBIcon" @click="addTools2(22)">
                         <div class="whiteBIcon" @click="addTools2(22)">
                           <img
                           <img
                             src="../../assets/icon/fourthToolList/AIprogram2.png"
                             src="../../assets/icon/fourthToolList/AIprogram2.png"
@@ -8159,7 +8170,7 @@
                             /><span>已选择</span>
                             /><span>已选择</span>
                           </div>
                           </div>
                         </div>
                         </div>
-                      </div>
+                      </div> -->
                       <div class="tool">
                       <div class="tool">
                         <div class="whiteBIcon" @click="addTools2(23)">
                         <div class="whiteBIcon" @click="addTools2(23)">
                           <img
                           <img
@@ -18333,7 +18344,6 @@ export default {
   margin: 0 auto;
   margin: 0 auto;
   margin-top: 10px;
   margin-top: 10px;
   padding: 0 0 20px;
   padding: 0 0 20px;
-  background: #fff;
   border-radius: 20px;
   border-radius: 20px;
 }
 }
 
 
@@ -18675,7 +18685,7 @@ export default {
 }
 }
 
 
 .courseTitle .ctitle {
 .courseTitle .ctitle {
-  font-size: 22px;
+  font-size: 20px;
   font-weight: bold;
   font-weight: bold;
   color: #0e1e33;
   color: #0e1e33;
   white-space: nowrap;
   white-space: nowrap;
@@ -18904,7 +18914,7 @@ export default {
 
 
 .courseIndex > div:nth-child(1) {
 .courseIndex > div:nth-child(1) {
   margin: 0 0 0 10px;
   margin: 0 0 0 10px;
-  font-size: 24px;
+  font-size: 20px;
   min-width: 100px;
   min-width: 100px;
   font-weight: bold;
   font-weight: bold;
   border-left: 4px solid #3363b9;
   border-left: 4px solid #3363b9;
@@ -18914,7 +18924,7 @@ export default {
 }
 }
 
 
 .courseIndex > div:nth-child(2) {
 .courseIndex > div:nth-child(2) {
-  font-size: 23px;
+  font-size: 20px;
   /* width: 300px; */
   /* width: 300px; */
   max-width: calc(100% - 180px);
   max-width: calc(100% - 180px);
   white-space: nowrap;
   white-space: nowrap;
@@ -19558,7 +19568,7 @@ export default {
 }
 }
 
 
 .vedioBox {
 .vedioBox {
-  border-radius: 0 0 20px 20px;
+  border-radius: 20px;
   background: #fff;
   background: #fff;
   overflow: auto;
   overflow: auto;
 }
 }
@@ -19792,7 +19802,7 @@ export default {
   flex-direction: column;
   flex-direction: column;
   align-items: center;
   align-items: center;
   margin: 20px auto 0;
   margin: 20px auto 0;
-  max-height: 500px;
+  max-height: calc(100% -  75px);
   overflow: auto;
   overflow: auto;
 }
 }
 
 
@@ -21894,7 +21904,7 @@ ol {
 .navItem {
 .navItem {
   background: #f0f4fa;
   background: #f0f4fa;
   border-radius: 8px;
   border-radius: 8px;
-  width: 90%;
+  width: 95%;
   margin: 10px auto 0;
   margin: 10px auto 0;
   display: flex;
   display: flex;
   flex-direction: row;
   flex-direction: row;

File diff suppressed because it is too large
+ 763 - 766
src/components/easy3/studyStudent.vue


File diff suppressed because it is too large
+ 620 - 637
src/components/studyStudent.vue


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