阅卷评卷界面提交优化反馈异常提示

src/modules/marking/views/TpScoreBoard.vue

@@ -180,11 +180,11 @@
             id="subMarkBtn"
             class="submit-button"
             type="primary"
-            :loading="loading"
             size="small"
             @keydown.enter="submitMark"
             @click="submitMark"
             v-bind:round="true"
+            :loading="loading"
           >
             <span class="sub-btn">提</span> <span>交</span>
           </el-button>
@@ -238,14 +238,14 @@ export default {
       markDiff: false,
       curIndex: 0,
       steps: [],
-      loading: false,
       btnflag: false,
       textareaflag: false,
       tmpSignItem: this.signItem,
       tags: [],
       unusualType: "",
       scoreError: [],
-      itemScoreBtn: []
+      itemScoreBtn: [],
+      loading: false
     };
   },
   props: [
@@ -541,7 +541,7 @@ export default {
       }
       console.log("remarkValue: " + remarkValue);
       if (!this.markedResult.id) {
-        //正常提交清空
+        //正常提交情况
         console.log("提交resultItems", this.resultItems);
         this.$http
           .post(
@@ -578,40 +578,45 @@ export default {
               this.problemView = false;
               this.unusualType = "";
             },
-            response => {
+            error => {
               // 响应错误回调
-              console.log(response);
-              if (response.data.desc) {
-                var errorInfo = response.data.desc;
+              console.log(error);
+              if (error.response.data.desc) {
+                var errorInfo = error.response.data.desc;
                 if (errorInfo.includes("超时")) {
+                  this.$loading().close();
+                  this.loading = false;
                   this.$alert(
                     "该评卷任务已超时，请点击确定重新登录！",
                     "提示",
                     {
                       confirmButtonText: "确定",
                       callback: () => {
-                        var loginUrl = sessionStorage.getItem("loginUrl");
+                        console.log("sessionStorage", sessionStorage);
                         this.$http
                           .post(CORE_API + "/auth/logout")
-                          .then(response => {
-                            console.log(response);
+                          .then(() => {
+                            const orgId = this.user.rootOrgId;
                             this.USER_SIGNOUT();
-                            sessionStorage.clear();
-                            if (loginUrl) {
-                              window.location.href = loginUrl;
-                            } else {
-                              window.location.href = "about:blank";
-                            }
+                            window.name = "";
+                            this.$router.replace({
+                              path: "/login" + "?orgId=" + orgId
+                            });
                           })
                           .catch(response => {
-                            console.log(response);
-                            this.USER_SIGNOUT();
-                            sessionStorage.clear();
-                            if (loginUrl) {
-                              window.location.href = loginUrl;
-                            } else {
-                              window.location.href = "about:blank";
+                            const orgId = this.user.rootOrgId;
+                            if (response.status == 500) {
+                              this.$notify({
+                                showClose: true,
+                                message: response.data.desc,
+                                type: "error"
+                              });
                             }
+                            this.USER_SIGNOUT();
+                            window.name = "";
+                            this.$router.replace({
+                              path: "/login" + "?orgId=" + orgId
+                            });
                           });
                         return;
                       }
@@ -619,7 +624,7 @@ export default {
                   );
                 } else {
                   this.$notify({
-                    message: response.data.desc,
+                    message: error.response.data.desc,
                     type: "error"
                   });
                   this.$emit("submitMark");
@@ -659,12 +664,12 @@ export default {
             this.problemView = false;
             this.unusualType = "";
           },
-          response => {
+          error => {
             // 响应错误回调
-            console.log(response);
-            if (response.data.desc) {
+            console.log(error.response);
+            if (error.response.data.desc) {
               this.$notify({
-                message: response.data.desc,
+                message: error.response.data.desc,
                 type: "error"
               });
             } else {