Merge branch 'develop' of SEEC-II-FrontEnd-Team/SEEC-II-FrontEnd into master

src/views/student/Review/ReviewDetail/ReviewSelfDetail/index.vue

@@ -68,8 +68,9 @@ export default {
     async argue(item) {
       const { reviewId } = this.$route.params;
       try {
-        const { data } = await postStudentArgueReview({ reviewId, ...item });
-        this.detail.checkList = data;
+        await postStudentArgueReview({ reviewId, ...item });
+        const { data } = await getStudentReviewSelfDetail(reviewId);
+        this.detail = data;
       } catch (e) {
         this.$toast.open({
           message: `重复的申请评审是不被允许的`,

src/views/student/Review/ReviewDocDetail/index.vue

@@ -31,12 +31,14 @@
           <div class="right-part">
             <div v-if="fetchLoading"><page-section-loading show /></div>
             <div v-else>
-              <div
-                class="button  is-medium is-primary action-button"
-                :class="{ 'is-loading': submitLoading }"
-                @click="submitCheckList"
-              >
-                提 交
+              <div v-if="detail.review.state === 'REVIEWING'">
+                <div
+                  class="button  is-medium is-primary action-button"
+                  :class="{ 'is-loading': submitLoading }"
+                  @click="submitCheckList"
+                >
+                  提 交
+                </div>
               </div>
               <check-list
                 :review="detail.review"

src/views/teacher/Code/index.vue

@@ -20,8 +20,8 @@
     </page-header>
 
     <page-body>
+      <page-section-loading :show="loadingCodeList" />
       <div class="data-table">
-        <page-section-loading :show="loadingCodeList" />
         <b-table
           v-if="!loadingCodeList"
           :data="codeData"

src/views/teacher/Review/index.vue

@@ -264,7 +264,9 @@ export default {
   methods: {
     async getReviewList() {
       const { courseId } = this.$route.params;
+      this.reviewListLoading = true;
       const { data } = await getTeacherCourseReviewList(courseId);
+      this.reviewListLoading = false;
       this.review = data;
     },
     async getDocHomework() {

vue.config.js

@@ -2,9 +2,9 @@ module.exports = {
   devServer: {
     proxy: {
       "^/api": {
-        //target: "http://localhost:4000/",
-        target: "http://10.1.1.198:8080/",
-        // target: "http://192.168.0.101:8080",
+        // target: "http://localhost:4000/",
+        // target: "http://10.1.1.198:8080/",
+        target: "http://192.168.0.101:8080",
         // target: "http://10.1.2.3:8080/",
 
         ws: true,