update

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

@@ -140,7 +140,7 @@
             <div class="depth">
               <span>协同合作</span>
               <div>
-                <el-progress :width="80" type="circle" :percentage="lightJson.upgCourseTeachers ? ((lightJson.upgCourseTeachers / lightJson.teachers) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
+                <el-progress :width="80" type="circle" :percentage="lightJson.upgCourseTeachers ? ((lightJson.upgCourseTeachers / lightJson.teachers) * 100).toFixed(0) > 100 ? 100 : ((lightJson.upgCourseTeachers / lightJson.teachers) * 100).toFixed(0) : 0" :stroke-width="15" :format="format"
                   color="#106BFF"></el-progress>
               </div>
             </div>

src/components/pages/dataBoardSies/Pe/index.vue

@@ -7,29 +7,7 @@
           <div class="title">用户概况</div>
         </div>
         <div class="dataBox">
-          <div class="info_box">
-            <div class="info blueBG">
-              <span>用户总数</span>
-              <!-- <span>{{ count }}</span> -->
-              <span>{{ 310 }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>本月运动用户环比</span>
-              <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ "0.9%" }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>运动用户百分比</span>
-              <!-- <span>{{ loginCount }}</span> -->
-              <span>{{ '60%' }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>本月运动用户总数</span>
-              <!-- <span>{{ (loginCount / count).toFixed(0) }}</span> -->
-              <span>{{ 18 }}</span>
-            </div>
-          </div>
-          <loginCount style="height: calc(100% - 140px)" :monthArray="loginCountMonthArray"></loginCount>
+          <loginCount style="height: calc(100% )" :monthArray="loginCountMonthArray"></loginCount>
         </div>
       </div>
       <div class="bottom">
@@ -41,7 +19,7 @@
             <div class="info blueBG">
               <span>运动总时长</span>
               <!-- <span>{{ loginTime.toFixed(0) }}小时</span> -->
-              <span>{{ 1513 }}</span>
+              <span>{{ 3055 }}</span>
             </div>
             <div class="info blueBG">
               <span>人均运动时长</span>
@@ -58,7 +36,7 @@
         <div class="titleBox">
           <div class="title">班级表现</div>
           <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 150px;">
-            <el-option label="累计积分" value=""></el-option>
+            <el-option label="运动人数" value=""></el-option>
           </el-select>
         </div>
         <div class="dataBox">

src/components/pages/dataBoardSies/Pe/loginCount/index.vue

@@ -81,8 +81,8 @@ export default {
                 );
                 // this.option.xAxis.data = option.xdata;
                 // this.option.series[0].data = option.teacher;
-                this.option.xAxis.data = ['1月', '2月', '3月', '4月', '5月', '6月', '7月'];
-                this.option.series[0].data = [300, 500, 490, 510, 505, 520, 550];
+                this.option.xAxis.data = ['3月', '4月', '5月', '6月', '7月', '8月', '9月'];
+                this.option.series[0].data = [300, 500, 490, 510, 102, 201, 550];
                 // 初始化雷达图
                 this.chartObj = chartObj;
                 this.chartObj.setOption(this.option);

src/components/pages/dataBoardSies/Pe/studentInfo2/index.vue

@@ -30,6 +30,7 @@ export default {
                 xAxis: {
                     type: 'value',
                     show:false,
+                    max:500
                 },
                 grid:{
                     left: '15%',

src/components/pages/dataBoardSies/Pe/teacherInfo/index.vue

@@ -138,8 +138,7 @@ export default {
                 );
                 const hours = 
                 [
-                    '1班', '2班', '3班', '4班', '5班', '6班', '7班',
-                    '8班'
+                    '1班', '2班', '3班', '4班', '5班', '6班'
                 ];
                 // prettier-ignore
                 const days = 
@@ -149,12 +148,12 @@ export default {
                 // prettier-ignore
                 const data = 
                 [
-                    [0, 0, 8], [0, 1, 3], [0, 2, 3], [0, 3, 2], [0, 4, 4], [0, 5, 5], [0, 6, 0], [0, 7, 0],
-                    [1, 0, 18], [1, 1, 29], [1, 2, 21], [1, 3, 37], [1, 4, 38], [1, 5, 41], [1, 6, 0], [1, 7, 0],
-                    [2, 0, 46], [2, 1, 43], [2, 2, 31], [2, 3, 44], [2, 4, 43], [2, 5, 38], [2, 6, 0], [2, 7, 0],
-                    [3, 0, 43], [3, 1, 37], [3, 2, 25], [3, 3, 40], [3, 4, 35], [3, 5, 26], [3, 6, 0], [3, 7, 0],
-                    [4, 0, 38], [4, 1, 37], [4, 2, 25], [4, 3, 0], [4, 4, 0], [4, 5, 0], [4, 6, 0], [4, 7, 0],
-                    [5, 0, 24], [5, 1, 0], [5, 2, 3], [5, 3, 0], [5, 4, 0], [5, 5, 0], [5, 6, 0], [5, 7, 0],
+                    [0, 0, 8], [0, 1, 3], [0, 2, 3], [0, 3, 2], [0, 4, 4], [0, 5, 5],
+                    [1, 0, 18], [1, 1, 29], [1, 2, 21], [1, 3, 37], [1, 4, 38], [1, 5, 41],
+                    [2, 0, 46], [2, 1, 43], [2, 2, 31], [2, 3, 44], [2, 4, 43], [2, 5, 38],
+                    [3, 0, 43], [3, 1, 37], [3, 2, 25], [3, 3, 40], [3, 4, 35], [3, 5, 26],
+                    [4, 0, 38], [4, 1, 37], [4, 2, 25], [4, 3, 0], [4, 4, 0], [4, 5, 0],
+                    [5, 0, 24], [5, 1, 0], [5, 2, 3], [5, 3, 0], [5, 4, 0], [5, 5, 0],
                 ];
                 const title = [];
                 const singleAxis = [];

src/components/pages/dataBoardSies/education/courseInfo/index.vue

@@ -37,7 +37,7 @@ export default {
                 },
                 series: [
                     {
-                    data: [120, 200, 150, 80, 70, 110],
+                    data: [212, 219, 245, 251, 110, 124],
                     type: 'bar',
                     itemStyle: {
                         color: 'rgba(80, 135, 236)'

src/components/pages/dataBoardSies/education/index.vue

@@ -11,7 +11,7 @@
             <div class="info blueBG">
               <span>用户总数</span>
               <!-- <span>{{ count }}</span> -->
-              <span>{{ 310 }}</span>
+              <span>{{ 2126 }}</span>
             </div>
             <div class="info blueBG">
               <span>本月登录用户环比</span>
@@ -21,7 +21,7 @@
             <div class="info blueBG">
               <span>本月登录用户总数</span>
               <!-- <span>{{ loginCount }}</span> -->
-              <span>{{ 2131 }}</span>
+              <span>{{ 2013 }}</span>
             </div>
             <div class="info blueBG">
               <span>本月新增登录用户</span>
@@ -82,7 +82,7 @@
         <div class="titleBox">
           <div class="title">年级表现</div>
           <el-select v-model="cType" @change="typeChange" class="selectBox"  @focus="setMinWidth" style="width: 150px;">
-            <el-option label="全部年级" value=""></el-option>
+            <el-option label="累计积分" value=""></el-option>
           </el-select>
         </div>
         <div class="dataBox">

src/components/pages/dataBoardSies/education/teacherInfo/index.vue

@@ -138,8 +138,7 @@ export default {
                 );
                 const hours = 
                 [
-                    '1班', '2班', '3班', '4班', '5班', '6班', '7班',
-                    '8班'
+                    '1班', '2班', '3班', '4班', '5班', '6班'
                 ];
                 // prettier-ignore
                 const days = 
@@ -149,12 +148,12 @@ export default {
                 // prettier-ignore
                 const data = 
                 [
-                    [0, 0, 2], [0, 1, 1], [0, 2, 3], [0, 3, 0], [0, 4, 5], [0, 5, 5], [0, 6, 7], [0, 7, 8],
-                    [1, 0, 5], [1, 1, 1], [1, 2, 2], [1, 3, 0], [1, 4, 5], [1, 5, 7], [1, 6, 7], [1, 7, 8],
-                    [2, 0, 5], [2, 1, 2], [2, 2, 0], [2, 3, 2], [2, 4, 1], [2, 5, 5], [2, 6, 4], [2, 7, 4],
-                    [3, 0, 1], [3, 1, 1], [3, 2, 1], [3, 3, 0], [3, 4, 5], [3, 5, 2], [3, 6, 7], [3, 7, 8],
-                    [4, 0, 5], [4, 1, 3], [4, 2, 0], [4, 3, 3], [4, 4, 4], [4, 5, 2], [4, 6, 3], [4, 7, 5],
-                    [5, 0, 5], [5, 1, 1], [5, 2, 0], [5, 3, 0], [5, 4, 5], [5, 5, 5], [5, 6, 7], [5, 7, 8],
+                    [0, 0, 34], [0, 1, 35], [0, 2, 40], [0, 3, 33], [0, 4, 35], [0, 5, 35], 
+                    [1, 0, 34], [1, 1, 30], [1, 2, 35], [1, 3, 41], [1, 4, 42], [1, 5, 37], 
+                    [2, 0, 45], [2, 1, 35], [2, 2, 44], [2, 3, 45], [2, 4, 41], [2, 5, 35], 
+                    [3, 0, 41], [3, 1, 44], [3, 2, 43], [3, 3, 39], [3, 4, 42], [3, 5, 42], 
+                    [4, 0, 34], [4, 1, 36], [4, 2, 40], [4, 3, 0], [4, 4, 0], [4, 5, 0], 
+                    [5, 0, 44], [5, 1, 44], [5, 2, 34], [5, 3, 0], [5, 4, 0], [5, 5, 0],
                 ];
                 const title = [];
                 const singleAxis = [];
@@ -182,7 +181,7 @@ export default {
                         type: 'scatter',
                         data: [],
                         symbolSize: function (dataItem) {
-                            return dataItem[1] * 3;
+                            return dataItem[1];
                         }
                     });
                 });

src/components/pages/dataBoardSies/index.vue

@@ -12,7 +12,7 @@
         <div :class="{ active: type == 1 }" @click="setType(1)">德育sise</div>
         <div :class="{ active: type == 2 }" @click="setType(2)">智慧体育</div>
         <div :class="{ active: type == 3 }" @click="setType(3)">图书馆</div>
-        <!-- <div :class="{ active: type == 3 }" @click="setType(4)">灵动校园</div> -->
+        <div :class="{ active: type == 4 }" @click="setType(4)">灵动校园</div>
       </div>
     </div>
     <div class="db_body">

src/components/pages/dataBoardSies/library/cateRank/index.vue

@@ -96,7 +96,7 @@ export default {
 }
 
 .title {
-  font-size: 20px;
+  font-size: 16px;
   text-align: right;
   font-weight: 700;
   margin-bottom: 10px;

src/components/pages/dataBoardSies/library/cateRank2/index.vue

@@ -94,7 +94,7 @@ export default {
   padding: 5px 0;
 }
 .title{
-  font-size: 20px;
+  font-size: 16px;
   text-align: right;
   font-weight: 700;
   margin-bottom: 10px;

src/components/pages/dataBoardSies/library/courseInfo/index.vue

@@ -37,7 +37,7 @@ export default {
                 },
                 series: [
                     {
-                    data: [120, 200, 150, 80, 70, 110],
+                    data: [212, 219, 245, 251, 110, 124],
                     type: 'bar',
                     itemStyle: {
                         color: 'rgba(80, 135, 236)'

src/components/pages/dataBoardSies/library/index.vue

@@ -11,22 +11,22 @@
             <div class="info blueBG">
               <span>用户总数</span>
               <!-- <span>{{ count }}</span> -->
-              <span>{{ 310 }}</span>
+              <span>{{ 2126 }}</span>
             </div>
             <div class="info blueBG">
               <span>本月借阅用户环比</span>
               <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ "0.9%" }}</span>
+              <span>{{ "8300%" }}</span>
             </div>
             <div class="info blueBG">
               <span>本月借阅书籍总数</span>
               <!-- <span>{{ loginCount }}</span> -->
-              <span>{{ 138 }}</span>
+              <span>{{ 558 }}</span>
             </div>
             <div class="info blueBG">
               <span>本月借阅用户总数</span>
               <!-- <span>{{ (loginCount / count).toFixed(0) }}</span> -->
-              <span>{{ 18 }}</span>
+              <span>{{ 84 }}</span>
             </div>
           </div>
           <loginCount style="height: calc(100% - 140px)" :monthArray="loginCountMonthArray"></loginCount>
@@ -46,7 +46,7 @@
             <div class="info blueBG">
               <span>人均借阅数</span>
               <!-- <span>{{ (loginTime / count).toFixed(0) }}小时</span> -->
-              <span>{{ 4 }}小时</span>
+              <span>{{ 4 }}</span>
             </div>
           </div>
           <loginTime :yearArray="loginCountYearArray" style="height: calc(100% - 70px)"></loginTime>

src/components/pages/dataBoardSies/library/loginCount/index.vue

@@ -81,8 +81,8 @@ export default {
                 );
                 // this.option.xAxis.data = option.xdata;
                 // this.option.series[0].data = option.teacher;
-                this.option.xAxis.data = ['1月', '2月', '3月', '4月', '5月', '6月', '7月'];
-                this.option.series[0].data = [300, 500, 490, 510, 505, 520, 550];
+                this.option.xAxis.data = ['3月', '4月', '5月', '6月', '7月', '8月', '9月'];
+                this.option.series[0].data = [293, 498, 630, 463, 35, 1, 84];
                 // 初始化雷达图
                 this.chartObj = chartObj;
                 this.chartObj.setOption(this.option);

src/components/pages/dataBoardSies/library/studentInfo/index.vue

@@ -32,17 +32,37 @@ export default {
                 tooltip: {
                     trigger: 'item'
                 },
-                legend: {
-                },
+                // legend: {
+                // },
                 series: [
                     {
                         name: 'Access From',
                         type: 'pie',
                         radius: '50%',
                         data: [
-                            { value: 1048, name: '文学类' },
-                            { value: 735, name: '社会类' },
-                            { value: 580, name: '自然科学' },
+                            { value: 24630, name: '文学类' },
+                            { value: 6948, name: '其他类' },
+                            { value: 2996, name: '语言文字类' },
+                            { value: 2828, name: '文化科学教育体育类' },
+                            { value: 1701, name: '历史地理类' },
+                            { value: 1288, name: '生物科学类' },
+                            { value: 1243, name: '艺术类' },
+                            { value: 507, name: '综合性图书' },
+                            { value: 475, name: '数理科学和化学' },
+                            { value: 436, name: '天文学地球科学' },
+                            { value: 301, name: '工业技术' },
+                            { value: 210, name: '哲学宗教' },
+                            { value: 193, name: '医药卫生' },
+                            { value: 129, name: '农业科学' },
+                            { value: 124, name: '自然科学总论' },
+                            { value: 80, name: '政治法律' },
+                            { value: 69, name: '环境科学安全科学' },
+                            { value: 66, name: '马克思主义' },
+                            { value: 57, name: '军事' },
+                            { value: 52, name: '航空航天' },
+                            { value: 51, name: '交通运输' },
+                            { value: 44, name: '社会科学总论' },
+                            { value: 31, name: '经济' },
                         ],
                         emphasis: {
                             itemStyle: {

src/components/pages/dataBoardSies/library/teacherInfo/index.vue

@@ -138,8 +138,7 @@ export default {
                 );
                 const hours = 
                 [
-                    '1班', '2班', '3班', '4班', '5班', '6班', '7班',
-                    '8班'
+                    '1班', '2班', '3班', '4班', '5班', '6班'
                 ];
                 // prettier-ignore
                 const days = 
@@ -149,12 +148,12 @@ export default {
                 // prettier-ignore
                 const data = 
                 [
-                    [0, 0, 2], [0, 1, 1], [0, 2, 3], [0, 3, 0], [0, 4, 5], [0, 5, 5], [0, 6, 7], [0, 7, 8],
-                    [1, 0, 5], [1, 1, 1], [1, 2, 2], [1, 3, 0], [1, 4, 5], [1, 5, 7], [1, 6, 7], [1, 7, 8],
-                    [2, 0, 5], [2, 1, 2], [2, 2, 0], [2, 3, 2], [2, 4, 1], [2, 5, 5], [2, 6, 4], [2, 7, 4],
-                    [3, 0, 1], [3, 1, 1], [3, 2, 1], [3, 3, 0], [3, 4, 5], [3, 5, 2], [3, 6, 7], [3, 7, 8],
-                    [4, 0, 5], [4, 1, 3], [4, 2, 0], [4, 3, 3], [4, 4, 4], [4, 5, 2], [4, 6, 3], [4, 7, 5],
-                    [5, 0, 5], [5, 1, 1], [5, 2, 0], [5, 3, 0], [5, 4, 5], [5, 5, 5], [5, 6, 7], [5, 7, 8],
+                    [0, 0, 34], [0, 1, 35], [0, 2, 40], [0, 3, 33], [0, 4, 35], [0, 5, 35], 
+                    [1, 0, 34], [1, 1, 30], [1, 2, 35], [1, 3, 41], [1, 4, 42], [1, 5, 37], 
+                    [2, 0, 45], [2, 1, 35], [2, 2, 44], [2, 3, 45], [2, 4, 41], [2, 5, 35], 
+                    [3, 0, 41], [3, 1, 44], [3, 2, 43], [3, 3, 39], [3, 4, 42], [3, 5, 42], 
+                    [4, 0, 34], [4, 1, 36], [4, 2, 40], [4, 3, 0], [4, 4, 0], [4, 5, 0], 
+                    [5, 0, 44], [5, 1, 44], [5, 2, 34], [5, 3, 0], [5, 4, 0], [5, 5, 0],
                 ];
                 const title = [];
                 const singleAxis = [];
@@ -182,7 +181,7 @@ export default {
                         type: 'scatter',
                         data: [],
                         symbolSize: function (dataItem) {
-                            return dataItem[1] * 3;
+                            return dataItem[1];
                         }
                     });
                 });

src/components/pages/dataBoardSies/school/cateRank/index.vue

@@ -1,14 +1,13 @@
 <template>
   <div class="data_body">
-    <div style="width: 100%; height: 100%">
+    <div style="width: 100%; height: 100%;overflow: auto;">
       <el-table :data="tableData" style="width: 100%" :header-cell-style="{ background: '#E0EAFB',color: '#000' }"
         :row-class-name="tableRowClassName" class="tableClass">
-        <el-table-column label="排行" min-width="50" align="center">
-          <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+        <el-table-column prop="subject" label="学科" min-width="30" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="类别名称" min-width="80" align="center">
+        <el-table-column prop="score1" label="其他考试均分占比（%）" min-width="100" align="center">
         </el-table-column>
-        <el-table-column prop="sum" label="课程数量" min-width="80" align="center">
+        <el-table-column prop="score2" label="期末分组占比（%）" min-width="90" align="center">
         </el-table-column>
       </el-table>
     </div>
@@ -25,12 +24,16 @@ export default {
   data() {
     return {
       tableData: [
-        // { rank: "1", name: "一年级", sum: "2356" },
-        // { rank: "2", name: "二年级", sum: "2256" },
-        // { rank: "3", name: "三年级", sum: "2156" },
-        // { rank: "4", name: "四年级", sum: "1356" },
-        // { rank: "5", name: "五年级", sum: "1256" },
-        // { rank: "6", name: "六年级", sum: "1056" },
+        { subject: "体育", score1: "60", score2: "40" },
+        { subject: "信息技术", score1: "60", score2: "40" },
+        { subject: "形体", score1: "60", score2: "40" },
+        { subject: "数学", score1: "60", score2: "40" },
+        { subject: "科学", score1: "60", score2: "40" },
+        { subject: "美术", score1: "60", score2: "40" },
+        { subject: "英语", score1: "60", score2: "40" },
+        { subject: "语文", score1: "60", score2: "40" },
+        { subject: "道德与法治", score1: "60", score2: "40" },
+        { subject: "音乐", score1: "60", score2: "40" },
       ],
     };
   },
@@ -60,13 +63,13 @@ export default {
       immediate: true,
       deep: true,
       handler(newValue, oldValue) {
-        this.setArray(newValue)
+        // this.setArray(newValue)
         this.$forceUpdate();
       },
     },
   },
   mounted() {
-    this.setArray(this.courseNumberArray)
+    // this.setArray(this.courseNumberArray)
   },
 };
 </script>

src/components/pages/dataBoardSies/school/courseInfo/index.vue

@@ -33,20 +33,22 @@ export default {
                 grid: {
                     left: '5%',
                     right: '5%',
-                    bottom: '15%',
+                    bottom: '5%',
                     top: '5%',
                     containLabel: true
                 },
-                xAxis: [
-                    {
+                xAxis: {
+                    type: 'value'
+                },
+                yAxis:  {
                         type: 'category',
                         data: [
-                            '俄罗斯方块',
-                            '单词大作战',
-                            '诗词大会',
-                            '数字王国',
-                            '石头剪刀布',
-                            '123木头人'
+                            '一年级',
+                            '二年级',
+                            '三年级',
+                            '四年级',
+                            '五年级',
+                            '六年级'
                         ],
                         axisLine: {
                             show: false //不显示横轴线
@@ -79,36 +81,19 @@ export default {
                                 }
                             }
                         }
-                    }
-                ],
-                yAxis: {
-                    type: 'value'
-                },
-                series: [
-                    {
-                        name: '男生人数',
-                        type: 'bar',
-                        stack: 'total',
-                        barWidth: 20,
-                        label: {
-                            show: true
-                        },
-                        emphasis: {
-                            focus: 'series'
-                        },
-                        data: [320, 302, 301, 334, 390, 330]
                     },
+                series: [
                     {
-                        name: '女生人数',
                         type: 'bar',
                         stack: 'total',
-                        label: {
-                            show: true
-                        },
+                        barWidth: 30,
+                        // label: {
+                        //     show: true
+                        // },
                         emphasis: {
                             focus: 'series'
                         },
-                        data: [120, 132, 101, 134, 90, 230]
+                        data: [86, 106, 67, 33, 29, 22]
                     }
                 ]
             },

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

@@ -4,52 +4,53 @@
     <div class="left">
       <div class="top">
         <div class="titleBox">
-          <div class="title">用户概况</div>
+          <div class="title">综合成绩配置</div>
         </div>
         <div class="dataBox">
-          <div class="info_box">
-            <div class="info blueBG">
-              <span>用户总数</span>
-              <!-- <span>{{ count }}</span> -->
-              <span>{{ 310 }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>本月运动用户环比</span>
-              <!-- <span>{{ weekCount }}</span> -->
-              <span>{{ "0.9%" }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>运动用户百分比</span>
-              <!-- <span>{{ loginCount }}</span> -->
-              <span>{{ '60%' }}</span>
-            </div>
-            <div class="info blueBG">
-              <span>本月运动用户总数</span>
-              <!-- <span>{{ (loginCount / count).toFixed(0) }}</span> -->
-              <span>{{ 18 }}</span>
-            </div>
-          </div>
-          <loginCount style="height: calc(100% - 140px)" :monthArray="loginCountMonthArray"></loginCount>
+          <cateRank :monthArray="loginCountMonthArray"></cateRank>
         </div>
       </div>
       <div class="bottom">
         <div class="titleBox">
-          <div class="title">运动时长</div>
+          <div class="title">整体表现</div>
+          <div>
+            <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 100px;">
+              <el-option label="三年级" value=""></el-option>
+            </el-select>
+            <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 180px;">
+              <el-option label="2022-2023第二学期" value=""></el-option>
+            </el-select>
+          </div>
         </div>
         <div class="dataBox">
           <div class="info_box">
             <div class="info blueBG">
-              <span>运动总时长</span>
+              <span>实有人数</span>
               <!-- <span>{{ loginTime.toFixed(0) }}小时</span> -->
-              <span>{{ 1513 }}</span>
+              <span>{{ 323 }}</span>
             </div>
             <div class="info blueBG">
-              <span>人均运动时长</span>
+              <span>考试人数</span>
               <!-- <span>{{ (loginTime / count).toFixed(0) }}小时</span> -->
-              <span>{{ 4 }}</span>
+              <span>{{ 320 }}</span>
+            </div>
+          </div>
+          <div class="depth_box" style="height: calc(100% - 70px)">
+            <div class="depth">
+              <span>优秀率</span>
+              <div>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="5" :format="format"
+                  color="#106BFF"></el-progress>
+              </div>
+            </div>
+            <div class="depth">
+              <span>合格率</span>
+              <div>
+                <el-progress :width="80" type="circle" :percentage="80" :stroke-width="5" :format="format"
+                  color="#106BFF"></el-progress>
+              </div>
             </div>
           </div>
-          <loginTime :yearArray="loginCountYearArray" style="height: calc(100% - 70px)"></loginTime>
         </div>
       </div>
     </div>
@@ -57,9 +58,14 @@
       <div class="top">
         <div class="titleBox">
           <div class="title">班级表现</div>
-          <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 150px;">
-            <el-option label="累计积分" value=""></el-option>
-          </el-select>
+          <div>
+            <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 100px;">
+              <el-option label="三年级" value=""></el-option>
+            </el-select>
+            <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 180px;">
+              <el-option label="2022-2023第二学期" value=""></el-option>
+            </el-select>
+          </div>
         </div>
         <div class="dataBox">
           <teacherInfo style="height: calc(100%)" :courseArray="courseArray" @openCourse="openCourse"></teacherInfo>
@@ -67,106 +73,42 @@
       </div>
       <div class="bottom">
         <div class="titleBox">
-          <div class="title">学生运动报告</div>
+          <div class="title">成绩分布</div>
           <div>
-            <el-select v-model="eva" @change="typeChange2" @focus="setMinWidth" class="selectBox" style="width: 120px;">
-              <el-option label="全部年级" value=""></el-option>
+            <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 100px;">
+              <el-option label="三年级" value=""></el-option>
             </el-select>
-            <el-select v-model="eva" @change="typeChange2" @focus="setMinWidth" class="selectBox" style="width: 120px;">
-              <el-option label="全部班级" value=""></el-option>
+            <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 180px;">
+              <el-option label="2022-2023第二学期" value=""></el-option>
             </el-select>
           </div>
         </div>
         <div class="dataBox">
-          <div class="pe_box">
-            <div class="pe_child">
-              <div class="pe_f ">
-                <div class="pe_img orange_pe"><img src="../../../../assets/icon/new/pe_heart.png" alt=""></div>
-                <span>平均心率（次／分）</span>
-              </div>
-              <div class="pe_s">
-                127
-              </div>
-            </div>
-            <div class="pe_child">
-              <div class="pe_f ">
-                <div class="pe_img red_pe"><img src="../../../../assets/icon/new/pe_heart.png" alt=""></div>
-                <span>平均最大心率（次／分）</span>
-              </div>
-              <div class="pe_s">
-                181
-              </div>
-            </div>
-            <div class="pe_child">
-              <div class="pe_f ">
-                <div class="pe_img blue_pe"><img src="../../../../assets/icon/new/pe_mi.png" alt=""></div>
-                <span>运动密度</span>
-              </div>
-              <div class="pe_s">
-                18.93%
-              </div>
-            </div>
-            <div class="pe_child">
-              <div class="pe_f">
-                <div class="pe_img purple_pe"><img src="../../../../assets/icon/new/pe_time.png" alt=""></div>
-                <span>有效时长（分）</span>
-              </div>
-              <div class="pe_s">
-                10
-              </div>
-            </div>
-          </div>
-          <studentInfo2 style="height: calc(100% - 100px)" :evCourseArray="evCourseArray" :eva="eva"></studentInfo2>
+          <studentInfo2 :evCourseArray="evCourseArray" :eva="eva"></studentInfo2>
         </div>
       </div>
     </div>
     <div class="right">
       <div class="top">
         <div class="titleBox">
-          <div class="title">运动项目锻炼占比</div>
-
+          <div class="title">公开课情况</div>
+          <div>
+            <el-select v-model="cType" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 180px;">
+              <el-option label="2022-2023第二学期" value=""></el-option>
+            </el-select>
+          </div>
         </div>
         <div class="dataBox">
-
           <courseInfo :courseNumberArray="courseNumberArray" @openCourse="openCourse2"></courseInfo>
         </div>
       </div>
       <div class="bottom">
         <div class="titleBox">
-          <div class="title">运动合格情况</div>
+          <div class="title">教学成果统计</div>
         </div>
         <div class="dataBox">
           <!-- <studentInfo :evCourseArray="evCourseArray" :eva="eva"></studentInfo> -->
-          <div class="depth_box">
-            <div class="depth">
-              <span>平均心率合格率</span>
-              <div>
-                <el-progress :width="80" type="circle" :percentage="14.6" :stroke-width="5" :format="format"
-                  color="#106BFF"></el-progress>
-              </div>
-            </div>
-            <div class="depth">
-              <span>运动密度合格率</span>
-              <div>
-                <el-progress :width="80" type="circle" :percentage="2.4" :stroke-width="5" :format="format"
-                  color="#106BFF"></el-progress>
-              </div>
-            </div>
-            <div class="depth">
-              <span>有效时长占比</span>
-              <div>
-                <el-progress :width="80" type="circle" :percentage="20" :stroke-width="5" :format="format"
-                  color="#106BFF"></el-progress>
-              </div>
-            </div>
-            <div class="depth">
-              <span>综合合格率</span>
-              <div>
-                <el-progress :width="80" type="circle" :percentage="12.3" :stroke-width="5" :format="format"
-                  color="#106BFF"></el-progress>
-              </div>
-            </div>
-          </div>
+          <loginTime :yearArray="loginCountYearArray"></loginTime>
         </div>
       </div>
     </div>

src/components/pages/dataBoardSies/school/loginTime/index.vue

@@ -21,67 +21,27 @@ export default {
                 sdata: [],
             },
             option: {
+                tooltip: {
+                    trigger: 'item'
+                },
                 series: [
                     {
-                        type: 'gauge',
-                        startAngle: 180,
-                        endAngle: 0,
-                        center: ['50%', '75%'],
-                        radius: '150%',
-                        min: 0,
-                        max: 4000,
-                        splitNumber: 8,
-                        axisLine: {
-                            lineStyle: {
-                                width: 10,
-                                color: [
-                                    [0.25, 'rgb(251, 223, 148)'],
-                                    [0.5, 'rgb(145, 208, 237)'],
-                                    [0.75, 'rgb(68, 96, 193)'],
-                                    [1, 'rgb(240, 141, 158)']
-                                ]
-                            }
-                        },
-                        pointer: {
-                            icon: 'path://M12.8,0.7l12,40.1H0.7L12.8,0.7z',
-                            length: '12%',
-                            width: 12,
-                            offsetCenter: [0, '-60%'],
-                            itemStyle: {
-                                color: 'auto'
-                            }
-                        },
-                        axisTick: {
-                            length: 6,
-                            lineStyle: {
-                                color: 'auto',
-                                width: 2
-                            }
-                        },
-                        splitLine: {
-                            length: 20,
-                            lineStyle: {
-                                color: 'auto',
-                                width: 5
-                            }
-                        },
-                        axisLabel: {
-                            show:false
-                        },
-                        title:{
-                            show:false
-                        },
-                        detail: {
-                            fontSize: 30,
-                            offsetCenter: [0, '-15%'],
-                            color: 'inherit'
-                        },
+                        type: 'pie',
+                        radius: '70%',
                         data: [
-                            {
-                                value: 3055,
-                                name: ''
+                            { value: 1, name: '指导培养青年教师' },
+                            { value: 29, name: '指导学生' },
+                            { value: 81, name: '业务比赛获奖' },
+                            { value: 18, name: '课例获奖' },
+                            { value: 4, name: '发表论文' }
+                        ],
+                        emphasis: {
+                            itemStyle: {
+                                shadowBlur: 10,
+                                shadowOffsetX: 0,
+                                shadowColor: 'rgba(0, 0, 0, 0.5)'
                             }
-                        ]
+                        }
                     }
                 ]
             },

src/components/pages/dataBoardSies/school/studentInfo2/index.vue

@@ -29,9 +29,10 @@ export default {
             option: {
                 xAxis: {
                     type: 'value',
-                    show:false,
+                    show: false,
+                    // max: 500
                 },
-                grid:{
+                grid: {
                     left: '15%',
                     right: '5%',
                     bottom: '5%',
@@ -41,54 +42,52 @@ export default {
                     inverse: true,
                     type: 'category',
                     data: [
-                        '休闲状态(<=50%)',
-                        '热身状态(50-60%)',
-                        '脂肪燃烧(60-70%)',
-                        '心肺提升(70-80%)',
-                        '乳酸闽值(80-90%)',
-                        '极限无氧(>=90%)'
+                        '三（1）班级',
+                        '三（2）班级',
+                        '三（3）班级',
+                        '三（4）班级',
+                        '三（5）班级',
+                        '三（6）班级'
                     ]
                 },
                 series: [
                     {
                         showBackground: true,
+                        stack: 'total',
                         data: [
-                            {
-                                value: 10,
-                                itemStyle: {
-                                    color: 'rgb(157, 157, 157)'
-                                }
-                            },
-                            {
-                                value: 20,
-                                itemStyle: {
-                                    color: 'rgb(15, 216, 242)'
-                                }
-                            },
-                            {
-                                value: 40,
-                                itemStyle: {
-                                    color: 'rgb(0, 208, 146)'
-                                }
-                            },
-                            {
-                                value: 80,
-                                itemStyle: {
-                                    color: 'rgb(255, 192, 29)'
-                                }
-                            },
-                            {
-                                value: 70,
-                                itemStyle: {
-                                    color: 'rgb(247, 123, 1)'
-                                }
-                            },
-                            {
-                                value: 15,
-                                itemStyle: {
-                                    color: 'rgb(255, 58, 32)'
-                                }
-                            },
+                            40, 30, 40, 50, 60, 70
+                        ],
+                        type: 'bar'
+                    },
+                    {
+                        showBackground: true,
+                        stack: 'total',
+                        data: [
+                            20, 10, 26, 51, 44, 35
+                        ],
+                        type: 'bar'
+                    },
+                    {
+                        showBackground: true,
+                        stack: 'total',
+                        data: [
+                            11, 23, 41, 15, 23, 14
+                        ],
+                        type: 'bar'
+                    },
+                    {
+                        showBackground: true,
+                        stack: 'total',
+                        data: [
+                            41, 21, 21, 12, 24, 34
+                        ],
+                        type: 'bar'
+                    },
+                    {
+                        showBackground: true,
+                        stack: 'total',
+                        data: [
+                            52, 54, 53, 24, 35, 43
                         ],
                         type: 'bar'
                     }

src/components/pages/dataBoardSies/school/teacherInfo/index.vue

@@ -22,109 +22,44 @@ export default {
                 data: [],
             },
             option: {
-                tooltip: {
-                    position: 'top',
-                    formatter: function (params) {
-                        // console.log(params);
-                        return params.marker + params.name + ' ' + params.data[1];//params.seriesName + '<br>' + params.
+                xAxis: {
+                    data: ['三（1）班', '三（2）班', '三（3）班', '三（4）班', '三（5）班', '三（6）班'],
 
+                },
+                grid: {
+                    left: '5%',
+                    right: '5%',
+                    bottom: '5%',
+                    top: '5%',
+                    containLabel: true
+                },
+                yAxis: {},
+                tooltip: {
+                    formatter: (val) => {
+                        console.log(val)
+                        return val.marker + val.name + '<br/>' +
+                            '最低分：' + val.data[1] + '<br/>' +
+                            '最高分：' + val.data[2] + '<br/>' +
+                            '平均分：' + val.data[3];
                     }
                 },
-                title: [],
-                singleAxis: [],
-                series: []
+                series: [
+                    {
+                        type: 'candlestick',
+                        data: [
+                            [43, 100, 85.5, 85.5],
+                            [40, 100, 81.8, 81.8],
+                            [38, 98, 78.8, 78.8],
+                            [33, 99, 85.2, 85.2],
+                            [18, 100, 77, 77],
+                            [26, 100, 83.1, 83.1]
+                        ]
+                    }
+                ]
             },
         };
     },
     methods: {
-        // setChart(option) {
-        //     // 雷达图显示的标签
-        //     let newPromise = new Promise((resolve) => {
-        //         resolve();
-        //     });
-        //     //然后异步执行echarts的初始化函数
-        //     newPromise.then(() => {
-        //         const chartObj = this.$echarts.init(
-        //             //劳动课程
-        //             this.$el.querySelector("#charts_canvas")
-        //         );
-        //         const hours = option.hours
-        //         // [
-        //         //     // '语文', '数学', '英语', '科学', '体育', '音乐', '美术',
-        //         //     // '劳动', '其他',
-        //         // ];
-        //         // prettier-ignore
-        //         const days = option.days
-        //         // [
-        //         //     // '一年级', '二年级', '三年级', '四年级', '五年级', '六年级'
-        //         // ];
-        //         // prettier-ignore
-        //         const data = option.data
-        //         // [
-        //         //     // [0, 0, 2], [0, 1, 1], [0, 2, 3], [0, 3, 0], [0, 4, 5], [0, 5, 5], [0, 6, 7], [0, 7, 8], [0, 8, 1],
-        //         //     // [1, 0, 5], [1, 1, 1], [1, 2, 2], [1, 3, 0], [1, 4, 5], [1, 5, 7], [1, 6, 7], [1, 7, 8], [1, 8, 6],
-        //         //     // [2, 0, 5], [2, 1, 2], [2, 2, 0], [2, 3, 2], [2, 4, 1], [2, 5, 5], [2, 6, 4], [2, 7, 4], [2, 8, 1],
-        //         //     // [3, 0, 1], [3, 1, 1], [3, 2, 1], [3, 3, 0], [3, 4, 5], [3, 5, 2], [3, 6, 7], [3, 7, 8], [3, 8, 5],
-        //         //     // [4, 0, 5], [4, 1, 3], [4, 2, 0], [4, 3, 3], [4, 4, 4], [4, 5, 2], [4, 6, 3], [4, 7, 5], [4, 8, 1],
-        //         //     // [5, 0, 5], [5, 1, 1], [5, 2, 0], [5, 3, 0], [5, 4, 5], [5, 5, 5], [5, 6, 7], [5, 7, 8], [5, 8, 3],
-        //         // ];
-        //         const title = [];
-        //         const singleAxis = [];
-        //         const series = [];
-        //         days.forEach(function (day, idx) {
-        //             title.push({
-        //                 textBaseline: 'middle',
-        //                 top: ((idx + 0.5) * 90) / days.length + '%',
-        //                 text: day,
-        //                 textStyle: {
-        //                     fontSize: 12,
-        //                 },
-        //             });
-        //             singleAxis.push({
-        //                 left: 70,
-        //                 type: 'category',
-        //                 boundaryGap: false,
-        //                 data: hours,
-        //                 top: (idx * 90) / days.length + 5 + '%',
-        //                 height: 90 / days.length - 10 + '%'
-        //             });
-        //             series.push({
-        //                 singleAxisIndex: idx,
-        //                 coordinateSystem: 'singleAxis',
-        //                 type: 'scatter',
-        //                 data: [],
-        //                 symbolSize: function (dataItem) {
-        //                     return dataItem[1] * 3;
-        //                 }
-        //             });
-        //         });
-        //         data.forEach(function (dataItem) {
-        //             series[dataItem[0]].data.push([dataItem[1], dataItem[2]]);
-        //         });
-        //         chartObj.off('click')
-        //         let _this = this
-        //         chartObj.on('click', function (param) {  
-        //             //param参数包含的内容有： 
-        //             //param.name：X轴的值 
-        //             //param.data：Y轴的值 
-        //             //param.value：Y轴的值 
-        //             //param.type：点击事件均为click 
-        //             //param.seriesName：legend的名称 
-        //             //param.seriesIndex：系列序号（series中当前图形是第几个图形第几个） 
-        //             //param.dataIndex：数值序列（X轴上当前点是第几个点）
-        //             //alert(param.seriesName);  //legend的名称
-        //             console.log(param);  //X轴的值
-        //             _this.$emit('openCourse',param.componentIndex,param.data[0])
-        //         });
-
-        //         this.option.title = title
-        //         this.option.singleAxis = singleAxis
-        //         this.option.series = series
-        //         // 初始化雷达图
-        //         this.chartObj = chartObj;
-        //         this.chartObj.setOption(this.option);
-        //     });
-        // },
         setChart(option) {
             // 雷达图显示的标签
             let newPromise = new Promise((resolve) => {
@@ -136,62 +71,7 @@ export default {
                     //劳动课程
                     this.$el.querySelector("#charts_canvas")
                 );
-                const hours = 
-                [
-                    '1班', '2班', '3班', '4班', '5班', '6班', '7班',
-                    '8班'
-                ];
-                // prettier-ignore
-                const days = 
-                [
-                    '一年级', '二年级', '三年级', '四年级', '五年级', '六年级'
-                ];
-                // prettier-ignore
-                const data = 
-                [
-                    [0, 0, 8], [0, 1, 3], [0, 2, 3], [0, 3, 2], [0, 4, 4], [0, 5, 5], [0, 6, 0], [0, 7, 0],
-                    [1, 0, 18], [1, 1, 29], [1, 2, 21], [1, 3, 37], [1, 4, 38], [1, 5, 41], [1, 6, 0], [1, 7, 0],
-                    [2, 0, 46], [2, 1, 43], [2, 2, 31], [2, 3, 44], [2, 4, 43], [2, 5, 38], [2, 6, 0], [2, 7, 0],
-                    [3, 0, 43], [3, 1, 37], [3, 2, 25], [3, 3, 40], [3, 4, 35], [3, 5, 26], [3, 6, 0], [3, 7, 0],
-                    [4, 0, 38], [4, 1, 37], [4, 2, 25], [4, 3, 0], [4, 4, 0], [4, 5, 0], [4, 6, 0], [4, 7, 0],
-                    [5, 0, 24], [5, 1, 0], [5, 2, 3], [5, 3, 0], [5, 4, 0], [5, 5, 0], [5, 6, 0], [5, 7, 0],
-                ];
-                const title = [];
-                const singleAxis = [];
-                const series = [];
-                days.forEach(function (day, idx) {
-                    title.push({
-                        textBaseline: 'middle',
-                        top: ((idx + 0.5) * 90) / days.length + '%',
-                        text: day,
-                        textStyle: {
-                            fontSize: 12,
-                        },
-                    });
-                    singleAxis.push({
-                        left: 70,
-                        type: 'category',
-                        boundaryGap: false,
-                        data: hours,
-                        top: (idx * 90) / days.length + 5 + '%',
-                        height: 90 / days.length - 10 + '%'
-                    });
-                    series.push({
-                        singleAxisIndex: idx,
-                        coordinateSystem: 'singleAxis',
-                        type: 'scatter',
-                        data: [],
-                        symbolSize: function (dataItem) {
-                            return dataItem[1] * 1.5;
-                        }
-                    });
-                });
-                data.forEach(function (dataItem) {
-                    series[dataItem[0]].data.push([dataItem[1], dataItem[2]]);
-                });
-                this.option.title = title
-                this.option.singleAxis = singleAxis
-                this.option.series = series
+
                 // 初始化雷达图
                 this.chartObj = chartObj;
                 this.chartObj.setOption(this.option);