diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 5f8b2d4f7..dacfd001a 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -565,7 +565,7 @@ textarea { .el-dialog__header{ color: $--color-text-primary; } -#entranceHtml { +#entranceHtml,#entrance { .el-icon-arrow-right { font-family: "nz-icon" !important; font-size: 16px; @@ -576,6 +576,12 @@ textarea { .el-icon-arrow-right:before { content: "\e6ad"; } + .el-icon-arrow-up{ + font-family: nz-icon!important; + } + .el-icon-arrow-up:before{ + content: "\e6af"; + } .el-icon-arrow-down{ font-family: nz-icon!important; } diff --git a/nezha-fronted/src/assets/css/themes/src/pagination.scss b/nezha-fronted/src/assets/css/themes/src/pagination.scss index 02384e677..16ff0eec6 100644 --- a/nezha-fronted/src/assets/css/themes/src/pagination.scss +++ b/nezha-fronted/src/assets/css/themes/src/pagination.scss @@ -74,7 +74,7 @@ .el-icon { display: block; - font-size: 12px; + font-size: 12px !important; font-weight: bold; } } diff --git a/nezha-fronted/src/components/common/mixin/exportHtml.js b/nezha-fronted/src/components/common/mixin/exportHtml.js index 420b8fd8d..5d0726d56 100644 --- a/nezha-fronted/src/components/common/mixin/exportHtml.js +++ b/nezha-fronted/src/components/common/mixin/exportHtml.js @@ -1,5 +1,4 @@ import bus from '@/libs/bus' -import { Loading } from 'element-ui' export default { data () { return { diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 8b4b75727..188132c64 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -4287,7 +4287,6 @@ export default { document.body.removeChild(link) // 下载完成移除元素 window.URL.revokeObjectURL(href) // 释放blob对象 } - this.$refs.topTool.closeDialog() }, () => { this.$message.error('123') }) diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue index fcca3daf1..b71e3dc41 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue @@ -28,12 +28,13 @@
{{$t('dashboard.panel.chartForm.typeVal.table.label')}} - - - - - - + +
- +
- + diff --git a/nezha-fronted/src/entrance/exportHtml/exportHtml.js b/nezha-fronted/src/entrance/exportHtml/exportHtml.js index 0aea2c51c..6046749f4 100644 --- a/nezha-fronted/src/entrance/exportHtml/exportHtml.js +++ b/nezha-fronted/src/entrance/exportHtml/exportHtml.js @@ -2,7 +2,7 @@ // import 'element-ui/lib/theme-chalk/index.css' // import 'xterm/dist/xterm.css' import '@/assets/css/main.scss' -// import '@/assets/css/font/iconfont.js' +import '@/assets/css/font/iconfont.js' import ElementUI from 'element-ui' import i18n from '@/components/common/i18n' @@ -21,12 +21,14 @@ import { clickoutside, bottomBoxWindow, stringTimeParseToUnix, unixTimeParseToSt import * as tools from '@/components/common/js/tools.js' import * as constants from '@/components/common/js/constants.js' +import elementSet from '@/components/common/elementSet' // 自定义表头组件 import chartList from '@/components/chart/chartList.vue' // 全局引入 chartList 组件 防止 chart-group爆粗 - import pickTime from '@/components/common/pickTime' import nzDataList from '@/components/common/table/nzDataList' import mainMixin from '@/components/common/mixin/mainMixinFun' import Pagination from '@/components/common/pagination' + +Vue.component('element-set', elementSet) // 公用设置表头 Vue.component('pick-time', pickTime) Vue.component('nzDataList', nzDataList) Vue.component('chartList', chartList)