lsc hai 1 ano
pai
achega
b8e2fc6663

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.ac2e7d1971bfcdc8577d1a9ddfa6ed64.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.776d4f4d456ef8b32333.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.6d1ed9ef60d0e798e7e8fb16b18d483e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.3f63f074a9d58d0878e9.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.6d1ed9ef60d0e798e7e8fb16b18d483e.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.6d1ed9ef60d0e798e7e8fb16b18d483e.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.ac2e7d1971bfcdc8577d1a9ddfa6ed64.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.3f63f074a9d58d0878e9.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.3f63f074a9d58d0878e9.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.776d4f4d456ef8b32333.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 1 - 1
src/components/pages/addCourse.vue

@@ -13566,7 +13566,7 @@ ol {
 }
 
 .navStage .nt_taskName {
-  max-width: calc(100% - 75px);
+  max-width: calc(100% - 82px);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

+ 2 - 1
src/components/pages/dataBoardNew/course/chartList/cateRank.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="data_body">
-        <div style="width: 100%; height: 100%">
+        <div style="width: 100%; height: 100%" :style="{minWidth:ooption.hours.length * 75 + 'px'}">
             <div id="charts_canvas" class="echart" style="width: 100%; height: 100%; "></div>
         </div>
     </div>
@@ -223,6 +223,7 @@ export default {
     padding: 0;
     width: 95%;
     background: #fff;
+    overflow: auto;
 }
 </style>
   

+ 139 - 233
src/components/pages/dataBoardNew/course/index.vue

@@ -21,20 +21,10 @@
               <!-- <span>{{ weekCount }}</span> -->
               <span v-if="loginCountMonthArray.length">{{
                 loginCountMonthArray[loginCountMonthArray.length - 1].course -
-                  loginCountMonthArray[loginCountMonthArray.length - 2].course <
-                0
-                  ? 0
-                  : (
-                      ((loginCountMonthArray[loginCountMonthArray.length - 1]
-                        .course -
-                        loginCountMonthArray[loginCountMonthArray.length - 2]
-                          .course) /
-                        (allCourse -
-                          loginCountMonthArray[loginCountMonthArray.length - 1]
-                            .course)) *
-                      100
-                    ).toFixed(2) + "%"
-              }}</span>
+                loginCountMonthArray[loginCountMonthArray.length - 2].course < 0 ? 0 : (
+                  ((loginCountMonthArray[loginCountMonthArray.length - 1].course -
+                    loginCountMonthArray[loginCountMonthArray.length - 2].course) / (allCourse -
+                      loginCountMonthArray[loginCountMonthArray.length - 1].course)) * 100).toFixed(2) + "%" }}</span>
             </div>
             <div class="info blueBG">
               <span>模板课程总数</span>
@@ -49,49 +39,27 @@
               }}</span>
             </div>
           </div>
-          <TeaFre
-            style="height: calc(100% - 140px)"
-            :monthArray="loginCountMonthArray"
-          ></TeaFre>
+          <TeaFre style="height: calc(100% - 140px)" :monthArray="loginCountMonthArray"></TeaFre>
         </div>
       </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-if="skType == 0"
-            v-model="lType"
-            @change="typeChange1"
-            class="selectBox"
-            style="margin-left: auto"
-          >
+          <el-select v-if="skType == 0" v-model="lType" @change="typeChange1" class="selectBox" style="margin-left: auto">
             <el-option label="全部" value="all"></el-option>
             <el-option label="年级" value="grade"></el-option>
             <el-option label="主题" value="theme"></el-option>
             <el-option label="学科" value="subject"></el-option>
           </el-select>
-          <el-select
-            v-if="skType == 1"
-            v-model="lType1"
-            @change="typeChange2"
-            class="selectBox"
-            style="margin-left: auto"
-          >
+          <el-select v-if="skType == 1" v-model="lType1" @change="typeChange2" class="selectBox"
+            style="margin-left: auto">
             <el-option label="全部" value="all"></el-option>
             <el-option label="年级" value="grade"></el-option>
             <el-option label="主题" value="theme"></el-option>
