diff --git a/frontend/src/custom-theme.css b/frontend/src/custom-theme.css index e9bb74b11a..1bf5908091 100755 --- a/frontend/src/custom-theme.css +++ b/frontend/src/custom-theme.css @@ -1,5 +1,6 @@ .vjs-custom-skin > .video-js { width: 100%; + background-color: rgba(0, 0, 0, 0); font-family: "PingFang SC","Helvetica Neue","Hiragino Sans GB","Segoe UI","Microsoft YaHei","微软雅黑",sans-serif; } @@ -111,7 +112,7 @@ } .vjs-custom-skin > .video-js .vjs-time-tooltip, -.vjs-custom-skin > .video-js .vjs-mouse-display:after, +.vjs-custom-skin > .video-js .vjs-mouse-display:after, .vjs-custom-skin > .video-js .vjs-play-progress:after { border-radius: 0; font-size: 1em; diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 36d2dd7baa..533bf9b5ee 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2785,6 +2785,7 @@ export default { email: 'Email:', tel: 'Tel:', web: 'Web:', + bbs: 'BBS:', apply: 'Free Trial Application', more: 'More', weChat_official_account: 'WeChat official account', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 1f3bce50bb..209d78504a 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2779,6 +2779,7 @@ export default { email: '郵箱:', tel: '電話:', web: '網址:', + bbs: '論壇:', apply: '免費試用申請', more: '更多', weChat_official_account: '微信公眾號', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index bf71845835..6916b2234a 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2794,6 +2794,7 @@ export default { email: '邮箱:', tel: '电话:', web: '网址:', + bbs: '论坛:', apply: '免费试用申请', more: '更多', weChat_official_account: '微信公众号', diff --git a/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue b/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue index e428beb5e2..4ce2771a3f 100644 --- a/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue +++ b/frontend/src/views/chart/components/dragItem/QuotaExtItem.vue @@ -319,10 +319,10 @@ export default { }, isEnableCompare() { let xAxis = null - if (Object.prototype.toString.call(this.chart.xaxisExt) === '[object Array]') { - xAxis = JSON.parse(JSON.stringify(this.chart.xaxisExt)) + if (Object.prototype.toString.call(this.chart.xaxis) === '[object Array]') { + xAxis = JSON.parse(JSON.stringify(this.chart.xaxis)) } else { - xAxis = JSON.parse(this.chart.xaxisExt) + xAxis = JSON.parse(this.chart.xaxis) } const t1 = xAxis.filter(ele => { return ele.deType === 1 && SUPPORT_Y_M.includes(ele.dateStyle) diff --git a/frontend/src/views/wizard/index.vue b/frontend/src/views/wizard/index.vue index 9846564106..6c2a77fcdd 100644 --- a/frontend/src/views/wizard/index.vue +++ b/frontend/src/views/wizard/index.vue @@ -98,6 +98,13 @@ href="https://www.dataease.io" >www.dataease.io + + {{ $t('wizard.bbs') }}https://bbs.fit2cloud.com/c/de +
@@ -395,7 +402,7 @@ export default { .content_bottom_contact { float: left; margin-left: 278px; - width: 300px; + width: 200px; margin-top: 40px; } @@ -403,7 +410,7 @@ export default { font-style: normal; font-weight: 500; font-size: 14px; - line-height: 22px; + line-height: 20px; color: var(--TextPrimary, #1F2329); margin-bottom: 16px; } @@ -411,8 +418,8 @@ export default { .contact_content { font-style: normal; font-weight: 400; - font-size: 14px; - line-height: 22px; + font-size: 12px; + line-height: 16px; color: #646A73; margin-top: 8px; } @@ -422,11 +429,12 @@ export default { } .content_bottom_qr_code { - width: 400px; + width: 500px; float: right; text-align: right; margin-right: 180px; margin-top: 40px; + padding-right: 100px; } .contact_title_qr {