From 9c4b50d5e40510b05413f6cf859e7e4459c0f9cd Mon Sep 17 00:00:00 2001 From: ZZJ <zzjdsg2300@163.com> Date: 星期五, 03 十二月 2021 18:15:33 +0800 Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus --- src/pages/shuohuangMonitorAnalyze/components/timeShortcut.vue | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/pages/shuohuangMonitorAnalyze/components/timeShortcut.vue b/src/pages/shuohuangMonitorAnalyze/components/timeShortcut.vue index cabb2cd..56255f5 100644 --- a/src/pages/shuohuangMonitorAnalyze/components/timeShortcut.vue +++ b/src/pages/shuohuangMonitorAnalyze/components/timeShortcut.vue @@ -13,7 +13,13 @@ export default { data () { return { - actPicker: 'today', + //actPicker: 'today', + } + }, + props: { + actPicker:{ + type: String, + default: 'year' //鐜版彁渚涘彲閫夊弬鏁颁负锛歵oday week month year } }, watch: { @@ -68,6 +74,7 @@ <style lang="scss"> .time-shortcut { + margin-right: 62px; ul { display: flex; li { -- Gitblit v1.8.0