|
|
@@ -16,12 +16,11 @@
|
|
|
<span>{{ allUser }}</span>
|
|
|
</div>
|
|
|
<div class="info blueBG">
|
|
|
- <span>本月登录用户环比</span>
|
|
|
+ <span>本月新增登录用户</span>
|
|
|
<span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].user -
|
|
|
loginCountMonthArray[loginCountMonthArray.length - 2].user) < 0 ? 0 :
|
|
|
- ((loginCountMonthArray[loginCountMonthArray.length - 1].user -
|
|
|
- loginCountMonthArray[loginCountMonthArray.length - 2].user) /
|
|
|
- loginCountMonthArray[loginCountMonthArray.length - 2].user * 100) + '%' }}</span>
|
|
|
+ loginCountMonthArray[loginCountMonthArray.length - 1].user -
|
|
|
+ loginCountMonthArray[loginCountMonthArray.length - 2].user }}</span>
|
|
|
</div>
|
|
|
<div class="info blueBG">
|
|
|
<span>本月登录用户总数</span>
|
|
|
@@ -29,11 +28,12 @@
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="info blueBG">
|
|
|
- <span>本月新增登录用户</span>
|
|
|
+ <span>本月登录用户环比</span>
|
|
|
<span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].user -
|
|
|
loginCountMonthArray[loginCountMonthArray.length - 2].user) < 0 ? 0 :
|
|
|
- loginCountMonthArray[loginCountMonthArray.length - 1].user -
|
|
|
- loginCountMonthArray[loginCountMonthArray.length - 2].user }}</span>
|
|
|
+ (((loginCountMonthArray[loginCountMonthArray.length - 1].user -
|
|
|
+ loginCountMonthArray[loginCountMonthArray.length - 2].user) /
|
|
|
+ loginCountMonthArray[loginCountMonthArray.length - 2].user) * 100).toFixed(2) + '%' }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<loginCount style="height: calc(100% - 140px)" :monthArray="loginCountMonthArray"></loginCount>
|
|
|
@@ -152,7 +152,7 @@
|
|
|
<span>{{ isCourseCount ? (workCount / isCourseCount).toFixed(0) : 0 }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <workNum style="height:calc(100% - 70px)" :workNumList="workNumList"></workNum>
|
|
|
+ <workNum style="height:calc(100% - 70px)" :workNumList="workNumList" @openCourse="openCourse"></workNum>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -161,11 +161,11 @@
|
|
|
<div class="title">平台使用概况</div>
|
|
|
<div class="tCircleC">
|
|
|
<div class="tCircleBox">
|
|
|
- <span class="tCircle tt"></span>
|
|
|
+ <span class="tCircle ts"></span>
|
|
|
<span class="tname">老师</span>
|
|
|
</div>
|
|
|
<div class="tCircleBox">
|
|
|
- <span class="tCircle ts"></span>
|
|
|
+ <span class="tCircle tt"></span>
|
|
|
<span class="tname">学生</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -182,7 +182,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.upCourseTeachers ? parseInt((lightJson.upCourseTeachers / lightJson.teachers * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="rgb(64, 149, 229)"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -190,7 +190,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.upSCourseTeachers ? parseInt((lightJson.upSCourseTeachers / lightJson.teachers * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="rgb(64, 149, 229)"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -198,7 +198,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.toolTeachers ? parseInt((lightJson.toolTeachers / lightJson.teachers * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="rgb(64, 149, 229)"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -206,7 +206,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.gCourseTeachers ? parseInt((lightJson.gCourseTeachers / lightJson.teachers * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="rgb(64, 149, 229)"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -214,7 +214,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.commentTeachers ? parseInt((lightJson.commentTeachers / lightJson.teachers * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="rgb(64, 149, 229)"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -222,7 +222,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.courseStudents ? parseInt((lightJson.courseStudents / lightJson.students * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#53c95f"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -230,7 +230,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.scourseStudents ? parseInt((lightJson.scourseStudents / lightJson.students * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#53c95f"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -238,7 +238,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.toolStudents ? parseInt((lightJson.toolStudents / lightJson.students * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#53c95f"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -246,7 +246,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.gsCourseStudents ? parseInt((lightJson.gsCourseStudents / lightJson.students * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#53c95f"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="depth">
|
|
|
@@ -254,7 +254,7 @@
|
|
|
<div>
|
|
|
<el-progress :width="80" type="circle"
|
|
|
:percentage="lightJson.commentStudents ? parseInt((lightJson.commentStudents / lightJson.students * 100).toFixed(0)) : 0"
|
|
|
- :stroke-width="5" :format="format" color="#106BFF"></el-progress>
|
|
|
+ :stroke-width="5" :format="format" color="#53c95f"></el-progress>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -279,7 +279,7 @@
|
|
|
align-items: center;
|
|
|
">
|
|
|
<el-select v-model="cType" @change="typeChange" class="selectBox">
|
|
|
- <el-option label="全部" value=""></el-option>
|
|
|
+ <!-- <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>
|
|
|
@@ -345,7 +345,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
isLoading: false,
|
|
|
- cType: "",
|
|
|
+ cType: "grade",
|
|
|
cType1: "全部年级",
|
|
|
cType2: "全部活动",
|
|
|
cType3: "按年级",
|
|
|
@@ -396,6 +396,9 @@ export default {
|
|
|
this.getData();
|
|
|
},
|
|
|
methods: {
|
|
|
+ openCourse(cid) {
|
|
|
+ window.parent.postMessage({ cid: cid, screenType: "3" }, "*");
|
|
|
+ },
|
|
|
otherEchart() {
|
|
|
this.oType = !this.oType;
|
|
|
},
|
|
|
@@ -708,7 +711,7 @@ export default {
|
|
|
let toWeekCouseCount = 0
|
|
|
for (var z = 0; z < _course.length; z++) {
|
|
|
let _date = new Date(weekArray.lastWeek[weekArray.lastWeek.length - 1])
|
|
|
- console.log(_date)
|
|
|
+ // console.log(_date)
|
|
|
if (new Date(_course[z].create_at) > _date && _course[z].pid == '34628934-d02f-11ec-8c78-005056b86db5') {
|
|
|
weekCourse.push(_course[z])
|
|
|
var a = new Date(_course[z].create_at)
|
|
|
@@ -718,6 +721,9 @@ export default {
|
|
|
} else {
|
|
|
toWeekCouseCount++
|
|
|
}
|
|
|
+ // if (weekArray.toWeek.indexOf(string) == -1) {
|
|
|
+ // lastWeekCouseCount++
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -745,7 +751,17 @@ export default {
|
|
|
toCourseidWeek.push(weekCourse[z].courseid)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ // if (weekArray.toWeek.indexOf(string) == -1) {
|
|
|
+ // weekCourse2[i].lastCourse++
|
|
|
+ // if (lastCourseidWeek.indexOf(weekCourse[z].courseid) === -1) {
|
|
|
+ // lastCourseidWeek.push(weekCourse[z].courseid)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // weekCourse2[i].toCourse++
|
|
|
+ // if (toCourseidWeek.indexOf(weekCourse[z].courseid) === -1) {
|
|
|
+ // toCourseidWeek.push(weekCourse[z].courseid)
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -766,9 +782,10 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
typeChange() {
|
|
|
- if (this.cType === '') {
|
|
|
- this.courseNumberArray = this.allArray
|
|
|
- } else if (this.cType === 'grade') {
|
|
|
+ // if (this.cType === '') {
|
|
|
+ // this.courseNumberArray = this.allArray
|
|
|
+ // } else
|
|
|
+ if (this.cType === 'grade') {
|
|
|
this.courseNumberArray = this.gradeArray
|
|
|
} else if (this.cType === 'theme') {
|
|
|
this.courseNumberArray = this.themeArray
|
|
|
@@ -1077,7 +1094,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.tCircleBox .tt {
|
|
|
- background: rgb(64, 149, 229);
|
|
|
+ background: #53c95f;
|
|
|
}
|
|
|
|
|
|
.tCircleBox .ts {
|
