Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/dataBoardNew/course/index.vue

@@ -25,16 +25,15 @@
                 0
                   ? 0
                   : (
-                      (loginCountMonthArray[loginCountMonthArray.length - 1]
+                      ((loginCountMonthArray[loginCountMonthArray.length - 1]
                         .course -
                         loginCountMonthArray[loginCountMonthArray.length - 2]
                           .course) /
-                      (allCourse -
-                        loginCountMonthArray[loginCountMonthArray.length - 1]
-                          .course)
-                    ).toFixed(2) *
-                      100 +
-                    "%"
+                        (allCourse -
+                          loginCountMonthArray[loginCountMonthArray.length - 1]
+                            .course)) *
+                      100
+                    ).toFixed(2) + "%"
               }}</span>
             </div>
             <div class="info blueBG">
@@ -194,7 +193,7 @@
           <CateRank
             v-if="courseType == 0"
             style="height: calc(100%)"
-             :courseArray="courseArray"
+            :courseArray="courseArray"
           ></CateRank>
           <CourseNum
             v-if="courseType == 1"
@@ -219,7 +218,11 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="allCourse ? parseInt((evaCount / allCourse * 100).toFixed(0)) : 0"
+                    :percentage="
+                      allCourse
+                        ? parseInt(((evaCount / allCourse) * 100).toFixed(0))
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -232,7 +235,13 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="allCourse ? parseInt((haveWorksCourse / allCourse * 100).toFixed(0)) : 0"
+                    :percentage="
+                      allCourse
+                        ? parseInt(
+                            ((haveWorksCourse / allCourse) * 100).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -245,7 +254,13 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="allCourse ? parseInt((evaWorksCount / allCourse * 100).toFixed(0)) : 0"
+                    :percentage="
+                      allCourse
+                        ? parseInt(
+                            ((evaWorksCount / allCourse) * 100).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -258,7 +273,13 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="allCourse ? parseInt((evaWorksCount / allCourse * 100).toFixed(0)) : 0"
+                    :percentage="
+                      allCourse
+                        ? parseInt(
+                            ((evaWorksCount / allCourse) * 100).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -268,28 +289,40 @@
             </div>
           </div>
           <div class="info_box" v-if="shType">
-            <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+            <div class="info blueBG" style="width: calc(100% / 4 - 10px)">
               <span>平台实施课程总数</span>
               <!-- <span>{{ count }}</span> -->
               <span>{{ isCourseCount }}</span>
             </div>
-            <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+            <div class="info blueBG" style="width: calc(100% / 4 - 10px)">
               <span>平台实施课程占比</span>
               <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ isCourseCount ? (isCourseCount / allCourseCount * 100).toFixed(0) + '%' : '0%' }}</span>
+              <span>{{
+                isCourseCount
+                  ? ((isCourseCount / allCourseCount) * 100).toFixed(0) + "%"
+                  : "0%"
+              }}</span>
             </div>
-            <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+            <div class="info blueBG" style="width: calc(100% / 4 - 10px)">
               <span>课程平均任务数量</span>
               <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ isCourseCount ? (taskCount / isCourseCount).toFixed(0) : 0 }}</span>
+              <span>{{
+                isCourseCount ? (taskCount / isCourseCount).toFixed(0) : 0
+              }}</span>
             </div>
-            <div class="info blueBG" style="width:calc(100% / 4 - 10px)">
+            <div class="info blueBG" style="width: calc(100% / 4 - 10px)">
               <span>课程平均作业数量</span>
               <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ isCourseCount ? (workCount / isCourseCount).toFixed(0) : 0 }}</span>
+              <span>{{
+                isCourseCount ? (workCount / isCourseCount).toFixed(0) : 0
+              }}</span>
             </div>
           </div>
-          <WorkNum style="height:calc(100% - 95px)" :workNumList="workNumList" v-if="shType"></WorkNum>
+          <WorkNum
+            style="height: calc(100% - 95px)"
+            :workNumList="workNumList"
+            v-if="shType"
+          ></WorkNum>
           <div class="otherCss">
             <div v-if="!shType">转换为散点图</div>
             <div v-if="shType">转换为漏斗图</div>
@@ -358,7 +391,11 @@
           <div class="title">课程协同情况</div>
         </div>
         <div class="dataBox">
-          <WorkTime style="height: calc(100% - 25px)" :personArray="personList" v-if="xtType"></WorkTime>
+          <WorkTime
+            style="height: calc(100% - 25px)"
+            :personArray="personList"
+            v-if="xtType"
+          ></WorkTime>
           <Subjuect style="height: calc(100% - 25px)" v-if="!xtType"></Subjuect>
           <div class="otherCss">
             <div v-if="!xtType">转换为人员协同</div>
