From a580ff6fbd03e94a043300f3ee65faa8fdab7c65 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 八月 2022 09:28:46 +0800
Subject: [PATCH] Merge pull request #568 from zouyaoji/wvp-28181-2.0

---
 web_src/src/components/control.vue |  108 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue
index a0b2834..2dd15ec 100644
--- a/web_src/src/components/control.vue
+++ b/web_src/src/components/control.vue
@@ -235,10 +235,8 @@
       <el-table-column prop="local_ip" label="鏈湴"></el-table-column>
       <el-table-column prop="typeid" label="绫诲瀷"></el-table-column>
       <el-table-column align="right">
-        <template slot="header" slot-scope="scope">
-          <el-button icon="el-icon-refresh-right" circle @click="getAllSession()"></el-button>
-        </template>
-        <template slot-scope="scope">
+        <template v-slot:default="scope">
+          <el-button size="mini" icon="el-icon-refresh-right" circle @click="getAllSession()"></el-button>
           <el-button @click.native.prevent="deleteRow(scope.$index, allSessionData)" type="text" size="small">绉婚櫎
           </el-button>
         </template>
@@ -326,7 +324,7 @@
      */
     getThreadsLoad: function () {
       let that = this;
-      if (that.mediaServerChoose != null) {
+      if (!!that.mediaServerChoose) {
         this.$axios({
           method: 'get',
           url: '/zlm/' + that.mediaServerChoose + '/index/api/getThreadsLoad'
@@ -377,7 +375,7 @@
     },
     getLoadCount: function () {
       let that = this;
-      if (that.mediaServerChoose != null) {
+      if (!!that.mediaServerChoose) {
         that.mediaServer.getMediaServer(that.mediaServerChoose, (data) => {
           if (data.code == 0) {
             that.loadCount = data.data.count
@@ -475,42 +473,46 @@
     },
 
     getAllSession: function () {
-      let that = this;
-      that.allSessionData = [];
-      this.$axios({
-        method: 'get',
-        url: '/zlm/' + that.mediaServerChoose + '/index/api/getAllSession'
-      }).then(function (res) {
-        res.data.data.forEach(item => {
-          let data = {
-            peer_ip: item.peer_ip,
-            local_ip: item.local_ip,
-            typeid: item.typeid,
-            id: item.id
-          };
-          that.allSessionData.push(data);
+      this.allSessionData = [];
+      if (!!this.mediaServerChoose) {
+        this.$axios({
+          method: 'get',
+          url: '/zlm/' + this.mediaServerChoose + '/index/api/getAllSession'
+        }).then((res)=> {
+          res.data.data.forEach(item => {
+            let data = {
+              peer_ip: item.peer_ip,
+              local_ip: item.local_ip,
+              typeid: item.typeid,
+              id: item.id
+            };
+            this.allSessionData.push(data);
+          });
         });
-      });
+      }
+
     },
     getServerConfig: function () {
-      let that = this;
-      this.$axios({
-        method: 'get',
-        url: '/zlm/' + that.mediaServerChoose + '/index/api/getServerConfig'
-      }).then(function (res) {
-        let info = res.data.data[0];
-        let serverInfo = {}
-        for (let i = 0; i < Object.keys(info).length; i++) {
-          let key = Object.keys(info)[i];
-          let group = key.substring(0, key.indexOf("."))
-          let itemKey = key.substring(key.indexOf(".") + 1)
-          if (!serverInfo[group]) serverInfo[group] = {}
-          serverInfo[group][itemKey] = info[key]
-        }
+      if (!!this.mediaServerChoose) {
+        this.$axios({
+          method: 'get',
+          url: '/zlm/' + this.mediaServerChoose + '/index/api/getServerConfig'
+        }).then((res)=> {
+          let info = res.data.data[0];
+          let serverInfo = {}
+          for (let i = 0; i < Object.keys(info).length; i++) {
+            let key = Object.keys(info)[i];
+            let group = key.substring(0, key.indexOf("."))
+            let itemKey = key.substring(key.indexOf(".") + 1)
+            if (!serverInfo[group]) serverInfo[group] = {}
+            serverInfo[group][itemKey] = info[key]
+          }
 
-        that.serverConfig = serverInfo;
-        that.visible = true;
-      });
+          this.serverConfig = serverInfo;
+          this.visible = true;
+        });
+      }
+
     },
     getWVPServerConfig: function () {
       let that = this;
@@ -533,6 +535,14 @@
     },
     reStartServer: function () {
       let that = this;
+      if (!!!this.mediaServerChoose) {
+        this.$message({
+          type: 'info',
+          message: '鏈�夋嫨鑺傜偣'
+        });
+        return;
+      }
+
       this.$confirm('姝ゆ搷浣滃皢閲嶅惎濯掍綋鏈嶅姟鍣�, 鏄惁缁х画?', '鎻愮ず', {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',
@@ -573,17 +583,19 @@
       console.log(JSON.stringify(tabledata[index]));
     },
     deleteSession: function (id) {
-      let that = this;
-      this.$axios({
-        method: 'get',
-        url: '/zlm/' + that.mediaServerChoose + '/index/api/kick_session&id=' + id
-      }).then(function (res) {
-        that.getAllSession();
-        that.$message({
-          type: 'success',
-          message: '鍒犻櫎鎴愬姛!'
+      if (!!this.mediaServerChoose) {
+        this.$axios({
+          method: 'get',
+          url: '/zlm/' + this.mediaServerChoose + '/index/api/kick_session?id=' + id
+        }).then((res)=>{
+          this.getAllSession();
+          this.$message({
+            type: 'success',
+            message: '鍒犻櫎鎴愬姛!'
+          });
         });
-      });
+      }
+
     },
     getNameFromKey: function (key) {
       let nameData = {

--
Gitblit v1.8.0