diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 343d44ace..b4e6c23d4 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -389,6 +389,12 @@ li{ height: calc(100% - 2px); padding-left: 20px; line-height: 27px; + display: inline-block; +} +.sub-list-tab-txt { + font-size: 14px; + color: #666666; + padding-left: 8px; } /* end--二级页面tab*/ @@ -487,10 +493,8 @@ li{ display: flex; height: 50px; align-items : center; - /*justify-content: space-between;*/ -} -.top-tools-reverse { - /*flex-direction: row-reverse;*/ + position: relative; + flex-direction: row-reverse; } .top-tools>div { margin-top: 2px; @@ -508,6 +512,30 @@ li{ display: flex; align-content: center; } +.top-tool-main-right { + position: absolute; + right: 0; + display: flex; + align-items: center; + transition: .4s right, .4s transform; +} +.top-tool-main-left { + position: absolute; + left: 0; + display: flex; + align-items: center; + transition: .4s right, .4s transform; +} +.top-tool-main-left>.panel-dropdown-title { + margin-top: -2px; +} +.top-tool-main-right>.nz-btn, .top-tool-main-right-to-left>.nz-btn, .top-tool-main-right>.nz-btn-group, .top-tool-main-right>.panel-calendar { + margin-top: -2px; +} +.top-tool-main-right-to-left { + right: 100% !important; + transform: translateX(100%); +} /* end--顶部工具栏*/ /* begin--二级顶部工具栏*/ @@ -575,6 +603,9 @@ li{ .nz-table.el-table--border td, .el-table--border th, .nz-table .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed { border-right: none; } +.nz-table .el-table__body { + width: 100% !important; +} .chart-table .nz-table.el-table td { background-color: white; } @@ -881,6 +912,7 @@ li{ height: calc(100% - 132px); width: 100%; } + .el-scrollbar__wrap { overflow-x: hidden !important; } @@ -888,6 +920,15 @@ li{ background-color: #aaa; cursor: default; } +.el-scrollbar__bar.is-vertical { + width: 11px; +} +.app>.el-scrollbar__bar.is-vertical { + width: 5px; +} +.el-scrollbar__bar { + border-radius: 6px; +} .el-autocomplete-suggestion__wrap.el-scrollbar__wrap, .el-cascader-menu__wrap.el-scrollbar__wrap { margin-bottom: 0 !important; } @@ -1274,9 +1315,12 @@ li{ background-color: rgba(255, 99, 71, .85); } -/*滚动条相关,减小table内滚动条的空间*/ +/*滚动条相关*/ +.ps__thumb-y { + width: 11px; +} .ps__rail-y:hover > .ps__thumb-y, .ps__rail-y:focus > .ps__thumb-y, .ps__rail-y.ps--clicking .ps__thumb-y { - width: 6px; + width: 11px; } .ps__thumb-y { right: 0px; diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 3e8553c25..afc496b29 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -291,9 +291,6 @@ export default { pageSize(val) { this.pageObj.pageSize = val; this.seriesItem=this.filterShowData(this.storedTableData,this.pageObj) - this.$nextTick(() => { - this.gutterHandler(".nz-table"); - }); }, filterShowData(source,pageObj){ return source.slice((pageObj.pageNo-1)*pageObj.pageSize,pageObj.pageNo*pageObj.pageSize) @@ -305,9 +302,6 @@ export default { screenPageSize(val) { this.screenPageObj.pageSize = val; this.seriesItemScreen=this.filterShowData(this.storedScreanTableData,this.screenPageObj) - this.$nextTick(() => { - this.gutterHandler(".nz-table"); - }); }, startLoading(area){ if(area==='screen'){ diff --git a/nezha-fronted/src/components/charts/line-chart-block.scss b/nezha-fronted/src/components/charts/line-chart-block.scss index 10b4f1c17..8a2d762e8 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.scss +++ b/nezha-fronted/src/components/charts/line-chart-block.scss @@ -33,6 +33,7 @@ text-align:left; margin:0 auto; line-height: 18px; + position: relative; } .legend-container-screen.legend-container { height: 115px; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 606ebe246..522a3ed33 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -64,13 +64,11 @@
-
- -
- {{item.alias?item.alias:item.name}} -
-
-
+
+
+ {{item.alias?item.alias:item.name}} +
+
@@ -99,13 +97,11 @@
-
- -
- {{item.alias?item.alias:item.name}} -
-
-
+
+
+ {{item.alias?item.alias:item.name}} +
+
@@ -844,11 +840,11 @@ this.isGreyScreen.push(false); }); } - this.$nextTick(() => { + /*this.$nextTick(() => { this.$refs.screenLegendScrollbar.update(); - /*let divHeight = this.$refs.screenLegendArea.offsetHeight; - this.echartModalStore.resize({height: '100%'});*/ - }); + let divHeight = this.$refs.screenLegendArea.offsetHeight; + this.echartModalStore.resize({height: '100%'}); + });*/ } }, handleLineFeed(str,chartWidth){ diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index f2e320990..1e0cea251 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -16,17 +16,14 @@
-
- -
-
- +
+
{ - this.gutterHandler(".nz-table"); - }); }, search: function (searchObj) { this.searchLabel = {}; @@ -420,7 +414,6 @@ this.getTableData(); this.$nextTick(() => { - this.gutterHandler(".nz-table"); //绑定滚动条事件,控制top按钮 let el = this.$refs.alertRuleTable.$el.querySelector(".el-table__body-wrapper"); if (el._ps_) { diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index c5ee67a6b..aff590226 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -16,9 +16,10 @@
-
- { - this.gutterHandler(".nz-table"); - }); }, search: function (searchObj) { this.searchLabel = {}; @@ -380,9 +378,6 @@ } }); } - this.$nextTick(() => { - this.gutterHandler(".nz-table"); - }); }); this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index dcd443ed3..188d90e1d 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -33,8 +33,8 @@
-
-
+
+ - -
@@ -711,9 +709,6 @@ this.pageObj.pageSize = val; localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getAssetData(); - this.$nextTick(() => { - this.gutterHandler(".nz-table"); - }); }, getPrincipalName(data) { for (let item in this.idcUserData) { @@ -784,7 +779,6 @@ } this.$nextTick(() => { - this.gutterHandler(".nz-table"); //左侧dc列表初始选中状态 if (this.$store.state.assetData.selectedData.length > 0) { this.checkList = []; diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index e2a1ca2f5..acb095a04 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -22,15 +22,14 @@
-
-
- - { - this.gutterHandler(".nz-table"); - }); }, search: function (searchObj) { this.searchLabel = {}; @@ -527,7 +523,6 @@ this.getTableData(); this.initReceiverData(); this.$nextTick(() => { - this.gutterHandler(".nz-table"); //绑定滚动条事件,控制top按钮 let el = this.$refs.accountTable.$el.querySelector(".el-table__body-wrapper"); if (el._ps_) { diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 540f8e168..8be876a7d 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -53,15 +53,14 @@
-
-
- - { - this.gutterHandler(".nz-table"); - }); }, search: function (searchObj) { this.searchLabel = {}; @@ -576,7 +572,6 @@ this.getTableData(); this.$nextTick(function(){ - this.gutterHandler(".nz-table"); this.getUserData();//绑定滚动条事件,控制top按钮 let el = this.$refs.dcTable.$el.querySelector(".el-table__body-wrapper"); if (el._ps_) { diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index 487614b32..f33a2bb9e 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -22,15 +22,14 @@
-
-
- -
@@ -251,9 +250,6 @@ this.pageObj.pageSize = val; localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getTableData(); - this.$nextTick(() => { - this.gutterHandler(".nz-table"); - }); }, search: function (searchObj) { this.pageObj.pageNo = 1; @@ -287,7 +283,6 @@ this.getTableData(); this.$nextTick(() => { - this.gutterHandler(".nz-table"); //绑定滚动条事件,控制top按钮 let el = this.$refs.modelTable.$el.querySelector(".el-table__body-wrapper"); if (el._ps_) { diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 62c439733..04797d795 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -22,15 +22,14 @@
-
-
- - @@ -563,9 +562,6 @@ this.pageObj.pageSize = val; localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getTableData(); - this.$nextTick(() => { - this.gutterHandler(".nz-table"); - }); }, search: function (searchObj) { this.pageObj.pageNo = 1; @@ -658,7 +654,6 @@ this.getIdcData(); this.getUserData(); this.$nextTick(() => { - this.gutterHandler(".nz-table"); //绑定滚动条事件,控制top按钮 let el = this.$refs.promTable.$el.querySelector(".el-table__body-wrapper"); if (el._ps_) { diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 9807a3953..293d4103d 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -10,7 +10,7 @@
-
+
{{showPanel.name}} @@ -31,7 +31,7 @@
-
+
--> -
+
-
+