@@ -482,7 +519,7 @@ export default {
       this.xtType = !this.xtType;
     },
     format(percentage) {
-      return percentage + '%';
+      return percentage + "%";
     },
     typeChange1() {
       var a = [];
@@ -974,27 +1011,41 @@ export default {
           }
           this.toolList = toolAllArray;
 
-          var twoPerson = 0,threePerson = 0,fivePerson = 0,sevenPerson = 0;
-          var personList = []
-          for(var i = 0;i<courseList.length;i++){
-            if(courseList[i].course_teacher){
-              if(courseList[i].course_teacher.split(',').length <= 2){
-                twoPerson++
-              }else if(4 >= courseList[i].course_teacher.split(',').length && courseList[i].course_teacher.split(',').length > 2){
+          var twoPerson = 0,
+            threePerson = 0,
+            fivePerson = 0,
+            sevenPerson = 0;
+          var personList = [];
+          for (var i = 0; i < courseList.length; i++) {
+            if (courseList[i].course_teacher) {
+              if (courseList[i].course_teacher.split(",").length <= 2) {
+                twoPerson++;
+              } else if (
+                4 >= courseList[i].course_teacher.split(",").length &&
+                courseList[i].course_teacher.split(",").length > 2
+              ) {
                 threePerson++;
-              }else if(6 >= courseList[i].course_teacher.split(',').length && courseList[i].course_teacher.split(',').length > 4){
+              } else if (
+                6 >= courseList[i].course_teacher.split(",").length &&
+                courseList[i].course_teacher.split(",").length > 4
+              ) {
                 fivePerson++;
-              }else if(courseList[i].course_teacher.split(',').length > 7){
+              } else if (courseList[i].course_teacher.split(",").length > 7) {
                 sevenPerson++;
               }
             }
           }
 
-          personList.push({ name:"2人以下",value: twoPerson },{ name:"3-4人",value: threePerson },{ name:"5-6人",value: fivePerson },{ name:"7人以上",value: sevenPerson });
+          personList.push(
+            { name: "2人以下", value: twoPerson },
+            { name: "3-4人", value: threePerson },
+            { name: "5-6人", value: fivePerson },
+            { name: "7人以上", value: sevenPerson }
+          );
           this.personList = personList;
 
           let _workCourse = res.data[10]; //带作业的课程
-          let _taskCount = 0 //任务数量
+          let _taskCount = 0; //任务数量
 
           var wList = [];
           for (var i = 0; i < _workCourse.length; i++) {
@@ -1021,7 +1072,10 @@ export default {
           for (var i = 0; i < _workCourse.length; i++) {
             let a = Object.keys(wList);
             for (var j = 0; j < Object.keys(wList).length; j++) {
-              if (_workCourse[i].courseId == wList[a[j]].cid && _workCourse[i].id) {
+              if (
+                _workCourse[i].courseId == wList[a[j]].cid &&
+                _workCourse[i].id
+              ) {
                 wList[a[j]].work++;
               }
             }
@@ -1033,15 +1087,15 @@ export default {
             item.cid,
           ]);
           this.workNumList = workNumList;
-          this.taskCount = _taskCount
-          this.workCount = _workCourse.length
+          this.taskCount = _taskCount;
+          this.workCount = _workCourse.length;
           this.isCourseCount = res.data[11][0].count; //课程开展总数
           this.allCourseCount = res.data[9].length; //课程总数
 
-          let _gradeCourse = 0 //各年级上传课程
-          let _subjectCourse = 0 //各学科上传课程
-          let _courseArray = []
-          _subject.push({ name: '其他' })
+          let _gradeCourse = 0; //各年级上传课程
+          let _subjectCourse = 0; //各学科上传课程
+          let _courseArray = [];
+          _subject.push({ name: "其他" });
 
           for (var i = 0; i < _grade.length; i++) {
             _courseArray.push({
@@ -1049,55 +1103,63 @@ 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.courseArray = _courseArray
+          this.courseArray = _courseArray;
 
           this.evaCount = res.data[12][0].count; //设置评价
-          
+
           this.evaWorksCount = res.data[13][0].count; //查询有目标并且有评价的作业
 
           for (var i = 0; i < this.pusaDep.length; i++) {
             if (this.pusaDep[i].name == "课程总数") {
-              this.pusaDep[i].value = ((this.allCourse / this.allCourse) * 100).toFixed(
-                0
-              );
+              this.pusaDep[i].value = (
+                (this.allCourse / this.allCourse) *
+                100
+              ).toFixed(0);
             } else if (this.pusaDep[i].name == "设置评价课程") {
               this.pusaDep[i].value = (
-                (this.evaCount  / this.allCourse) *
+                (this.evaCount / this.allCourse) *
                 100
               ).toFixed(0);
             } else if (this.pusaDep[i].name == "已提交作业课程") {
@@ -1119,76 +1181,98 @@ export default {
           }
 
           var today = new Date();
-          var lastDayOfWeek = new Date(today.setDate(today.getDate() - today.getDay() + 7));;//本周周日
+          var lastDayOfWeek = new Date(
+            today.setDate(today.getDate() - today.getDay() + 7)
+          ); //本周周日
 
           let weekArray = {
-            lastWeek: [],//上周
-            toWeek: [] //本周
-          }
+            lastWeek: [], //上周
+            toWeek: [], //本周
+          };
           for (var i = 0; i < 14; i++) {
-            let time = JSON.parse(JSON.stringify(lastDayOfWeek))
-            let time2 = new Date(time)
+            let time = JSON.parse(JSON.stringify(lastDayOfWeek));
+            let time2 = new Date(time);
             var a = new Date(time2.setDate(time2.getDate() - i));
             if (i > 6) {
-              weekArray.lastWeek.push(a.getFullYear() + '-' + (a.getMonth() + 1) + '-' + a.getDate());
+              weekArray.lastWeek.push(
+                a.getFullYear() + "-" + (a.getMonth() + 1) + "-" + a.getDate()
+              );
             } else {
-              weekArray.toWeek.push(a.getFullYear() + '-' + (a.getMonth() + 1) + '-' + a.getDate());
+              weekArray.toWeek.push(
+                a.getFullYear() + "-" + (a.getMonth() + 1) + "-" + a.getDate()
+              );
             }
           }
           let weekCourse = [];
           let weekCourse2 = [];
-          let lastWeekCouseCount = 0
-          let toWeekCouseCount = 0
+          let lastWeekCouseCount = 0;
+          let toWeekCouseCount = 0;
           for (var z = 0; z < _course.length; z++) {
-            let _date = new Date(weekArray.lastWeek[weekArray.lastWeek.length - 1])
-            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)
-              var string = a.getFullYear() + '-' + (a.getMonth() + 1) + '-' + a.getDate()
+            let _date = new Date(
+              weekArray.lastWeek[weekArray.lastWeek.length - 1]
+            );
+            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);
+              var string =
+                a.getFullYear() + "-" + (a.getMonth() + 1) + "-" + a.getDate();
               if (weekArray.lastWeek.indexOf(string) != -1) {
-                lastWeekCouseCount++
+                lastWeekCouseCount++;
               } else {
-                toWeekCouseCount++
+                toWeekCouseCount++;
               }
             }
           }
 
-          let lastCourseidWeek = []
-          let toCourseidWeek = []
+          let lastCourseidWeek = [];
+          let toCourseidWeek = [];
           for (var i = 0; i < _grade.length; i++) {
             weekCourse2.push({
               name: _grade[i].name,
               id: _grade[i].id,
               lastCourse: 0,
               toCourse: 0,
-            })
+            });
             for (var z = 0; z < weekCourse.length; z++) {
               if (weekCourse[z].typeid == _grade[i].id) {
-                var a = new Date(weekCourse[z].create_at)
-                var string = a.getFullYear() + '-' + (a.getMonth() + 1) + '-' + a.getDate()
+                var a = new Date(weekCourse[z].create_at);
+                var string =
+                  a.getFullYear() +
+                  "-" +
+                  (a.getMonth() + 1) +
+                  "-" +
+                  a.getDate();
                 if (weekArray.lastWeek.indexOf(string) != -1) {
-                  weekCourse2[i].lastCourse++
+                  weekCourse2[i].lastCourse++;
                   if (lastCourseidWeek.indexOf(weekCourse[z].courseid) === -1) {
-                    lastCourseidWeek.push(weekCourse[z].courseid)
+                    lastCourseidWeek.push(weekCourse[z].courseid);
                   }
                 } else {
-                  weekCourse2[i].toCourse++
+                  weekCourse2[i].toCourse++;
                   if (toCourseidWeek.indexOf(weekCourse[z].courseid) === -1) {
-                    toCourseidWeek.push(weekCourse[z].courseid)
+                    toCourseidWeek.push(weekCourse[z].courseid);
                   }
                 }
-
               }
             }
           }
           weekCourse2.push({
-            name: '其他',
-            id: '',
-            lastCourse: (lastWeekCouseCount - lastCourseidWeek.length) > 0 ? (lastWeekCouseCount - lastCourseidWeek.length) : 0,
-            toCourse: (toWeekCouseCount - toCourseidWeek.length) > 0 ? (toWeekCouseCount - toCourseidWeek.length) : 0,
-          })
+            name: "其他",
+            id: "",
+            lastCourse:
+              lastWeekCouseCount - lastCourseidWeek.length > 0
+                ? lastWeekCouseCount - lastCourseidWeek.length
+                : 0,
+            toCourse:
+              toWeekCouseCount - toCourseidWeek.length > 0
+                ? toWeekCouseCount - toCourseidWeek.length
+                : 0,
+          });
 
-          this.weekCourse2 = weekCourse2
+          this.weekCourse2 = weekCourse2;
 
           this.$forceUpdate();
         })

src/components/pages/dataBoardNew/teacher/chartList/teaAct.vue

@@ -12,6 +12,11 @@
 
 <script>
 export default {
+  props: {
+    pusaDep: {
+      type: Array,
+    },
+  },
   data() {
     return {
       chartObj: null,
@@ -21,7 +26,7 @@ export default {
           formatter: "{b} : {c}%",
         },
         // legend: {
-        //   data: ["教学评一体化课程", "已评价课程", "已提交作业课程", "设置评价课程", "课程总数"],
+        //   data: ["评价", "授课", "创建", "登录"],
         // },
         series: [
           {
@@ -51,11 +56,10 @@ export default {
               borderWidth: 1,
             },
             data: [
-              { value: 20, name: "教学评一体化课程" },
-              { value: 40, name: "已评价课程" },
-              { value: 60, name: "已提交作业课程" },
-              { value: 80, name: "设置评价课程" },
-              { value: 100, name: "课程总数" },
+              // { value: 20, name: "登录" },
+              // { value: 40, name: "创建" },
+              // { value: 60, name: "授课" },
+              // { value: 80, name: "评价" },
             ],
           },
         ],
@@ -63,7 +67,7 @@ export default {
     };
   },
   methods: {
-    setChart() {
+    setChart(array) {
       // 雷达图显示的标签
       let newPromise = new Promise((resolve) => {
         resolve();
@@ -74,16 +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.setArray(this.pusaDep)
     var _this = this;
     window.addEventListener("resize", () => {
       if (_this.chartObj) {
@@ -91,6 +113,9 @@ export default {
       }
     });
   },
+  created() {
+    this.setChart();
+  },
 };
 </script>
 

src/components/pages/dataBoardNew/teacher/chartList/teaActSecond.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="data_body">
+    <div style="width: 100%; height: 100%">
+      <div
+        id="charts_canvas"
+        class="echart"
+        style="width: 100%; height: 100%"
+      ></div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    pusaDep: {
+      type: Array,
+    },
+  },
+  data() {
+    return {
+      chartObj: null,
+      option: {
+        tooltip: {
+          trigger: "item",
+          formatter: "{b} : {c}%",
+        },
+        // legend: {
+        //   data: ["评价", "授课", "创建", "登录"],
+        // },
+        series: [
+          {
+            type: "funnel",
+            left: "10%",
+            top: 60,
+            bottom: 20,
+            width: "95%",
+            min: 0,
+            max: 100,
+            minSize: "0%",
+            maxSize: "100%",
+            sort: "descending",
+            label: {
+              show: true,
+              position: "inside",
+            },
+            labelLine: {
+              length: 10,
+              lineStyle: {
+                width: 1,
+                type: "solid",
+              },
+            },
+            itemStyle: {
+              borderColor: "#fff",
+              borderWidth: 1,
+            },
+            data: [
+              // { value: 20, name: "登录" },
+              // { value: 40, name: "创建" },
+              // { value: 60, name: "授课" },
+              // { value: 80, name: "评价" },
+            ],
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    setChart(array) {
+      // 雷达图显示的标签
+      let newPromise = new Promise((resolve) => {
+        resolve();
+      });
+      //然后异步执行echarts的初始化函数
+      newPromise.then(() => {
+        const chartObj = this.$echarts.init(
+          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.setArray(this.pusaDep)
+    var _this = this;
+    window.addEventListener("resize", () => {
+      if (_this.chartObj) {
+        _this.chartObj.resize();
+      }
+    });
+  },
+  created() {
+    this.setChart();
+  },
+};
+</script>
+
+<style scoped>
+.data_body {
+  height: 100%;
+  /* display: flex; */
+  position: relative;
+  border-radius: 5px;
+  /* border: 1px solid #eee; */
+  margin: 0 auto;
+  box-sizing: border-box;
+  padding: 0;
+  width: 95%;
+  background: #fff;
+}
+</style>

src/components/pages/dataBoardNew/teacher/chartList/teaData.vue

@@ -25,7 +25,6 @@ export default {
                 tooltip: {
                     position: 'top',
                     formatter: function (params) {
-                        // console.log(params);
                         return params.marker + params.name + ' ' + params.data[1];//params.seriesName + '<br>' + params.
 
                     }

src/components/pages/dataBoardNew/teacher/chartList/toolUse.vue

@@ -50,7 +50,6 @@ export default {
           },
           axisLabel: {
             formatter: function (value) {
-              console.log(value);
               var ret = "";//拼接加\n返回的类目项  
               var maxLength = 2;//每项显示文字个数  
               var valLength = value.length;//X轴类目项的文字个数  

src/components/pages/dataBoardNew/teacher/chartList/workNum.vue

@@ -71,7 +71,6 @@ export default {
         chartObj.off('click')
         let _this = this
         chartObj.on('click', function (param) {
-          console.log(param);  //X轴的值
           _this.$emit('openCourse', param.dataIndex)
         });
         // 初始化雷达图

src/components/pages/dataBoardNew/teacher/chartList/workTime.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="data_body" style="height: calc(100% - 100px)">
+  <div class="data_body">
     <div style="width: 100%; height: 100%">
       <div
         id="charts_canvas"
@@ -12,6 +12,11 @@
 
 <script>
 export default {
+  props: {
+    workNumList: {
+      type: Array,
+    },
+  },
   data() {
     return {
       chartObj: null,
@@ -19,38 +24,43 @@ export default {
         data: [],
       },
       option: {
+        xAxis: {
+          name: "课程数量",
+          nameTextStyle: {
+            padding: [25, 0, 0, 0],
+            verticalAlign:'top'
+          },
+          nameGap: -45
+        },
+        grid: {
+          top: "15%",
+          left: "5%",
+          right: "5%",
+          bottom: "15%",
+          containLabel: true,
+        },
+        yAxis: {
+          name: "项目数量",
+        },
+        color: ["#3681FC"],
         tooltip: {
-          trigger: "item",
+          formatter: function (params) {
+            return (
+              params.marker +
+              params.data[2] +
+              "<br/>" +
+              "课程数量：" +
+              params.data[0] +
+              "<br/>" +
+              "项目数量：" +
+              params.data[1]
+            );
+          },
         },
-        xAxis: {},
-        yAxis: {},
         series: [
           {
-            symbolSize: 20,
-            data: [
-              [10.0, 8.04],
-              [8.07, 6.95],
-              [13.0, 7.58],
-              [9.05, 8.81],
-              [11.0, 8.33],
-              [14.0, 7.66],
-              [13.4, 6.81],
-              [10.0, 6.33],
-              [14.0, 8.96],
-              [12.5, 6.82],
-              [9.15, 7.2],
-              [11.5, 7.2],
-              [3.03, 4.23],
-              [12.2, 7.83],
-              [2.02, 4.47],
-              [1.05, 3.33],
-              [4.05, 4.96],
-              [6.03, 7.24],
-              [12.0, 6.26],
-              [12.0, 8.84],
-              [7.08, 5.82],
-              [5.02, 5.68],
-            ],
+            symbolSize: 8,
+            data: [],
             type: "scatter",
           },
         ],
@@ -58,7 +68,7 @@ export default {
     };
   },
   methods: {
-    setChart() {
+    setChart(option) {
       // 雷达图显示的标签
       let newPromise = new Promise((resolve) => {
         resolve();
@@ -69,23 +79,41 @@ export default {
           //劳动课程
           this.$el.querySelector("#charts_canvas")
         );
+        this.option.series[0].data = this.ooption.data;
 
-        chartObj.off("click");
-        let _this = this;
-        chartObj.on("click", function (param) {
-          console.log(param); //X轴的值
-          _this.$emit("openCourse", param.data[3]);
-        });
         // 初始化雷达图
         this.chartObj = chartObj;
         this.chartObj.setOption(this.option);
       });
     },
+    setArray(array) {
+      this.ooption = {
+        data: [],
+      };
+      for (var i = 0; i < array.length; i++) {
+        this.ooption.data.push(array[i]);
+      }
+      if (!this.chartObj) {
+        this.setChart(this.ooption);
+      } else {
+        this.option.series[0].data = this.ooption.data;
+        this.chartObj.setOption(this.option);
+      }
+      this.$forceUpdate();
+    },
   },
   watch: {
+    workNumList: {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        this.setArray(newValue);
+        this.$forceUpdate();
+      },
+    },
   },
   mounted() {
-    this.setChart();
+    this.setArray(this.workNumList);
     var _this = this;
     window.addEventListener("resize", () => {
       if (_this.chartObj) {

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

@@ -107,7 +107,9 @@
           <div class="info blueBG">
             <span>人均登录频次</span>
             <!-- <span>{{ weekCount }}</span> -->
-            <span>{{ allLoginTime == 0 ? 0 : (allLoginTime / teacherNum).toFixed(0) }}</span>
+            <span>{{
+              allLoginTime == 0 ? 0 : (allLoginTime / teacherNum).toFixed(0)
+            }}</span>
           </div>
         </div>
         <div class="dataBox">
@@ -161,7 +163,11 @@
           </div>
         </div>
         <div class="dataBox">
-          <TeaData v-if="courseType == 0 || courseType == 1" style="height: calc(100%)" :courseArray="courseArray"></TeaData>
+          <TeaData
+            v-if="courseType == 0 || courseType == 1"
+            style="height: calc(100%)"
+            :courseArray="courseArray"
+          ></TeaData>
           <!-- <FunPlot v-if="courseType == 1" style="height: calc(100%)"></FunPlot> -->
         </div>
       </div>
@@ -192,25 +198,30 @@
               项目参与情况
             </div>
           </div>
-          <div class="timeDiv">
-            <div @click="sType = 0" :class="{ isClick: sType == 0 }">周</div>
-            <div @click="sType = 1" :class="{ isClick: sType == 1 }">月</div>
-            <div @click="sType = 2" :class="{ isClick: sType == 2 }">学期</div>
-          </div>
         </div>
         <div class="dataBox">
           <div class="allBox" style="height: calc(100% - 30px)">
             <div class="allBox_left">
-              <TeaAct></TeaAct>
+              <TeaAct v-if="bType == 0" :pusaDep="pusaDep"></TeaAct>
+              <TeaActSecond v-if="bType == 1" :pusaDep="pusaDep1"></TeaActSecond>
             </div>
-            <div class="allBox_right">
+            <div class="allBox_right" v-if="bType == 0">
               <div class="depth">
                 <span>创建课程</span>
                 <div>
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="80"
+                    :percentage="
+                      lightJson.createCourse
+                        ? parseInt(
+                            (
+                              (lightJson.createCourse / lightJson.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -223,7 +234,16 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="80"
+                    :percentage="
+                      lightJson.gCourseTeachers
+                        ? parseInt(
+                            (
+                              (lightJson.gCourseTeachers / lightJson.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -236,7 +256,7 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="80"
+                    :percentage="0"
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -249,7 +269,16 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="80"
+                    :percentage="
+                      lightJson.commentTeachers
+                        ? parseInt(
+                            (
+                              (lightJson.commentTeachers / lightJson.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -262,7 +291,16 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="80"
+                    :percentage="
+                      lightJson.useTool
+                        ? parseInt(
+                            (
+                              (lightJson.useTool / lightJson.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -275,7 +313,16 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="80"
+                    :percentage="
+                      lightJson.useEvalution
+                        ? parseInt(
+                            (
+                              (lightJson.useEvalution / lightJson.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -288,7 +335,110 @@
                   <el-progress
                     :width="80"
                     type="circle"
-                    :percentage="80"
+                    :percentage="
+                      lightJson.evaWorksCount
+                        ? parseInt(
+                            (
+                              (lightJson.evaWorksCount / lightJson.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
+                    :stroke-width="5"
+                    :format="format"
+                    color="#106BFF"
+                  ></el-progress>
+                </div>
+              </div>
+            </div>
+            <div class="allBox_right" v-if="bType == 1">
+              <div class="depth">
+                <span>创建项目</span>
+                <div>
+                  <el-progress
+                    :width="80"
+                    type="circle"
+                    :percentage="
+                      lightJson1.createProject
+                        ? parseInt(
+                            (
+                              (lightJson1.createProject / lightJson1.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
+                    :stroke-width="5"
+                    :format="format"
+                    color="#106BFF"
+                  ></el-progress>
+                </div>
+              </div>
+              <div class="depth">
+                <span>师生协作</span>
+                <div>
+                  <el-progress
+                    :width="80"
+                    type="circle"
+                    :percentage="
+                      lightJson1.gProjectTeachers
+                        ? parseInt(
+                            (
+                              (lightJson1.gProjectTeachers / lightJson1.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
+                    :stroke-width="5"
+                    :format="format"
+                    color="#106BFF"
+                  ></el-progress>
+                </div>
+              </div>
+              <div class="depth">
+                <span>使用模板</span>
+                <div>
+                  <el-progress
+                    :width="80"
+                    type="circle"
+                    :percentage="0"
+                    :stroke-width="5"
+                    :format="format"
+                    color="#106BFF"
+                  ></el-progress>
+                </div>
+              </div>
+              <div class="depth">
+                <span>互动交流</span>
+                <div>
+                  <el-progress
+                    :width="80"
+                    type="circle"
+                    :percentage="0"
+                    :stroke-width="5"
+                    :format="format"
+                    color="#106BFF"
+                  ></el-progress>
+                </div>
+              </div>
+              <div class="depth">
+                <span>使用工具</span>
+                <div>
+                  <el-progress
+                    :width="80"
+                    type="circle"
+                    :percentage="
+                      lightJson1.useTool
+                        ? parseInt(
+                            (
+                              (lightJson1.useTool / lightJson1.teachers) *
+                              100
+                            ).toFixed(0)
+                          )
+                        : 0
+                    "
                     :stroke-width="5"
                     :format="format"
                     color="#106BFF"
@@ -304,11 +454,7 @@
       <div class="top" style="border-radius: 5px">
         <div class="titleBox" style="justify-content: space-between">
           <div class="title">年级占比</div>
-          <el-select
-            v-model="cType4"
-            @change="typeChange"
-            class="selectBox"
-          >
+          <el-select v-model="cType4" @change="typeChange" class="selectBox">
             <el-option label="全部" value=""></el-option>
             <el-option label="年级" value="grade"></el-option>
             <el-option label="主题" value="theme"></el-option>
@@ -316,39 +462,37 @@
           </el-select>
         </div>
         <div class="dataBox">
-          <WorkNum style="height: calc(100% - 40px)" :courseNumberArray="courseNumberArray"></WorkNum>
+          <WorkNum
+            style="height: calc(100% - 40px)"
+            :courseNumberArray="courseNumberArray"
+          ></WorkNum>
         </div>
       </div>
       <div class="bottom">
         <div class="titleBox" style="justify-content: space-between">
           <div class="title">活动参与</div>
-          <div
-            style="
-              display: flex;
-              flex-direction: row;
-              flex-wrap: nowrap;
-              align-items: center;
-            "
-          >
-            <el-select v-model="cType6" class="selectBox" style="width: 110px">
-              <el-option label="全部年级" value="全部年级"></el-option>
-            </el-select>
-          </div>
         </div>
         <div class="dataBox">
           <div class="info_box">
             <div class="info blueBG">
               <span>人均参与课程数</span>
               <!-- <span>{{ count }}</span> -->
-              <span>{{ 18 }}</span>
+              <span>{{
+                allCourse == 0 ? 0 : (allCourse / teacherNum).toFixed(0)
+              }}</span>
             </div>
             <div class="info blueBG">
               <span>人均参与项目数</span>
               <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ 4 }}</span>
+              <span>{{
+                allProject == 0 ? 0 : (allProject / teacherNum).toFixed(0)
+              }}</span>
             </div>
           </div>
-          <WorkTime style="height: calc(100% - 72px)"></WorkTime>
+          <WorkTime
+            style="height: calc(100% - 72px)"
+            :workNumList="workNumList"
+          ></WorkTime>
         </div>
       </div>
     </div>
@@ -364,6 +508,7 @@ import WorkNum from "./chartList/workNum.vue";
 import WorkTime from "./chartList/workTime.vue";
 import ToolUse from "./chartList/toolUse.vue";
 import Bar from "./chartList/bar.vue";
+import TeaActSecond from "./chartList/teaActSecond.vue";
 export default {
   components: {
     TeaFre,
@@ -374,6 +519,7 @@ export default {
     WorkTime,
     ToolUse,
     Bar,
+    TeaActSecond,
   },
   props: {
     oid: {
@@ -391,7 +537,6 @@ export default {
       bType: 0,
       sType: 0,
       cType4: "",
-      cType6: "全部年级",
       oType: false,
       teacherNum: 0,
       allLoginTeacher: 0,
@@ -410,6 +555,39 @@ export default {
       subjectArray: [],
       themeArray: [],
       allArray: [],
+      workNumList: [],
+      allCourse: 0,
+      allProject: 0,
+      lightJson: {
+        teachers: 0,
+        createCourse: 0, //创建课程
+        gCourseTeachers: 0, //协同教研
+        useTemplate: 0, //使用模板
+        commentTeachers: 0, //互动交流
+        useTool: 0, //使用工具
+        useEvalution: 0, //实施评价
+        evaWorksCount: 0, //教学评一体化
+      },
+      lightJson1: {
+        teachers: 0,
+        createProject: 0, //创建项目
+        gProjectTeachers: 0, //师生协作
+        useTemplate: 0, //使用模板
+        commentTeachers: 0, //互动交流
+        useTool: 0, //使用工具
+      },
+      pusaDep: [
+        { value: 0, name: "登录" },
+        { value: 0, name: "创建" },
+        { value: 0, name: "授课" },
+        { value: 0, name: "评价" },
+      ],
+      pusaDep1: [
+        { value: 0, name: "登录" },
+        { value: 0, name: "创建" },
+        { value: 0, name: "师生协作" },
+        { value: 0, name: "使用工具" },
+      ],
     };
   },
   mounted() {
@@ -420,7 +598,7 @@ export default {
       this.oType = !this.oType;
     },
     format(percentage) {
-      return percentage + '%';
+      return percentage + "%";
     },
     typeChange() {
       if (this.cType4 === "") {
@@ -595,10 +773,10 @@ export default {
           this.allLoginTime = res.data[9][0].count; //一年的登录频次
 
           let _course = res.data[10]; //课程
-          let _gradeCourse = 0 //各年级上传课程
-          let _subjectCourse = 0 //各学科上传课程
-          let _courseArray = []
-          _subject.push({ name: '其他' })
+          let _gradeCourse = 0; //各年级上传课程
+          let _subjectCourse = 0; //各学科上传课程
+          let _courseArray = [];
+          _subject.push({ name: "其他" });
 
           for (var i = 0; i < _grade.length; i++) {
             _courseArray.push({
@@ -606,38 +784,45 @@ 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++;
               }
             }
           }
@@ -697,6 +882,136 @@ export default {
           this.allArray = [..._gradeArray, ..._subjectArray, ..._themeArray];
           this.typeChange();
 
+          let _teacherCourse = res.data[11]; //老师创建的课程
+          this.allCourse = res.data[11].length;
+          let _teacherProject = res.data[12]; //老师创建的项目
+          this.allProject = res.data[12].length;
+
+          var _workNumList = [];
+          // 创建一个对象来存储结果
+          var result = {};
+
+          // 合并数据 _teacherCourse 和 _teacherProject 到结果对象
+          _teacherCourse.forEach((item) => {
+            var userid = item.userid;
+            var username = item.username;
+            if (!result[username]) {
+              result[username] = {
+                username: username,
+                userid: userid,
+                course: 0,
+                project: 0,
+              };
+            }
+            result[username].course++;
+          });
+
+          _teacherProject.forEach((item) => {
+            var userid = item.userid;
+            var username = item.username;
+            if (!result[username]) {
+              result[username] = {
+                username: username,
+                userid: userid,
+                course: 0,
+                project: 0,
+              };
+            }
+            result[username].project++;
+          });
+
+          for (var username in result) {
+            var entry = result[username];
+            _workNumList.push([
+              entry.course,
+              entry.project,
+              entry.username,
+              entry.userid,
+            ]);
+          }
+
+          this.workNumList = _workNumList;
+
+          this.lightJson.teachers = res.data[3][0].count; //教师总数
+          this.lightJson1.teachers = res.data[3][0].count; //教师总数
+          this.lightJson.createCourse = res.data[13].length; //创建了课程的老师
+          this.lightJson.gCourseTeachers = res.data[14][0].count; //参与协同课程的老师
+          this.lightJson.commentTeachers = res.data[15][0].count; //参与互动交流的老师
+          this.lightJson.useTool = res.data[16][0].count; //使用工具
+          this.lightJson.useEvalution = res.data[17].length; //实施评价
+          this.lightJson.evaWorksCount = res.data[18][0].count; //教学评一体化
+
+          let _isLoginTeacher = res.data[19].length; //登录过的教师
+          let _isCourseTeacher = res.data[20].length; //授课了的教师
+
+          for (var i = 0; i < this.pusaDep.length; i++) {
+            if (this.pusaDep[i].name == "登录") {
+              this.pusaDep[i].value = (
+                (_isLoginTeacher / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            } else if (this.pusaDep[i].name == "创建") {
+              this.pusaDep[i].value = (
+                (this.lightJson.createCourse / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            } else if (this.pusaDep[i].name == "授课") {
+              this.pusaDep[i].value = (
+                (_isCourseTeacher / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            } else if (this.pusaDep[i].name == "评价") {
+              this.pusaDep[i].value = (
+                (this.lightJson.useEvalution / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            }
+          }
+
+          this.lightJson1.createProject = res.data[21].length; //创建项目
+          let _teacherAndStudent = res.data[22]; //师生协作
+          this.lightJson1.useTool = res.data[23][0].count; //项目使用工具
+          let _tsCount = 0;
+
+          for (var i = 0; i < _teacherAndStudent.length; i++) {
+            if (_teacherAndStudent[i].type2) {
+              if (
+                (_teacherAndStudent[i].type =
+                  1 && _teacherAndStudent[i].type2.indexOf(2) != -1) ||
+                (_teacherAndStudent[i].type =
+                  2 && _teacherAndStudent[i].type2.indexOf(1) != -1)
+              ) {
+                _tsCount++;
+              }
+            }
+          }
+
+          this.lightJson1.gProjectTeachers = _tsCount;
+
+          for (var i = 0; i < this.pusaDep1.length; i++) {
+            if (this.pusaDep1[i].name == "登录") {
+              this.pusaDep1[i].value = (
+                (_isLoginTeacher / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            } else if (this.pusaDep1[i].name == "创建") {
+              this.pusaDep1[i].value = (
+                (this.lightJson1.createProject / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            } else if (this.pusaDep1[i].name == "师生协作") {
+              this.pusaDep1[i].value = (
+                (this.lightJson1.gProjectTeachers / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            } else if (this.pusaDep1[i].name == "使用工具") {
+              this.pusaDep1[i].value = (
+                (this.lightJson1.useTool / this.lightJson.teachers) *
+                100
+              ).toFixed(0);
+            }
+          }
+
           this.$forceUpdate();
         })
         .catch((err) => {