update

src/components/pages/addCourse.vue

@@ -79,7 +79,7 @@
               </div>
             </div>
           </div>
-          <div class="rightBox" v-if="this.steps == 1" @mousewheel="scrollChange" style="padding:30px 10px 0" :style="{height:(!isStepDisplay && !isBtnDisplay) ? 'calc(100% - 40px)' : 'calc(100% - 100px)'}">
+          <div class="rightBox" v-if="this.steps == 1" @mousewheel="scrollChange" style="padding:30px 10px 0" :style="{height:(!isStepDisplay && !isBtnDisplay) ? 'calc(100% - 20px)' : 'calc(100% - 100px)'}">
             <div class="updateMask" :style="{
               height: rightBoxHeight ? rightBoxHeight + 'px' : '100%',
             }" v-if="cid && userid != courseUserid && role != '1'"></div>
@@ -442,8 +442,8 @@
                   <div class="navBottom">
                     <div class="navTask" v-if="unitJson[unitIndex].dyName">
                       <div class="nt_taskBox" style="width: 100%;">
-                        <div class="nt_taskTitle">阶段 {{ unitIndex + 1 }}</div>
-                        <div class="nt_taskName">
+                        <div class="nt_taskTitle" style="font-size: 16px;min-width: fit-content;margin-right: 10px;font-weight: 700;">阶段 {{ unitIndex + 1 }}</div>
+                        <div class="nt_taskName" style="font-size: 16px;font-weight: 700;">
                           <el-tooltip effect="light" :content="unitJson[unitIndex].dyName" placement="top">
                             <span>{{ unitJson[unitIndex].dyName }}</span>
                           </el-tooltip>
@@ -486,7 +486,7 @@
                   width: 100%;
                   padding: 0 20px 0 20px;
                   box-sizing: border-box;
-                  background: #f0f4fa
+                  background: #e4eaf2
                 ">
                 <!-- :style="{ maxWidth: (userid == courseUserid || role == '1') ? 'calc(100% - 300px)' : 'calc(100% - 175px)' }" -->
                     <div class="cru_selectBox" :style="{ maxWidth: isPasteTask ? 'calc(100% - 175px)' : 'calc(100% - 40px)' }">
@@ -542,7 +542,8 @@
                     <div class="taskBorder" :style="{ minHeight: unitJson[unitIndex].easy && 'unset' }"
                       :class="{ smallTaskBorder: itemTask.isFold === 1 }"
                       v-for="(itemTask, itemTaskIndex) in item.taskJson" :key="itemTaskIndex">
-                      <div v-if="unitJson[unitIndex].easy != 1">
+                      <div style="background: #e4eaf2;padding: 20px;border-radius: 5px;">
+                        <div v-if="unitJson[unitIndex].easy != 1">
                         <div :style="{
                           marginBottom:
                             unitJson[unitIndex].easy == 3 ||
@@ -1039,7 +1040,9 @@
                           </div>
                         </div>
                       </div>
-                      <div v-if="unitJson[unitIndex].easy != 3 &&
+                      </div>
+                      <div style="background: #e4eaf2;padding: 20px;border-radius: 5px;margin-top: 15px;">
+                        <div v-if="unitJson[unitIndex].easy != 3 &&
                         !(unitJson[unitIndex].easy == 5 && itemTask.taskType == 1)
                         " style="
                       flex-direction: row;
@@ -2142,6 +2145,7 @@
                           </div>
                         </div> -->
                       </div>
+                      </div>
                     </div>
                     <div class="addTaskBorder" @click="addTaskBorder" v-if="!unitJson[unitIndex].easy">
                       <div>
@@ -2197,7 +2201,7 @@
               </div> -->
             </div>
           </div>
