update

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

@@ -37,35 +37,27 @@
       </div>
       <div class="bottom">
         <div class="titleBox">
-          <div
-            class="title"
-            :class="{ isClick: skType == 0 }"
-            @click="skType = 0"
-            style="cursor: pointer; padding: 0 0 5px 0"
-          >
+          <div class="title" :class="{ isClick: skType == 0 }" @click="skType = 0"
+            style="cursor: pointer; padding: 0 0 5px 0">
             在线时长
           </div>
-          <div
-            class="title"
-            :class="{ isClick: skType == 1 }"
-            @click="skType = 1"
-            style="cursor: pointer; padding: 0 0 5px 0"
-          >
+          <div class="title" :class="{ isClick: skType == 1 }" @click="skType = 1"
+            style="cursor: pointer; padding: 0 0 5px 0">
             登录频次
           </div>
-          <el-select v-model="cType1" class="selectBox" style="width: 110px">
+          <el-select v-model="cType1" class="selectBox" style="width: 110px;margin-left:auto;">
             <el-option label="全部年级" value="全部年级"></el-option>
             <el-option label="一年级" value="一年级"></el-option>
             <el-option label="二年级" value="二年级"></el-option>
             <el-option label="三年级" value="三年级"></el-option>
           </el-select>
-          <div class="timeDiv">
+          <!-- <div class="timeDiv">
             <div @click="tType = 0" :class="{ isClick: tType == 0 }">周</div>
             <div @click="tType = 1" :class="{ isClick: tType == 1 }">月</div>
             <div @click="tType = 2" :class="{ isClick: tType == 2 }">学期</div>
-          </div>
+          </div> -->
         </div>
-        <div class="info_box" v-if="!oType">
+        <div class="info_box" v-if="skType == 0">
           <div class="info blueBG">
             <span>登录频次</span>
             <!-- <span>{{ count }}</span> -->
@@ -77,7 +69,7 @@
             <span>{{ 4 }}</span>
           </div>
         </div>
-        <div class="info_box" v-if="oType">
+        <div class="info_box" v-if="skType == 1">
           <div class="info blueBG">
             <span>累计时长</span>
             <!-- <span>{{ count }}</span> -->
@@ -89,61 +81,48 @@
             <span>{{ 4 }}</span>
           </div>
         </div>
-        <div class="dataBox">
-          <toolUser style="height: calc(100% - 120px)" v-if="!oType"></toolUser>
-          <bar style="height: calc(100% - 120px)" v-if="oType"></bar>
-          <div class="otherCss">
+        <div class="dataBox" style="height: calc(100% - 115px);">
+          <toolUser style="height: calc(100% - 10px)" v-if="skType == 0"></toolUser>
+          <bar style="height: calc(100% - 10px)" v-if="skType == 1"></bar>
+          <!-- <div class="otherCss">
             <div v-if="!oType">切换为柱状图</div>
             <div v-if="oType">切换为热力图</div>
             <div class="otherImg" @click="otherEchart">
               <img src="../../../../assets/icon/other.png" alt="" />
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
     <div class="center">
       <div class="top">
         <div class="titleBox" style="justify-content: space-between">
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               flex-wrap: nowrap;
               align-items: center;
-            "
-          >
-            <div
-              class="title"
-              :class="{ isClick: courseType == 0 }"
-              @click="courseType = 0"
-              style="cursor: pointer; padding: 0 0 5px 0"
-            >
+            ">
+            <div class="title" :class="{ isClick: courseType == 0 }" @click="courseType = 0"
+              style="cursor: pointer; padding: 0 0 5px 0">
               整体分布
             </div>
-            <div
-              class="title"
-              :class="{ isClick: courseType == 1 }"
-              @click="courseType = 1"
-              style="cursor: pointer; padding: 0 0 5px 0"
-            >
+            <div class="title" :class="{ isClick: courseType == 1 }" @click="courseType = 1"
+              style="cursor: pointer; padding: 0 0 5px 0">
               总量增幅
             </div>
+            <div class="title" :class="{ isClick: courseType == 2 }" @click="courseType = 2"
+              style="cursor: pointer; padding: 0 0 5px 0">
+              实施情况
+            </div>
           </div>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               flex-wrap: nowrap;
               align-items: center;
