修改热力图

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

@@ -28,7 +28,7 @@ export default {
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],

src/components/pages/dataBoardNew/course/chartList/toolUse2.vue

@@ -24,11 +24,11 @@ export default {
         tooltip: {
           formatter: function (p) {
             const format = p.data[0];
-            return format + ' ' + p.data[1]+'份';
+            return format + ' ' + p.data[1]+'小时';
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],

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

@@ -490,7 +490,7 @@ export default {
     CourseNum,
     ToolChart,
     Subjuect,
-    loading
+    loading,
   },
   props: {
     oid: {
@@ -676,37 +676,52 @@ export default {
       let courseWorksCountYearArray = {};
       let timeArray = [];
       for (var i = 0; i < this.courseTList.length; i++) {
-        timeArray.push(this.courseTList[i].time);
+        timeArray.push({
+          vtime: this.courseTList[i].time,
+          time: this.courseTList[i].text,
+        });
       }
       for (var i = 0; i < this.courseTList.length; i++) {
         let _type = this.courseTList[i].type
           ? this.courseTList[i].type.split(",")
           : [];
         if (this.lType1 == "all") {
-          timeArray.forEach((item) => {
-            courseWorksCountYearArray[item] =
-              courseWorksCountYearArray[item] + 1 || 1;
-          });
-        } else if (this.lType1 == "grade") {
-          if (this.hasCommonValue(this.gradeList, _type)) {
+          if (this.courseTList[i].text) {
             timeArray.forEach((item) => {
-              courseWorksCountYearArray[item] =
-                courseWorksCountYearArray[item] + 1 || 1;
+              courseWorksCountYearArray[item.vtime] = parseInt(
+                (item.time / 60 / 60).toFixed(0)
+              );
             });
           }
+        } else if (this.lType1 == "grade") {
+          if (this.hasCommonValue(this.gradeList, _type)) {
+            if (this.courseTList[i].text) {
+              timeArray.forEach((item) => {
+                courseWorksCountYearArray[item.vtime] = parseInt(
+                  (item.time / 60 / 60).toFixed(0)
+                );
+              });
+            }
+          }
         } else if (this.lType1 == "subject") {
           if (this.hasCommonValue(this.subjectList2, _type)) {
-            timeArray.forEach((item) => {
-              courseWorksCountYearArray[item] =
-                courseWorksCountYearArray[item] + 1 || 1;
-            });
+            if (this.courseTList[i].text) {
+              timeArray.forEach((item) => {
+                courseWorksCountYearArray[item.vtime] = parseInt(
+                  (item.time / 60 / 60).toFixed(0)
+                );
+              });
+            }
           }
         } else {
           if (this.hasCommonValue(this.thList, _type)) {
-            timeArray.forEach((item) => {
-              courseWorksCountYearArray[item] =
-                courseWorksCountYearArray[item] + 1 || 1;
-            });
+            if (this.courseTList[i].text) {
+              timeArray.forEach((item) => {
+                courseWorksCountYearArray[item.vtime] = parseInt(
+                  (item.time / 60 / 60).toFixed(0)
+                );
+              });
+            }
           }
         }
       }

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

@@ -28,7 +28,7 @@ export default {
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],

src/components/pages/dataBoardNew/school/barToolUser/index.vue

@@ -24,11 +24,11 @@ export default {
         tooltip: {
           formatter: function (p) {
             const format = p.data[0];
-            return format + ' ' + p.data[1]+'份';
+            return format + ' ' + p.data[1]+'小时';
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],

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

@@ -1102,17 +1102,19 @@ export default {
           // })
 
           this.weekCourse2 = weekCourse2;
-
           let allTimeYear = res.data[26]; //累计时长热力图
           this.teacherLoginCount = res.data[27][0].count; //教师登录频次柱状图
           this.studentLoginCount = res.data[28][0].count; //学生登录频次柱状图
           let allTimeYearArray = {};
           let timeArray1 = [];
           for (var i = 0; i < allTimeYear.length; i++) {
-            timeArray1.push(allTimeYear[i].vtime);
+            timeArray1.push({
+              vtime: allTimeYear[i].vtime,
+              time: allTimeYear[i].time,
+            });
           }
           timeArray1.forEach((item) => {
-            allTimeYearArray[item] = allTimeYearArray[item] + 1 || 1;
+            allTimeYearArray[item.vtime] = parseInt((item.time / 60 / 60).toFixed(0))
           });
           // for (var i = Month; i > Month - 12; i--) {
           //   if (i <= 0) {

src/components/pages/dataBoardNew/school/toolUser/index.vue

@@ -24,11 +24,11 @@ export default {
         tooltip: {
           formatter: function (p) {
             const format = p.data[0];
-            return format + ' ' + p.data[1]+'份';
+            return format + ' ' + p.data[1]+'次';
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],

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

@@ -911,10 +911,13 @@ export default {
           let loginCountYearArray2 = {};
           let timeArray1 = [];
           for(var i = 0;i<loginCountYear2.length;i++){
-            timeArray1.push(loginCountYear2[i].vtime);
+             timeArray1.push({
+              vtime: loginCountYear2[i].vtime,
+              time: loginCountYear2[i].time,
+            });
           }
           timeArray1.forEach((item) => {
-            loginCountYearArray2[item] = loginCountYearArray2[item] + 1 || 1;
+            loginCountYearArray2[item.vtime] = parseInt((item.time / 60 / 60).toFixed(0))
           });
           // for (var i = Month; i > Month - 12; i--) {
           //   if (i <= 0) {

src/components/pages/dataBoardNew/student/toolUser/index.vue

@@ -24,11 +24,11 @@ export default {
         tooltip: {
           formatter: function (p) {
             const format = p.data[0];
-            return format + ' ' + p.data[1]+'份';
+            return format + ' ' + p.data[1]+'次';
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],

src/components/pages/dataBoardNew/student/toolUser2/index.vue

@@ -24,11 +24,11 @@ export default {
         tooltip: {
           formatter: function (p) {
             const format = p.data[0];
-            return format + ' ' + p.data[1]+'份';
+            return format + ' ' + p.data[1]+'小时';
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],

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

@@ -24,11 +24,11 @@ export default {
         tooltip: {
           formatter: function (p) {
             const format = p.data[0];
-            return format + ' ' + p.data[1]+'份';
+            return format + ' ' + p.data[1]+'次';
           }
         },
         visualMap: {
-          top: 65,
+          top: 35,
           left: 10,
           right: 0,
           min: 0,
@@ -41,7 +41,7 @@ export default {
           calculable: true,
         },
         calendar: {
-          top: 100,
+          top: 70,
           left: 50,
           right: 30,
           cellSize: ['auto', 15],