update

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

@@ -10,19 +10,19 @@
           <div class="info_box">
             <div class="info blueBG">
               <span>用户总数</span>
-              <span>{{count}}</span>
+              <span>{{ count }}</span>
             </div>
             <div class="info greenBG">
               <span>周使用频次</span>
-              <span>{{weekCount}}</span>
+              <span>{{ weekCount }}</span>
             </div>
             <div class="info blueBG">
               <span>登录频次</span>
-              <span>{{loginCount}}</span>
+              <span>{{ loginCount }}</span>
             </div>
             <div class="info greenBG">
               <span>人均使用频次</span>
-              <span>{{(loginCount / count).toFixed(0)}}</span>
+              <span>{{ (loginCount / count).toFixed(0) }}</span>
             </div>
           </div>
           <loginCount style="height: calc(100% - 140px)" :monthArray="loginCountMonthArray"></loginCount>
@@ -36,14 +36,14 @@
           <div class="info_box">
             <div class="info blueBG">
               <span>累计时长</span>
-              <span>{{loginTime.toFixed(0)}}小时</span>
+              <span>{{ loginTime.toFixed(0) }}小时</span>
             </div>
             <div class="info greenBG">
               <span>人均时长</span>
-              <span>{{(loginTime / count).toFixed(0)}}小时</span>
+              <span>{{ (loginTime / count).toFixed(0) }}小时</span>
             </div>
           </div>
-          <loginTime style="height: calc(100% - 70px)"></loginTime>
+          <loginTime :yearArray="loginCountYearArray" style="height: calc(100% - 70px)"></loginTime>
         </div>
       </div>
     </div>
@@ -56,7 +56,7 @@
           <div class="info_box" style="width: 95%">
             <div class="info2 blueBG">
               <span>上传课程总数</span>
-              <span>{{courseCount}}</span>
+              <span>{{ courseCount }}</span>
             </div>
             <div class="info2 greenBG">
               <span>各年级平均课程数</span>
@@ -68,7 +68,7 @@
             </div>
             <div class="info2 greenBG">
               <span>教师人均课程数</span>
-              <span>{{(courseCount / teacherCount).toFixed(0)}}</span>
+              <span>{{ (courseCount / teacherCount).toFixed(0) }}</span>
             </div>
           </div>
           <teacherInfo style="height: calc(100% - 70px)"></teacherInfo>
@@ -83,121 +83,61 @@
             <div class="depth">
               <span>上传课程</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="36"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="36" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>指导项目</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="76"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>使用工具</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="76"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>课程评价</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="76"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>互动交流</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="76"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>参与课程</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="36"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="36" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>参与项目</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="76"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>使用工具</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="25"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="25" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>协同合作</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="76"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
             <div class="depth">
               <span>合作交流</span>
               <div>
-                <el-progress
-                  :width="80"
-                  type="circle"
-                  :percentage="76"
-                  :stroke-width="15"
-                  :format="format"
-                ></el-progress>
+                <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"></el-progress>
               </div>
             </div>
           </div>
@@ -212,26 +152,24 @@
         <div class="dataBox">
           <div class="course_box">
             <div class="info_box">
-                <div class="info3 blueBG">
-                  <span>课程总数</span>
-                  <span>{{courseCount}}</span>
-                </div>
-                <div class="info3 greenBG">
-                  <span>类别总数</span>
-                  <span>546</span>
-                </div>
-                <div class="info3 blueBG">
-                  <span>类别平均</span>
-                  <span>12</span>
-                </div>
+              <div class="info3 blueBG">
+                <span>课程总数</span>
+                <span>{{ courseCount }}</span>
+              </div>
+              <div class="info3 greenBG">
+                <span>类别总数</span>
+                <span>546</span>
+              </div>
+              <div class="info3 blueBG">
+                <span>类别平均</span>
+                <span>12</span>
+              </div>
             </div>
             <div class="course_box_p">
               <courseInfo></courseInfo>
             </div>
           </div>
-          <cateRank
-            style="height: calc(100% - 200px); overflow: auto"
-          ></cateRank>
+          <cateRank style="height: calc(100% - 200px); overflow: auto"></cateRank>
         </div>
       </div>
       <div class="bottom">
