diff --git a/nezha-fronted/src/assets/css/components/page/config/system/license.scss b/nezha-fronted/src/assets/css/components/page/config/system/license.scss index 80219ea84..91ae0f0b5 100644 --- a/nezha-fronted/src/assets/css/components/page/config/system/license.scss +++ b/nezha-fronted/src/assets/css/components/page/config/system/license.scss @@ -147,4 +147,37 @@ display: none; } } + .el-carousel__item{ + text-align: center; + } + .nz-license-footer{ + text-align: center; + margin-top: 30px; + margin-bottom: 15px; + .el-pagination{ + font-size: 14px; + .btn-prev, .btn-next{ + color: #fff; + font-size: 14px; + margin: 0 5px; + border: none; + background-color: #CBCED1 !important; + border-radius: 50%; + height: 24px; + width: 24px; + } + .number { + font-size: 14px; + margin: 0px; + border: none; + background-color: transparent !important; + } + .number.active{ + color: #FA901C; + } + } + } + .el-carousel__indicators.el-carousel__indicators--horizontal{ + display: none; + } } diff --git a/nezha-fronted/src/components/common/mixin/exportHtml.js b/nezha-fronted/src/components/common/mixin/exportHtml.js index 5fa9da4e5..420b8fd8d 100644 --- a/nezha-fronted/src/components/common/mixin/exportHtml.js +++ b/nezha-fronted/src/components/common/mixin/exportHtml.js @@ -21,13 +21,9 @@ export default { end: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.searchTime[1])), vars: vars } - const loading = Loading.service({ - lock: true, - customClass: 'export-pdf-mask', - background: 'rgba(0,0,0,.2)' - }) + this.$store.dispatch('dispatchHomeLoading', true) this.$get('/visual/panel/snapshot', params, 'blob').then(res => { - loading.close() + this.$store.dispatch('dispatchHomeLoading', false) const self = this let fileName = name const resFileName = '' diff --git a/nezha-fronted/src/components/layout/home.vue b/nezha-fronted/src/components/layout/home.vue index 00d0c9a87..bc7df6a22 100644 --- a/nezha-fronted/src/components/layout/home.vue +++ b/nezha-fronted/src/components/layout/home.vue @@ -1,5 +1,5 @@ @@ -142,7 +153,8 @@ export default { endItem: '', qrCodeShow: false, qrCodeArr: [], - totalQrCode: 10 + totalQrCode: 10, + currentPage: 1 } }, methods: { @@ -306,6 +318,10 @@ export default { // 把画布的内容转换为base64编码格式的图片 const data = cas.toDataURL('image/png', 1) return data + }, + setActiveItem (currentPage) { + console.log() + this.$refs.carousel.setActiveItem('qr-' + (currentPage - 1)) } }, computed: { @@ -321,8 +337,6 @@ export default { } } - diff --git a/nezha-fronted/src/store/panel.js b/nezha-fronted/src/store/panel.js index 90df54984..55a1603fb 100644 --- a/nezha-fronted/src/store/panel.js +++ b/nezha-fronted/src/store/panel.js @@ -26,7 +26,8 @@ const panel = { // 当前鼠标所在的图表id currentMousemove: 0, variablesArr: [], - timeBoxClass: '' + timeBoxClass: '', + homeLoading: false }, mutations: { setShowRightBox (state, flag) { @@ -97,6 +98,9 @@ const panel = { }, setTimeBoxClass (state, value) { state.timeBoxClass = value + }, + setHomeLoading (state, value) { + state.homeLoading = value } }, getters: { @@ -153,6 +157,9 @@ const panel = { }, getTimeBoxClass (state, value) { return state.timeBoxClass + }, + getHomeLoading (state, value) { + return state.homeLoading } }, actions: { @@ -197,7 +204,10 @@ const panel = { }, dispatchTimeBoxClass (store, timeBoxClass) { store.commit('setTimeBoxClass', timeBoxClass) - } + }, + dispatchHomeLoading (store, homeLoading) { + store.commit('setHomeLoading', homeLoading) + }, } } export default panel