|
|
@@ -83,61 +83,72 @@
|
|
|
<div class="depth">
|
|
|
<span>上传课程</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="36" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle"
|
|
|
+ :percentage="lightJson.upCourseTeachers ? ((lightJson.upCourseTeachers / lightJson.teachers) * 100).toFixed(0) : 0"
|
|
|
+ :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
- <span>指导项目</span>
|
|
|
+ <span>上传项目</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="lightJson.upCourseUsers ? ((lightJson.upCourseUsers / lightJson.users) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>使用工具</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="lightJson.toolUsers ? ((lightJson.toolUsers / lightJson.users) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>课程评价</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="lightJson.rateUser ? ((lightJson.rateUser / lightJson.users) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>互动交流</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="lightJson.commentUsers ? ((lightJson.commentUsers / lightJson.users) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>参与课程</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="36" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="lightJson.gCourseTeachers ? ((lightJson.gCourseTeachers / lightJson.teachers) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>参与项目</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="lightJson.gCourseUsers ? ((lightJson.gCourseUsers / lightJson.users) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>使用工具</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="25" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="25" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>协同合作</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="lightJson.upgCourseTeachers ? ((lightJson.upgCourseTeachers / lightJson.teachers) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
<span>合作交流</span>
|
|
|
<div>
|
|
|
- <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format" color="#106BFF"></el-progress>
|
|
|
+ <el-progress :width="80" type="circle" :percentage="76" :stroke-width="15" :format="format"
|
|
|
+ color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -154,7 +165,7 @@
|
|
|
<el-option label="主题" value="theme"></el-option>
|
|
|
<el-option label="学科" value="subject"></el-option>
|
|
|
</el-select>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
<div class="dataBox">
|
|
|
<div class="course_box">
|
|
|
@@ -165,18 +176,19 @@
|
|
|
</div>
|
|
|
<div class="info3 greenBG">
|
|
|
<span>类别总数</span>
|
|
|
- <span>{{typeCount}}</span>
|
|
|
+ <span>{{ typeCount }}</span>
|
|
|
</div>
|
|
|
<div class="info3 blueBG">
|
|
|
<span>类别平均</span>
|
|
|
- <span>{{(typeCount / 3).toFixed(0)}}</span>
|
|
|
+ <span>{{ (typeCount / 3).toFixed(0) }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="course_box_p">
|
|
|
- <courseInfo></courseInfo>
|
|
|
+ <courseInfo :courseNumberArray="courseNumberArray"></courseInfo>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <cateRank style="height: calc(100% - 50% - 10px); overflow: auto"></cateRank>
|
|
|
+ <cateRank style="height: calc(100% - 50% - 10px); overflow: auto" :courseNumberArray="courseNumberArray">
|
|
|
+ </cateRank>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="bottom">
|
|
|
@@ -229,10 +241,26 @@ export default {
|
|
|
gradeCourse: 0,
|
|
|
subjectCourse: 0,
|
|
|
courseArray: [],
|
|
|
- cType:'',
|
|
|
- grade:[],
|
|
|
- subject:[],
|
|
|
- theme:[],
|
|
|
+ cType: '',
|
|
|
+ gradeArray: [],
|
|
|
+ subjectArray: [],
|
|
|
+ themeArray: [],
|
|
|
+ allArray: [],
|
|
|
+ courseNumberArray: [],
|
|
|
+ typeCount: 0,
|
|
|
+ lightJson: {
|
|
|
+ users: 0,
|
|
|
+ teachers: 0,
|
|
|
+ students: 0,
|
|
|
+ upCourseTeachers: 0,
|
|
|
+ gCourseTeachers: 0,
|
|
|
+ upCourseUsers: 0,
|
|
|
+ gCourseUsers: 0,
|
|
|
+ toolUsers: 0,
|
|
|
+ rateUser: 0,
|
|
|
+ upgCourseTeachers: 0,
|
|
|
+ commentUsers: 0,
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -395,7 +423,7 @@ export default {
|
|
|
for (var j = 0; j < _courseArray[i].subject.length - 1; j++) {
|
|
|
sum += _courseArray[i].subject[j].course
|
|
|
}
|
|
|
- _courseArray[i].subject[_courseArray[i].subject.length - 1].course = (_courseArray[i].courseid.length - sum) < 0 ? 0 : _courseArray[i].courseid.length - sum
|
|
|
+ _courseArray[i].subject[_courseArray[i].subject.length - 1].course = (_courseArray[i].courseid.length - sum) < 0 ? 0 : _courseArray[i].courseid.length - sum
|
|
|
}
|
|
|
for (var j = 0; j < _subject.length; j++) {
|
|
|
for (var z = 0; z < _course.length; z++) {
|
|
|
@@ -411,10 +439,83 @@ export default {
|
|
|
|
|
|
let _theme = res.data[14] //主题
|
|
|
|
|
|
- this.grade = _grade
|
|
|
- this.subject = _subject
|
|
|
- this.theme = _theme
|
|
|
this.typeCount = _grade.length + _subject.length + _theme.length
|
|
|
+ let _gradeArray = []
|
|
|
+ let _subjectArray = []
|
|
|
+ let _themeArray = []
|
|
|
+
|
|
|
+ for (var i = 0; i < _grade.length; i++) {
|
|
|
+ _gradeArray.push({
|
|
|
+ name: _grade[i].name,
|
|
|
+ typeid: _grade[i].id,
|
|
|
+ course: 0
|
|
|
+ })
|
|
|
+ for (var z = 0; z < _course.length; z++) {
|
|
|
+ if (_course[z].typeid == _grade[i].id) {
|
|
|
+ _gradeArray[i].course++
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ for (var i = 0; i < _subject.length; i++) {
|
|
|
+ _subjectArray.push({
|
|
|
+ name: _subject[i].name,
|
|
|
+ typeid: _subject[i].id,
|
|
|
+ course: 0
|
|
|
+ })
|
|
|
+ for (var z = 0; z < _course.length; z++) {
|
|
|
+ if (_course[z].typeid == _subject[i].id) {
|
|
|
+ _subjectArray[i].course++
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ for (var i = 0; i < _theme.length; i++) {
|
|
|
+ _themeArray.push({
|
|
|
+ name: _theme[i].name,
|
|
|
+ typeid: _theme[i].id,
|
|
|
+ course: 0
|
|
|
+ })
|
|
|
+ for (var z = 0; z < _course.length; z++) {
|
|
|
+ if (_course[z].typeid == _theme[i].id) {
|
|
|
+ _themeArray[i].course++
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ this.gradeArray = _gradeArray
|
|
|
+ this.subjectArray = _subjectArray
|
|
|
+ this.themeArray = _themeArray
|
|
|
+ this.allArray = [..._gradeArray, ..._subjectArray, ..._themeArray]
|
|
|
+ this.typeChange();
|
|
|
+
|
|
|
+ let _teachers = res.data[15][0].count //老师数量
|
|
|
+ let _students = res.data[16][0].count //学生数量
|
|
|
+ let _upCourseTeachers = res.data[17][0].count //上传课程老师的数量
|
|
|
+ let _gCourseTeachers = res.data[18][0].count //参与课程的老师
|
|
|
+ let _upCourseUsers = res.data[19][0].count //上传项目的用户
|
|
|
+ let _gCourseUsers = res.data[20][0].count //参与项目的用户
|
|
|
+ let _toolUsers = res.data[21][0].count //使用工具的用户
|
|
|
+ let _rateUser = res.data[22][0].count //被评价的用户
|
|
|
+ let _upgCourseTeachers = res.data[23][0].count //参与协同课程的老师
|
|
|
+ let _commentUsers = res.data[24][0].count //参与互动交流的用户
|
|
|
+
|
|
|
+ this.lightJson = {
|
|
|
+ users: this.count,
|
|
|
+ teachers: _teachers,
|
|
|
+ students: _students,
|
|
|
+ upCourseTeachers: _upCourseTeachers,
|
|
|
+ gCourseTeachers: _gCourseTeachers,
|
|
|
+ upCourseUsers: _upCourseUsers,
|
|
|
+ gCourseUsers: _gCourseUsers,
|
|
|
+ toolUsers: _toolUsers,
|
|
|
+ rateUser: _rateUser,
|
|
|
+ upgCourseTeachers: _upgCourseTeachers,
|
|
|
+ commentUsers: _commentUsers,
|
|
|
+ }
|
|
|
this.$forceUpdate();
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
@@ -422,16 +523,17 @@ export default {
|
|
|
console.error(err);
|
|
|
});
|
|
|
},
|
|
|
- typeChange(){
|
|
|
- if(this.cType === ''){
|
|
|
-
|
|
|
- }else if(this.cType === 'grade'){
|
|
|
-
|
|
|
- }else if(this.cType === 'theme'){
|
|
|
-
|
|
|
- }else if(this.cType === 'subject'){
|
|
|
-
|
|
|
+ typeChange() {
|
|
|
+ if (this.cType === '') {
|
|
|
+ this.courseNumberArray = this.allArray
|
|
|
+ } else if (this.cType === 'grade') {
|
|
|
+ this.courseNumberArray = this.gradeArray
|
|
|
+ } else if (this.cType === 'theme') {
|
|
|
+ this.courseNumberArray = this.subjectArray
|
|
|
+ } else if (this.cType === 'subject') {
|
|
|
+ this.courseNumberArray = this.themeArray
|
|
|
}
|
|
|
+ this.$forceUpdate();
|
|
|
},
|
|
|
format(percentage) {
|
|
|
return percentage;
|
|
|
@@ -634,17 +736,17 @@ export default {
|
|
|
width: calc(100% - 100px);
|
|
|
}
|
|
|
|
|
|
-.selectBox{
|
|
|
+.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;
|
|
|
}
|
|
|
</style>
|
