1

src/components/pages/dataBoard/teacher/chartList/funPlot.vue

@@ -12,6 +12,11 @@
 
 <script>
 export default {
+  props: {
+    pusaDep: {
+      type: Array,
+    },
+  },
   data() {
     return {
       chartObj: null,
@@ -51,10 +56,10 @@ export default {
               borderWidth: 1,
             },
             data: [
-              { value: 20, name: "登录" },
-              { value: 40, name: "创建" },
-              { value: 60, name: "授课" },
-              { value: 80, name: "评价" },
+              // { value: 20, name: "登录" },
+              // { value: 40, name: "创建" },
+              // { value: 60, name: "授课" },
+              // { value: 80, name: "评价" },
             ],
           },
         ],
@@ -62,7 +67,7 @@ export default {
     };
   },
   methods: {
-    setChart() {
+    setChart(array) {
       // 雷达图显示的标签
       let newPromise = new Promise((resolve) => {
         resolve();
@@ -73,13 +78,34 @@ export default {
           this.$el.querySelector("#charts_canvas")
         );
         // 初始化雷达图
+        this.option.series[0].data = array;
         this.chartObj = chartObj;
         this.chartObj.setOption(this.option);
       });
     },
+    setArray(array){
+        let _array = array;
+
+        if (!this.chartObj) {
+          this.setChart(_array);
+        } else {
+          this.option.series[0].data = _array;
+          this.chartObj.setOption(this.option);
+        }
+        this.$forceUpdate();
+    },
+  },
+  watch: {
+    pusaDep: {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        this.setArray(newValue)
+      },
+    },
   },
   mounted() {
-    this.setChart(this.option);
+    this.setArray(this.pusaDep)
     var _this = this;
     window.addEventListener("resize", () => {
       if (_this.chartObj) {

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

@@ -14,7 +14,7 @@
             </div>
             <div class="teaLeft teaRigth">
               <div>周使用频次</div>
-              <div>{{weekCount}}</div>
+              <div>{{ weekCount }}</div>
             </div>
           </div>
           <div class="teafre" style="margin: 10px auto">
@@ -27,7 +27,10 @@
               <div>{{ (loginCount / count).toFixed(0) }}</div>
             </div>
           </div>
-          <TeaFre style="height: calc(100% - 150px)" :monthArray="loginCountMonthArray"></TeaFre>
+          <TeaFre
+            style="height: calc(100% - 150px)"
+            :monthArray="loginCountMonthArray"
+          ></TeaFre>
         </div>
       </div>
       <div class="bottom">
@@ -68,7 +71,11 @@
               <div>{{ subjectCourse.toFixed(0) }}</div>
             </div>
           </div>
-          <TeaData style="height: calc(100% - 62px)" :courseArray="courseArray" @openCourse="openCourse2"></TeaData>
+          <TeaData
+            style="height: calc(100% - 62px)"
+            :courseArray="courseArray"
+            @openCourse="openCourse2"
+          ></TeaData>
         </div>
       </div>
       <div class="bottom">
@@ -77,7 +84,7 @@
         </div>
         <div class="dataBox">
           <div class="allBox">
-            <div class="allBox_left"><FunPlot></FunPlot></div>
+            <div class="allBox_left"><FunPlot :pusaDep="pusaDep"></FunPlot></div>
             <div class="allBox_right">
               <div class="depth">
                 <span>上传课程</span>
@@ -85,7 +92,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="36"
+                    :percentage="
+                      lightJson.upCourseTeachers
+                        ? (
+                            (lightJson.upCourseTeachers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -98,7 +112,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="76"
+                    :percentage="
+                      lightJson.upCourseUsers
+                        ? (
+                            (lightJson.upCourseUsers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -111,7 +132,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="76"
+                    :percentage="
+                      lightJson.upgCourseTeachers
+                        ? (
+                            (lightJson.upgCourseTeachers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -124,7 +152,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="76"
+                    :percentage="
+                      lightJson.commentUsers
+                        ? (
+                            (lightJson.commentUsers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -137,7 +172,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="76"
+                    :percentage="
+                      lightJson.evaTeachers
+                        ? (
+                            (lightJson.evaTeachers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -150,7 +192,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="36"
+                    :percentage="
+                      lightJson.toolUsers
+                        ? (
+                            (lightJson.toolUsers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -163,7 +212,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="76"
+                    :percentage="
+                      lightJson.tevaTeachers
+                        ? (
+                            (lightJson.tevaTeachers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -176,7 +232,14 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="25"
+                    :percentage="
+                      lightJson.sevaTeachers
+                        ? (
+                            (lightJson.sevaTeachers / lightJson.teachers) *
+                            100
+                          ).toFixed(0)
+                        : 0
+                    "
                     :stroke-width="15"
                     :format="format"
                     color="#106BFF"
@@ -194,7 +257,10 @@
           <div class="title">教学活动</div>
         </div>
         <div class="dataBox">
-          <WorkNum :workNumList="workNumList" @openCourse="openCourse"></WorkNum>
+          <WorkNum
+            :workNumList="workNumList"
+            @openCourse="openCourse"
+          ></WorkNum>
         </div>
       </div>
       <div class="bottom">
@@ -250,35 +316,54 @@ export default {
       loginCount: 0,
       loginTime: 0,
       courseCount: 0,
-      loginCountMonthArray:[],
-      weekCount:0,
+      loginCountMonthArray: [],
+      weekCount: 0,
       gradeCourse: 0,
       subjectCourse: 0,
       courseArray: [],
       workNumList: [],
-      grade:[],
-      subject:[],
-      theme:[],
+      grade: [],
+      subject: [],
+      theme: [],
+      lightJson: {
+        users: 0,
+        teachers: 0,
+        students: 0,
+        upCourseTeachers: 0,
+        upCourseUsers: 0,
+        toolUsers: 0,
+        upgCourseTeachers: 0,
+        commentUsers: 0,
+        evaTeachers: 0,
+        tevaTeachers: 0,
+        sevaTeachers: 0,
+      },
+      pusaDep: [
+        { value: 0, name: "登录" },
+        { value: 0, name: "创建" },
+        { value: 0, name: "授课" },
+        { value: 0, name: "评价" },
+      ],
     };
   },
   mounted() {
     this.getData();
   },
   methods: {
-    openCourse2(classIndex,subIndex){
-      console.log(classIndex,subIndex);
+    openCourse2(classIndex, subIndex) {
+      console.log(classIndex, subIndex);
       // console.log(this.courseArray);
       // console.log(this.courseArray[classIndex].id,this.courseArray[classIndex].subject[subIndex].id || '');
       window.parent.postMessage(
-        { 
+        {
           tools: "openCourse",
           typea: this.courseArray[classIndex].id,
-          typed: this.courseArray[classIndex].subject[subIndex].id || '',
-        }, 
+          typed: this.courseArray[classIndex].subject[subIndex].id || "",
+        },
         "*"
       );
     },
-    openCourse(cid){
+    openCourse(cid) {
       window.parent.postMessage({ cid: cid, screenType: "3" }, "*");
     },
     getData() {
@@ -296,55 +381,56 @@ 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;
-          this.courseCount = res.data[5][0].courseCount
-
-
+          this.courseCount = res.data[5][0].courseCount;
 
           let loginCountMonthArray = [];
-          const date = new Date()
-          var Month = date.getMonth() + 1
-          var Year = date.getFullYear()
+          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,
                 teacher: 0,
-              })
+              });
             } else {
               loginCountMonthArray.push({
                 Month: i,
                 Year: Year,
                 teacher: 0,
-              })
+              });
             }
           }
 
-          loginCountMonthArray = loginCountMonthArray.reverse()
-          let teacherLoginCountYear = res.data[3] // 教师半年登录次数统计
+          loginCountMonthArray = loginCountMonthArray.reverse();
+          let teacherLoginCountYear = res.data[3]; // 教师半年登录次数统计
 
           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()
+            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) {
-                loginCountMonthArray[j].teacher++
+              if (
+                _month == loginCountMonthArray[j].Month &&
+                _year == loginCountMonthArray[j].Year
+              ) {
+                loginCountMonthArray[j].teacher++;
                 break;
               }
             }
           }
 
           this.loginCountMonthArray = loginCountMonthArray;
-          this.weekCount = res.data[4][0].count
+          this.weekCount = res.data[4][0].count;
 
-          let _grade = res.data[6] //年级
-          let _subject = res.data[7]  //学科
-          let _course = res.data[8] //课程
-          let _gradeCourse = 0 //各年级上传课程
-          let _subjectCourse = 0 //各学科上传课程
-          let _courseArray = []
-          _subject.push({ name: '其他' })
+          let _grade = res.data[6]; //年级
+          let _subject = res.data[7]; //学科
+          let _course = res.data[8]; //课程
+          let _gradeCourse = 0; //各年级上传课程
+          let _subjectCourse = 0; //各学科上传课程
+          let _courseArray = [];
+          _subject.push({ name: "其他" });
 
           for (var i = 0; i < _grade.length; i++) {
             _courseArray.push({
@@ -352,48 +438,55 @@ export default {
               id: _grade[i].id,
               courseid: [],
               subject: [],
-            })
+            });
             for (var z = 0; z < _course.length; z++) {
               if (_course[z].typeid == _grade[i].id) {
-                _gradeCourse++
-                if (_courseArray[i].courseid.indexOf(_course[z].courseid) === -1) {
-                  _courseArray[i].courseid.push(_course[z].courseid)
+                _gradeCourse++;
+                if (
+                  _courseArray[i].courseid.indexOf(_course[z].courseid) === -1
+                ) {
+                  _courseArray[i].courseid.push(_course[z].courseid);
                 }
               }
-
             }
             for (var j = 0; j < _subject.length; j++) {
               _courseArray[i].subject.push({
                 name: _subject[j].name,
                 id: _subject[j].id,
-                course: 0
-              })
+                course: 0,
+              });
               for (var z = 0; z < _course.length; z++) {
-                if (_course[z].typeid == _subject[j].id && _courseArray[i].courseid.indexOf(_course[z].courseid) !== -1) {
-                  _courseArray[i].subject[j].course++
+                if (
+                  _course[z].typeid == _subject[j].id &&
+                  _courseArray[i].courseid.indexOf(_course[z].courseid) !== -1
+                ) {
+                  _courseArray[i].subject[j].course++;
                 }
               }
             }
-            let sum = 0
+            let sum = 0;
             for (var j = 0; j < _courseArray[i].subject.length - 1; j++) {
-              sum += _courseArray[i].subject[j].course
+              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++) {
               if (_course[z].typeid == _subject[j].id) {
-                _subjectCourse++
+                _subjectCourse++;
               }
             }
           }
-          this.gradeCourse = _gradeCourse / _grade.length
-          this.subjectCourse = _subjectCourse / _subject.length
-          this.courseArray = _courseArray
+          this.gradeCourse = _gradeCourse / _grade.length;
+          this.subjectCourse = _subjectCourse / _subject.length;
+          this.courseArray = _courseArray;
 
           this.grade = _grade;
           this.subject = _subject;
-          this.theme = res.data[9];//主题
+          this.theme = res.data[9]; //主题
           var _workCourse = res.data[10]; //带作业的课程
           var wList = [];
           for (var i = 0; i < _workCourse.length; i++) {
@@ -431,6 +524,46 @@ export default {
             item.cid,
           ]);
           this.workNumList = workNumList;
+
+          let _teachers = res.data[11][0].count; //老师数量
+          let _students = res.data[12][0].count; //学生数量
+          let _upCourseTeachers = res.data[13][0].count; //上传课程老师的数量
+          let _upCourseUsers = res.data[14][0].count; //上传项目的用户
+          let _toolUsers = res.data[15][0].count; //使用工具的用户
+          let _upgCourseTeachers = res.data[16][0].count; //参与协同课程的老师
+          let _commentUsers = res.data[17][0].count; //参与互动交流的用户
+          let _evaTeachers = res.data[18][0].count; //查询添加目标的老师
+          let _tevaTeachers = res.data[19][0].count; //查询创建课程有添加目标的老师
+          let _sevaTeachers = res.data[20][0].count; //查询对作业评价的老师
+
+          this.lightJson = {
+            users: this.count,
+            teachers: _teachers,
+            students: _students,
+            upCourseTeachers: _upCourseTeachers,
+            upCourseUsers: _upCourseUsers,
+            toolUsers: _toolUsers,
+            upgCourseTeachers: _upgCourseTeachers,
+            commentUsers: _commentUsers,
+            evaTeachers: _evaTeachers,
+            tevaTeachers: _tevaTeachers,
+            sevaTeachers: _sevaTeachers,
+          };
+          
+          let _loginCount = res.data[21][0].count; //漏斗图查询登录
+          let _workTeaCount = res.data[22][0].count; //漏斗图查询有交作业的课程老师数量
+          // let allCount = _loginCount + _upCourseTeachers + _workTeaCount + _sevaTeachers;
+          for(var i = 0;i<this.pusaDep.length;i++){
+            if(this.pusaDep[i].name == "登录"){
+              this.pusaDep[i].value = ((_loginCount / _teachers) * 100).toFixed(0);
+            }else if(this.pusaDep[i].name == "创建"){
+              this.pusaDep[i].value = ((_upCourseTeachers / _teachers) * 100).toFixed(0);
+            }else if(this.pusaDep[i].name == "授课"){
+              this.pusaDep[i].value = ((_workTeaCount / _teachers) * 100).toFixed(0);
+            }else if(this.pusaDep[i].name == "评价"){
+              this.pusaDep[i].value = ((_sevaTeachers / _teachers) * 100).toFixed(0);
+            }
+          }
           this.$forceUpdate();
         })
         .catch((err) => {