Merge branch 'develop' into hotfix/zhouweilu

src/components/CheckList/index.vue

@@ -11,7 +11,7 @@
           class="checkbox-section"
           v-model="item.level"
           :type="item.state === 'SOLVING' ? 'is-primary' : 'is-success'"
-          :disabled="item.state === 'PENDING' || item.state === 'ARGUED'"
+          :disabled="judgeDisable(item)"
         >
           <b-tooltip :label="item.explain" position="is-top">
             {{ item.content }}
@@ -37,7 +37,7 @@
           'input-custom--warning': item.state === 'PENDING',
           'input-custom--end': item.state === 'ARGUED'
         }"
-        :disabled="item.state === 'PENDING' || item.state === 'ARGUED'"
+        :disabled="judgeDisable(item)"
         type="text"
         placeholder="填写备注"
         style="box-shadow:none;border-color:white"
@@ -83,6 +83,16 @@ export default {
     value: {
       type: Array,
       default: () => []
+    },
+    review: {
+      type: Object,
+      default: () => ({
+        state: "DEFAULT"
+      })
+    },
+    isTeacher: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -101,6 +111,16 @@ export default {
     }
   },
   methods: {
+    judgeDisable(item) {
+      if (this.isTeacher) {
+        return false;
+      }
+      return (
+        item.state === "PENDING" ||
+        item.state === "ARGUED" ||
+        this.review.state === "ARGUING"
+      );
+    },
     async acceptArgue(item) {
       this.acceptArgueLoading = true;
       await this.$emit("accept-argue", item);

src/components/DocumentStateTag/index.vue

@@ -9,7 +9,7 @@ export default {
   props: {
     state: {
       type: String,
-      default: "已失效"
+      default: "无状态"
     }
   },
   computed: {

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

@@ -39,6 +39,7 @@
                 提 交
               </div>
               <check-list
+                :review="detail.review"
                 v-model="detail.checkList"
                 @submit-solution="submitSolution"
                 @accept-argue="acceptArgue"
@@ -81,7 +82,8 @@ export default {
         checkList: []
       },
       submitLoading: false,
-      loadingDocContent: false
+      loadingDocContent: false,
+      fetchLoading: false
     };
   },
   mixins: [timeMixins],

src/views/teacher/Review/ReviewDetail/GroupArgueDetail/index.vue

@@ -45,7 +45,7 @@
             >
               提 交
             </div>
-            <check-list v-model="detail.checkList" />
+            <check-list :isTeacher="true" v-model="detail.checkList" />
           </div>
         </div>
       </div>

vue.config.js

@@ -2,8 +2,8 @@ module.exports = {
   devServer: {
     proxy: {
       "^/api": {
-        // target: "http://localhost:4000/",
-        target: "http://10.1.1.198: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/",