diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index b631510aa..90cfa65d1 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -87,6 +87,21 @@ .orange-bg { background-color: var(--theme-color) !important; } +.colorffa416{ + color: #ffa416; +} +.colorec7f66{ + color: #ec7f66; +} +.color535b64{ + color: #535b64; +} +.color999999{ + color: #999999; +} +.color23bf9a{ + color: #23bf9a; +} .timezone-area{ display: inline-block; vertical-align: middle; diff --git a/nezha-fronted/src/assets/css/font/iconfont.css b/nezha-fronted/src/assets/css/font/iconfont.css index 9f563fed0..70a4eb4cc 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.css +++ b/nezha-fronted/src/assets/css/font/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('iconfont.woff2?t=1634288113261') format('woff2'), - url('iconfont.woff?t=1634288113261') format('woff'), - url('iconfont.ttf?t=1634288113261') format('truetype'); + src: url('iconfont.woff2?t=1634809124279') format('woff2'), + url('iconfont.woff?t=1634809124279') format('woff'), + url('iconfont.ttf?t=1634809124279') format('truetype'); } .nz-icon { @@ -13,6 +13,42 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-Panelkong:before { + content: "\e748"; +} + +.nz-icon-Projectkong:before { + content: "\e74f"; +} + +.nz-icon-Assetkong:before { + content: "\e750"; +} + +.nz-icon-ZD:before { + content: "\e74e"; +} + +.nz-icon-failed:before { + content: "\e749"; +} + +.nz-icon-stop:before { + content: "\e74a"; +} + +.nz-icon-unknown-error:before { + content: "\e74c"; +} + +.nz-icon-over:before { + content: "\e74b"; +} + +.nz-icon-connecting:before { + content: "\e74d"; +} + .nz-icon-label:before { content: "\e747"; } @@ -397,10 +433,6 @@ content: "\e6f7"; } -.nz-icon-ZD:before { - content: "\e6f9"; -} - .nz-icon-revoke1:before { content: "\e6ee"; } diff --git a/nezha-fronted/src/assets/css/font/iconfont.ttf b/nezha-fronted/src/assets/css/font/iconfont.ttf index 3937d7d66..e93f91b37 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.ttf and b/nezha-fronted/src/assets/css/font/iconfont.ttf differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff b/nezha-fronted/src/assets/css/font/iconfont.woff index 7f4a5cf70..238304a6a 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff and b/nezha-fronted/src/assets/css/font/iconfont.woff differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff2 b/nezha-fronted/src/assets/css/font/iconfont.woff2 index 4c6129cc9..fbce038be 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff2 and b/nezha-fronted/src/assets/css/font/iconfont.woff2 differ diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css index 9f33d368d..14c5dc55c 100644 --- a/nezha-fronted/src/assets/css/nzIcon.css +++ b/nezha-fronted/src/assets/css/nzIcon.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('./font/iconfont.woff2?t=1634288113261') format('woff2'), - url('./font/iconfont.woff?t=1634288113261') format('woff'), - url('./font/iconfont.ttf?t=1634288113261') format('truetype'); + src: url('./font/iconfont.woff2?t=1634809124279') format('woff2'), + url('./font/iconfont.woff?t=1634809124279') format('woff'), + url('./font/iconfont.ttf?t=1634809124279') format('truetype'); } .nz-icon { @@ -13,6 +13,42 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-Panelkong:before { + content: "\e748"; +} + +.nz-icon-Projectkong:before { + content: "\e74f"; +} + +.nz-icon-Assetkong:before { + content: "\e750"; +} + +.nz-icon-ZD:before { + content: "\e74e"; +} + +.nz-icon-failed:before { + content: "\e749"; +} + +.nz-icon-stop:before { + content: "\e74a"; +} + +.nz-icon-unknown-error:before { + content: "\e74c"; +} + +.nz-icon-over:before { + content: "\e74b"; +} + +.nz-icon-connecting:before { + content: "\e74d"; +} + .nz-icon-label:before { content: "\e747"; } @@ -397,10 +433,6 @@ content: "\e6f7"; } -.nz-icon-ZD:before { - content: "\e6f9"; -} - .nz-icon-revoke1:before { content: "\e6ee"; } diff --git a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue index aaa1bd810..e63798ee0 100644 --- a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue @@ -26,8 +26,13 @@ >
- - {{item.remoteAddr?item.remoteAddr:'-'}} + +
+ {{getStatusText(item.status)}} +
+ +
+ {{getRemoteText(item)}}
{{item.username?item.username:'-'}} @@ -43,12 +48,41 @@ import detailViewLeftMixin from '@/components/common/mixin/detailViewLeftMixin' import alertLabel from '@/components/common/alert/alertLabel' import { terminalLog } from '@/components/common/js/constants' +import {calcDurationByStringTimeB} from "@/components/common/js/tools"; export default { name: 'terminalLogDetail', mixins: [detailViewLeftMixin], components: { alertLabel }, + computed: { + getStatusText () { + return function (status) { + return terminalLog.status[status] + } + }, + getRemoteText () { + return function (record) { + return `${record.loginUser}@${record.host}:${record.port}` + } + }, + statusClass () { + return function (status) { + switch (status) { + case 0: + return 'nz-icon-connecting color23bf9a' + case 1: + return 'nz-icon-failed colorffa416' + case 2: + return 'nz-icon-over color999999' + case 3: + return 'nz-icon-stop colorec7f66' + case 4: + return 'nz-icon-unknown-error color535b64' + } + } + } + }, data () { return { tableTitle: [ @@ -124,11 +158,6 @@ export default { this.$set(item, 'loading', loading) // this.$set(this.tableData,index,item);// 调用父组件 }, - getStatusText () { - return function (status) { - return terminalLog.status[status] - } - } } } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 9f6218158..c49c6ebba 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -835,9 +835,9 @@ const cn = { authtype: '认证方式', statusItem: { connecting: '连接中', - connectionFailed: '连接失败', + connectionFailed: '发送失败', over: '已结束', - kickedOut: '被踢出', + kickedOut: '强制退出', unknownError: '未知错误' }, option: '操作', @@ -892,7 +892,8 @@ const cn = { loginUser: '登陆用户', sourceIp: '源 IP', sourceUser: '源用户', - SessionId: '会话 ID' + SessionId: '会话 ID', + stop: '停止' }, dc: { dc: '数据中心', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 71c1b667f..0c5e54d2d 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -876,9 +876,9 @@ const en = { authtype: 'AuthType', statusItem: { connecting: 'Connecting', - connectionFailed: 'Connection failed', - over: 'Over', - kickedOut: 'Kicked out', + connectionFailed: 'Failed', + over: 'Close', + kickedOut: 'Stopped', unknownError: 'Unknown error' }, option: 'Operation', // "操作", @@ -932,7 +932,8 @@ const en = { loginUser: 'Login user', sourceIp: 'Source IP', sourceUser: 'Source user', - SessionId: 'Session ID' + SessionId: 'Session ID', + stop: 'Stop' }, operationlog: { operationlog: 'Operation log', diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue index 7714c684b..5fee841ed 100644 --- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue @@ -37,7 +37,12 @@