-            "
-          >
-            <el-select
-              v-model="cType3"
-              class="selectBox"
-              style="width: 110px"
-              v-if="courseType == 1"
-            >
+            ">
+            <el-select v-model="cType3" class="selectBox" style="width: 110px" v-if="courseType == 1">
               <el-option label="按年级" value="按年级"></el-option>
             </el-select>
             <el-select v-model="cType2" class="selectBox" style="width: 110px">
@@ -152,192 +131,124 @@
           </div>
         </div>
         <div class="dataBox">
-          <teacherInfo
-            v-if="courseType == 0"
-            style="height: calc(100%)"
-          ></teacherInfo>
-          <courseNum
-            v-if="courseType == 1"
-            style="height: calc(100%)"
-          ></courseNum>
+          <teacherInfo v-if="courseType == 0" style="height: calc(100%)"></teacherInfo>
+          <courseNum v-if="courseType == 1" style="height: calc(100%)"></courseNum>
+          <div style="height: calc(100%)" v-if="courseType == 2">
+            <div class="info_box" style="width: 96%;">
+              <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+                <span>平台实施课程总数</span>
+                <!-- <span>{{ count }}</span> -->
+                <span>{{ 18 }}</span>
+              </div>
+              <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+                <span>平台实施课程占比</span>
+                <!-- <span>{{ weekCount }}</span> -->
+                <span>{{ "80%" }}</span>
+              </div>
+              <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+                <span>课程平均任务数量</span>
+                <!-- <span>{{ weekCount }}</span> -->
+                <span>{{ 18 }}</span>
+              </div>
+              <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+                <span>课程平均作业数量</span>
+                <!-- <span>{{ weekCount }}</span> -->
+                <span>{{ 18 }}</span>
+              </div>
+            </div>
+            <workNum style="height:calc(100% - 70px)"></workNum>
+          </div>
         </div>
       </div>
       <div class="bottom">
         <div class="titleBox" style="justify-content: space-between">
           <div class="title">平台使用概况</div>
-          <div class="timeDiv">
+          <!-- <div class="timeDiv">
             <div @click="tType = 0" :class="{ isClick: tType == 0 }">周</div>
             <div @click="tType = 1" :class="{ isClick: tType == 1 }">月</div>
             <div @click="tType = 2" :class="{ isClick: tType == 2 }">学期</div>
-          </div>
+          </div> -->
         </div>
         <div class="dataBox">
-          <div
-            class="depth_box"
-            v-if="!shType"
-            style="height: calc(100% - 30px)"
-          >
+          <div class="depth_box" style="height: calc(100%s)">
             <div class="depth">
               <span>参与课程</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>参与项目</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>使用工具</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>协同合作</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>互动交流</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>参与课程</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>参与项目</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>使用工具</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>协同合作</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>互动交流</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="80"
-                  :stroke-width="15"
-                  :format="format"
-                  color="#106BFF"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="15" :format="format"
+                  color="#106BFF"></el-progress>
               </div>
             </div>
           </div>
-          <div class="info_box" v-if="shType">
-            <div class="info blueBG">
-              <span>平台实施课程总数</span>
-              <!-- <span>{{ count }}</span> -->
-              <span>{{ 18 }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>平台实施课程占比</span>
-              <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ "80%" }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>课程平均任务数量</span>
-              <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ 18 }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>课程平均作业数量</span>
-              <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ 18 }}</span>
-            </div>
-          </div>
-          <workNum v-if="shType"></workNum>
-          <div class="otherCss">
+          <!-- <div class="otherCss">
             <div v-if="!shType">切换为散点图</div>
             <div v-if="shType">切换为进度条</div>
             <div class="otherImg" @click="shEchart">
               <img src="../../../../assets/icon/other.png" alt="" />
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
@@ -345,14 +256,12 @@
       <div class="top" style="border-radius: 5px">
         <div class="titleBox" style="justify-content: space-between">
           <div class="title">整体分布</div>
