页面修改

src/components/course/classmate-form.vue

@@ -124,7 +124,7 @@
       </thead>
     </table>
     <div class="planTabDiv" ref="planTabDiv">
-      <table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
+      <table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;" v-loading="loading">
         <tbody>
           <tr v-for="(item,index) in dataList.fridayList" :key="index">
             <td>
@@ -176,6 +176,10 @@
         type: Object,
         default: null
       },
+      loading:{
+        type:Boolean,
+        default:false,
+      }
     },
     components: {
       mateitem,

src/pages/stuMan/classPlan.vue

@@ -2,157 +2,74 @@
   <div class="page-body MainPlan xg">
     <div class="col row wrap q-col-gutter-md">
       <div class="col-2 flex">
-        <el-select
-          v-model="msg.TeacherId"
-          style="width: 100%"
-          placeholder="教师"
-          size="small"
-          @change="getPlanList()"
-        >
-          <el-option
-            v-for="item in TeacherList"
-            :key="item.TeacherName"
-            :label="item.TeacherName"
-            :value="item.TId"
-          >
+        <el-select v-model="msg.TeacherId" style="width: 100%" placeholder="教师" size="small" @change="getPlanList()">
+          <el-option v-for="item in TeacherList" :key="item.TeacherName" :label="item.TeacherName" :value="item.TId">
           </el-option>
-          <div
-            slot="prefix"
-            class="full-height flex items-center"
-            style="color: #000; padding-right: 10px"
-          >
+          <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
             教师:
           </div>
         </el-select>
       </div>
       <div class="col-2">
-        <el-select
-          v-model="msg.ClassRoomId"
-          style="width: 100%"
-          placeholder="教室"
-          size="small"
-          @change="getTypeWay()"
-        >
-          <el-option
-            v-for="item in ClassRoomList"
-            :key="item.RoomName"
-            :label="item.RoomName"
-            :value="item.RoomId"
-          >
+        <el-select v-model="msg.ClassRoomId" style="width: 100%" placeholder="教室" size="small" @change="getTypeWay()">
+          <el-option v-for="item in ClassRoomList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomId">
           </el-option>
-          <div
-            slot="prefix"
-            class="full-height flex items-center"
-            style="color: #000; padding-right: 10px"
-          >
+          <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
             教室:
           </div>
         </el-select>
       </div>
       <div class="col-2" style="width: 13%">
-        <el-date-picker
-          v-model="msg.StartTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="开始日期"
-          size="small"
-          style="width: 100%"
-          @change="getTypeWay()"
-          :picker-options="picker"
-          :clearable="false"
-        >
+        <el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="开始日期" size="small"
+          style="width: 100%" @change="getTypeWay()" :picker-options="picker" :clearable="false">
         </el-date-picker>
       </div>
       <div class="col-2" style="width: 13%">
-        <el-date-picker
-          v-model="msg.EndTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="结束日期"
-          size="small"
-          style="width: 100%"
-          @change="getTypeWay()"
-          clear-icon="iconfont icon-guanbi"
-          :picker-options="pickerEnd"
-        >
+        <el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="结束日期" size="small"
+          style="width: 100%" @change="getTypeWay()" clear-icon="iconfont icon-guanbi" :picker-options="pickerEnd">
         </el-date-picker>
       </div>
       <div class="col-1" style="width: 10%">
-        <el-select
-          v-model="msg.ClassType"
-          style="width: 100%"
-          placeholder="类型"
-          size="small"
-          @change="getTypeWay()"
-        >
+        <el-select v-model="msg.ClassType" style="width: 100%" placeholder="类型" size="small" @change="getTypeWay()">
           <el-option :key="0" label="全部" :value="0"> </el-option>
           <el-option :key="1" label="正常" :value="1"> </el-option>
           <el-option :key="2" label="试听课" :value="2"> </el-option>
-          <div
-            slot="prefix"
-            class="full-height flex items-center"
-            style="color: #000; padding-right: 10px"
-          >
+          <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
             状态:
           </div>
         </el-select>
       </div>
       <div class="col-3" style="width: 30%">
-        <q-btn
-          color="accent"
-          size="sm"
-          class="q-mr-md"
-          style="margin-top: 2px"
-          @click="exchangeType"
-          :label="typeName"
-        />
-        <q-btn
-          color="accent"
-          size="sm"
-          class="q-mr-md"
-          label="下载计划"
-          @click="downLoadPlan()"
-        />
-        <q-btn
-          color="negative"
-          size="sm"
-          label="调课申请"
-          @click="openForm"
-        ></q-btn>
+        <q-btn color="accent" size="sm" class="q-mr-md" style="margin-top: 2px" @click="exchangeType"
+          :label="typeName" />
+        <q-btn color="accent" size="sm" class="q-mr-md" label="下载计划" @click="downLoadPlan()" />
+        <q-btn color="negative" size="sm" label="调课申请" @click="openForm"></q-btn>
       </div>
     </div>
-    <classmateForm :dataList="dataList" v-if="commonType == 1"></classmateForm>
-    <change-class-form
-      v-if="persistent"
-      @close="closeSaveForm"
-      @success="refreshPage"
-    ></change-class-form>
-    <teachTable
-      v-if="commonType == 2"
-      :tableData="tableData"
-      :PageCount="PageCount"
-      :setMsg="tabMsg"
-      :showCZ="false"
-      @getChange="getChange"
-    ></teachTable>
+    <classmateForm :dataList="dataList" v-if="commonType == 1" :loading="loading"></classmateForm>
+    <change-class-form v-if="persistent" @close="closeSaveForm" @success="refreshPage"></change-class-form>
+    <teachTable v-if="commonType == 2" :tableData="tableData" :PageCount="PageCount" :setMsg="tabMsg" :showCZ="false"
+      @getChange="getChange" :loading="loading"></teachTable>
   </div>
 </template>
 
 <script>
-import {
+  import {
     getTeacherDropDownList,
     queryClassRoomList,
-} from "../../api/school/index";
-import {
+  } from "../../api/school/index";
+  import {
     GetClassPlanStatistical,
     GetClassPlanStatisticalPage,
-} from "../../api/teacher/index";
-import { EduDownLoad } from "../../api/common/common";
-import classmateForm from "../../components/course/classmate-form";
-import teachTable from "../teacher/components/teachTable";
-import changeClassForm from "../../components/teacher/changeClassForm.vue";
+  } from "../../api/teacher/index";
+  import {
+    EduDownLoad
+  } from "../../api/common/common";
+  import classmateForm from "../../components/course/classmate-form";
+  import teachTable from "../teacher/components/teachTable";
+  import changeClassForm from "../../components/teacher/changeClassForm.vue";
 
-export default {
+  export default {
     meta: {
       title: "教师课表",
     },
@@ -213,6 +130,7 @@ export default {
             }
           },
         },
+        loading:false,
       };
     },
     created() {
@@ -223,9 +141,9 @@ export default {
       let today =
         date.getFullYear() +
         "-" +
-      (date.getMonth() < 9
-        ? "0" + (date.getMonth() + 1)
-        : date.getMonth() + 1) +
+        (date.getMonth() < 9 ?
+          "0" + (date.getMonth() + 1) :
+          date.getMonth() + 1) +
         "-" +
         (date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
       this.msg.StartTime = today;
@@ -301,7 +219,9 @@ export default {
         this.tabMsg.EndTime = this.msg.EndTime;
         this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
         this.tabMsg.ClassType = this.msg.ClassType;
+        this.loading=true;
         GetClassPlanStatisticalPage(this.tabMsg).then((res) => {
+          this.loading=false;
           if (res.Code == 1) {
             this.tableData = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
@@ -320,10 +240,10 @@ export default {
         }
       },
     },
-};
+  };
 </script>
 <style lang="scss">
-.xg .el-input--prefix .el-input__inner {
+  .xg .el-input--prefix .el-input__inner {
     padding-left: 50px;
-}
+  }
 </style>
\ No newline at end of file

src/pages/stuMan/classRecord.vue

@@ -45,7 +45,7 @@
       </div>
     </div>
     <teachTable v-if="commonType == 2" :tableData="tableData" :PageCount="PageCount" :setMsg="tabMsg" :showCZ="true"
-      @getChange="getChange"></teachTable>
+      @getChange="getChange" :loading="loading"></teachTable>
   </div>
 </template>
 
@@ -80,6 +80,7 @@
         TeacherId: 0,
         ClassRoomId: 0,
         dataList: {},
+        loading:false,
         msg: {
           StartTime: "",
           EndTime: "",
@@ -211,7 +212,9 @@
         this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
         this.tabMsg.ClassType = this.msg.ClassType;
         this.tabMsg.TeacherId=this.msg.TeacherId;
+        this.loading=true;
         GetClassPlanStatisticalPage(this.tabMsg).then((res) => {
+          this.loading=false;
           if (res.Code == 1) {
             this.tableData = res.Data.PageData;
             this.PageCount = res.Data.PageCount;

src/pages/teacher/components/teachTable.vue

 <template>
   <div style="padding: 20px 0">
     <div class="page-content">
-      <q-table
-        :pagination="setMsg"
-        no-data-label="暂无相关数据"
-        flat
-        class="sticky-column-table sticky-right-column-table"
-        separator="none"
-        :data="tableData"
-        :columns="showCZ ? columns : columns2"
-        row-key="name"
-      >
+      <q-table :pagination="setMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
+        separator="none" :data="tableData" :columns="showCZ ? columns : columns2" row-key="name">
         <template v-slot:body-cell-GuestList="props">
           <q-td auto-width :props="props">
-            <span
-              v-for="(item, index) in props.row.GuestList"
-              style="margin-right: 5px"
-            >
+            <span v-for="(item, index) in props.row.GuestList" style="margin-right: 5px" :key="index">
               {{ item.GuestName }}
             </span>
           </q-td>
@@ -31,44 +20,22 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td>
-            <q-btn
-              flat
-              size="xs"
-              icon="iconfont icon-view"
-              v-if="props.row.ClassType == 1"
-              color="accent"
-              style="font-weight: 400"
-              label="课程回顾"
-              @click="goCourseRecord(props.row)"
-            />
-            <q-btn
-              flat
-              size="xs"
-              icon="iconfont icon-view"
-              v-if="props.row.ClassType == 1"
-              color="accent"
-              style="font-weight: 400"
-              label="课程反馈"
-              @click="goFeedBack(props.row)"
-            />
+            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
+              style="font-weight: 400" label="课程回顾" @click="goCourseRecord(props.row)" />
+            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
+              style="font-weight: 400" label="课程反馈" @click="goFeedBack(props.row)" />
           </q-td>
         </template>
         <template v-slot:bottom>
-          <q-pagination
-            class="full-width justify-end"
-            v-model="PageIndex"
-            color="primary"
-            :max="PageCount"
-            :input="true"
-            @input="changePage"
-          />
+          <q-pagination class="full-width justify-end" v-model="PageIndex" color="primary" :max="PageCount"
+            :input="true" @input="changePage" />
         </template>
       </q-table>
     </div>
   </div>
 </template>
 <script>
-export default {
+  export default {
     props: {
       setMsg: {
         type: Object,
@@ -87,6 +54,10 @@ export default {
         Type: Boolean,
         default: true,
       },
+      loading:{
+        type:Boolean,
+        default:false,
+      }
     },
     meta: {
       title: "我的课表",
@@ -94,8 +65,7 @@ export default {
     components: {},
     data() {
       return {
-      columns: [
-        {
+        columns: [{
             name: "ClassDate",
             label: "日期",
             field: "ClassDate",
@@ -143,8 +113,7 @@ export default {
             field: "Id",
           },
         ],
-      columns2: [
-        {
+        columns2: [{
             name: "ClassDate",
             label: "日期",
             field: "ClassDate",
@@ -221,8 +190,8 @@ export default {
         });
       },
     },
-};
+  };
 </script>
 <style lang="sass">
-@import url('~assets/css/table.sass')
+  @import url('~assets/css/table.sass')
 </style>
\ No newline at end of file