-          <div :class="{info_btnBox:isBtnDisplay,info_btnBox2:!isBtnDisplay}" @mouseenter="btnDisplay(true)"  @mouseleave="btnDisplay(false)">
+          <div :class="{info_btnBox:isBtnDisplay,info_btnBox2:!isBtnDisplay}" @mouseenter="btnDisplay(true)"  @mouseleave="btnDisplay(false)" v-if="false">
             <button class="c_pub_button_return pub_btn_return_img" v-if="steps == 1 && isBtnDisplay" @click="
               goTo(
                 '/course?userid=' +
@@ -9155,7 +9159,7 @@ export default {
 .chapter_upload_up {
   width: 20px;
   height: 20px;
-  background: #F0F4FA;
+  background: #e4eaf2;
   cursor: pointer;
   margin: 0 auto;
   border-radius: 5px;
@@ -9557,6 +9561,11 @@ ol {
   border-radius: 15px;
 }
 
+.whiteBIcon > div:nth-child(2){
+  height: 20px;
+  line-height: 20px;
+}
+
 .check {
   /* width: 20px;
   height: 20px; */
@@ -9906,8 +9915,8 @@ ol {
   margin-top: 20px;
   min-height: 670px;
   position: relative;
-  background: #F0F4FA;
-  padding: 20px 20px 0;
+  background: #fff;
+  padding: 20px;
   overflow: hidden;
   box-sizing: border-box;
 }
@@ -9961,7 +9970,7 @@ ol {
 
 .fold {
   display: flex;
-  margin: 0 10px;
+  margin: 0 20px;
   flex-direction: row;
   align-items: center;
   cursor: pointer;
@@ -11199,7 +11208,7 @@ ol {
 
 .rb_c_box_left {
   height: 100%;
-  background: #F0F4FA;
+  background: #e4eaf2;
   width: 270px;
   min-width: 270px;
   border-radius: 8px;
@@ -11220,7 +11229,7 @@ ol {
 }
 
 .rb_c_box_right>.basic_box {
-  background: #F0F4FA;
+  background: #e4eaf2;
   border-radius: 8px;
   height: calc(100% - 0px);
   overflow: auto;

src/components/pages/dataBoard/school/cateRank/index.vue

@@ -18,7 +18,7 @@
         </el-table-column>
         <el-table-column
           prop="sum"
-          label="类别平均"
+          label="课程数量"
           min-width="80"
           align="center"
         >

src/components/pages/dataBoard/school/index.vue

@@ -149,6 +149,7 @@
         <div class="titleBox">
           <div class="title">课程数量</div>
           <el-select v-model="cType" @change="typeChange" class="selectBox">
+            <el-option label="全部" value=""></el-option>
             <el-option label="年级" value="grade"></el-option>
             <el-option label="主题" value="theme"></el-option>
             <el-option label="学科" value="subject"></el-option>
@@ -164,11 +165,11 @@
               </div>
               <div class="info3 greenBG">
                 <span>类别总数</span>
-                <span>546</span>
+                <span>{{typeCount}}</span>
               </div>
               <div class="info3 blueBG">
                 <span>类别平均</span>
-                <span>12</span>
+                <span>{{(typeCount / 3).toFixed(0)}}</span>
               </div>
             </div>
             <div class="course_box_p">
@@ -228,7 +229,10 @@ export default {
       gradeCourse: 0,
       subjectCourse: 0,
       courseArray: [],
-      cType:'grade',
+      cType:'',
+      grade:[],
+      subject:[],
+      theme:[],
     }
   },
   mounted() {
@@ -405,6 +409,12 @@ export default {
           this.subjectCourse = _subjectCourse / _subject.length
           this.courseArray = _courseArray
 
+          let _theme = res.data[14] //主题
+
+          this.grade = _grade
+          this.subject = _subject
+          this.theme = _theme
+          this.typeCount = _grade.length + _subject.length + _theme.length
           this.$forceUpdate();
         })
         .catch((err) => {
@@ -412,7 +422,17 @@ export default {
           console.error(err);
         });
     },
-    typeChange(){},
+    typeChange(){
+      if(this.cType === ''){
+
+      }else if(this.cType === 'grade'){
+
+      }else if(this.cType === 'theme'){
+
+      }else if(this.cType === 'subject'){
+
+      }
+    },
     format(percentage) {
       return percentage;
     },

src/components/pages/easy/addCourse.vue

@@ -24,7 +24,7 @@
               </el-breadcrumb>
             </div>
           </div>
-          <div class="rightBox" style="padding: 30px 10px 0;" :style="{height:(!isBtnDisplay) ? 'calc(100% - 70px)' : 'calc(100% - 120px)'}" v-if="this.steps == 1" @mousewheel="scrollChange">
+          <div class="rightBox" style="padding: 30px 10px 0;" :style="{height:(!isBtnDisplay) ? 'calc(100% - 50px)' : 'calc(100% - 120px)'}" v-if="this.steps == 1" @mousewheel="scrollChange">
             <div class="updateMask" :style="{
               height: rightBoxHeight ? rightBoxHeight + 'px' : '100%',
             }" v-if="cid && userid != courseUserid && role != '1'"></div>
@@ -3215,7 +3215,7 @@
               </div> -->
             </div>
           </div>
-          <div :class="{info_btnBox:isBtnDisplay,info_btnBox2:!isBtnDisplay}" @mouseenter="btnDisplay(true)"  @mouseleave="btnDisplay(false)">
+          <div :class="{info_btnBox:isBtnDisplay,info_btnBox2:!isBtnDisplay}" @mouseenter="btnDisplay(true)"  @mouseleave="btnDisplay(false)" v-if="false">
             <button class="c_pub_button_return pub_btn_return_img" @click="lastSteps" v-if="isBtnDisplay">
               返回课程
             </button>
@@ -10329,6 +10329,10 @@ ol {
   border-radius: 15px;
 }
 
+.whiteBIcon > div:nth-child(2){
+  height: 20px;
+  line-height: 20px;
+}
 .check {
   /* width: 20px;
   height: 20px; */
@@ -10937,7 +10941,7 @@ ol {
   margin: 0 auto;
   position: relative;
   box-sizing: border-box;
-  border-radius: 5px 0px;
+  border-radius: 5px;
 }
 
 .e_add_top {

src/components/pages/task/addCourse.vue

@@ -31,7 +31,7 @@
           </div>
           <div
             class="rightBox"
-            :style="{height:(!isBtnDisplay) ? 'calc(100% - 70px)' : 'calc(100% - 120px)'}"
+            :style="{height:(!isBtnDisplay) ? 'calc(100% - 50px)' : 'calc(100% - 120px)'}"
             style="padding: 30px 10px 0;"
             v-if="this.steps == 1"
             @mousewheel="scrollChange"
@@ -5167,7 +5167,7 @@
               </div> -->
             </div>
           </div>
-          <div :class="{info_btnBox:isBtnDisplay,info_btnBox2:!isBtnDisplay}" @mouseenter="btnDisplay(true)"  @mouseleave="btnDisplay(false)">
+          <div :class="{info_btnBox:isBtnDisplay,info_btnBox2:!isBtnDisplay}" @mouseenter="btnDisplay(true)"  @mouseleave="btnDisplay(false)" v-if="false">
             <button
               v-if="isBtnDisplay"
               class="c_pub_button_return pub_btn_return_img"
@@ -12870,6 +12870,10 @@ ol {
   border-radius: 15px;
 }
 
+.whiteBIcon > div:nth-child(2){
+  height: 20px;
+  line-height: 20px;
+}
 .check {
   /* width: 20px;
   height: 20px; */
@@ -13479,7 +13483,7 @@ ol {
   margin: 0 auto;
   position: relative;
   box-sizing: border-box;
-  border-radius: 5px 0px;
+  border-radius: 5px;
 }
 
 .e_add_top {