fix

src/modules/questions/views/BluePaperStructure.vue

@@ -249,28 +249,20 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "error",
-      }).then(() => {
-        this.loading = true;
-        var url = QUESTION_API + "/paperStruct/" + this.selectedIds;
-        this.$http
-          .delete(url)
-          .then(() => {
+      })
+        .then(() => {
+          this.loading = true;
+          var url = QUESTION_API + "/paperStruct/" + this.selectedIds;
+          this.$httpWithMsg.delete(url).then(() => {
             this.$notify({
               type: "success",
               message: "删除成功！",
             });
             this.searchAll();
             this.selectedList = [];
-          })
-          .catch(() => {
-            this.$notify({
-              type: "error",
-              message: "删除失败！",
-            });
-            this.selectedList = [];
           });
-      });
-      this.loading = false;
+        })
+        .finally(() => (this.loading = false));
     },
     //得到难度
     getDifficulty(val) {
@@ -309,25 +301,20 @@ export default {
     deleteStruct(row) {
       this.$confirm("是否删除试卷结构?", "提示", {
         type: "warning",
-      }).then(() => {
-        this.loading = true;
-        this.$http
-          .delete(QUESTION_API + "/paperStruct/" + row.id)
-          .then(() => {
-            this.$notify({
-              message: "删除成功",
-              type: "success",
+      })
+        .then(() => {
+          this.loading = true;
+          this.$httpWithMsg
+            .delete(QUESTION_API + "/paperStruct/" + row.id)
+            .then(() => {
+              this.$notify({
+                message: "删除成功",
+                type: "success",
+              });
+              this.searchAll();
             });
-            this.searchAll();
-          })
-          .catch(() => {
-            this.$notify({
-              type: "error",
-              message: "删除失败",
-            });
-          });
-      });
-      this.loading = false;
+        })
+        .finally(() => (this.loading = false));
     },
     //清理缓存试卷结构
     removeItem() {

src/modules/questions/views/EditPaper.vue

@@ -1671,22 +1671,11 @@ export default {
                 "/" +
                 this.quesModel.id
             )
-            .then((response) => {
-              if (response.data.length > 0) {
-                var deleteInfo =
-                  "该试题被试卷：" +
-                  response.data.join(" , ") +
-                  "使用,不能删除";
-                this.$notify({
-                  message: deleteInfo,
-                  type: "error",
-                });
-              } else {
-                this.$notify({
-                  message: "保存成功",
-                  type: "success",
-                });
-              }
+            .then(() => {
+              this.$notify({
+                message: "保存成功",
+                type: "success",
+              });
             })
             .finally(() => (this.loading = false));
         });
@@ -1822,7 +1811,7 @@ export default {
         callback: (action) => {
           if (action == "confirm") {
             this.loading = true;
-            this.$http
+            this.$httpWithMsg
               .delete(
                 QUESTION_API +
                   "/paper/deleteQuestion/" +
@@ -1830,28 +1819,17 @@ export default {
                   "/" +
                   questionId
               )
-              .then((response) => {
-                if (response.data.length > 0) {
-                  var deleteInfo =
-                    "该试题被试卷：" +
-                    response.data.join(" , ") +
-                    "使用,不能删除";
-                  this.$notify({
-                    message: deleteInfo,
-                    type: "error",
-                  });
-                } else {
-                  this.initPaper();
-                  this.getreduplicateQuestions();
-                  this.reduplicateGroup = [];
-                  this.loading = true;
-                  this.$notify({
-                    message: "保存成功",
-                    type: "success",
-                  });
-                }
-                this.loading = false;
-              });
+              .then(() => {
+                this.initPaper();
+                this.getreduplicateQuestions();
+                this.reduplicateGroup = [];
+                this.loading = true;
+                this.$notify({
+                  message: "保存成功",
+                  type: "success",
+                });
+              })
+              .finally(() => (this.loading = false));
           }
         },
       });

src/modules/questions/views/EditSelectQuestion.vue

@@ -392,27 +392,19 @@ export default {
         })
           .then(() => {
             this.fullscreenLoading = true;
-            this.$http
+            this.$httpWithMsg
               .delete(
                 QUESTION_API + "/paper/deleteQuestion/" + this.quesModel.id
               )
-              .then((response) => {
-                if (response.data.length > 0) {
-                  this.deleteInfo =
-                    "该试题被试卷：" +
-                    response.data.join(" , ") +
-                    "使用,不能删除";
-                  this.deleteDialogVisible = true;
-                } else {
-                  this.$notify({
-                    message: "删除成功",
-                    type: "success",
-                  });
-                  this.$router.push({ path: "/questions/question_list/0" });
-                }
+              .then(() => {
+                this.$notify({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.$router.push({ path: "/questions/question_list/0" });
               });
           })
-          .catch(() => {});
+          .finally(() => (this.fullscreenLoading = false));
       } else {
         this.fullscreenLoading = true;
         this.$httpWithMsg

src/modules/questions/views/PaperStructure.vue

@@ -283,26 +283,19 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      }).then(() => {
-        var url = QUESTION_API + "/paperStruct/" + row.id;
-        this.loading = true;
-        this.$http.delete(url).then(
-          () => {
+      })
+        .then(() => {
+          var url = QUESTION_API + "/paperStruct/" + row.id;
+          this.loading = true;
+          this.$httpWithMsg.delete(url).then(() => {
             this.$notify({
               type: "success",
               message: "删除成功!",
             });
             this.searchPaperStructs();
-          },
-          () => {
-            this.$notify({
-              type: "error",
-              message: "删除失败!",
-            });
-          }
-        );
-      });
-      this.loading = false;
+          });
+        })
+        .finally(() => (this.loading = false));
     },
     //删除多条数据
     deletePapers() {
@@ -310,28 +303,20 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "error",
-      }).then(() => {
-        this.loading = true;
-        var url = QUESTION_API + "/paperStruct/" + this.selectedIds;
-        this.$http
-          .delete(url)
-          .then(() => {
+      })
+        .then(() => {
+          this.loading = true;
+          var url = QUESTION_API + "/paperStruct/" + this.selectedIds;
+          this.$httpWithMsg.delete(url).then(() => {
             this.$notify({
               type: "success",
               message: "删除成功！",
             });
             this.searchPaperStructs();
             this.selectedList = [];
-          })
-          .catch(() => {
-            this.$notify({
-              type: "error",
-              message: "删除失败！",
-            });
-            this.selectedList = [];
           });
-      });
-      this.loading = false;
+        })
+        .finally(() => (this.loading = false));
     },
 
     //新增

src/modules/questions/views/Question.vue

@@ -515,33 +515,16 @@ export default {
         type: "warning",
       }).then(() => {
         this.loading = true;
-        this.$http
+        this.$httpWithMsg
           .delete(QUESTION_API + "/paper/deleteQuestion/" + row.id)
-          .then(
-            (response) => {
-              if (response.data.length > 0) {
-                this.loading = false;
-                this.deleteInfo =
-                  "该试题被试卷：" +
-                  response.data.join(" , ") +
-                  "使用,不能删除";
-                this.deleteDialogVisible = true;
-              } else {
-                this.$notify({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.searchQues();
-              }
-            },
-            () => {
-              this.$notify({
-                message: "删除失败",
-                type: "error",
-              });
-              this.loading = false;
-            }
-          );
+          .then(() => {
+            this.$notify({
+              message: "删除成功",
+              type: "success",
+            });
+            this.searchQues();
+          })
+          .finally(() => (this.loading = false));
       });
     },
     //打开弹窗