diff --git a/nezha-fronted/src/assets/css/common/checkbox.scss b/nezha-fronted/src/assets/css/common/checkbox.scss index 30f0d6d90..93d1412b4 100644 --- a/nezha-fronted/src/assets/css/common/checkbox.scss +++ b/nezha-fronted/src/assets/css/common/checkbox.scss @@ -24,3 +24,6 @@ border-color: $--checkbox-border-color; background-color: $--background-color-empty; } +.el-input__inner { + border-color: $--border-color-light; +} diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 4c98131e7..11930d3fd 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -411,7 +411,7 @@ margin-right: 20px; height: 22px; margin-top: 8px; - border: 1px solid $--click-search-items-border-color; + border: 1px solid $--explore-border-color-bottom; background: $--background-color-empty; .el-cascader { @@ -461,7 +461,7 @@ } } .nz-label-search:hover { - border-color: #C7C7C7; + border-color: $--explore-border-color-bottom; } } .click-search-dropdown { diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index cb1b713f1..007c8b3bf 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -33,7 +33,8 @@ } &>.nz-table2 { height: 100%; - padding-top: 20px !important; + padding: 20px 20px 10px 20px !important; + box-sizing: border-box; .table-list { background-color: $--background-color-empty; .list-width { @@ -44,6 +45,9 @@ } } } + &>.bottom-panel{ + padding: 15px 10px 10px 10px !important; + } } .sub-top-tools .top-tool-btn-txt .nz-icon{ display: inline-block; @@ -141,9 +145,7 @@ } .bottom-panel { - padding-top: 15px; background-color: $--background-color-empty; - padding-bottom: 10px; height: calc(100% - 30px); } .bottom-log { diff --git a/nezha-fronted/src/assets/css/components/common/project/topology.scss b/nezha-fronted/src/assets/css/components/common/project/topology.scss index 3a2e7fb37..425c048e4 100644 --- a/nezha-fronted/src/assets/css/components/common/project/topology.scss +++ b/nezha-fronted/src/assets/css/components/common/project/topology.scss @@ -61,7 +61,7 @@ } .edit-topologyLine{ background: rgba(196,196,196,0.4) !important; - box-shadow: inset 0 -1px 0 0 rgba(0,0,0,0.27); + border-bottom: 1px solid $--explore-border-color-bottom; } .topology-scroll{ &.v{ diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss index b1ff04c08..e59d2918a 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss @@ -269,8 +269,8 @@ .ti-input { border: 1px solid $--border-color-light; .ti-tag.ti-valid { - background-color: $--value-background-color; - color: $--value-color; + background-color: $--label-background-color !important;; + color: $--color-text-primary !important;; } .ti-new-tag-input { color: $--color-text-regular !important; diff --git a/nezha-fronted/src/assets/css/components/page/config/backups.scss b/nezha-fronted/src/assets/css/components/page/config/backups.scss index 7462acc32..f0f1e49a6 100644 --- a/nezha-fronted/src/assets/css/components/page/config/backups.scss +++ b/nezha-fronted/src/assets/css/components/page/config/backups.scss @@ -1,4 +1,4 @@ -.system { +.system.backup { padding-top: 40px; .system-config-backup { width: 100% !important; @@ -144,7 +144,7 @@ } } } - + } } .el-table_1_column_1 .cell{ diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss index 94351ddbe..0fc7d3f00 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss @@ -135,7 +135,7 @@ } .show-panel-name{ display: inline-block; - padding: 0 7px; + padding: 0 5px; font-weight: bold; max-width: 310px; overflow:hidden; @@ -144,3 +144,9 @@ vertical-align: bottom; color: $--color-text-primary; } + +.starred-pop{ + padding: 8px 12px; + margin-bottom: 8px; + min-width: auto; +} \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss index 9260c41a9..df8cb759d 100644 --- a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss +++ b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss @@ -18,7 +18,7 @@ .projectTopo{ flex: 1; width: calc(50% - 10px); - margin-right: 10px; + //margin-right: 10px; min-width: 435px; //div.page { // textarea { diff --git a/nezha-fronted/src/assets/css/components/page/tool/ping.scss b/nezha-fronted/src/assets/css/components/page/tool/ping.scss index f812586b8..02181328e 100644 --- a/nezha-fronted/src/assets/css/components/page/tool/ping.scss +++ b/nezha-fronted/src/assets/css/components/page/tool/ping.scss @@ -1,3 +1,7 @@ +.ping-popover.el-popover { + padding: 0; + margin-top: 5px; +} .ping{ .top-tool-left{ // align-items: center; @@ -20,8 +24,8 @@ border-radius: 2px; border: 1px solid $--button-icon-border-color !important; .ti-tag.ti-valid { - background-color: $--value-background-color; - color: $--value-color; + background-color: $--label-background-color !important;; + color: $--color-text-primary !important;; } .ti-new-tag-input { color: $--color-text-regular !important; @@ -35,20 +39,31 @@ } .ti-input:hover{} } - .choose{ - width: 50px !important; - height: 36px !important; - line-height: 36px !important; - padding: 0 !important; - border-radius: 2px 0px 0px 2px !important; - border-right: none !important; - span{ - display: flex; - align-content: center; - justify-content: center; + .choose-box { + overflow: hidden; + width: calc(100% - 7px); + height: 30px; + border: 1px solid $--border-color-light; + padding-left: 5px; + display: flex; + //align-items: center; + .nz-icon-arrow-down6{ + font-size: 12px; + color: $--color-text-secondary; } + } + .choose{ + width: auto; + height: 26px !important; + line-height: 30px !important; + padding: 2px 4px !important; + border-radius: 2px !important; + border-right: none !important; + background: $--label-background-color; + margin-right: 5px; + color: $--color-text-primary; i{ - font-size: 20px !important; + font-size: 14px !important; } } .btn{ diff --git a/nezha-fronted/src/assets/css/components/page/tool/trace.scss b/nezha-fronted/src/assets/css/components/page/tool/trace.scss index e717af1f8..9ed19e8ea 100644 --- a/nezha-fronted/src/assets/css/components/page/tool/trace.scss +++ b/nezha-fronted/src/assets/css/components/page/tool/trace.scss @@ -19,8 +19,8 @@ border-radius: 2px; border: 1px solid $--button-icon-border-color !important; .ti-tag.ti-valid { - background-color: $--value-background-color; - color: $--value-color; + background-color: $--label-background-color !important;; + color: $--color-text-primary !important;; } .ti-new-tag-input { color: $--color-text-regular !important; @@ -33,20 +33,31 @@ } .ti-input:hover{} } - .choose{ - width: 50px !important; - height: 36px !important; - line-height: 36px !important; - padding: 0 !important; - border-radius: 2px 0px 0px 2px !important; - border-right: none !important; - span{ - display: flex; - align-content: center; - justify-content: center; + .choose-box { + overflow: hidden; + width: calc(100% - 7px); + height: 30px; + border: 1px solid $--border-color-light; + padding-left: 5px; + display: flex; + //align-items: center; + .nz-icon-arrow-down6{ + font-size: 12px; + color: $--color-text-secondary; } + } + .choose{ + width: auto; + height: 26px !important; + line-height: 30px !important; + padding: 2px 4px !important; + border-radius: 2px !important; + border-right: none !important; + background: $--label-background-color; + margin-right: 5px; + color: $--color-text-primary; i{ - font-size: 20px !important; + font-size: 14px !important; } } .btn{ @@ -103,7 +114,7 @@ } .nz-icon-edit{ font-size: 26px; - } + } .el-icon-more{ font-size: 22px; } @@ -163,4 +174,4 @@ .pop-list{ max-height: 144px; overflow-y: auto; -} \ No newline at end of file +} diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index 86a16ff18..bd66a71b8 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -252,6 +252,8 @@ $--right-box-sub-title-border-color: $--border-color-light; /* 16.tooltip */ $--tooltip-background-color: #222329; $--tooltip-border-color: rgba(112,116,122,0.6); +/* 17.label*/ +$--label-background-color: #18171D; /*** themes/common.scss是与主题切换无关的变量 ***/ @import './src/common/var.scss'; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index 7fe14a84c..e5a1e8949 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -247,7 +247,8 @@ $--right-box-sub-title-border-color: $--right-box-sub-title-background-color; /* 16.tooltip */ $--tooltip-background-color: #ffffff; $--tooltip-border-color: rgba(119,131,145,0.6); - +/* 17.label*/ +$--label-background-color: #D8d8d8; /*** themes/common.scss是与主题切换无关的变量 ***/ @import './src/common/var.scss'; diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 02151ec30..a68c38970 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -197,13 +197,13 @@ export default { let minute = tData.getMinutes() minute = minute > 9 ? minute : '0' + minute // 如果分钟小于10,则在前面加0补充为两位数字 if (minTime !== null && maxTime !== null) { - const diffSec = (maxTime - minTime) / 1000 + const diffSec = (maxTime - minTime) const secOneDay = 24 * 60 * 60// 1天的秒数 const secOneMonth = secOneDay * 30// 30天的秒数 if (diffSec <= secOneDay) { // 同一天 return [hour, minute].join(':') } else if (diffSec < secOneMonth) { // 大于1天，小于30天 - return [tData.getMonth() + 1, tData.getDate()].join('/') + ' ' + [hour, minute].join(':') + return [tData.getMonth() + 1, tData.getDate()].join('/') + '\n' + [hour, minute].join(':') } else { // 大于等于30天 return [tData.getMonth() + 1, tData.getDate()].join('/') } diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index 6c1213999..5a5e0f403 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -72,6 +72,7 @@ import logsData from '@/components/chart/logsData' import lodash from 'lodash' export default { + // 该组件用于获取chart的具体数据 name: 'panelChart', components: { chartHeader, @@ -79,44 +80,44 @@ export default { ChartScreenHeader }, props: { - chartInfo: Object, // 其中的param json串已转化为对象 + chartInfo: Object, // 其中的param json串已转化为对象 // 当前chart的具体信息 timeRange: Array, // 时间范围 - isFullscreen: Boolean, - panelLock: Boolean, + isFullscreen: Boolean, // 是否全屏 + panelLock: Boolean, // 是否被锁定 chartDetailInfo: Object, - from: String, + from: String, // 使用该组件的位置 filter: {}, - showHeader: { + showHeader: { // 是否显示header type: Boolean, default: true }, - isExportHtml: { + isExportHtml: { // 是否是导出的html type: Boolean, default: false }, - dataJson: { + dataJson: { // 导出的html的数据 type: Object } }, data () { return { - chartData: [], + chartData: [], // 当前chart的数据 loading: true, isError: false, - multipleTime: false, - minusTime: '', - showAllData: false, + multipleTime: false, // 是否开启对比 + minusTime: '', // 是否开启对比相差的时间 + showAllData: false, // 是否显示所有legend allDataLength: 0, - severityData: this.$store.getters.severityData, + severityData: this.$store.getters.severityData, // 告警级别的数据 severityDataWeight: this.$store.getters.severityDataWeight // isExportData: false } }, computed: { - headerH () { + headerH () { // 50px header所包含的高 return this.$store.getters.getHeaderH }, - headerHPadding () { + headerHPadding () { // 50px header + padding 主要用于展开的空group return this.$store.getters.getHeaderHPadding } }, @@ -142,7 +143,7 @@ export default { this.chartInfo.loaded && this.query(elements, startTime, endTime, step) }, // 参数 isRefresh 标识是否是刷新操作 - getChartData (isRefresh, params) { + getChartData (isRefresh, params) { // 获取chart的数据前的准备 主要用于处理时间参数 this.loading = true // TODO assetInfo、endpointInfo、echarts等进行不同的处理 let startTime = '' @@ -172,7 +173,7 @@ export default { } this.chartInfo.loaded && this.query(elements, startTime, endTime, step, params) }, - query (elements, startTime, endTime, step, params) { + query (elements, startTime, endTime, step, params) { // 获取chart的数据 this.isError = false this.allDataLength = 0 // this.chartData = this.chartInfo.chartData @@ -419,7 +420,7 @@ export default { this.loading = false } }, - queryData (elements, startTime, endTime, step, params) { + queryData (elements, startTime, endTime, step, params) { // 获取chart的数据主要用于导出的html this.isError = false this.allDataLength = 0 // this.chartData = this.chartInfo.chartData diff --git a/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue b/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue index 9eabb34e6..294847c5c 100644 --- a/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue +++ b/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue @@ -99,8 +99,8 @@ export default { subContentClass () { const className = [] switch (this.targetTab) { - case 'panel': - className.push('bottom-panel') + case 'panelTab': + className.push('nz-table2 bottom-panel') break case 'log': { className.push('bottom-log') diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue index af13d7524..f726cd220 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue @@ -43,6 +43,9 @@
{{ $t('overall.syncChart') }}
 + +
{{ $t('overall.snapshoot') }}
+ @@ -76,6 +79,9 @@
{{ $t('overall.syncChart') }}
 + +
{{ $t('overall.snapshoot') }}
+ diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue index e83036f50..e6498bc71 100644 --- a/nezha-fronted/src/components/common/popBox/selectPanel.vue +++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue @@ -2,12 +2,46 @@
- -
+
+ {{ node.label }} + + + + + + +
{{$t('overall.edit')}}
+ + +
{{$t('overall.delete')}}
+ + + + + + +
+ +
- {{ node.label }} - + {{ node.label }} + - + @@ -35,6 +69,10 @@ +
@@ -52,6 +90,7 @@ + diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index f083ad3cd..a316b09be 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -500,19 +500,19 @@ export default { this.importBox.width = '600px' } else if (type == 2) { // export this.importBox.title = this.$t('overall.exportExcel') - this.importBox.width = this.exportBoxShow ? '850px' : '580px' - if (this.exportBoxShow) { - this.formatArr = [ - { name: 'XLSX', value: 1 }, - { name: 'CSV', value: 2 }, - { name: 'JSON', value: 3 }, - { name: 'PDF', value: 4 }, - { name: 'Html', value: 5 }] - } else { - this.formatArr = [{ name: 'XLSX', value: 1 }, - { name: 'CSV', value: 2 }, - { name: 'JSON', value: 3 }] - } + this.importBox.width = '580px' + // if (this.exportBoxShow) { + // this.formatArr = [ + // { name: 'XLSX', value: 1 }, + // { name: 'CSV', value: 2 }, + // { name: 'JSON', value: 3 }, + // { name: 'PDF', value: 4 }, + // { name: 'Html', value: 5 }] + // } else { + // this.formatArr = [{ name: 'XLSX', value: 1 }, + // { name: 'CSV', value: 2 }, + // { name: 'JSON', value: 3 }] + // } } }, getTimeString () { diff --git a/nezha-fronted/src/components/page/config/backups.vue b/nezha-fronted/src/components/page/config/backups.vue index 591568737..a8c127dec 100644 --- a/nezha-fronted/src/components/page/config/backups.vue +++ b/nezha-fronted/src/components/page/config/backups.vue @@ -1,5 +1,5 @@