diff --git a/src/api/index.js b/src/api/index.js index 8019935..5ddfc53 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -120,4 +120,5 @@ export default { examStatistics: `occupationlab/occupationlab/data/kanban/examStatistics`, studentGradeDistribution: `occupationlab/occupationlab/data/kanban/studentGradeDistribution`, studentAssessSchievement: `occupationlab/occupationlab/data/kanban/studentAssessSchievement`, + overviewOfOurSchoolData: `occupationlab/occupationlab/data/kanban/overviewOfOurSchoolData`, }; \ No newline at end of file diff --git a/src/assets/img/screen/stat.png b/src/assets/img/screen/stat.png index 7bf2b30..28830d9 100644 Binary files a/src/assets/img/screen/stat.png and b/src/assets/img/screen/stat.png differ diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue index 35da18f..6a69bee 100644 --- a/src/pages/screen/index.vue +++ b/src/pages/screen/index.vue @@ -40,7 +40,7 @@ -
+
@@ -63,7 +63,30 @@ 学生成绩分布分析
-
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + 月人均在线学习时长情况 +
+
@@ -86,11 +109,11 @@ 平台登录人数
-
+
-
+
@@ -117,14 +140,18 @@
- +

{{ overview.numberOfPeopleStudy }}

+

{{ overview.courseStudyFrequency }}

+

{{ overview.courseStudyTime }}

+

{{ overview.numberOfExperiments }}

+

{{ overview.cumulativeExperimentTime }}

-

23124

+

{{ overview.currentActivePeople }}

当前活跃人数

-
+
@@ -149,7 +176,7 @@ 学生实验课程考核成绩趋势图
-
+
@@ -182,7 +209,7 @@
  • {{ item.curriculumName }}
  • -
    +
    @@ -211,7 +238,7 @@
  • {{ item.curriculumName }}
  • -->
    -
    +
    @@ -281,8 +308,7 @@ export default { name: '日' } ], - stompClientMarket: null, - stompClient: null, + overview: {}, goodsSell: [], cryptoList: [], courses: [], @@ -318,6 +344,11 @@ export default { }, // 获取文本表格数据 getList() { + // 本院数据概览 + this.$post(this.api.overviewOfOurSchoolData).then(({ data }) => { + this.overview = data + }).catch(res => {}) + // 本月综合学习积极性最高的实验课程 this.$post(this.api.getTheMostUsedCoursesInOurSchool).then(({ data }) => { this.courses = data @@ -612,8 +643,8 @@ export default { data: courseData[i] }) ++index + if (index > 3) index = 0 } - console.log(33, courseData) const option = { tooltip: { trigger: 'axis', @@ -633,7 +664,7 @@ export default { }, grid: { left: '30', - top: '25%', + top: '27%', right: '10', bottom: '5%', containLabel: true diff --git a/src/styles/page/screen.scss b/src/styles/page/screen.scss index 9e79c4e..fd44018 100644 --- a/src/styles/page/screen.scss +++ b/src/styles/page/screen.scss @@ -7,7 +7,7 @@ top: 0; left: 0; width: 100%; - height: 100%; + height: 720px; } .wrap { width: 100%; @@ -169,6 +169,7 @@ font-family: 'yjsz'; color: #00f3ff; text-shadow: 0 0 25px #00d8ff; + text-align: center; } .name { font-size: 16px; @@ -187,7 +188,37 @@ .stat-wrap { position: relative; height: 100%; - background: url(../../assets/img/screen/stat.png) 0 -10px/100% auto no-repeat; + background: url(../../assets/img/screen/stat.png) 0 0/100% auto no-repeat; + .num { + position: absolute; + width: 100px; + text-align: center; + font-size: 32px; + font-weight: bold; + color: #00d8ff; + } + .num1 { + top: 220px; + left: 10px; + } + .num2 { + top: 25px; + right: 160px; + } + .num3 { + top: 280px; + left: 185px; + } + .num4 { + top: 205px; + right: 270px; + } + .num5 { + bottom: 250px; + right: 40px; + width: 140px; + font-size: 20px; + } } .main_table { width: 100%; @@ -226,13 +257,6 @@ } } } -.charts { - display: flex; - .chart { - width: 50%; - height: 220px; - } -} .header{ z-index: 2; position: relative; @@ -254,6 +278,7 @@ line-height: 80px; color: #fff; } +$height: 250px; .content{ display: flex; padding: 20px; @@ -266,13 +291,16 @@ } .item { position: relative; - height: 280px; + height: $height; margin-bottom: 30px; border: 1px solid #2C58A6; box-shadow: 0 0 10px #2C58A6; // background-color: #073a7d; } } +.chart { + height: $height; +} .list { padding: 0 15px; margin-top: 25px;