From f7f6e2950bf4849315964fead5d4ddcce8ca0add Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 7 Nov 2022 14:14:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20sftp=20=E4=BA=8C=E7=BA=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E5=88=A0=E9=99=A4mock=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/terminalLogCMDTab.vue    | 4 ++--
 .../components/common/bottomBox/tabs/terminalLogRecordTab.vue | 4 ++--
 .../components/common/bottomBox/tabs/terminalLogSftpTab.vue   | 2 +-
 nezha-fronted/src/components/common/mixin/routerPathParams.js | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
index 6083074bd..7428f035e 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
@@ -36,14 +36,14 @@
 </template>
 
 <script>
-import dataListMixin from '@/components/common/mixin/dataList'
+// import dataListMixin from '@/components/common/mixin/dataList'
 import subDataListMixin from '@/components/common/mixin/subDataList'
 import nzBottomDataList from '@/components/common/bottomBox/nzBottomDataList'
 import detailViewRightMixin from '@/components/common/mixin/detailViewRightMixin'
 
 export default {
   name: 'terminalLogRecordTab',
-  mixins: [dataListMixin, subDataListMixin, detailViewRightMixin],
+  mixins: [subDataListMixin, detailViewRightMixin],
   components: {
     nzBottomDataList
   },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
index 82572c30c..7c4c553e9 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
@@ -37,14 +37,14 @@
 <script>
 import Terminal from '../../js/Xterm'
 import bus from '../../../../libs/bus'
-import dataListMixin from '@/components/common/mixin/dataList'
+// import dataListMixin from '@/components/common/mixin/dataList'
 import subDataListMixin from '@/components/common/mixin/subDataList'
 import nzBottomDataList from '@/components/common/bottomBox/nzBottomDataList'
 import detailViewRightMixin from '@/components/common/mixin/detailViewRightMixin'
 
 export default {
   name: 'terminalLogReplayTab',
-  mixins: [dataListMixin, subDataListMixin, detailViewRightMixin],
+  mixins: [subDataListMixin, detailViewRightMixin],
   components: {
     nzBottomDataList
   },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogSftpTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogSftpTab.vue
index 3254e153c..291817d18 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogSftpTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogSftpTab.vue
@@ -57,7 +57,7 @@ export default {
   },
   data () {
     return {
-      url: '/mock/terminal/sftp/log/',
+      url: '/terminal/sftp/log/',
       tableId: 'sftpTable', // 需要分页的table的id，用于记录每页数量
       detailType: 'list',
       searchMsg: { // 给搜索框子组件传递的信息
diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js
index ef85cebf9..553a952da 100644
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -69,6 +69,7 @@ export default {
               childrenNum: this.$refs[detailType].bottomBox.object.childrenNum || '',
               clientState: this.$refs[detailType].bottomBox.object.clientState || '',
               protocol: this.$refs[detailType].bottomBox.object.protocol || '',
+              uuid: this.$refs[detailType].bottomBox.object.uuid || '',
               model: {
                 tsgAppliance: this.$refs[detailType].bottomBox.object.model ? this.$refs[detailType].bottomBox.object.model.tsgAppliance : ''
               }
@@ -82,6 +83,7 @@ export default {
                 childrenNum: this.$refs[detailType].detailViewRightObj.childrenNum || '',
                 clientState: this.$refs[detailType].detailViewRightObj.clientState || '',
                 protocol: this.$refs[detailType].detailViewRightObj.protocol || '',
+                uuid: this.$refs[detailType].detailViewRightObj.uuid || '',
                 model: {
                   tsgAppliance: this.$refs[detailType].detailViewRightObj.model ? this.$refs[detailType].detailViewRightObj.model.tsgAppliance : ''
                 }
@@ -99,6 +101,7 @@ export default {
             childrenNum: this.bottomBox.object.childrenNum || '',
             clientState: this.bottomBox.object.clientState || '',
             protocol: this.bottomBox.object.protocol || '',
+            uuid: this.bottomBox.object.uuid || '',
             model: {
               tsgAppliance: this.bottomBox.object.model ? this.bottomBox.object.model.tsgAppliance : ''
             }
@@ -113,6 +116,7 @@ export default {
             childrenNum: this.detailViewRightObj.childrenNum || '',
             clientState: this.detailViewRightObj.clientState || '',
             protocol: this.detailViewRightObj.protocol || '',
+            uuid: this.detailViewRightObj.uuid || '',
             model: {
               tsgAppliance: this.detailViewRightObj.model ? this.detailViewRightObj.model.tsgAppliance : ''
             }