xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-dev' into feature-Beta-dev-renpy

Browse Source
This commit is contained in:
nieziyan 2024-03-14 16:22:03 +08:00
commit 5e867f46d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/stationOperation/components/RealTimeDataChart.vue
View File

@ -80,8 +80,8 @@ const initialOption = {
// ` // `
return ` return `
<div>${params.marker}${params.name}</div> <div>${params.marker}${params.name}</div>
<div>START：${dayjs.utc(params.value[4]).format('YYYY-MM-DD HH:mm:ss')}</div> <div>START：${dayjs(params.value[4]).format('YYYY-MM-DD HH:mm:ss')}</div>
<div style="white-space: pre"> END：${dayjs.utc(params.value[2]).format('YYYY-MM-DD HH:mm:ss')}</div> <div style="white-space: pre"> END：${dayjs(params.value[2]).format('YYYY-MM-DD HH:mm:ss')}</div>
` `
}, },
}, },
@ -190,7 +190,7 @@ export default {
let now = dayjs(new Date()) let now = dayjs(new Date())
now = now.add(1, 'hour').set('minute', 0).set('second', 0).set('millisecond', 0) now = now.add(1, 'hour').set('minute', 0).set('second', 0).set('millisecond', 0)
const max = now.valueOf() const max = dayjs(dayjs.utc(now.valueOf()).format('YYYY-MM-DD HH:mm:ss')).valueOf()
const min = max - this.scaleSettings.cacheTime * 24 * 60 * 60 * 1000 const min = max - this.scaleSettings.cacheTime * 24 * 60 * 60 * 1000
const option = cloneDeep(initialOption) const option = cloneDeep(initialOption)
const { grid, xAxis, yAxis, series, dataZoom } = option const { grid, xAxis, yAxis, series, dataZoom } = option
@ -212,7 +212,7 @@ export default {
formatter: (val) => { formatter: (val) => {
// let dateTime = new Date(val) // let dateTime = new Date(val)
// return dayjs.utc(dateTime).format('HH:mm\nMM/DD') // return dayjs.utc(dateTime).format('HH:mm\nMM/DD')
return dayjs.utc(val).format('HH:mm\nMM/DD') return dayjs(val).format('HH:mm\nMM/DD')
}, },
color: '#ade6ee', color: '#ade6ee',
}, },