Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/components/classReport.vue

@@ -70,8 +70,10 @@
       :before-close="handleClose"
       class="dialog_diy"
     >
-      <div>
+      <div v-if="!isLoading1">
+        <div v-if="studentJuri.length == 0">暂无数据</div>
         <el-table
+          v-else
           :data="studentJuri"
           border
           v-loading="isLoading1"
@@ -97,6 +99,7 @@
           </el-table-column>
         </el-table>
       </div>
+      <div v-else>正在加载数据中...</div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="getCStudentReport">确定</el-button>

src/components/pages/components/stReport.vue

@@ -85,7 +85,9 @@
       class="dialog_diy"
     >
       <div v-if="!isLoading1">
+        <div v-if="mbCourse.length == 0">暂无数据</div>
         <div
+          v-else
           class="evaBox"
           v-for="(item, index) in mbCourse"
           :key="index"
@@ -124,7 +126,7 @@
 
 <script>
 export default {
-  props: ["ooid", "ccid","checkid"],
+  props: ["ooid", "ccid", "checkid"],
   data() {
     return {
       sName: "",
@@ -146,8 +148,8 @@ export default {
       immediate: true,
       deep: true,
       handler(newValue, oldValue) {
-        if(this.checkid){
-          this.classChoose = this.checkid
+        if (this.checkid) {
+          this.classChoose = this.checkid;
         }
         this.getClass();
         this.getSData();
@@ -262,8 +264,8 @@ export default {
     },
   },
   created() {
-    if(this.checkid){
-      this.classChoose = this.checkid
+    if (this.checkid) {
+      this.classChoose = this.checkid;
     }
     this.getClass();
     this.getSData();