diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss index 23ee3507..ef745ec0 100644 --- a/src/assets/css/components/views/charts/panel.scss +++ b/src/assets/css/components/views/charts/panel.scss @@ -285,7 +285,7 @@ font-size: 20px; } } - } + } &.cn-chart__single-value--icon-right { display: flex; flex-direction: row-reverse; @@ -817,7 +817,11 @@ display: flex; flex-direction: column; max-width: 60%; - padding-right: 10px; + padding-left: 10px; + + div:nth-of-type(1) { + margin-bottom: 10px; + } .content__data { padding-bottom: 7%; diff --git a/src/mixins/common.js b/src/mixins/common.js index 225e433d..5abb4131 100644 --- a/src/mixins/common.js +++ b/src/mixins/common.js @@ -1,4 +1,5 @@ import { hasButton } from '@/permission' +import {getMillisecond} from "@/utils/date-util"; export default { data () { return { @@ -51,8 +52,8 @@ export default { utcTimeToLocalhost (str) { // 系统设置的时区 到 utc 0 return str }, - parseMsDate (ms, format = 'YYYY-MM-DD HH:mm:ss') { - return this.dayJs.tz(parseFloat(ms)).format(format) + parseMsDate (time, format = 'YYYY-MM-DD HH:mm:ss') { + return this.dayJs.tz(getMillisecond(time)).format(format) } } } diff --git a/src/views/charts/Chart2.vue b/src/views/charts/Chart2.vue index 7e582de3..e910b649 100644 --- a/src/views/charts/Chart2.vue +++ b/src/views/charts/Chart2.vue @@ -5,68 +5,68 @@