@@ -149,16 +117,8 @@
               }}</span>
             </div>
           </div>
-          <Bar
-            style="height: calc(100% - 70px)"
-            v-if="skType == 0"
-            :workList="tedurArray"
-          ></Bar>
-          <ToolUse
-            style="height: calc(100% - 70px)"
-            v-if="skType == 1"
-            :yearArray="courseWorksCountYearArray"
-          ></ToolUse>
+          <Bar style="height: calc(100% - 70px)" v-if="skType == 0" :workList="tedurArray"></Bar>
+          <ToolUse style="height: calc(100% - 70px)" v-if="skType == 1" :yearArray="courseWorksCountYearArray"></ToolUse>
           <!-- <div class="otherCss">
             <div v-if="!oType">切换为柱状图</div>
             <div v-if="oType">切换为热力图</div>
@@ -172,34 +132,18 @@
     <div class="center">
       <div class="top">
         <div class="titleBox">
-          <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>
         <div class="dataBox">
-          <CateRank
-            v-if="courseType == 0"
-            style="height: calc(100%)"
-            :courseArray="courseArray"
-          ></CateRank>
-          <CourseNum
-            v-if="courseType == 1"
-            style="height: calc(100%)"
-            :weekCourse2="weekCourse2"
-          ></CourseNum>
+          <CateRank v-if="courseType == 0" style="height: calc(100%)" :courseArray="courseArray"></CateRank>
+          <CourseNum v-if="courseType == 1" style="height: calc(100%)" :weekCourse2="weekCourse2"></CourseNum>
         </div>
       </div>
       <div class="bottom">
@@ -213,77 +157,45 @@
             </div>
             <div class="allBox_right">
               <div class="depth">
-                <span>设置评价</span>
+                <span>已提交作业</span>
                 <div>
-                  <el-progress
-                    :width="80"
-                    type="circle"
-                    :percentage="
-                      allCourse
-                        ? parseInt(((evaCount / allCourse) * 100).toFixed(0))
-                        : 0
-                    "
-                    :stroke-width="5"
-                    :format="format"
-                    color="#106BFF"
-                  ></el-progress>
+                  <el-progress :width="80" type="circle" :percentage="allCourse
+                      ? parseInt(
+                        ((haveWorksCourse / allCourse) * 100).toFixed(0)
+                      )
+                      : 0
+                    " :stroke-width="5" :format="format" color="#106BFF"></el-progress>
                 </div>
               </div>
               <div class="depth">
-                <span>已提交作业</span>
+                <span>设置评价</span>
                 <div>
-                  <el-progress
-                    :width="80"
-                    type="circle"
-                    :percentage="
-                      allCourse
-                        ? parseInt(
-                            ((haveWorksCourse / allCourse) * 100).toFixed(0)
-                          )
-                        : 0
-                    "
-                    :stroke-width="5"
-                    :format="format"
-                    color="#106BFF"
-                  ></el-progress>
+                  <el-progress :width="80" type="circle" :percentage="allCourse
+                      ? parseInt(((evaCount / allCourse) * 100).toFixed(0))
+                      : 0
+                    " :stroke-width="5" :format="format" color="#106BFF"></el-progress>
                 </div>
               </div>
               <div class="depth">
                 <span>已评价课程</span>
                 <div>
-                  <el-progress
-                    :width="80"
-                    type="circle"
-                    :percentage="
-                      allCourse
-                        ? parseInt(
-                            ((evaWorksCount / allCourse) * 100).toFixed(0)
-                          )
-                        : 0
-                    "
-                    :stroke-width="5"
-                    :format="format"
-                    color="#106BFF"
-                  ></el-progress>
+                  <el-progress :width="80" type="circle" :percentage="allCourse
+                      ? parseInt(
+                        ((evaWorksCount / allCourse) * 100).toFixed(0)
+                      )
+                      : 0
+                    " :stroke-width="5" :format="format" color="#106BFF"></el-progress>
                 </div>
               </div>
               <div class="depth">
                 <span>教学评一体化</span>
                 <div>
