修改并测试

src/store/getters.js

@@ -17,6 +17,8 @@ const getters = {
   getRowItemData: state => state.dashboard.getRowItemData,
   getRowItemDataLength: state => state.dashboard.getRowItemDataLength,
   getTempateData: state => state.dashboard.getTempateData,
-  getCategoryData: state => state.categoryList.getCategoryData
+  getTempateDataLength: state => state.dashboard.getTempateDataLength,
+  getCategoryData: state => state.categoryList.getCategoryData,
+  getCategoryDataLength: state => state.categoryList.getCategoryDataLength
 }
 export default getters

src/store/modules/categoryList.js

@@ -1,12 +1,16 @@
 import { getCategoryList, setCategoryList, addCategoryList } from '@/api/categoryList'
 
 const state = {
-  getCategoryData: []
+  getCategoryData: [],
+  getCategoryDataLength: 0
 }
 
 const mutations = {
   GET_CATEGORY: (state, data) => {
     state.getCategoryData = data
+  },
+  CATEGORY_LENGTH: (state, length) => {
+    state.getCategoryDataLength = length
   }
 }
 
@@ -14,10 +18,12 @@ const actions = {
   // 获取课程表专区
   getBlockList({ commit, state }, obj) {
     const blockType = obj.blockType
+    const page = (obj.page - 1) * 10
     return new Promise((resolve, reject) => {
       getCategoryList(blockType).then((res) => {
         const list = res.data
-        commit('GET_CATEGORY', list)
+        commit('CATEGORY_LENGTH', list.length)
+        commit('GET_CATEGORY', list.splice(page, 10))
         resolve()
       }).catch(error => {
         reject(error)

src/store/modules/dashboard.js

@@ -7,7 +7,8 @@ const state = {
   getBlockRowDataLength: 0,
   getRowItemData: [],
   getRowItemDataLength: 0,
-  getTempateData: []
+  getTempateData: [],
+  getTempateDataLength: 0
 }
 
 const mutations = {
@@ -31,6 +32,9 @@ const mutations = {
   },
   GET_TEMPATE: (state, data) => {
     state.getTempateData = data
+  },
+  TEMPATE__LENGTH: (state, length) => {
+    state.getTempateDataLength = length
   }
 }
 
@@ -134,11 +138,13 @@ const actions = {
     })
   },
   // 获取课程表模板
-  getTempateList({ commit, state }) {
+  getTempateList({ commit, state }, obj) {
+    const page = (obj.page - 1) * 10
     return new Promise((resolve, reject) => {
       getTempate().then((res) => {
         const list = res.data
-        commit('GET_TEMPATE', list)
+        commit('TEMPATE__LENGTH', list.length)
+        commit('GET_TEMPATE', list.splice(page, 10))
         resolve()
       }).catch(error => {
         reject(error)
@@ -150,7 +156,6 @@ const actions = {
     return new Promise((resolve, reject) => {
       setTempate(data).then((res) => {
         // const list = res.data
-        dispatch('getTempateList')
         resolve()
       }).catch(error => {
         reject(error)

src/store/modules/schoolTimetable.js

@@ -26,18 +26,18 @@ const mutations = {
 const actions = {
   // 获取课程表列表
   getScheduleList({ commit, state }, obj) {
-    console.log(obj)
-    debugger
-    const page = (obj.page - 1) * 10
+    console.log(obj.page)
     return new Promise((resolve, reject) => {
       getSchedule({
         code: '',
         title: '',
-        weekSeq: ''
+        weekSeq: '',
+        pageNo: obj.page
       }).then((res) => {
         const list = res.data.list
-        commit('SCHEDUL_LENGTH', list.length)
-        commit('GET_SCHEDULE', list.splice(page, 10))
+        const length = res.data.totalSize
+        commit('SCHEDUL_LENGTH', length)
+        commit('GET_SCHEDULE', list)
         resolve()
       }).catch(error => {
         reject(error)

src/views/categoryList/index.vue

@@ -108,6 +108,12 @@
           <el-button type="primary" @click="handOk">确 定</el-button>
         </div>
       </el-dialog>
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="getCategoryDataLength"
+        @current-change="handleCurrentChange"
+      />
     </div>
   </div>
 </template>
@@ -133,18 +139,21 @@ export default {
         sort: [
           { required: true, message: '请输入排序', trigger: 'blur' }
         ]
-      }
+      },
+      page: 1
     }
   },
   created() {
     this.$store.dispatch('categoryList/getBlockList', {
-      blockType: ''
+      blockType: '',
+      page: this.page
     })
   },
   // eslint-disable-next-line vue/order-in-components
   computed: {
     ...mapGetters([
-      'getCategoryData'
+      'getCategoryData',
+      'getCategoryDataLength'
     ])
   },
   methods: {
@@ -190,7 +199,8 @@ export default {
       this.$store.dispatch('categoryList/setBlockList', this.form).then(() => {
         this.dialogFormVisible = false
         this.$store.dispatch('categoryList/getBlockList', {
-          blockType: ''
+          blockType: '',
+          page: this.page
         })
       })
     },
@@ -200,14 +210,16 @@ export default {
         this.$store.dispatch('categoryList/setBlockList', this.form).then(() => {
           this.dialogFormVisible = false
           this.$store.dispatch('categoryList/getBlockList', {
-            blockType: ''
+            blockType: '',
+            page: this.page
           })
         })
       } else if (this.form.code !== '' && this.form.title !== '' && this.form.status !== '' && this.form.courseType !== '' && this.form.sort !== '') {
         this.$store.dispatch('categoryList/addBlockList', this.form).then(() => {
           this.dialogFormVisible = false
           this.$store.dispatch('categoryList/getBlockList', {
-            blockType: ''
+            blockType: '',
+            page: this.page
           })
         })
       }
@@ -223,6 +235,14 @@ export default {
         sort: ''
       }
     },
+    handleCurrentChange(val) {
+      console.log(val)
+      this.page = val
+      this.$store.dispatch('categoryList/getBlockList', {
+        blockType: '',
+        page: this.page
+      })
+    },
     setForm(data) {
       this.form.id = data.id
       this.form.courseType = data.courseType
@@ -251,4 +271,8 @@ export default {
   .el-select>.el-input {
     width: 300px;
   }
+  .el-pagination {
+    text-align: center;
+    margin-top: 20px;
+  }
 </style>

src/views/dashboardBlockRow/index.vue

@@ -21,7 +21,7 @@
           width="100"
         >
           <template>
-            <span>{{ name() }}</span>
+            <span>{{ codeName() }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -155,20 +155,20 @@ export default {
     newDate(date) {
       return new Date(date).toLocaleString()
     },
-    name() {
+    codeName() {
       const id = this.$route.query.id
       let name = ''
       switch (id) {
-        case '0':
+        case 0:
           name = '知识付费'
           break
-        case '1':
+        case 1:
           name = '学前'
           break
-        case '2':
+        case 2:
           name = '小学'
           break
-        case '3':
+        case 3:
           name = '中学'
           break
       }

src/views/schoolTimetable/index.vue

@@ -206,7 +206,7 @@ export default {
     handleCurrentChange(val) {
       console.log(val)
       this.page = val
-      this.$store.dispatch('dashboard/getScheduleList', {
+      this.$store.dispatch('schoolTimetable/getScheduleList', {
         page: this.page
       })
     }

src/views/tempateList/index.vue

@@ -83,6 +83,12 @@
           <el-button type="primary" @click="handOk">确 定</el-button>
         </div>
       </el-dialog>
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="getTempateDataLength"
+        @current-change="handleCurrentChange"
+      />
     </div>
   </div>
 </template>
@@ -97,16 +103,20 @@ export default {
       form: {},
       dialogFormVisible: false,
       type: '',
-      formLabelWidth: '120px'
+      formLabelWidth: '120px',
+      page: 1
     }
   },
   created() {
-    this.$store.dispatch('dashboard/getTempateList')
+    this.$store.dispatch('dashboard/getTempateList', {
+      page: this.page
+    })
   },
   // eslint-disable-next-line vue/order-in-components
   computed: {
     ...mapGetters([
-      'getTempateData'
+      'getTempateData',
+      'getTempateDataLength'
     ])
   },
   methods: {
@@ -142,6 +152,9 @@ export default {
         console.log(this.form)
         this.$store.dispatch('dashboard/setTempateList', this.form).then(() => {
           this.dialogFormVisible = false
+          this.$store.dispatch('dashboard/getTempateList', {
+            page: this.page
+          })
         })
       } else if (this.form.templateCode !== '' && this.form.status !== '' && this.form.sort !== '') {
         // this.$store.dispatch('dashboard/addBlockRowList', this.form).then(() => {
@@ -152,6 +165,12 @@ export default {
         // })
       }
     },
+    handleCurrentChange(val) {
+      this.page = val
+      this.$store.dispatch('dashboard/getTempateList', {
+        page: this.page
+      })
+    },
     setForm(data) {
       this.form = {
         'id': data.id,
@@ -179,4 +198,8 @@ export default {
   .el-select>.el-input {
     width: 300px;
   }
+  .el-pagination {
+    text-align: center;
+    margin-top: 20px;
+  }
 </style>

src/views/uploadTab/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="upload-tab">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-      <el-form-item label="学龄" prop="code">
-        <el-select v-model="ruleForm.code" placeholder="请选择活动学龄">
+      <el-form-item label="学龄" prop="scheduleCode">
+        <el-select v-model="ruleForm.scheduleCode" placeholder="请选择活动学龄">
           <el-option label="小学一年级" value="PRIMARY_FIRST_GRADE" />
           <el-option label="小学二年级" value="PRIMARY_SECOND_GRADE" />
           <el-option label="小学三年级" value="PRIMARY_THREE_GRADE" />
@@ -47,14 +47,14 @@ export default {
     return {
       ruleForm: {
         title: '',
-        code: '',
+        scheduleCode: '',
         weekSeq: ''
       },
       rules: {
         title: [
           { required: true, message: '请输入标题', trigger: 'blur' }
         ],
-        code: [
+        scheduleCode: [
           { required: true, message: '请选择学龄', trigger: 'change' }
         ],
         weekSeq: [