From d7b00dc7a788d3889ca7c21a648689ba007e89c7 Mon Sep 17 00:00:00 2001
From: zhusiyu <410827992@qq.com>
Date: Thu, 28 Jul 2022 17:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AE=A1=E7=90=86=E7=A9=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../studentManage.vue                         | 87 +++++++++++--------
 1 file changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
index 528c12c..9a82467 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
@@ -29,24 +29,37 @@
                             </dv-decoration-9>
                         </div>
                         <div class="left-topNum-num">
-                            <div class="numbox1 numbox" v-for="(item,i) in studentManageData1" :key="i">
+                            <div v-if="studentManageData1.length!==0" class="numbox1 numbox"
+                                 v-for="(item,i) in studentManageData1" :key="i">
                                 <p class="num">{{item.total}}</p>
                                 <p class="text">{{item.stage_name}}部</p>
                             </div>
+                            <div class="numbox1 numbox" v-if="studentManageData1.length===0">
+                                <p class="num">0</p>
+                                <p class="text"> 部</p>
+                            </div>
+                            <div class="numbox1 numbox" v-if="studentManageData1.length===0">
+                                <p class="num">0</p>
+                                <p class="text"> 部</p>
+                            </div>
+                            <div class="numbox1 numbox" v-if="studentManageData1.length===0">
+                                <p class="num">0</p>
+                                <p class="text"> 部</p>
+                            </div>
                         </div>
                         <div class="left-topNum-gender">
                             <div class="boy">
                                 <a-row style="width: 100%;height: 100%">
                                     <a-col :span="14" style="height: 100%">
                                         <div class="border"></div>
-                                        <span class="gender-style">{{genderBoy}}生</span>
+                                        <span class="gender-style">{{typeof genderBoy == 'string' ? genderBoy : ' '}}生</span>
                                         <br>
                                         <i class="total">{{numrBoy}}人</i>
                                     </a-col>
                                     <a-col class="echarts" id="myechartsBoy" ref="myecharts" :span="10"
                                            style="height: 100%"></a-col>
                                     <a-col style="position: absolute; top: 28px;right: 9px; fontSize: 18px;fontWeight: 700;color: #01F6F9">
-                                        {{boybili}}%
+                                        {{!isNaN(boybili) ? boybili : 0}}%
                                     </a-col>
                                 </a-row>
                             </div>
@@ -54,14 +67,14 @@
                                 <a-row style="width: 100%;height: 100%;position: relative;">
                                     <a-col :span="14" style="height: 100%">
                                         <div class="border"></div>
-                                        <span class="gender-style">{{genderGril}}生</span>
+                                        <span class="gender-style">{{typeof genderGril == 'string' ? genderGril : ' '}}生</span>
                                         <br>
                                         <i class="total">{{numGril}}人</i>
                                     </a-col>
                                     <a-col class="echarts" id="myechartsGril" ref="myecharts" :span="10"
                                            style="height: 100%"></a-col>
                                     <a-col style="position: absolute; top: 28px;right: 9px; fontSize: 18px;fontWeight: 700;color: #01F6F9">
-                                        {{grilbili}}%
+                                        {{!isNaN(grilbili) ? grilbili : 0}}%
                                     </a-col>
                                 </a-row>
                             </div>
@@ -74,7 +87,9 @@
                                     v-if="collapseData.length !=0">
                             <a-collapse-panel v-for="(item,i) in collapseData" :key="i" :show-arrow="false"
                                               :header="item.headText">
-                                <a-table :columns="item.columns" :dataSource="item.tableData" :customRow="getCustomRow"
+                                <a-empty description="暂无数据" v-if="item.tableData.length ===0"/>
+                                <a-table v-if="item.tableData.length !==0" :columns="item.columns"
+                                         :dataSource="item.tableData" :customRow="getCustomRow"
                                          :pagination="false"></a-table>
                             </a-collapse-panel>
                         </a-collapse>
@@ -113,7 +128,7 @@
                                 <swiper id="mySwiper" :options="swiperOption" ref="mySwiper"
                                         v-if="honorDataSourse.length!=0">
                                     <swiper-slide class="swiper-item divcard swiper-slide"
-                                                  v-for='(item,index) of honorDataSourse' :key='index'>
+                                                  v-for='(item,index) in honorDataSourse' :key='index'>
                                         <a-row>
                                             <a-col :span="8">
                                                 <img src="../images/headSrc1.png" alt="">
