From f8454946074e065c5000c38081cf5b09885f1948 Mon Sep 17 00:00:00 2001
From: wu <2468489804@qq.com>
Date: Tue, 23 Aug 2022 14:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=87=8D=E5=90=AF&=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=85=8D=E7=BD=AE=E5=BA=94=E7=94=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edgeServer/edgeServerConfigure/device.vue | 16 ++++++-
 .../edgeServer/edgeServerConfigure/index.vue  | 45 ++++++++++++-------
 .../edgeServer/edgeServerMonitor/index.vue    |  4 +-
 3 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/views/edgeServer/edgeServerConfigure/device.vue b/src/views/edgeServer/edgeServerConfigure/device.vue
index 05b5a4d..83f3a96 100644
--- a/src/views/edgeServer/edgeServerConfigure/device.vue
+++ b/src/views/edgeServer/edgeServerConfigure/device.vue
@@ -61,7 +61,7 @@
           <el-button
             class="header-button"
             type="primary"
-            @click="setDeviceConfigure"
+            @click="setDeviceConfigureConfirm"
             >应用</el-button
           >
         </div>
@@ -735,6 +735,20 @@ export default {
       this.$set(this.devicePointData[index], "@Binding", row.nodeCode)
       done();
     },
+    setDeviceConfigureConfirm(){
+      this.$confirm('是否要应用该配置信息，更改配置后需要重启改服务才能使服务生效?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.setDeviceConfigure()
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消应用服务配置'
+          });          
+        });
+    },
     async setDeviceConfigure() {
       try {
         // 验证表单
diff --git a/src/views/edgeServer/edgeServerConfigure/index.vue b/src/views/edgeServer/edgeServerConfigure/index.vue
index 71ff10c..83c439e 100644
--- a/src/views/edgeServer/edgeServerConfigure/index.vue
+++ b/src/views/edgeServer/edgeServerConfigure/index.vue
@@ -320,23 +320,34 @@ export default {
       })
       done()
     },
-    async setServerExec ({ row }) {
-      try {
-        await this.$api.SET_SERVER_EXEC({
-          action: 'exec',
-          server_id: row.id,
-          command: 'server_restart',
-          username: 'admin',
-          password: process.env.VUE_APP_HSLSERVER_PASSWORD
-        })
-        this.$message({
-          message: '服务应用请求成功，请求动作已添加至请求队列中，请从服务监控页面查看结果',
-          type: 'success'
-        })
-        this.getServers()
-      } catch (e) {
-        console.log(e)
-      }
+    setServerExec ({ row }) {
+
+      this.$confirm('是否要重启动该服务', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          try {
+            await this.$api.SET_SERVER_EXEC({
+              action: 'exec',
+              server_id: row.id,
+              command: 'server_restart'
+            })
+            this.$message({
+              message: '服务应用请求成功，请求动作已添加至请求队列中，请从服务监控页面查看结果',
+              type: 'success'
+            })
+            this.getServers()
+          } catch (e) {
+            console.log(e)
+          }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已重启动该服务'
+          });          
+        });
+      
     },
     handleDialogCancel (done) {
       this.$message({
diff --git a/src/views/edgeServer/edgeServerMonitor/index.vue b/src/views/edgeServer/edgeServerMonitor/index.vue
index c381716..e5f8868 100644
--- a/src/views/edgeServer/edgeServerMonitor/index.vue
+++ b/src/views/edgeServer/edgeServerMonitor/index.vue
@@ -159,9 +159,7 @@ export default {
           action: 'exec',
           server_id: server.id,
           command: command,
-          device_name: device.device_name,
-          username: 'admin',
-          password: process.env.VUE_APP_HSLSERVER_PASSWORD
+          device_name: device.device_name
         })
         this.$message({
           message: '请求成功，请求动作已添加至请求队列中',