Merge branch 'cmy/develop-bi' into develop

TEAMModelOS/ClientApp/src/view/iot/areaiot.vue

@@ -504,7 +504,7 @@ export default {
            this.basicsData.rooms= basicsTotal.map(item =>item.room)
            this.basicsData.teachs=basicsTotal.map(item=>item.teach)
            this.basicsData.students=basicsTotal.map(item=>item.student)
-           this.basicsData.classInfo=basicsTotal.map(item=>item.class)
+        //    this.basicsData.classInfo=basicsTotal.map(item=>item.class)
            this.basicsData.classTimes=basicsTotal.map(item=>item.classTime)
            this.basicsData.classStudenttimes=basicsTotal.map(item=>item.classStudenttime)
            this.basicsData.weekNums=this.basicsData.rooms.length

TEAMModelOS/ClientApp/src/view/iot/echarts/barandLine/specialBarline.vue

@@ -135,7 +135,7 @@
               textStyle: {
                 color: '#90979c',
               },
-              data: [this.$t('schoolIot.basicsChat.roomnum'),this.$t('schoolIot.basicsChat.teachnum'),this.$t('schoolIot.basics.studentnums'),this.$t('schoolIot.basics.classroomTotal'),this.$t('schoolIot.basics.classroomTime'),this.$t('schoolIot.basics.studentTime')]
+              data: [this.$t('schoolIot.basicsChat.roomnum'),this.$t('schoolIot.basicsChat.teachnum'),this.$t('schoolIot.basics.studentnums'),this.$t('schoolIot.basics.classroomTime'),this.$t('schoolIot.basics.studentTime')]
             },
             calculable: true,
             xAxis: [{
@@ -299,29 +299,29 @@
                 },
                 data:this.transferJson.students
             },
-            {
-                //课堂总数
-                name:this.$t('schoolIot.basics.classroomTotal'),
-                type:'bar',
-                // stack: '参与人数',
-                barWidth: 10,
-                symbol: 'circle',
-                itemStyle: {
-                    color: "#FA709A",
-                    normal: {
-                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                            offset: 0,
-                            color: "#FEE140"
-                        },
-                        {
-                            offset: 1,
-                            color: "#FA709A"
-                        }
-                    ])
-                }
-                },
-                data:this.transferJson.class
-            },
+            // {
+            //     //课堂总数
+            //     name:this.$t('schoolIot.basics.classroomTotal'),
+            //     type:'bar',
+            //     // stack: '参与人数',
+            //     barWidth: 10,
+            //     symbol: 'circle',
+            //     itemStyle: {
+            //         color: "#FA709A",
+            //         normal: {
+            //         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            //                 offset: 0,
+            //                 color: "#FEE140"
+            //             },
+            //             {
+            //                 offset: 1,
+            //                 color: "#FA709A"
+            //             }
+            //         ])
+            //     }
+            //     },
+            //     data:this.transferJson.class
+            // },
             { 
             //课堂总时数
             name:this.$t('schoolIot.basics.classroomTime'),

TEAMModelOS/ClientApp/src/view/iot/schooliot.vue

@@ -408,7 +408,7 @@ export default {
            this.basicsData.rooms= basicsTotal.map(item =>item.room)
            this.basicsData.teachs=basicsTotal.map(item=>item.teach)
            this.basicsData.students=basicsTotal.map(item=>item.student)
-           this.basicsData.classInfo=basicsTotal.map(item=>item.class)
+        //    this.basicsData.classInfo=basicsTotal.map(item=>item.class)
            this.basicsData.classTimes=basicsTotal.map(item=>item.classTime)
            this.basicsData.classStudenttimes=basicsTotal.map(item=>item.classStudenttime)
            this.basicsData.weekNums=this.basicsData.rooms.length