@@ -270,13 +208,14 @@ export default {
   data() {
     return {
       isLoading: false,
-      count:0,
-      loginCount:0,
-      loginTime:0,
-      courseCount:0,
-      teacherCount:0,
-      loginCountMonthArray:[],
-      weekCount:0,
+      count: 0,
+      loginCount: 0,
+      loginTime: 0,
+      courseCount: 0,
+      teacherCount: 0,
+      loginCountMonthArray: [],
+      weekCount: 0,
+      loginCountYearArray:[],
     }
   },
   mounted() {
@@ -296,7 +235,7 @@ export default {
           this.isLoading = false;
           this.count = res.data[0][0].count
           this.loginCount = res.data[1][0].loginCount
-          this.loginTime = parseInt(res.data[3][0].time) / 60  / 60
+          this.loginTime = parseInt(res.data[3][0].time) / 60 / 60
           this.courseCount = res.data[5][0].courseCount
           this.teacherCount = res.data[6][0].count
 
@@ -304,20 +243,20 @@ export default {
           const date = new Date()
           var Month = date.getMonth() + 1
           var Year = date.getFullYear()
-          for(var i = Month;i>Month-6;i--){
-            if(i <= 0){
+          for (var i = Month; i > Month - 6; i--) {
+            if (i <= 0) {
               loginCountMonthArray.push({
-                Year:Year-1,
-                Month:12+i,
-                student:0,
-                teacher:0
+                Year: Year - 1,
+                Month: 12 + i,
+                student: 0,
+                teacher: 0
               })
-            }else{
+            } else {
               loginCountMonthArray.push({
-                Month:i,
-                Year:Year,
-                student:0,
-                teacher:0
+                Month: i,
+                Year: Year,
+                student: 0,
+                teacher: 0
               })
             }
           }
@@ -325,23 +264,23 @@ export default {
           let teacherLoginCountYear = res.data[7] // 老师半年登录次数统计
           let studentLoginCountYear = res.data[8] // 学生半年登录次数统计
 
-          for(var i = 0;i<teacherLoginCountYear.length;i++){
+          for (var i = 0; i < teacherLoginCountYear.length; i++) {
             let _date = new Date(teacherLoginCountYear[i].create_at)
             var _month = _date.getMonth() + 1
-            var _year = _date.getFullYear() 
-            for(var j = 0;j<loginCountMonthArray.length;j++){
-              if(_month == loginCountMonthArray[j].Month && _year == loginCountMonthArray[j].Year){
+            var _year = _date.getFullYear()
+            for (var j = 0; j < loginCountMonthArray.length; j++) {
+              if (_month == loginCountMonthArray[j].Month && _year == loginCountMonthArray[j].Year) {
                 loginCountMonthArray[j].teacher++
                 break;
               }
             }
           }
-          for(var i = 0;i<studentLoginCountYear.length;i++){
+          for (var i = 0; i < studentLoginCountYear.length; i++) {
             let _date = new Date(studentLoginCountYear[i].create_at)
             var _month = _date.getMonth() + 1
-            var _year = _date.getFullYear() 
-            for(var j = 0;j<loginCountMonthArray.length;j++){
-              if(_month == loginCountMonthArray[j].Month && _year == loginCountMonthArray[j].Year){
+            var _year = _date.getFullYear()
+            for (var j = 0; j < loginCountMonthArray.length; j++) {
+              if (_month == loginCountMonthArray[j].Month && _year == loginCountMonthArray[j].Year) {
                 loginCountMonthArray[j].student++
                 break;
               }
@@ -351,6 +290,52 @@ export default {
           this.loginCountMonthArray = loginCountMonthArray
 
           this.weekCount = res.data[9][0].count
+
+          let loginCountYear = res.data[10]
+          let loginCountYearArray = []
+          for (var i = Month; i > Month - 12; i--) {
+            if (i <= 0) {
+              loginCountYearArray.push({
+                Year: Year - 1,
+                Month: 12 + i,
+                mon: 0,
+                tue: 0,
+                wed: 0,
+                thur: 0,
+                fri: 0,
+                sat: 0,
+                sun: 0,
+              })
+            } else {
+              loginCountYearArray.push({
+                Month: i,
+                Year: Year,
+                mon: 0,
+                tue: 0,
+                wed: 0,
+                thur: 0,
+                fri: 0,
+                sat: 0,
+                sun: 0,
+              })
+            }
+          }
+          loginCountYearArray = loginCountYearArray.reverse()
+          for (var i = 0; i < loginCountYear.length; i++) {
+            let _date = new Date(loginCountYear[i].create_at)
+            var _month = _date.getMonth() + 1
+            var _year = _date.getFullYear()
+            var _day = _date.getDay()
+            let dayArray = ['sun', 'mon', 'tue', 'wed', 'thur', 'fri', 'sat']
+            for (var j = 0; j < loginCountYearArray.length; j++) {
+              if (_month == loginCountYearArray[j].Month && _year == loginCountYearArray[j].Year) {
+                loginCountYearArray[j][dayArray[_day]]++
+                break;
+              }
+            }
+          }
+          console.log(loginCountYearArray);
+          this.loginCountYearArray = loginCountYearArray
         })
         .catch((err) => {
           this.isLoading = false;
@@ -380,7 +365,7 @@ export default {
   height: 100%;
 }
 
-.left > .top {
+.left>.top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
   background: #fff;
@@ -388,7 +373,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.left > .bottom {
+.left>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
   background: #fff;
@@ -401,7 +386,7 @@ export default {
   margin: 0 20px;
 }
 
-.center > .top {
+.center>.top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
   background: #fff;
@@ -409,7 +394,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.center > .bottom {
+.center>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
   background: #fff;
@@ -421,7 +406,7 @@ export default {
   height: 100%;
 }
 
-.right > .top {
+.right>.top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
   background: #fff;
@@ -429,7 +414,7 @@ export default {
   margin: 0 0 20px 0;
 }
 
-.right > .bottom {
+.right>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
   background: #fff;
@@ -444,7 +429,7 @@ export default {
   width: 100%;
 }
 
-.titleBox > .title {
+.titleBox>.title {
   font-weight: 700;
 }
 
@@ -462,9 +447,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: column;
@@ -476,44 +461,40 @@ 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: 12px;
   /* margin: 0 0 5px 0; */
 }
 
-.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: 22px;
   font-weight: 700;
 }
 
 .blueBG {
-  background: linear-gradient(
-    180deg,
-    rgba(224, 234, 251, 0.2) 0%,
-    rgba(54, 130, 252, 0.3) 100%
-  );
+  background: linear-gradient(180deg,
+      rgba(224, 234, 251, 0.2) 0%,
+      rgba(54, 130, 252, 0.3) 100%);
 }
 
 .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 {
@@ -534,13 +515,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;
@@ -548,6 +529,7 @@ export default {
   width: 90%;
   margin: 0 auto;
 }
+
 .course_box .info_box {
   height: 100%;
   width: 100px;
@@ -555,6 +537,7 @@ export default {
   margin: 0;
   flex-wrap: nowrap;
 }
+
 .course_box_p {
   width: calc(100% - 100px);
 }

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

@@ -74,9 +74,9 @@ export default {
                     //劳动课程
                     this.$el.querySelector("#charts_canvas")
                 );
-                this.option.xAxis.data = this.ooption.xdata;
-                this.option.series[0].data = this.ooption.teacher;
-                this.option.series[1].data = this.ooption.student;
+                this.option.xAxis.data = option.xdata;
+                this.option.series[0].data = option.teacher;
+                this.option.series[1].data = option.student;
                 // 初始化雷达图
                 this.chartObj = chartObj;
                 this.chartObj.setOption(this.option);
@@ -103,9 +103,9 @@ export default {
                 if (!this.chartObj) {
                     this.setChart(this.ooption);
                 } else {
-                    this.option.xAxis.data = option.xdata;
-                    this.option.series[0].data = option.teacher;
-                    this.option.series[1].data = option.student;
+                    this.option.xAxis.data = this.ooption.xdata;
+                    this.option.series[0].data = this.ooption.teacher;
+                    this.option.series[1].data = this.ooption.student;
                     this.chartObj.setOption(this.option);
                 }
                 this.$forceUpdate();

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

@@ -8,6 +8,11 @@
   
 <script>
 export default {
+    props: {
+        yearArray: {
+            type: Array,
+        },
+    },
     data() {
         return {
             chartObj: null,
@@ -20,7 +25,7 @@ export default {
                     position: 'top'
                 },
                 grid: {
-                    top:'50',
+                    top: '50',
                     left: '5%',
                     right: '5%',
                     bottom: '5%',
@@ -28,10 +33,11 @@ export default {
                 },
                 xAxis: {
                     type: 'category',
-                    data: [
-                        '1月', '2月', '3月', '4月', '5月', '6月', '7月',
-                        '8月', '9月', '10月', '11月', '12月'
-                    ],
+                    // data: [
+                    //     '1月', '2月', '3月', '4月', '5月', '6月', '7月',
+                    //     '8月', '9月', '10月', '11月', '12月'
+                    // ],
+                    data: [],
                     splitArea: {
                         show: true
                     }
@@ -85,12 +91,10 @@ export default {
                     //劳动课程
                     this.$el.querySelector("#charts_canvas")
                 );
-                const data = [[0, 0, 5], [0, 1, 1], [0, 2, 0], [0, 3, 0], [0, 4, 0], [0, 5, 0], [0, 6, 0], [0, 7, 0], [0, 8, 0], [0, 9, 0], [0, 10, 0], [0, 11, 2], [0, 12, 4], [0, 13, 1], [0, 14, 1], [0, 15, 3], [0, 16, 4], [0, 17, 6], [0, 18, 4], [0, 19, 4], [0, 20, 3], [0, 21, 3], [0, 22, 2], [0, 23, 5], [1, 0, 7], [1, 1, 0], [1, 2, 0], [1, 3, 0], [1, 4, 0], [1, 5, 0], [1, 6, 0], [1, 7, 0], [1, 8, 0], [1, 9, 0], [1, 10, 5], [1, 11, 2], [1, 12, 2], [1, 13, 6], [1, 14, 9], [1, 15, 11], [1, 16, 6], [1, 17, 7], [1, 18, 8], [1, 19, 12], [1, 20, 5], [1, 21, 5], [1, 22, 7], [1, 23, 2], [2, 0, 1], [2, 1, 1], [2, 2, 0], [2, 3, 0], [2, 4, 0], [2, 5, 0], [2, 6, 0], [2, 7, 0], [2, 8, 0], [2, 9, 0], [2, 10, 3], [2, 11, 2], [2, 12, 1], [2, 13, 9], [2, 14, 8], [2, 15, 10], [2, 16, 6], [2, 17, 5], [2, 18, 5], [2, 19, 5], [2, 20, 7], [2, 21, 4], [2, 22, 2], [2, 23, 4], [3, 0, 7], [3, 1, 3], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [3, 6, 0], [3, 7, 0], [3, 8, 1], [3, 9, 0], [3, 10, 5], [3, 11, 4], [3, 12, 7], [3, 13, 14], [3, 14, 13], [3, 15, 12], [3, 16, 9], [3, 17, 5], [3, 18, 5], [3, 19, 10], [3, 20, 6], [3, 21, 4], [3, 22, 4], [3, 23, 1], [4, 0, 1], [4, 1, 3], [4, 2, 0], [4, 3, 0], [4, 4, 0], [4, 5, 1], [4, 6, 0], [4, 7, 0], [4, 8, 0], [4, 9, 2], [4, 10, 4], [4, 11, 4], [4, 12, 2], [4, 13, 4], [4, 14, 4], [4, 15, 14], [4, 16, 12], [4, 17, 1], [4, 18, 8], [4, 19, 5], [4, 20, 3], [4, 21, 7], [4, 22, 3], [4, 23, 0], [5, 0, 2], [5, 1, 1], [5, 2, 0], [5, 3, 3], [5, 4, 0], [5, 5, 0], [5, 6, 0], [5, 7, 0], [5, 8, 2], [5, 9, 0], [5, 10, 4], [5, 11, 1], [5, 12, 5], [5, 13, 10], [5, 14, 5], [5, 15, 7], [5, 16, 11], [5, 17, 6], [5, 18, 0], [5, 19, 5], [5, 20, 3], [5, 21, 4], [5, 22, 2], [5, 23, 0], [6, 0, 1], [6, 1, 0], [6, 2, 0], [6, 3, 0], [6, 4, 0], [6, 5, 0], [6, 6, 0], [6, 7, 0], [6, 8, 0], [6, 9, 0], [6, 10, 1], [6, 11, 0], [6, 12, 2], [6, 13, 1], [6, 14, 3], [6, 15, 4], [6, 16, 0], [6, 17, 0], [6, 18, 0], [6, 19, 0], [6, 20, 1], [6, 21, 2], [6, 22, 2], [6, 23, 6]]
-                    .map(function (item) {
-                    return [item[1], item[0], item[2] || '-'];
-                });
-                //   this.option.xAxis.data = option.xdata;
-                  this.option.series[0].data = data;
+
+                this.option.xAxis.data = option.xdata;
+                this.option.series[0].data = option.sdata;
+                this.option.visualMap.max = option.max ? option.max : 0;
                 // 初始化雷达图
                 this.chartObj = chartObj;
                 this.chartObj.setOption(this.option);
@@ -98,10 +102,80 @@ export default {
         },
     },
     watch: {
-
+        yearArray: {
+            immediate: true,
+            deep: true,
+            handler(newValue, oldValue) {
+                this.ooption = {
+                    xdata: [],
+                    sdata: [],
+                    max:0
+                }
+                let _array = newValue
+                let max = []
+                for (var i = 0; i < _array.length; i++) {
+                    this.ooption.xdata.push(_array[i].Month + '月')
+                    this.ooption.sdata.push([i, 0, _array[i].sun])
+                    this.ooption.sdata.push([i, 1, _array[i].mon])
+                    this.ooption.sdata.push([i, 2, _array[i].tue])
+                    this.ooption.sdata.push([i, 3, _array[i].wed])
+                    this.ooption.sdata.push([i, 4, _array[i].thur])
+                    this.ooption.sdata.push([i, 5, _array[i].fri])
+                    this.ooption.sdata.push([i, 6, _array[i].sat])
+                    // let _data = [_array[i].Month-1,] //[月份，星期，值]
+                    max.push(_array[i].sun)
+                    max.push(_array[i].mon)
+                    max.push(_array[i].tue)
+                    max.push(_array[i].wed)
+                    max.push(_array[i].thur)
+                    max.push(_array[i].fri)
+                    max.push(_array[i].sat)
+                }
+                this.ooption.max = max.sort(function(a,b){
+                    return b-a;
+                })[0];
+                if (!this.chartObj) {
+                    this.setChart(this.ooption);
+                } else {
+                    this.option.xAxis.data = this.ooption.xdata;
+                    this.option.series[0].data = this.ooption.sdata;
+                    this.option.visualMap.max = this.ooption.max ? this.ooption.max : 0;
+                    this.chartObj.setOption(this.option);
+                }
+                this.$forceUpdate();
+            },
+        },
     },
     mounted() {
-
+        this.ooption = {
+            xdata: [],
+            sdata: [],
+            max:0
+        }
+        let _array = this.yearArray
+        let max = []
+        for (var i = 0; i < _array.length; i++) {
+            this.ooption.xdata.push(_array[i].Month + '月')
+            this.ooption.sdata.push([i, 0, _array[i].sun])
+            this.ooption.sdata.push([i, 1, _array[i].mon])
+            this.ooption.sdata.push([i, 2, _array[i].tue])
+            this.ooption.sdata.push([i, 3, _array[i].wed])
+            this.ooption.sdata.push([i, 4, _array[i].thur])
+            this.ooption.sdata.push([i, 5, _array[i].fri])
+            this.ooption.sdata.push([i, 6, _array[i].sat])
+            // let _data = [_array[i].Month-1,] //[月份，星期，值]
+            max.push(_array[i].sun)
+            max.push(_array[i].mon)
+            max.push(_array[i].tue)
+            max.push(_array[i].wed)
+            max.push(_array[i].thur)
+            max.push(_array[i].fri)
+            max.push(_array[i].sat)
+        }
+        this.ooption.max = max.sort(function(a,b){
+                    return b-a;
+                })[0];
+                
         this.setChart(this.ooption);
         var _this = this;
         window.addEventListener("resize", () => {

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

@@ -14,7 +14,7 @@
             </div>
             <div class="info greenBG">
               <span>周使用频次</span>
-              <span>15620</span>
+              <span>{{weekCount}}</span>
             </div>
             <div class="info blueBG">
               <span>登录频次</span>
@@ -25,7 +25,7 @@
               <span>{{ (loginCount / count).toFixed(0) }}</span>
             </div>
           </div>
-          <loginCount style="height: calc(100% - 140px)"></loginCount>
+          <loginCount :monthArray="loginCountMonthArray" style="height: calc(100% - 140px)"></loginCount>
         </div>
       </div>
       <div class="bottom">
@@ -186,6 +186,8 @@ export default {
       count: 0,
       loginCount: 0,
       loginTime: 0,
+      loginCountMonthArray:[],
+      weekCount:0
     };
   },
   mounted() {
@@ -206,6 +208,47 @@ export default {
           this.count = res.data[0][0].count;
           this.loginCount = res.data[1][0].loginCount;
           this.loginTime = parseInt(res.data[2][0].time) / 60 / 60;
+
+
+
+          let loginCountMonthArray = []
+          const date = new Date()
+          var Month = date.getMonth() + 1
+          var Year = date.getFullYear()
+          for (var i = Month; i > Month - 6; i--) {
+            if (i <= 0) {
+              loginCountMonthArray.push({
+                Year: Year - 1,
+                Month: 12 + i,
+                student: 0,
+              })
+            } else {
+              loginCountMonthArray.push({
+                Month: i,
+                Year: Year,
+                student: 0,
+              })
+            }
+          }
+
+          loginCountMonthArray = loginCountMonthArray.reverse()
+          let studentLoginCountYear = res.data[3] // 学生半年登录次数统计
+
+          for (var i = 0; i < studentLoginCountYear.length; i++) {
+            let _date = new Date(studentLoginCountYear[i].create_at)
+            var _month = _date.getMonth() + 1
+            var _year = _date.getFullYear()
+            for (var j = 0; j < loginCountMonthArray.length; j++) {
+              if (_month == loginCountMonthArray[j].Month && _year == loginCountMonthArray[j].Year) {
+                loginCountMonthArray[j].student++
+                break;
+              }
+            }
+          }
+          this.loginCountMonthArray = loginCountMonthArray;
+          console.log(loginCountMonthArray);
+
+          this.weekCount = res.data[4][0].count
         })
         .catch((err) => {
           this.isLoading = false;

src/components/pages/dataBoard/student/loginCount/index.vue

@@ -8,12 +8,17 @@
   
 <script>
 export default {
+    props: {
+        monthArray: {
+            type: Array,
+        },
+    },
     data() {
         return {
             chartObj: null,
             ooption: {
                 xdata: [],
-                sdata: [],
+                student: [],
             },
             option: {
                 tooltip: {
@@ -29,7 +34,8 @@ export default {
                 xAxis: {
                     type: 'category',
                     boundaryGap: true,
-                    data: ['1月', '2月', '3月', '4月', '5月', '6月']
+                    // data: ['1月', '2月', '3月', '4月', '5月', '6月']
+                    data: []
                 },
                 yAxis: {
                     type: 'value'
@@ -38,7 +44,8 @@ export default {
                     {
                         name: '学生',
                         type: 'line',
-                        data: [220, 182, 191, 234, 290, 330]
+                        // data: [220, 182, 191, 234, 290, 330]
+                        data: []
                     },
                 ]
             },
@@ -56,8 +63,8 @@ export default {
                     //劳动课程
                     this.$el.querySelector("#charts_canvas")
                 );
-                //   this.option.xAxis.data = option.xdata;
-                //   this.option.series[0].data = option.sdata;
+                this.option.xAxis.data = option.xdata;
+                this.option.series[0].data = option.student;
                 // 初始化雷达图
                 this.chartObj = chartObj;
                 this.chartObj.setOption(this.option);
@@ -65,10 +72,41 @@ export default {
         },
     },
     watch: {
+        monthArray: {
+            immediate: true,
+            deep: true,
+            handler(newValue, oldValue) {
+                this.ooption = {
+                    xdata: [],
+                    student: [],
+                }
+                let _array = newValue
+                for (var i = 0; i < _array.length; i++) {
+                    this.ooption.xdata.push(_array[i].Month + '月')
+                    this.ooption.student.push(_array[i].student)
+                }
 
+                if (!this.chartObj) {
+                    this.setChart(this.ooption);
+                } else {
+                    this.option.xAxis.data = this.ooption.xdata;
+                    this.option.series[0].data = this.ooption.student;
+                    this.chartObj.setOption(this.option);
+                }
+                this.$forceUpdate();
+            },
+        },
     },
     mounted() {
-
+        this.ooption = {
+            xdata: [],
+            student: [],
+        }
+        let _array = this.monthArray
+        for (var i = 0; i < _array.length; i++) {
+            this.ooption.xdata.push(_array[i].Month + '月')
+            this.ooption.student.push(_array[i].student)
+        }
         this.setChart(this.ooption);
         var _this = this;
         window.addEventListener("resize", () => {