diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index b0ef3670..cd4057f8 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -578,6 +578,7 @@ const widgetTools = [ {code: 'MM-dd', name: '日期无年'}, {code: 'hh:mm', name: '时分'}, {code: 'hh:mm:ss', 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 eb25f205..05fe53ab 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetTime.vue @@ -3,95 +3,127 @@