diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index 314f23d14..f71ce20f2 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -5,7 +5,7 @@ $content-right-background-color: #fcfcfc; //右侧背景色 $header-text-color: #e5e5e5; // header默认字色 $header-text-color-active: #fff; // header高亮字色 $header-text-color-hover: #444; //header hover字色 -$header-background-color-hover: #666; //菜单鼠标悬停背景色 +$header-background-color-hover: #3d4959; //菜单鼠标悬停背景色 $btn-normal-background-color: linear-gradient(180deg, #F5B93E 0%, #EE9D3F 100%); //橙色按钮背景颜色 $btn-normal-background-color-hover: #EE9D3F ; //橙色按钮hover背景颜色 diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index d72849e8f..4e79f2c97 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -539,7 +539,7 @@ li{ } .top-tools .top-tool-search { width: 260px; - margin: -2px 0 0 0; + /*margin: -2px 0 0 0;*/ } .top-tools .top-tool-btn-txt .nz-icon{ display: inline-block; @@ -569,9 +569,9 @@ li{ .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 { +/*.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%); @@ -1708,10 +1708,46 @@ li{ /*export相关*/ -.dropdownBtn .el-dropdown__caret-button{ +.export-dropdown-btn { + position: relative; +} +.endpoint-query-dropdown { + position: absolute; + right: 0; + top: 31px; +} +.export-dropdown { + width: 90px; + right: 0; + left: unset !important; + top: 27px; +} +.endpoint-query-dropdown::after, .export-dropdown::after { + content: ''; + display: block; + width:0; + height:0; + overflow: hidden; + font-size: 0; + line-height: 0; + border: 5px; + border-style: dashed dashed solid dashed; + border-color: transparent transparent #fff transparent; + position: absolute; + right: 3px; + bottom: 0; + +} +.export-dropdown::after { + transform: translate(-50%, -54px); +} +.endpoint-query-dropdown::after { + transform: translate(-50%, -45px); +} +/*.dropdownBtn .el-dropdown__caret-button{ top:0px !important; left: -1px; -} +}*/ .export-xlsx .el-dialog__body{ padding: 10px 20px 20px 20px; } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index d7868f762..ecc96ed94 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -236,10 +236,19 @@ label: 'alertName', disabled: false }, { - id: 3, - name: this.$t('alert.list.type'), - type: 'select', - label: 'alertType', + name: this.$t('project.project.project'), + type: 'project', + label: 'project', + disabled: false + }, { + name: this.$t('project.module.module'), + type: 'module', + label: 'module', + disabled: false + }, { + name: this.$t('project.endpoint.endpoint'), + type: 'input', + label: 'endpointId', disabled: false }, { id: 4, @@ -252,7 +261,7 @@ name: this.$t('asset.asset'), type: 'asset', label: 'asset', - disabled: true + disabled: false }, { id: 12, name: this.$t('alert.list.state'), @@ -368,6 +377,20 @@ this.exportExcel(this.searchLabel); this.importBox.show = false; }, + getTimeString:function(){ + let split='-'; + let date=new Date(); + let year=date.getFullYear(); + let month=this.formatNum(date.getMonth()+1); + let day=this.formatNum(date.getDate()); + let hours=this.formatNum(date.getHours()); + let minutes=this.formatNum(date.getMinutes()); + let seconds=this.formatNum(date.getSeconds()); + return year + split + month + split + day + ' ' + hours + split + minutes + split + seconds; + }, + formatNum:function(num){ + return num>9?num:'0'+num; + }, exportAll:function(){ let temp = JSON.parse(JSON.stringify(this.searchLabel)); temp.pageSize = -1; @@ -402,16 +425,18 @@ this.loading = true; this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo); this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize); - this.$get('alert/message', this.searchLabel).then(response => { - this.loading = false; - if (response.code == 200) { - this.tableData = response.data.list; - this.tableData.forEach((item) => { - item.labels = JSON.parse(item.labels); - }); - this.pageObj.total = response.data.total; - } - }); + setTimeout(() => { + this.$get('alert/message', this.searchLabel).then(response => { + this.loading = false; + if (response.code == 200) { + this.tableData = response.data.list; + this.tableData.forEach((item) => { + item.labels = JSON.parse(item.labels); + }); + this.pageObj.total = response.data.total; + } + }); + }, 1000); }, pageNo(val) { this.pageObj.pageNo = val; @@ -470,8 +495,7 @@ if (this.from == "alertRule") { this.searchLabel.ruleId = this.obj.id; } else if (this.from == "asset") { - this.searchLabel.type = 3; - this.searchLabel.linkId = this.obj.id; + this.searchLabel.assetId = this.obj.id; } this.pageObj.pageNo = 1; for (let item in searchObj) { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index 68e7b7135..b0274929f 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -33,7 +33,20 @@ > - +
+ +
+
@@ -182,7 +195,7 @@ import loading from "../../loading"; import bus from "../../../../libs/bus"; import chartDataFormat from "../../../charts/chartDataFormat"; - + var timeout; export default { name: "endpointQueryTab", components: { @@ -197,6 +210,7 @@ let temp = this; return { tableHover: false, + dropdownShow: false, loading: false, showTopBtn: false, //主列表top按钮 currentEndpoint: {}, @@ -576,6 +590,16 @@ } this.$refs.addChartModal.createData(-1, metricInfo); }, + dropdownHandler(show) { + if (show) { + clearTimeout(timeout); + this.dropdownShow = true; + } else { + timeout = setTimeout(() => { + this.dropdownShow = false; + }, 700); + } + }, createSuccess(type, response, param, panel) { this.$confirm(this.$t("dashboard.metric.goPanelTip"),this.$t("tip.saveSuccess"), { confirmButtonText: this.$t("tip.yes"), diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue index 15247bb0f..fb980904f 100644 --- a/nezha-fronted/src/components/common/exportXLSX.vue +++ b/nezha-fronted/src/components/common/exportXLSX.vue @@ -1,13 +1,23 @@