-          <div
-            style="
+          <div style="
               display: flex;
               flex-direction: row;
               flex-wrap: nowrap;
               align-items: center;
-            "
-          >
+            ">
             <el-select v-model="cType4" class="selectBox" style="width: 110px">
               <el-option label="全部" value="全部"></el-option>
             </el-select>
@@ -478,7 +387,7 @@ export default {
   height: 100%;
 }
 
-.left > .top {
+.left>.top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
   background: #fff;
@@ -486,7 +395,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.left > .bottom {
+.left>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
   background: #fff;
@@ -499,7 +408,7 @@ export default {
   margin: 0 20px;
 }
 
-.center > .top {
+.center>.top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
   background: #fff;
@@ -507,7 +416,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.center > .bottom {
+.center>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
   background: #fff;
@@ -519,7 +428,7 @@ export default {
   height: 100%;
 }
 
-.right > .top {
+.right>.top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
   background: #fff;
@@ -527,7 +436,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.right > .bottom {
+.right>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
   background: #fff;
@@ -554,11 +463,9 @@ export default {
 }
 
 .greenBG {
-  background: linear-gradient(
-    180deg,
-    rgb(211, 246, 228, 0.2) 0%,
-    rgb(23, 196, 105, 0.3) 100%
-  );
+  background: linear-gradient(180deg,
+      rgb(211, 246, 228, 0.2) 0%,
+      rgb(23, 196, 105, 0.3) 100%);
 }
 
 .depth_box {
@@ -579,14 +486,13 @@ export default {
   justify-content: center;
 }
 
-.depth > span:nth-child(1) {
+.depth>span:nth-child(1) {
   font-size: 14px;
   font-weight: 700;
   margin: 0 0 10px;
 }
 
-.depth > div:nth-child(1) {
-}
+.depth>div:nth-child(1) {}
 
 .course_box {
   display: flex;
@@ -612,12 +518,12 @@ export default {
   margin-left: 10px;
 }
 
-.selectBox >>> .el-input__inner {
+.selectBox>>>.el-input__inner {
   height: 30px;
   line-height: 30px;
 }
 
-.selectBox >>> .el-input__icon {
+.selectBox>>>.el-input__icon {
   line-height: 30px;
 }
 
@@ -633,6 +539,7 @@ export default {
   padding: 0 10px;
   margin: 0 10px;
 }
+
 .teaMiddle {
   width: calc(100% / 3 - 10px);
 }
@@ -645,7 +552,7 @@ export default {
   margin: 0 0 0 15px;
 }
 
-.timeDiv > div {
+.timeDiv>div {
   margin-right: 10px;
   cursor: pointer;
 }
@@ -655,6 +562,7 @@ export default {
   border-bottom: 2px solid #1684fc;
   box-sizing: border-box;
 }
+
 .otherCss {
   display: flex;
   flex-direction: row;
@@ -662,13 +570,15 @@ export default {
   align-items: center;
   justify-content: flex-end;
 }
+
 .otherImg {
   width: 20px;
   height: 20px;
   margin: 0 10px;
   cursor: pointer;
 }
-.otherImg > img {
+
+.otherImg>img {
   width: 100%;
   height: 100%;
 }
@@ -682,9 +592,9 @@ export default {
   margin: 0 auto;
 }
 
-.info_box > .info2,
-.info_box > .info3,
-.info_box > .info {
+.info_box>.info2,
+.info_box>.info3,
+.info_box>.info {
   width: calc(50% - 10px);
   display: flex;
   flex-direction: row;
@@ -698,19 +608,19 @@ export default {
   border-radius: 5px;
 }
 
-.info_box > .info2 {
+.info_box>.info2 {
   width: calc(100% / 4 - 10px);
   /* align-items: flex-end; */
 }
 
-.info_box > .info3 {
+.info_box>.info3 {
   width: 100%;
   margin-bottom: 5px;
 }
 
-.info_box > .info2 > span:nth-child(1),
-.info_box > .info3 > span:nth-child(1),
-.info_box > .info > span:nth-child(1) {
+.info_box>.info2>span:nth-child(1),
+.info_box>.info3>span:nth-child(1),
+.info_box>.info>span:nth-child(1) {
   font-size: 14px;
   /* margin: 0 0 0 20px; */
   color: #565e6a;
@@ -719,9 +629,9 @@ export default {
   word-break: break-all;
 }
 
-.info_box > .info2 > span:nth-child(2),
-.info_box > .info3 > span:nth-child(2),
-.info_box > .info > span:nth-child(2) {
+.info_box>.info2>span:nth-child(2),
+.info_box>.info3>span:nth-child(2),
+.info_box>.info>span:nth-child(2) {
   font-size: 24px;
   /* font-weight: 700; */
 }

src/components/pages/grade/index.vue

@@ -460,7 +460,7 @@
           </div>
           <div class="people_nav">选择班级</div>
         </div>
-        <div
+        <!-- <div
           class="t_j_box"
           style="
             padding: 20px 0 0 25px;
@@ -469,7 +469,7 @@
           "
         >
           <span>班级</span>
-        </div>
+        </div> -->
         <el-checkbox-group
           v-model="checkboxList3"
           class="people_name"

src/components/pages/student/addCourse.vue

@@ -905,7 +905,7 @@
                           <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
                             v-if="itemTask.toolArray.length > 0" style="position: absolute; right: 55px"></div>
                         </div>
-                        <div style="margin: 10px 0;display: flex;">
+                        <div style="margin: 10px 0;align-items: center;" :style="{display: (itemTool.tool == 57 || itemTool.tool == 51) ? 'block' : 'flex'}">
                           <div>
                             <div class="tool" v-if="itemTool.tool == 1">
                               <div class="whiteBIcon" @click="openToolFun(1, itemTaskIndex, toolIndex)">
@@ -1156,38 +1156,38 @@
                                   itemTool.toolData[itemTool.sourceIndex]
                                     .type == 9
                                   " type="primary" @click="
-    checkFileFull(
-      itemTool.toolData[itemTool.sourceIndex]
-        .type,
-      itemTool.toolData[itemTool.sourceIndex].src
-    )
-    ">全屏查看</el-button>
+                                checkFileFull(
+                                  itemTool.toolData[itemTool.sourceIndex]
+                                    .type,
+                                  itemTool.toolData[itemTool.sourceIndex].src
+                                )
+                                ">全屏查看</el-button>
                                 <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
                                   .type == 3 ||
                                   itemTool.toolData[itemTool.sourceIndex]
                                     .type == 9
                                   " type="primary" @click="
-    downloadFile(
-      itemTool.toolData[itemTool.sourceIndex].src
-    )
-    ">文件下载</el-button>
+                                downloadFile(
+                                  itemTool.toolData[itemTool.sourceIndex].src
+                                )
+                                ">文件下载</el-button>
                                 <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
                                   .type == 8
                                   " type="primary" @click="
-    openLineS(
-      itemTool.toolData[itemTool.sourceIndex].src
-    )
-    ">打开链接
+                                openLineS(
+                                  itemTool.toolData[itemTool.sourceIndex].src
+                                )
+                                ">打开链接
                                 </el-button>
                                 <el-button v-if="itemTool.toolData[itemTool.sourceIndex]
                                   .type == 6
                                   " type="primary" @click="
-    checkFileFull(
-      itemTool.toolData[itemTool.sourceIndex]
-        .type,
-      itemTool.toolData[itemTool.sourceIndex]
-    )
-    ">全屏查看</el-button>
+                                checkFileFull(
+                                  itemTool.toolData[itemTool.sourceIndex]
+                                    .type,
+                                  itemTool.toolData[itemTool.sourceIndex]
+                                )
+                                ">全屏查看</el-button>
                                 <el-button type="primary" @click="
                                   editSourceUpadte(itemTaskIndex, toolIndex)
                                   ">添加资源</el-button>

src/components/pages/testStudent/index.vue

@@ -2,7 +2,7 @@
     <div class="pb_content" style="height: auto">
         <div class="pb_head top">
             <div>
-                <span>学生评测</span>
+                <span>评测中心</span>
             </div>
             <!-- <div class="student_button">
                 <el-button type="primary" class="bgColor" @click="goToCourse()">新建评测</el-button>