lsc 1 year ago
parent
commit
bbd367cb01

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.3b4e26876c4dde510f166a54f6a6c338.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.50fdbeeedf1f8ec0b11e.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.27d2b7a64b26443ef989af10c63e78bd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.2fe5e61d2254f6bb10f1.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.27d2b7a64b26443ef989af10c63e78bd.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.27d2b7a64b26443ef989af10c63e78bd.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.2fe5e61d2254f6bb10f1.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.2fe5e61d2254f6bb10f1.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.50fdbeeedf1f8ec0b11e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 8 - 1
src/components/pages/dataBoardSies/Pe/index.vue

@@ -47,8 +47,14 @@
         <div class="titleBox">
           <div class="title">学生运动报告</div>
           <div>
-            <el-select v-model="eva" @change="typeChange2" @focus="setMinWidth" class="selectBox" style="width: 120px;">
+            <el-select v-model="type1" @change="typeChange2" @focus="setMinWidth" class="selectBox" style="width: 120px;">
               <el-option label="全部年级" value=""></el-option>
+              <el-option label="一年级" value="1"></el-option>
+              <el-option label="二年级" value="2"></el-option>
+              <el-option label="三年级" value="3"></el-option>
+              <el-option label="四年级" value="4"></el-option>
+              <el-option label="五年级" value="5"></el-option>
+              <el-option label="六年级" value="6"></el-option>
             </el-select>
             <el-select v-model="eva" @change="typeChange2" @focus="setMinWidth" class="selectBox" style="width: 120px;">
               <el-option label="全部班级" value=""></el-option>
@@ -214,6 +220,7 @@ export default {
       },
       evArray: [],
       eva: '',
+      type1:'',
       evCourseArray: [],
       minWidth: 0
     }

+ 207 - 17
src/components/pages/dataBoardSies/school/index.vue

@@ -14,11 +14,16 @@
         <div class="titleBox">
           <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 v-model="cType1" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 100px;">
+              <el-option label="三年级" value="0"></el-option>
+              <el-option label="四年级" value="1"></el-option>
+              <el-option label="五年级" value="2"></el-option>
+              <el-option label="六年级" value="3"></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 v-model="cType2" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 180px;">
+              <el-option label="2022-2023第二学期" value="0"></el-option>
+              <el-option label="2021-2022第二学期" value="1"></el-option>
+              <el-option label="2021-2022第一学期" value="2"></el-option>
             </el-select>
           </div>
         </div>
@@ -27,27 +32,27 @@
             <div class="info blueBG">
               <span>实有人数</span>
               <!-- <span>{{ loginTime.toFixed(0) }}小时</span> -->
-              <span>{{ 323 }}</span>
+              <span>{{ allScoreArray[cType2][cType1].count }}</span>
             </div>
             <div class="info blueBG">
               <span>考试人数</span>
               <!-- <span>{{ (loginTime / count).toFixed(0) }}小时</span> -->
-              <span>{{ 320 }}</span>
+              <span>{{ allScoreArray[cType2][cType1].isC }}</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>
+                <el-progress :width="100" type="circle" :percentage="allScoreArray[cType2][cType1].excellent"
+                  :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>
+                <el-progress :width="100" type="circle" :percentage="allScoreArray[cType2][cType1].pass" :stroke-width="5"
+                  :format="format" color="#106BFF"></el-progress>
               </div>
             </div>
           </div>
@@ -75,16 +80,21 @@
         <div class="titleBox">
           <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 v-model="cType3" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 100px;">
+              <el-option label="三年级" value="0"></el-option>
+              <el-option label="四年级" value="1"></el-option>
+              <el-option label="五年级" value="2"></el-option>
+              <el-option label="六年级" value="3"></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 v-model="cType4" @change="typeChange" class="selectBox" @focus="setMinWidth" style="width: 180px;">
+              <el-option label="2022-2023第二学期" value="0"></el-option>
+              <el-option label="2021-2022第二学期" value="1"></el-option>
+              <el-option label="2021-2022第一学期" value="2"></el-option>
             </el-select>
           </div>
         </div>
         <div class="dataBox">
