From 4e9bfe46d3a18e58f7ffb29f632a2663ef2827ec Mon Sep 17 00:00:00 2001 From: chaos-zhu Date: Sun, 18 Aug 2024 14:24:58 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E4=BA=A4=E6=8D=A2?= =?UTF-8?q?=E5=86=85=E5=AD=98=E5=8D=A0=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/terminal/components/info-side.vue | 12 ++++++------ web/src/views/terminal/components/terminal.vue | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/src/views/terminal/components/info-side.vue b/web/src/views/terminal/components/info-side.vue index ffd9c55..7267364 100644 --- a/web/src/views/terminal/components/info-side.vue +++ b/web/src/views/terminal/components/info-side.vue @@ -258,8 +258,9 @@ const netstatInfo = computed(() => { const cpuUsage = computed(() => Number(cpuInfo.value?.cpuUsage) || 0) const usedMemPercentage = computed(() => Number(memInfo.value?.usedMemPercentage) || 0) const swapPercentage = computed(() => { - let swapPercentage = swapInfo.value?.swapPercentage === 'NaN' || Number.isNaN(swapInfo.value?.swapPercentage) - return swapPercentage ? 0 : Number(swapPercentage || 0) + let swapPercentage = swapInfo.value?.swapPercentage + let isNaN = swapPercentage === 'NaN' || Number.isNaN(swapInfo.value?.swapPercentage) + return isNaN ? 0 : Number(swapPercentage || 0) }) const usedPercentage = computed(() => Number(driveInfo.value?.usedPercentage) || 0) const output = computed(() => { @@ -295,10 +296,9 @@ const handleCopy = async () => { } const handleColor = (num) => { - if (num < 65) return '#8AE234' - if (num < 85) return '#FFD700' - if (num < 90) return '#FFFF33' - if (num <= 100) return '#FF3333' + if (num < 60) return '#13ce66' + if (num < 80) return '#e6a23c' + if (num <= 100) return '#ff4949' } const getHostPing = () => { diff --git a/web/src/views/terminal/components/terminal.vue b/web/src/views/terminal/components/terminal.vue index b81b649..aac425d 100644 --- a/web/src/views/terminal/components/terminal.vue +++ b/web/src/views/terminal/components/terminal.vue @@ -264,7 +264,8 @@ const handleCommandHost = (host) => { } const handleExecScript = (scriptObj) => { - const { command } = scriptObj + let { command } = scriptObj + command += '\n' if (!isSyncAllSession.value) return handleInputCommand(command) terminalRefs.value.forEach(terminalRef => { terminalRef.inputCommand(command)