Explorar el Código

build: :white_check_mark: 学校选择回首页

chaooo hace 2 años
padre
commit
bbc740f009

+ 3 - 0
src/layout/components/Navbar/SchoolSelect.vue

@@ -2,8 +2,10 @@
 import {SchoolList} from "@/api/school/types";
 import {getSchoolSelect} from "@/api/school";
 import {useUserStore} from "@/store/modules/user";
+import {useRouter} from "vue-router";
 
 const userStore = useUserStore();
+const router = useRouter();
 /**
  * 学校数据
  */
@@ -28,6 +30,7 @@ function changeMySchool() {
     if (schoolId.value == school.school_id) {
       //schoolNum.value = school.num;
       userStore.changeSchool(schoolId.value, school.num);
+      router.push("/");
       return true;
     }
   });

+ 3 - 2
src/views/grade/index.vue

@@ -87,7 +87,7 @@ watch(
             <template #title>
               <div class="title">
                 <span class="blue mr-10">{{ grade.name }}</span>
-                <span class="mr-10">教师:{{ grade.teacher_name }}</span>
+                <span class="mr-10">教师:{{ grade.teacher_name || "未分配" }}</span>
                 <span class="mr-10">班级号:{{ grade.num }}</span>
                 <span v-if="grade.grade_status == 1" class="red">结课时间:{{ grade.grade_time }}</span>
                 <span class="blue fr"
@@ -107,7 +107,8 @@ watch(
                 <el-table-column />
                 <!-- 无数据插槽 -->
                 <template #empty>
-                  <div class="empty">
+                  <div v-if="grade.count > 0">...</div>
+                  <div v-else class="empty">
                     <img src="../../assets/empty.png" alt="数据为空" />
                     <p>该班级还未绑定任何学生!</p>
                   </div>

+ 3 - 3
src/views/training/index.vue

@@ -90,7 +90,7 @@ watch(
         <el-option key="1" :value="Number(1)" label="正式学生"></el-option>
         <el-option key="2" :value="Number(2)" label="体验用户"></el-option>
       </el-select>
-      <el-select v-model="pageParams.grade_id" placeholder="请选择班级" size="large">
+      <el-select v-if="pageParams.is_formal == 1" v-model="pageParams.grade_id" placeholder="请选择班级" size="large">
         <el-option v-for="item in gradeData" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-input
@@ -105,11 +105,11 @@ watch(
       <el-table :data="trainingData" style="width: 100%">
         <el-table-column align="center" label="序号" max-width="120" type="index" />
         <el-table-column prop="name" label="学生名称" align="center" />
-        <el-table-column prop="phone" label="手机号码" align="center" />
+        <el-table-column v-if="isFormal == 1" prop="phone" label="手机号码" align="center" />
         <el-table-column prop="device_name" label="训练方式" align="center" />
         <el-table-column prop="create_time" label="训练时间" align="center" />
         <el-table-column prop="play_time" label="训练时长" align="center" />
-        <el-table-column prop="grade_name" label="所在班级" align="center" />
+        <el-table-column v-if="isFormal == 1" prop="grade_name" label="所在班级" align="center" />
         <el-table-column label="操作" align="center" min-width="120">
           <template #default="scope">
             <template v-if="scope.row.report_status == 1">