diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-time.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-time.js index 878b3cab..0958d7d5 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-time.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-time.js @@ -1,6 +1,6 @@ /* * @Descripttion: 时间控件json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:05:52 * @LastEditors: qianlishi @@ -56,7 +56,7 @@ export const widgetTime = { name: 'fontSize', required: false, placeholder: '', - value: '26' + value: '36' }, { type: 'vue-color', @@ -128,7 +128,7 @@ export const widgetTime = { name: 'width', required: false, placeholder: '该容器在1920px大屏中的宽度', - value: 300, + value: 400, }, { type: 'el-input-number', @@ -136,8 +136,8 @@ export const widgetTime = { name: 'height', required: false, placeholder: '该容器在1080px大屏中的高度', - value: 100, + value: 50, }, ], } - } \ No newline at end of file + } diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetTime.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetTime.vue index 5a55bc02..1c3d8918 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetTime.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetTime.vue @@ -94,11 +94,11 @@ export default { }, formatWeek(date, fmt) { const year = date.getFullYear(); - const month = date.getMonth() + 1; - const day = date.getDate(); - const hours = date.getHours(); - const minutes = date.getMinutes(); - const seconds = date.getSeconds(); + const month = this.check(date.getMonth() + 1); + const day = this.check(date.getDate()); + const hours = this.check(date.getHours()); + const minutes = this.check(date.getMinutes()); + const seconds = this.check(date.getSeconds()); let dayCycle = date.getDay(); const dayCycleArray = ["日", "一", "二", "三", "四", "五", "六"]; for (let i = 0; i < 7; i++) {