From 4eae57c864cabf05f8739838c964e505811b65ef Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 20 五月 2022 22:20:28 +0800
Subject: [PATCH] 修复ip配置后提示链接

---
 src/pages/settings/views/NetSettings.vue |   63 ++++++++++++-------------------
 1 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/src/pages/settings/views/NetSettings.vue b/src/pages/settings/views/NetSettings.vue
index f115a26..bb45387 100644
--- a/src/pages/settings/views/NetSettings.vue
+++ b/src/pages/settings/views/NetSettings.vue
@@ -17,7 +17,7 @@
           <!-- <span v-if="showStatus && i == 2" class="status">宸茶繛鎺�</span> -->
         </div>
       </div>
-      <div class="net-right">
+      <div class="net-right" v-loading="configLoading">
         <div class="net-set" v-if="activePage == 0">
           <div class="title">缃戠粶璁剧疆</div>
           <el-form :model="ruleForm" :rules="rules" ref="joinForm" class="join-form">
@@ -374,7 +374,8 @@
       ],
       value: "",
       IPV4_hid: false,
-      IPV6_hid: false
+      IPV6_hid: false,
+      configLoading: false
     }
   },
   mounted() {
@@ -462,24 +463,6 @@
       this.activePage = i
     },
     saveWire(ifname) {
-      // let data = {
-      //   ip: this.wireForm.ip,
-      //   gateway: this.wireForm.gateway,
-      //   dns: this.wireForm.dns,
-      //   subMask: this.wireForm.subMask,
-      //   ifname: this.activeWireItem.name,
-      // };
-      // setNetWorkCard(data).then(
-      //   (res) => {
-      //     if (res && res.success) {
-      //       this.$message.success(res.data);
-      //     }
-      //   },
-      //   (err) => {
-      //     this.$message.error("淇濆瓨澶辫触锛�" + err.msg);
-      //   }
-      // );
-
       this.$refs["wireForm"].validate((valid) => {
         if (valid) {
           let data = {
@@ -490,24 +473,7 @@
             ifname: this.activeWireItem.name
           }
 
-          let newUri = location.protocol + "//" + data.ip + location.port == 80 ? "" : ":" + location.port
-
-          if (this.wireForm.ip !== this.originalConfig.ip) {
-            var changeIPTimer = setTimeout(() => {
-              this.$alert(
-                '<strong>鎮ㄥ凡淇敼浜嗘湇鍔″櫒ip, 璇烽噸鏂扮櫥褰�</strong><a target="_parent" href="' +
-                  newUri +
-                  '"> ' +
-                  newUri +
-                  "<a/>",
-                "鎻愮ず",
-                {
-                  dangerouslyUseHTMLString: true,
-                  customClass: "noticeBox"
-                }
-              )
-            }, 10000)
-          }
+          let newUri = location.protocol + "//" + data.ip + (location.port == 80 ? "" : ":" + location.port)
 
           this.$confirm("纭闇�瑕佷慨鏀规湇鍔″櫒閰嶇疆鍚楋紵", {
             center: true,
@@ -515,8 +481,28 @@
             confirmButtonClass: "comfirm-class-sure"
           })
             .then(() => {
+              this.configLoading = true
+              if (this.wireForm.ip !== this.originalConfig.ip) {
+                this.configLoading = false
+                var changeIPTimer = setTimeout(() => {
+                  this.$alert(
+                    '<strong>鎮ㄥ凡淇敼浜嗘湇鍔″櫒ip, 璇烽噸鏂扮櫥褰�</strong><a target="_parent" href="' +
+                      newUri +
+                      '"> ' +
+                      newUri +
+                      "<a/>",
+                    "鎻愮ず",
+                    {
+                      dangerouslyUseHTMLString: true,
+                      customClass: "noticeBox"
+                    }
+                  )
+                }, 10000)
+              }
+
               setNetWorkCard(data)
                 .then((rsp) => {
+                  this.configLoading = false
                   if (rsp && rsp.success) {
                     this.$notify({
                       type: "success",
@@ -526,6 +512,7 @@
                 })
                 .catch((err) => {
                   clearTimeout(changeIPTimer)
+                  this.configLoading = false
                   this.$notify({
                     type: "error",
                     message: "淇濆瓨澶辫触"

--
Gitblit v1.8.0