@@ -209,11 +224,11 @@
                 //学生管理数据2
                 studentManageData2: [],
                 genderGril: '',
-                numGril: '',
+                numGril: 0,
                 genderBoy: '',
-                numrBoy: '',
-                boybili: '',
-                grilbili: '',
+                numrBoy: 0,
+                boybili: 0,
+                grilbili: 0,
                 spinning: false,
                 currentKey: '0',
                 rightTopShow: true,
@@ -279,16 +294,8 @@
             currentKey(val, old) {
                 this.currentKey = val
             }
-        },
-        beforeMount() {
-        },
-        created() {
-
         },
         mounted() {
-            this.$nextTick(() => {
-
-            })
             //学生管理数据1获取
             this.getStudentManageData1()
             //学生管理数据2获取
@@ -349,9 +356,10 @@
                     // this.getStudentManageData2()
                     this.spinning = false;
                     if (result[0].data.result.length != 0) {
-                        this.studentManageData1 = JSON.parse(result[0].data.result)
-                        for (let i = 0; i < this.studentManageData1.length; i++) {
-                            this.allStudeantTotal += this.studentManageData1[i].total
+                        let temp = JSON.parse(result[0].data.result)
+                        this.studentManageData1 = temp
+                        for (let i = 0; i < temp.length; i++) {
+                            this.allStudeantTotal += temp[i].total
                         }
                     }
                 })
@@ -383,11 +391,11 @@
                         this.numGril = this.studentManageData2[0].total
                         this.genderBoy = this.studentManageData2[1].XB_NAME
                         this.numrBoy = this.studentManageData2[1].total
+                        this.boybili = parseInt(Number(this.numrBoy) / Number(this.allStudeantTotal) * 100) + 1
+                        this.grilbili = parseInt(Number(this.numGril) / Number(this.allStudeantTotal) * 100)
                         this.getEchartsBoy()
                         this.getEchartsGirl()
                     }
-                    this.boybili = parseInt(Number(this.numrBoy) / Number(this.allStudeantTotal) * 100) + 1
-                    this.grilbili = parseInt(Number(this.numGril) / Number(this.allStudeantTotal) * 100)
                 })
             },
             //学生管理折叠面板数据获取
@@ -428,7 +436,7 @@
 
                 })
             },
-            //学生管理数据4获取
+            //学生管理表格数据获取
             getStudentManageData4: function () {
                 let param = {
                     "access_token": "system_01##20200102030405##a6ce11eab94df48a6ce11eab",
@@ -463,15 +471,15 @@
                     } else {
                         this.collapseDataEmpty = true
                     }
-                    res.forEach(item => {
-                        if (item.stage_name == '小学') {
-                            this.collapseData[0].tableData.push(item)
-                        } else if (item.stage_name == '初中') {
-                            this.collapseData[1].tableData.push(item)
-                        } else if (item.stage_name == '高中') {
-                            this.collapseData[2].tableData.push(item)
-                        }
-                    })
+//                    res.forEach(item => {
+//                        if (item.stage_name == '小学') {
+//                            this.collapseData[0].tableData.push(item)
+//                        } else if (item.stage_name == '初中') {
+//                            this.collapseData[1].tableData.push(item)
+//                        } else if (item.stage_name == '高中') {
+//                            this.collapseData[2].tableData.push(item)
+//                        }
+//                    })
                 })
             },
             //学生荣誉
@@ -525,7 +533,8 @@
                     this.spinning = false;
                     if (result[0].data.result != '') {
                         this.studentNoticeData = JSON.parse(result[0].data.result)
-                    } else {
+                    }
+                    if (this.studentNoticeData.length == 0) {
                         this.studentNoticeDataEmpty = true
                     }
                 })
@@ -764,7 +773,6 @@
                                 }
                             }
 
-
                         }
 
                         .left-topNum-num > div:nth-child(2) {
@@ -1080,6 +1088,13 @@
                         padding: 20px 10px 15px 20px;
                         margin-top: 20px;
                         border-radius: 7px;
+                        .timeLine-empty {
+                            margin-top: -6px;
+                            margin-right: 62px;
+                            /deep/ .ant-empty-image {
+                                height: 80px !important;
+                            }
+                        }
                     }
                 }
             }