-                  <el-progress
-                    :width="80"
-                    type="circle"
-                    :percentage="
-                      allCourse
-                        ? parseInt(
-                            ((evaWorksCount / allCourse) * 100).toFixed(0)
-                          )
-                        : 0
-                    "
-                    :stroke-width="5"
-                    :format="format"
-                    color="#106BFF"
-                  ></el-progress>
+                  <el-progress :width="80" type="circle" :percentage="allCourse
+                      ? parseInt(
+                        ((evaWorksCount / allCourse) * 100).toFixed(0)
+                      )
+                      : 0
+                    " :stroke-width="5" :format="format" color="#106BFF"></el-progress>
                 </div>
               </div>
             </div>
@@ -299,8 +211,8 @@
               <!-- <span>{{ weekCount }}</span> -->
               <span>{{
                 isCourseCount
-                  ? ((isCourseCount / allCourseCount) * 100).toFixed(0) + "%"
-                  : "0%"
+                ? ((isCourseCount / allCourseCount) * 100).toFixed(0) + "%"
+                : "0%"
               }}</span>
             </div>
             <div class="info blueBG" style="width: calc(100% / 4 - 10px)">
@@ -318,12 +230,8 @@
               }}</span>
             </div>
           </div>
-          <WorkNum
-            style="height: calc(100% - 95px)"
-            :workNumList="workNumList"
-            @openCourse="openCourse"
-            v-if="shType"
-          ></WorkNum>
+          <WorkNum style="height: calc(100% - 95px)" :workNumList="workNumList" @openCourse="openCourse" v-if="shType">
+          </WorkNum>
           <div class="otherCss">
             <div v-if="!shType">转换为散点图</div>
             <div v-if="shType">转换为漏斗图</div>
@@ -337,54 +245,31 @@
     <div class="right">
       <div class="top" style="border-radius: 5px">
         <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: toolType == 0 }"
-              @click="toolType = 0"
-              style="cursor: pointer; padding: 0 0 5px 0"
-            >
+            ">
+            <div class="title" :class="{ isClick: toolType == 0 }" @click="toolType = 0"
+              style="cursor: pointer; padding: 0 0 5px 0">
               课程占比
             </div>
-            <div
-              class="title"
-              :class="{ isClick: toolType == 1 }"
-              @click="toolType = 1"
-              style="cursor: pointer; padding: 0 0 5px 0"
-            >
+            <div class="title" :class="{ isClick: toolType == 1 }" @click="toolType = 1"
+              style="cursor: pointer; padding: 0 0 5px 0">
               工具使用
             </div>
           </div>
-          <el-select
-            v-model="cType4"
-            @change="typeChange"
-            class="selectBox"
-            v-if="toolType == 0"
-          >
-            <el-option label="全部" value=""></el-option>
+          <el-select v-model="cType4" @change="typeChange" class="selectBox" v-if="toolType == 0">
+            <!-- <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>
           </el-select>
         </div>
         <div class="dataBox">
-          <CourseAna
-            style="height: calc(100%)"
-            :courseNumberArray="courseNumberArray"
-            v-if="toolType == 0"
-          ></CourseAna>
-          <ToolChart
-            style="height: calc(100%)"
-            :toolArray="toolList"
-            v-if="toolType == 1"
-          ></ToolChart>
+          <CourseAna style="height: calc(100%)" :courseNumberArray="courseNumberArray" v-if="toolType == 0"></CourseAna>
+          <ToolChart style="height: calc(100%)" :toolArray="toolList" v-if="toolType == 1"></ToolChart>
         </div>
       </div>
       <div class="bottom">
@@ -392,11 +277,7 @@
           <div class="title">课程协同情况</div>
         </div>
         <div class="dataBox">
