diff --git a/nezha-fronted/src/components/cli/console.vue b/nezha-fronted/src/components/cli/console.vue
index bee884e55..c6fbbf33e 100644
--- a/nezha-fronted/src/components/cli/console.vue
+++ b/nezha-fronted/src/components/cli/console.vue
@@ -276,7 +276,8 @@ export default {
//关闭
this.terminalSocket.onclose = () =>{
//报错sorry的,还没来得及看信息就关闭
- this.$emit("closeConsole",this.terminal.name);//应该调用父窗口
+ // this.$emit("closeConsole",this.terminal.name);//
+ this.term.setOption('disableStdin',true);
};
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index d7b9ace0b..b46f87067 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -34,6 +34,8 @@
+
+
@@ -45,6 +47,7 @@
import endpointTab from "./tabs/endpointTab";
import panelTab from "./tabs/panelTab";
import terminalLogRecordTab from "./tabs/terminalLogRecordTab";
+ import terminalLogMonitorTab from "./tabs/terminalLogMonitorTab";
import terminalLogCMDTab from "./tabs/terminalLogCMDTab";
export default {
@@ -56,7 +59,8 @@
'endpoint-tab': endpointTab,
'panel-tab': panelTab,
terminalLogRecordTab,
- 'terminal-log-cmd-tab': terminalLogCMDTab
+ 'terminal-log-cmd-tab': terminalLogCMDTab,
+ terminalLogMonitorTab
},
props: {
isFullScreen: false, //是否全屏
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
new file mode 100644
index 000000000..75abf0c3e
--- /dev/null
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index d2056bc5a..3b5601fa2 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -375,7 +375,7 @@
-
+
@@ -1477,7 +1477,7 @@
case 'space':
case 'scale':
case 'translate':
- this.getNodesArr();
+ this.getNodesArr();
// if(!this.timer2){
// this.timer2=setTimeout(()=>{
// this.getNodesArr();
diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue
index 1bc108b89..78d925e51 100644
--- a/nezha-fronted/src/components/page/config/terminallog.vue
+++ b/nezha-fronted/src/components/page/config/terminallog.vue
@@ -64,7 +64,7 @@
-
+
@@ -92,7 +92,7 @@
-
@@ -295,18 +295,22 @@
this.bottomBox.terminalLog = JSON.parse(JSON.stringify(record));
this.bottomBox.showSubList = true;
},
+ monitor(record) {
+ this.bottomBox.targetTab = 'monitor';
+ this.bottomBox.terminalLog = JSON.parse(JSON.stringify(record));
+ this.bottomBox.showSubList = true;
+ console.log(record);
+ },
shutdown(record) {
this.$put("/terminal/kill", {uuid: record.uuid}).then(res => {
if (res.code === 200) {
this.$message.success(this.$t("config.terminallog.success"));
+ this.bottomBox.showSubList = false;
this.getTableData();
} else {
this.$message.error(this.$t("config.terminallog.killErrorTip"));
}
});
- },
- monitor(record) {
-
},
// 全屏
fullScreen() {
@@ -365,6 +369,12 @@
}
this.getTableData();
},
+ closeSubList(){
+ this.bottomBox.showSubList = false;
+ if( this.bottomBox.targetTab == 'monitor'){
+ this.getTableData();
+ }
+ },
// 数据排序
tableDataSort(item){
let orderBy='';