Parcourir la source

fix: 更改置顶查询语句适应后端变更

ChenYangfan il y a 6 ans
Parent
commit
fe54f41d67

+ 1 - 1
src/components/Discussion/DiscussionArea.vue

@@ -89,7 +89,7 @@ export default {
       })
     },
     getComments (size) {
-      return getComments({ slideId: this.slide.id, pageNumber: this.currentPage, sort: 'createAt,desc' }).then(res => {
+      return getComments({ slideId: this.slide.id, size, pageNumber: this.currentPage, sort: ['topNumber,desc', 'createAt,desc'] }).then(res => {
         this.wsComments = []
         this.comments = res.data
       }).catch(err => {

+ 1 - 1
src/components/PDF/Pdf.vue

@@ -54,7 +54,7 @@ export default {
       }
     },
     src (value) {
-      if (value) {
+      if (this.loading && value) {
         this.load(value)
       }
     }

+ 15 - 11
src/server/comment.js

@@ -1,6 +1,4 @@
-import {
-  useCommentServer
-} from '@/config/server-info'
+import { useCommentServer } from '@/config/server-info'
 import axios from '@/plugins/axios'
 
 export function createComment ({ slideId, pageNumber, title, content }) {
@@ -33,16 +31,22 @@ export function unTopComment ({ commentId }) {
     .then(res => {})
 }
 
-export function getComments ({ slideId, pageNumber, key = '', page = 0, size = 10, sort = '' }) {
+export function getComments ({ slideId, pageNumber, key = '', page = 1, size = 10, sort = '' }) {
+  const params = new URLSearchParams()
+  params.append('pageNumber', pageNumber)
+  params.append('key', key)
+  params.append('page', page.toString())
+  params.append('size', size.toString())
+  if (typeof sort !== typeof '') {
+    sort.forEach(_ => {
+      params.append('sort', _)
+    })
+  } else {
+    params.append('sort', sort)
+  }
   return axios
     .get(useCommentServer('/slide/' + slideId), {
-      params: {
-        pageNumber,
-        key,
-        page,
-        size,
-        sort
-      }
+      params: params
     })
     .then(res => res.data)
 }

+ 1 - 1
src/server/course-file.js

@@ -21,7 +21,7 @@ export function deleteCourseFile ({ courseFileId }) {
     .then(res => {})
 }
 
-export function getOneCourseFile ({ courseId, key = '', page = 0, size = 10, sort = '' }) {
+export function getOneCourseFile ({ courseId, key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useCourseFileServer('/course/' + courseId), {
       params: {

+ 3 - 3
src/server/course.js

@@ -56,7 +56,7 @@ export function getCourseCode({ courseId }) {
     .then(res => res.data)
 }
 
-export function getCourses({ key = '', page = 0, size = 10, sort = '' }) {
+export function getCourses({ key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useCourseServer(), {
       params: {
@@ -69,7 +69,7 @@ export function getCourses({ key = '', page = 0, size = 10, sort = '' }) {
     .then(res => res.data)
 }
 
-export function teacherGetCourses({ key = '', page = 0, size = 10, sort = '' }) {
+export function teacherGetCourses({ key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useCourseServer('/teacher'), {
       params: {
@@ -82,7 +82,7 @@ export function teacherGetCourses({ key = '', page = 0, size = 10, sort = '' })
     .then(res => res.data)
 }
 
-export function studentGetCourses({ key = '', page = 0, size = 10, sort = '' }) {
+export function studentGetCourses({ key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useCourseServer('/student'), {
       params: {

+ 2 - 2
src/server/message.js

@@ -19,7 +19,7 @@ export function deleteMessages ({ ids }) {
     .put(useMessageServer('/delete'), data)
 }
 
-export function getUnreadMessages ({ key = '', page = 0, size = 100, sort = '' }) {
+export function getUnreadMessages ({ key = '', page = 1, size = 100, sort = '' }) {
   return axios
     .get(useMessageServer('/unread'), {
       params: {
@@ -32,7 +32,7 @@ export function getUnreadMessages ({ key = '', page = 0, size = 100, sort = '' }
     .then(res => res.data)
 }
 
-export function getReadMessages ({ key = '', page = 0, size = 10, sort = '' }) {
+export function getReadMessages ({ key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useMessageServer('/read'), {
       params: {

+ 3 - 3
src/server/slide.js

@@ -45,7 +45,7 @@ export function modifySlideState({ id, state }) {
     .then(res => res.data)
 }
 
-export function teacherGetSlides({ key = '', page = 0, size = 10, sort = '' }) {
+export function teacherGetSlides({ key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useSlideServer('/teacher'), {
       params: {
@@ -58,7 +58,7 @@ export function teacherGetSlides({ key = '', page = 0, size = 10, sort = '' }) {
     .then(res => res.data)
 }
 
-export function teacherGetSlidesByCourse({ courseId, key = '', page = 0, size = 10, sort = '' }) {
+export function teacherGetSlidesByCourse({ courseId, key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useSlideServer('/teacher/course/' + courseId), {
       params: {
@@ -71,7 +71,7 @@ export function teacherGetSlidesByCourse({ courseId, key = '', page = 0, size =
     .then(res => res.data)
 }
 
-export function studentGetSlidesByCourse({ courseId, key = '', page = 0, size = 10, sort = '' }) {
+export function studentGetSlidesByCourse({ courseId, key = '', page = 1, size = 10, sort = '' }) {
   return axios
     .get(useSlideServer('/student/course/' + courseId), {
       params: {