Browse Source

解决教师列表变更后其他页面不是最新数据的bug

liqk 4 years ago
parent
commit
4e49de1d1a

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/teachContent.js

@@ -31,7 +31,7 @@ export default {
   props7: '存儲空間不足!',
   uploadText: '點擊或者拖拽上傳',
 
-  resTips: 'HiTeach生成的課件,不包含PPT等其他檔案',
+  resTips: 'HiTeach生成的課件,只支持HTEX格式的教材預覽',
   space: '空間:',
   calcing: '計算中…',
   blobFull: '(已滿)',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/teachContent.js

@@ -31,7 +31,7 @@ export default {
   props7: '存储空间不足!',
   uploadText: '点击或者拖拽上传',
 
-  resTips:'HiTeach生成的课件,不包含PPT等其他文件',
+  resTips:'HiTeach生成的课件,只支持HTEX格式的教材预览',
   space:'空间:',
   calcing:'计算中...',
   blobFull:'(已满)',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachContent.js

@@ -31,7 +31,7 @@ export default {
   props7: '儲存空間不足!',
   uploadText: '點按或者拖移上傳',
 
-  resTips: 'HiTeach生成的教材,不包含PPT等其他檔案',
+  resTips: 'HiTeach生成的課件,只支持HTEX格式的教材預覽',
   space: '空間:',
   calcing: '計算中…',
   blobFull: '(已滿)',

+ 49 - 16
TEAMModelOS/ClientApp/src/store/module/teachers.js

@@ -18,31 +18,24 @@ export default {
                 (resolve, reject) => {
                     if (context.state.teacherList.length == 0) {
                         apiTools.courseMgmt.getSchoolTeacher({
-                            'school_code': context.rootState.userInfo.schoolCode 
+                            'school_code': context.rootState.userInfo.schoolCode
                         }).then(
                             (res) => {
                                 if (res) {
-                                    if (res.teachers.length > 0) {
-                                        context.commit('setTeacherList', res.teachers)
-                                        resolve({
-                                            code: 1,
-                                            message: '数据请求成功'
-                                        })
-                                    } else {
-                                        resolve({
-                                            code: 2,
-                                            message: '请求成功,数据为空'
-                                        })
-                                    }
-                                } else {
+                                    context.commit('setTeacherList', res.teachers)
                                     resolve({
+                                        data: res.teachers,
+                                        message: '数据请求成功'
+                                    })
+                                } else {
+                                    reject({
                                         code: 0,
                                         message: '请求失败,API error!'
                                     })
                                 }
                             },
                             (err) => {
-                                resolve({
+                                reject({
                                     code: 0,
                                     message: '请求失败,API error!'
                                 })
@@ -50,11 +43,51 @@ export default {
                         )
                     } else {
                         resolve({
-                            code: 3,
+                            data: context.state.teacherList,
                             message: '数据已请求,无需重复请求'
                         })
                     }
                 }
+                // (resolve, reject) => {
+                //     if (context.state.teacherList.length == 0) {
+                //         apiTools.courseMgmt.getSchoolTeacher({
+                //             'school_code': context.rootState.userInfo.schoolCode 
+                //         }).then(
+                //             (res) => {
+                //                 if (res) {
+                //                     if (res.teachers.length > 0) {
+                //                         context.commit('setTeacherList', res.teachers)
+                //                         resolve({
+                //                             code: 1,
+                //                             message: '数据请求成功'
+                //                         })
+                //                     } else {
+                //                         resolve({
+                //                             code: 2,
+                //                             message: '请求成功,数据为空'
+                //                         })
+                //                     }
+                //                 } else {
+                //                     resolve({
+                //                         code: 0,
+                //                         message: '请求失败,API error!'
+                //                     })
+                //                 }
+                //             },
+                //             (err) => {
+                //                 resolve({
+                //                     code: 0,
+                //                     message: '请求失败,API error!'
+                //                 })
+                //             }
+                //         )
+                //     } else {
+                //         resolve({
+                //             code: 3,
+                //             message: '数据已请求,无需重复请求'
+                //         })
+                //     }
+                // }
             )
         }
     }

+ 1 - 1
TEAMModelOS/ClientApp/src/view/teachcontent/index.vue

@@ -505,7 +505,7 @@ export default {
                     label: '最近',
                     type: 'recent',
                     icon: 'md-time',
-                    tips: '仅本地临时缓存最近上传的资源,最多保存20条。退出账号或更换电脑记录将会清空。'
+                    tips: '临时缓存最近上传的资源,最多保存20条。退出账号或更换电脑缓存记录将会清空。'
                 },
                 {
                     label: this.$t('teachContent.filterRes'),

+ 2 - 0
TEAMModelOS/ClientApp/src/view/teachermgmt/components/personnel/Index.vue

@@ -598,6 +598,8 @@ export default {
                             else {
                                 alert('Can not update param.')
                             }
+                            //清空vuex教师列表,保证其他页面获取最新数据
+                            this.$store.commit('teachers/setTeacherList', [])
                         },
                         (err) => {
                             this.$Message.error('user/updSchoolUserStatus API error!')

+ 2 - 0
TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/Index.vue

@@ -854,6 +854,8 @@ export default {
             res => {
               if (res.code === 1) {
                 this.$Message.info(this.$t('teachermgmt.message.info1'))
+                //清空vuex教师列表,保证其他页面获取最新数据
+                this.$store.commit('teachers/setTeacherList', [])
               } else {
                 this.$Message.error('Can not set Auth.')
               }