diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index cd4057f8..1276d16f 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -578,6 +578,9 @@ const widgetTools = [ {code: 'MM-dd', name: '日期无年'}, {code: 'hh:mm', name: '时分'}, {code: 'hh:mm:ss', name: '时分秒'}, + {code: 'year-week', name: '日期+星期'}, + {code: 'year-h-m-week', name: '日期+时分+星期'}, + {code: 'year-h-m-s-week', name: '日期+时分秒+星期'}, {code: 'week', name: '星期'} ], value: 'yyyy-MM-dd hh:mm:ss' diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue index 05fe53ab..2bea618f 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue @@ -106,7 +106,39 @@ export default { dayCycle = "星期" + dayCycleArray[i]; } } - return dayCycle; + if (fmt == "year-week") { + return year + "-" + month + "-" + day + dayCycle; + } else if (fmt == "year-h-m-week") { + return ( + year + + "-" + + month + + "-" + + day + + " " + + hours + + ":" + + minutes + + dayCycle + ); + } else if (fmt == "year-h-m-s-week") { + return ( + year + + "-" + + month + + "-" + + day + + " " + + hours + + ":" + + minutes + + ":" + + seconds + + dayCycle + ); + } else if (fmt == "week") { + return dayCycle; + } }, displayTime() { this.timestr =