-          <studentInfo2 :evCourseArray="evCourseArray" :eva="eva"></studentInfo2>
+          <studentInfo2 :evCourseArray="evCourseArray2[cType4][cType3]"></studentInfo2>
         </div>
       </div>
     </div>
@@ -156,6 +166,10 @@ export default {
       subjectCourse: 0,
       courseArray: [],
       cType: '',
+      cType1: '0',
+      cType2: '0',
+      cType3: '0',
+      cType4: '0',
       gradeArray: [],
       subjectArray: [],
       themeArray: [],
@@ -178,8 +192,184 @@ export default {
       },
       evArray: [],
       eva: '',
-      evCourseArray: [],
-      minWidth: 0
+      evCourseArray: [
+
+      ],
+      evCourseArray2: [
+        [
+          {
+            class: ['三(1)班', '三(2)班', '三(3)班', '三(4)班', '三(5)班', '三(6)班'],
+            Array: [
+              [50, 50, 2, 15, 19, 6, 3, 5], [50, 50, 0, 16, 22, 5, 4, 3], [51, 50, 2, 26, 9, 6, 2, 5], [51, 50, 1, 21, 12, 7, 2, 7], [50, 49, 0, 19, 13, 10, 4, 3], [50, 49, 0, 17, 18, 9, 0, 5],
+            ]
+          },
+          {
+            class: ['四(1)班', '四(2)班', '四(3)班', '四(4)班', '四(5)班', '四(6)班'],
+            Array: [
+              [49, 49, 1, 20, 17, 3, 5, 3], [50, 50, 1, 11, 19, 9, 2, 8], [48, 48, 0, 9, 12, 9, 9, 9], [49, 49, 0, 12, 11, 8, 8, 10], [50, 50, 0, 9, 13, 10, 5, 13], [50, 49, 0, 13, 14, 10, 5, 7],
+            ]
+          },
+          {
+            class: ['五(1)班', '五(2)班', '五(3)班', '五(4)班'],
+            Array: [
+              [49, 49, 0, 13, 11, 11, 6, 8], [49, 49, 2, 17, 7, 12, 3, 8], [48, 48, 1, 19, 16, 15, 3, 4], [48, 48, 4, 18, 13, 8, 2, 3],
+            ]
+          },
+          {
+            class: ['六(1)班', '六(2)班'],
+            Array: [
+              [48, 48, 1, 30, 10, 4, 0, 3], [47, 47, 0, 23, 10, 4, 6, 4]
+            ]
+          }
+        ],
+        [
+          {
+            class: ['三(1)班', '三(2)班', '三(3)班', '三(4)班', '三(5)班', '三(6)班'],
+            Array: [
+              [50, 50, 1, 22, 17, 6, 2, 2],
+              [50, 50, 1, 14, 18, 11, 2, 4],
+              [50, 49, 0, 12, 16, 12, 4, 5],
+              [50, 50, 0, 23, 15, 8, 3, 1],
+              [50, 50, 3, 12, 14, 7, 6, 8],
+              [50, 49, 2, 20, 16, 5, 1, 5],
+            ]
+          },
+          {
+            class: ['四(1)班', '四(2)班', '四(3)班'],
+            Array: [
+              [50, 50, 0, 9, 20, 7, 7, 7],
+              [50, 49, 0, 11, 16, 15, 3, 4],
+              [49, 49, 0, 9, 21, 8, 10, 1],
+            ]
+          },
+          {
+            class: ['五(1)班'],
+            Array: [
+              [49, 49, 0, 15, 13, 11, 4, 6]
+            ]
+          },
+          {
+            class: ['六(1)班'],
+            Array: [
+              [0, 0, 0, 0, 0, 0, 0, 0]
+            ]
+          }
+        ],
+        [
+          {
+            class: ['三(1)班', '三(2)班', '三(3)班', '三(4)班', '三(5)班', '三(6)班'],
+            Array: [
+              [50, 50, 4, 34, 8, 2, 1, 1],
+              [49, 49, 1, 35, 8, 4, 1, 0],
+              [50, 50, 2, 23, 16, 6, 2, 1],
+              [50, 50, 3, 31, 11, 3, 1, 1],
+              [50, 49, 1, 25, 12, 3, 5, 3],
+              [50, 49, 2, 27, 14, 4, 1, 1]
+            ]
+          },
+          {
+            class: ['四(1)班', '四(2)班', '四(3)班'],
+            Array: [
+              [46, 46, 0, 17, 18, 6, 2, 3]
+              [50, 50, 0, 22, 16, 3, 4, 5]
+              [48, 48, 0, 16, 21, 6, 3, 2]
+            ]
+          },
+          {
+            class: ['五(1)班'],
+            Array: [
+              [48, 48, 0, 20, 15, 8, 2, 3]
+            ]
+          },
+          {
+            class: ['六(1)班'],
+            Array: [
+              [47, 47, 0, 19, 17, 8, 2, 1]
+            ]
+          }
+        ],
+      ],
+      minWidth: 0,
+      allScoreArray: [
+        [
+          {
+            count: 302,
+            isC: 298,
+            pass: 91,
+            excellent: 60
+          },
+          {
+            count: 296,
+            isC: 295,
+            pass: 83,
+            excellent: 41
+          },
+          {
+            count: 194,
+            isC: 194,
+            pass: 88,
+            excellent: 43
+          },
+          {
+            count: 95,
+            isC: 95,
+            pass: 93,
+            excellent: 78
+          },
+        ],
+        [
+          {
+            count: 300,
+            isC: 298,
+            pass: 92,
+            excellent: 57
+          },
+          {
+            count: 149,
+            isC: 148,
+            pass: 92,
+            excellent: 43
+          },
+          {
+            count: 49,
+            isC: 49,
+            pass: 88,
+            excellent: 56
+          },
+          {
+            count: 47,
+            isC: 0,
+            pass: 0,
+            excellent: 0
+          },
+        ],
+        [
+          {
+            count: 299,
+            isC: 297,
+            pass: 98,
+            excellent: 78
+          },
+          {
+            count: 144,
+            isC: 144,
+            pass: 93,
+            excellent: 62
+          },
+          {
+            count: 48,
+            isC: 48,
+            pass: 94,
+            excellent: 73
+          },
+          {
+            count: 47,
+            isC: 47,
+            pass: 98,
+            excellent: 77
+          },
+        ],
+      ]
     }
   },
   mounted() {

+ 122 - 81
src/components/pages/dataBoardSies/school/studentInfo2/index.vue

@@ -11,13 +11,13 @@
 export default {
     props: {
         evCourseArray: {
-            type: Array,
-            default: []
+            type: Object,   
+            default: () => {}
         },
-        eva: {
-            type: String,
-            default: ''
-        }
+        // eva: {
+        //     type: String,
+        //     default: ''
+        // }
     },
     data() {
         return {
@@ -26,12 +26,20 @@ export default {
                 xdata: [],
                 sdata: [],
             },
+            name:['100分','90-99分','80-89分','70-79分','60-69分','0-59分'],
             option: {
                 xAxis: {
                     type: 'value',
                     show: false,
                     // max: 500
                 },
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                    // Use axis to trigger tooltip
+                    type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+                    }
+                },
                 grid: {
                     left: '15%',
                     right: '5%',
@@ -42,55 +50,55 @@ export default {
                     inverse: true,
                     type: 'category',
                     data: [
-                        '三(1)班级',
-                        '三(2)班级',
-                        '三(3)班级',
-                        '三(4)班级',
-                        '三(5)班级',
-                        '三(6)班级'
+                        // '三(1)班级',
+                        // '三(2)班级',
+                        // '三(3)班级',
+                        // '三(4)班级',
+                        // '三(5)班级',
+                        // '三(6)班级'
                     ]
                 },
                 series: [
-                    {
-                        showBackground: true,
-                        stack: 'total',
-                        data: [
-                            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'
-                    }
+                    // {
+                    //     showBackground: true,
+                    //     stack: 'total',
+                    //     data: [
+                    //         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'
+                    // }
                 ]
             },
         };
@@ -107,36 +115,69 @@ export default {
                     //劳动课程
                     this.$el.querySelector("#charts_canvas")
                 );
-                // this.option.radar.indicator = option.xdata;
-                // this.option.series[0].data[0].value = option.sdata;
-
+                this.option.yAxis.data = option.xdata;
+                this.option.series = []
+                for(var i = 0;i<this.name.length;i++){
+                    this.option.series.push(           
+                        {
+                            name:this.name[i],
+                            showBackground: true,
+                            stack: 'total',
+                            data: [],
+                            type: 'bar'
+                        },
+                    );
+                }
+                for(var i = 0;i<option.sdata.length;i++){
+                    for(var j = 0;j<this.option.series.length;j++){
+                        this.option.series[j].data.push(option.sdata[i][j])
+                    }
+                }
+                console.log(this.option);
                 // 初始化雷达图
                 this.chartObj = chartObj;
                 this.chartObj.setOption(this.option);
             });
         },
         setArray(array) {
-            this.setChart(array);
-            return
+            // this.setChart(array);
+            // return
             this.ooption = {
-                xdata: [],
-                sdata: [],
-            }
-            for (var i = 0; i < array.length; i++) {
-                if (array[i].evid == this.eva) {
-                    this.ooption.xdata = array[i].indicator
-                    this.ooption.sdata = array[i].value
-                    break;
-                }
+                xdata: array.class,
+                sdata: array.Array,
             }
+            // for (var i = 0; i < array.length; i++) {
+            //     if (array[i].evid == this.eva) {
+            //         this.ooption.xdata = array[i].indicator
+            //         this.ooption.sdata = array[i].value
+            //         break;
+            //     }
+            // }
             setTimeout(() => {
-                // if (!this.chartObj) {
-                this.setChart(this.ooption);
-                // } else {
-                //     this.option.radar.indicator = this.ooption.xdata;
-                //     this.option.series[0].data[0].value = this.ooption.sdata;
-                //     this.chartObj.setOption(this.option);
-                // }
+                if (!this.chartObj) {
+                    this.setChart(this.ooption);
+                } else {
+                    this.option.yAxis.data = this.ooption.xdata;
+                    this.option.series = []
+                    for(var i = 0;i<this.name.length;i++){
+                        this.option.series.push(           
+                            {
+                                name:this.name[i],
+                                showBackground: true,
+                                stack: 'total',
+                                data: [],
+                                type: 'bar'
+                            },
+                        );
+                    }
+                    for(var i = 0;i<this.ooption.sdata.length;i++){
+                        for(var j = 0;j<this.option.series.length;j++){
+                            this.option.series[j].data.push(this.ooption.sdata[i][j])
+                        }
+                    }
+                    console.log(this.option);
+                    this.chartObj.setOption(this.option);
+                }
             }, 100);
             this.$forceUpdate();
         },
@@ -150,14 +191,14 @@ export default {
                 this.$forceUpdate();
             },
         },
-        eva: {
-            immediate: true,
-            deep: true,
-            handler(newValue, oldValue) {
-                this.setArray(this.evCourseArray)
-                this.$forceUpdate();
-            },
-        },
+        // eva: {
+        //     immediate: true,
+        //     deep: true,
+        //     handler(newValue, oldValue) {
+        //         this.setArray(this.evCourseArray)
+        //         this.$forceUpdate();
+        //     },
+        // },
     },
     mounted() {
         this.setArray(this.evCourseArray)

Some files were not shown because too many files changed in this diff