From 38e0e2b39714aa29aacf9636097e464c50fcc1c3 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 28 八月 2023 10:50:34 +0800
Subject: [PATCH] 面板的提示 报错 换成弹框

---
 src/utils/request.js          |   35 ++++++++++++-----
 src/assets/style/index.scss   |    1 
 src/views/visualization.vue   |   27 ++++++++++---
 src/components/AddControl.vue |    9 ++++
 4 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/assets/style/index.scss b/src/assets/style/index.scss
index c425a67..6b513d7 100644
--- a/src/assets/style/index.scss
+++ b/src/assets/style/index.scss
@@ -444,6 +444,7 @@
 }
 .el-button.el-button--small{
   padding:6px 6px;
+  font-size:12px!important;
 }
 .el-form--label-left .el-form-item__label{
   font-size: 13px;
diff --git a/src/components/AddControl.vue b/src/components/AddControl.vue
index c3a3672..478c5e6 100644
--- a/src/components/AddControl.vue
+++ b/src/components/AddControl.vue
@@ -104,7 +104,14 @@
           }
         }) 
       }else{
-        this.$message.error("褰撳墠璁惧娌℃湁宸ュ簭锛�");
+        this.$confirm( "褰撳墠璁惧娌℃湁宸ュ簭!", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning",
+        })
+          .then(() => {})
+          .catch(() => {});
+       
       }
     },
     shutdown() {
diff --git a/src/utils/request.js b/src/utils/request.js
index 23a0a72..779664d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import util from "@/libs/util.js";
-import { Message } from "element-ui";
+import { Message,MessageBox } from "element-ui";
 
 // import router from '@/router'
 
@@ -38,12 +38,20 @@
       return res.data ? res.data : {};
     } else {
       if(!res.config.loadingFlag){
-        Message({
-          // message: res.data.msg==res.data.data?res.data.data:res.data.msg+','+res.data.data,
-          message: res.data.msg,
-          type: 'error',
-          duration: 5 * 1000
+        // Message({
+        //   // message: res.data.msg==res.data.data?res.data.data:res.data.msg+','+res.data.data,
+        //   message: res.data.msg,
+        //   type: 'error',
+        //   duration: 5 * 1000
+        // })
+        MessageBox.confirm( res.data.msg+"?", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning",
         })
+          .then(() => {
+          })
+          .catch(() => {});
       }
       return res.data ? res.data : {};
     }
@@ -57,11 +65,18 @@
     } else if (message.includes('Request failed with status code')) {
       message = '绯荤粺鎺ュ彛' + message.substr(message.length - 3) + '寮傚父'
     }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
+    // Message({
+    //   message: message,
+    //   type: 'error',
+    //   duration: 5 * 1000
+    // })
+    MessageBox.confirm( message+"?", "鎻愮ず", {
+      confirmButtonText: "纭畾",
+      cancelButtonText: "鍙栨秷",
+      type: "warning",
     })
+      .then(() => {})
+      .catch(() => {});
     return Promise.reject(error)
   }
 )
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 3205d3a..9697ba8 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -729,7 +729,13 @@
       if (Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID) {
         this.$refs.control.islook = true;
       } else {
-        this.$message.error("褰撳墠璁惧娌℃湁宸ュ簭锛�");
+        this.$confirm( "褰撳墠璁惧娌℃湁宸ュ簭!", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning",
+        })
+          .then(() => {})
+          .catch(() => {});
       }
     },
     // 鍙充晶瀹屾垚
@@ -743,7 +749,13 @@
           }
         });
       } else {
-        this.$message.error("褰撳墠璁惧娌℃湁宸ュ簭锛�");
+        this.$confirm( "褰撳墠璁惧娌℃湁宸ュ簭!", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning",
+        })
+          .then(() => {})
+          .catch(() => {});
       }
     },
     getRandomNumber(min, max) {
@@ -832,11 +844,7 @@
   font-size: 30px;
   font-weight: 700;
 }
-.el-button--primary {
-  border: 0;
-  font-weight: 700 !important;
-  font-size: 16px !important;
-}
+
 .color_4efefa {
   color: #4efefa;
 }
@@ -1349,4 +1357,9 @@
     }
   }
 }
+.el-button--primary {
+  border: 0;
+  font-weight: 700 !important;
+  font-size: 16px;
+}
 </style>

--
Gitblit v1.8.0