-          <WorkTime
-            style="height: calc(100% - 25px)"
-            :personArray="personList"
-            v-if="xtType"
-          ></WorkTime>
+          <WorkTime style="height: calc(100% - 25px)" :personArray="personList" v-if="xtType"></WorkTime>
           <Subjuect style="height: calc(100% - 25px)" v-if="!xtType"></Subjuect>
           <div class="otherCss">
             <div v-if="!xtType">转换为人员协同</div>
@@ -449,7 +330,7 @@ export default {
     return {
       isLoading: false,
       cType: "全部年级",
-      cType4: "",
+      cType4: "grade",
       cType7: "全部课程",
       toolType: 0,
       tType: 0,
@@ -464,11 +345,13 @@ export default {
       loginCountMonthArray: [],
       lType: "all",
       lType1: "all",
+      allTimeList: [],
       tedurArray: [],
       classList: [],
       subjectList: [],
       themeList: [],
       allTime: 0,
+      allTimeLength: 0,
       gradeLength: 0,
       subjectLength: 0,
       themeLength: 0,
@@ -477,7 +360,7 @@ export default {
       courseWorksCountYearArray: [],
       allCourseWorks: [],
       gradeList: [],
-      subjectList: [],
+      subjectList2: [],
       thList: [],
       worksCount: 0,
       haveWorksCourse: 0,
@@ -528,9 +411,9 @@ export default {
     typeChange1() {
       var a = [];
       if (this.lType == "all") {
-        a = this.classList.concat(this.subjectList, this.themeList);
-        this.courseLength =
-          this.gradeLength + this.subjectLength + this.themeLength;
+        // a = this.classList.concat(this.subjectList, this.themeList);
+        a = this.allTimeList;
+        this.courseLength = this.allTimeLength;
       } else if (this.lType == "grade") {
         a = this.classList;
         this.courseLength = this.gradeLength;
@@ -614,7 +497,7 @@ export default {
             if (
               _month == courseWorksCountYearArray[j].Month &&
               _year == courseWorksCountYearArray[j].Year &&
-              this.subjectList.indexOf(_type) != -1
+              this.subjectList2.indexOf(_type) != -1
             ) {
               courseWorksCountYearArray[j][dayArray[_day]]++;
               break;
@@ -664,7 +547,7 @@ export default {
             }
           }
         } else if (this.lType1 == "subject") {
-          if (this.subjectList.indexOf(this.allCourseWorks[i].typeid)) {
+          if (this.subjectList2.indexOf(this.allCourseWorks[i].typeid)) {
             if (this.allCourseWorks[i].id) {
               worksCount++;
             }
@@ -728,6 +611,7 @@ export default {
           let _grade = res.data[0]; //年级
           let _subject = res.data[1]; //学科
           let _themeList = res.data[2]; //主题
+          let _allTime = [..._grade, ..._subject, ..._themeList]; //年级 + 学科 + 主题
           this.allCourse = res.data[3][0].count; //课程总数
           let _timeCourse = res.data[4]; //查询半年内全部课程
           this.courseTemplate = res.data[5][0].count; //查询模板课程总数
@@ -793,6 +677,15 @@ export default {
           });
 
           for (var i = 0; i < courseJson.length; i++) {
+            for (var j = 0; j < _allTime.length; j++) {
+              if (courseJson[i].typeid.indexOf(_allTime[j].id) != -1) {
+                if (_allTime[j].time && courseJson[i].text) {
+                  _allTime[j].time += parseInt(courseJson[i].text);
+                } else if (courseJson[i].text) {
+                  _allTime[j].time = parseInt(courseJson[i].text);
+                }
+              }
+            }
             for (var j = 0; j < _grade.length; j++) {
               if (courseJson[i].typeid.indexOf(_grade[j].id) != -1) {
                 if (_grade[j].time && courseJson[i].text) {
@@ -821,7 +714,8 @@ export default {
               }
             }
           }
-
+          
+          this.allTimeList = _allTime;
           this.classList = _grade;
           this.subjectList = _subject;
           this.themeList = _themeList;
@@ -842,8 +736,17 @@ export default {
           var _courseTypeList = this.courseTList;
           var _gList = [],
             _sList = [],
-            _tList = [];
+            _tList = [],
+            _timeList = [];
           for (var i = 0; i < _courseTypeList.length; i++) {
+
+            if (_timeList.length == 0) {
+              _timeList.push(_courseTypeList[i].courseid);
+            } else {
+              if (_timeList.indexOf(_courseTypeList[i].courseid) == -1) {
+                _timeList.push(_courseTypeList[i].courseid);
+              }
+            }
             if (_gradeList.indexOf(_courseTypeList[i].typeid) != -1) {
               if (_gList.length == 0) {
                 _gList.push(_courseTypeList[i].courseid);
@@ -873,14 +776,15 @@ export default {
             }
           }
 
+          this.allTimeLength = _timeList.length
           this.gradeLength = _gList.length;
           this.subjectLength = _sList.length;
           this.themeLength = _tList.length;
 
           var a = [];
           if (this.lType == "all") {
-            this.tedurArray = _grade.concat(_subject, _themeList);
-            this.courseLength = _gList.length + _sList.length + _tList.length;
+            this.tedurArray = _allTime;
+            this.courseLength = _timeList.length;
           } else if (this.lType == "grade") {
             this.tedurArray = _grade;
             this.courseLength = _gList.length;
@@ -891,6 +795,7 @@ export default {
             this.tedurArray = _themeList;
             this.courseLength = _tList.length;
           }
+
           var time = 0;
           a = this.tedurArray;
           for (var i = 0; i < a.length; i++) {
@@ -903,7 +808,7 @@ export default {
           let allCourseWorks = res.data[7]; //作业总数量
           this.allCourseWorks = allCourseWorks;
           this.gradeList = _gradeList;
-          this.subjectList = _subjectList;
+          this.subjectList2 = _subjectList;
           this.thList = _thList;
           this.typeChange2();
 
@@ -1304,7 +1209,7 @@ export default {
   height: 100%;
 }
 
-.left > .top {
+.left>.top {
   width: 100%;
   height: calc(100% / 2 - 10px);
   background: #fff;
@@ -1312,7 +1217,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.left > .bottom {
+.left>.bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
   background: #fff;
@@ -1325,7 +1230,7 @@ export default {
   margin: 0 20px;
 }
 
-.center > .top {
+.center>.top {
   width: 100%;
   height: calc(100% / 5 * 3 - 10px);
   background: #fff;
@@ -1333,7 +1238,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.center > .bottom {
+.center>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2 - 10px);
   background: #fff;
@@ -1345,7 +1250,7 @@ export default {
   height: 100%;
 }
 
-.right > .top {
+.right>.top {
   width: 100%;
   height: calc(100% / 2 - 10px);
   background: #fff;
@@ -1353,7 +1258,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.right > .bottom {
+.right>.bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
   background: #fff;
@@ -1398,43 +1303,38 @@ export default {
   padding: 0 10px;
   margin: 0 10px;
 }
+
 .teaMiddle {
   width: calc(100% / 3 - 10px);
 }
 
 .cNum {
-  background: linear-gradient(
-    180deg,
-    rgb(125, 227, 174, 0.2) 0%,
-    rgb(23, 196, 105, 0.3) 100%
-  ) !important;
+  background: linear-gradient(180deg,
+      rgb(125, 227, 174, 0.2) 0%,
+      rgb(23, 196, 105, 0.3) 100%) !important;
 }
 
 .tNum {
-  background: linear-gradient(
-    180deg,
-    rgb(174, 204, 254, 0.2) 0%,
-    rgb(54, 129, 252, 0.3) 100%
-  ) !important;
+  background: linear-gradient(180deg,
+      rgb(174, 204, 254, 0.2) 0%,
+      rgb(54, 129, 252, 0.3) 100%) !important;
 }
 
 .tSum {
-  background: linear-gradient(
-    180deg,
-    rgb(125, 227, 174, 0.2) 0%,
-    rgb(23, 196, 105, 0.3) 100%
-  ) !important;
+  background: linear-gradient(180deg,
+      rgb(125, 227, 174, 0.2) 0%,
+      rgb(23, 196, 105, 0.3) 100%) !important;
 }
 
-.teaLeft > div:first-child,
-.teaMiddle > div:first-child {
+.teaLeft>div:first-child,
+.teaMiddle>div:first-child {
   font-size: 12px;
   font-weight: 400;
   color: #565e6a;
 }
 
-.teaLeft > div:last-child,
-.teaMiddle > div:last-child {
+.teaLeft>div:last-child,
+.teaMiddle>div:last-child {
   font-size: 22px;
   font-weight: bold;
   color: #060e17;
@@ -1444,17 +1344,18 @@ export default {
   width: 50%;
   height: 100%;
 }
+
 .selectBox {
   width: 80px;
   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;
 }
 
@@ -1466,7 +1367,7 @@ export default {
   margin: 0 0 0 15px;
 }
 
-.timeDiv > div {
+.timeDiv>div {
   margin-right: 10px;
   cursor: pointer;
 }
@@ -1484,16 +1385,19 @@ 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%;
 }
+
 .allBox {
   width: 100%;
   height: 100%;
@@ -1502,10 +1406,12 @@ export default {
   flex-wrap: nowrap;
   align-items: center;
 }
+
 .allBox_left {
   width: 30%;
   height: 100%;
 }
+
 .allBox_right {
   display: flex;
   flex-wrap: wrap;
@@ -1524,13 +1430,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) {}
 
 .info_box {
   display: flex;
@@ -1541,9 +1447,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;
@@ -1557,19 +1463,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;
@@ -1578,9 +1484,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; */
 }

+ 2 - 2
src/components/pages/dataBoardNew/project/index.vue

@@ -5,9 +5,9 @@
       <div class="top">
         <div class="titleBox" style="justify-content: space-between">
           <div class="title">基础概况</div>
-          <el-select v-model="cType7" class="selectBox" style="width: 110px">
+          <!-- <el-select v-model="cType7" class="selectBox" style="width: 110px">
             <el-option label="全部课程" value="全部课程"></el-option>
-          </el-select>
+          </el-select> -->
         </div>
         <div class="dataBox">
           <div class="info_box">

+ 2 - 1
src/components/pages/dataBoardNew/school/teacherInfo/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="data_body">
-        <div style="width: 100%; height: 100%">
+        <div style="width: 100%; height: 100%" :style="{minWidth:ooption.hours.length * 75 + 'px'}">
             <div id="charts_canvas" class="echart" style="width: 100%; height: 100%; "></div>
         </div>
     </div>
@@ -223,6 +223,7 @@ export default {
     padding: 0;
     width: 95%;
     background: #fff;
+    overflow: auto;
 }
 </style>
   

+ 2 - 1
src/components/pages/dataBoardNew/teacher/chartList/teaData.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="data_body">
-        <div style="width: 100%; height: 100%">
+        <div style="width: 100%; height: 100%" :style="{minWidth:ooption.hours.length * 75 + 'px'}">
             <div id="charts_canvas" class="echart" style="width: 100%; height: 100%; "></div>
         </div>
     </div>
@@ -222,6 +222,7 @@ export default {
     padding: 0;
     width: 95%;
     background: #fff;
+    overflow: auto;
 }
 </style>
   

+ 2 - 2
src/components/pages/dataBoardNew/teacher/index.vue

@@ -152,14 +152,14 @@
             >
               教师行为分布
             </div>
-            <div
+            <!-- <div
               class="title"
               :class="{ isClick: courseType == 1 }"
               @click="courseType = 1"
               style="cursor: pointer; padding: 0 0 5px 0"
             >
               教师协同情况
-            </div>
+            </div> -->
           </div>
         </div>
         <div class="dataBox">

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio