diff --git a/src/components/Notice/index.vue b/src/components/Notice/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..fd7c637a4968fdc84aea6140ed85276fe87195ba --- /dev/null +++ b/src/components/Notice/index.vue @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/src/components/Widget/index.vue b/src/components/Widget/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..49d6f53b8ff3cc16b7d4f54f79bfe1cc36f37daf --- /dev/null +++ b/src/components/Widget/index.vue @@ -0,0 +1,61 @@ + + + \ No newline at end of file diff --git a/src/store/modules/taskbar.js b/src/store/modules/taskbar.js index 36daf838f8854e55c60cc674a9b82168b206ccc7..b0eadf4f84b1c8f07043148b374db13004ce11f2 100644 --- a/src/store/modules/taskbar.js +++ b/src/store/modules/taskbar.js @@ -1,6 +1,8 @@ const state = { startMapShow: false, - currentPag: 'start' + currentPag: 'start', + widgetShow: false, + widgetOrNotice: true // true -> widget false -> notice } const mutations = { @@ -23,12 +25,26 @@ const mutations = { } if (val === 'taskbar') return state.startMapShow = false + }, + // 小工具显示/隐藏 + WIDGET_SHOW(state,val){ + state.widgetShow = val + }, + // 小工具 还是 通知中心 + WIDGETORNOTICE(state,val){ + state.widgetOrNotice = val } } const actions = { changeStartMapShow({ commit }, val) { commit('STARTMAP_SHOW', val) + }, + changeWidgetShow({commit},val){ + commit('WIDGET_SHOW',val) + }, + changeWidgetOrNotice({commit},val){ + commit('WIDGETORNOTICE',val) } } diff --git a/src/styles/index.scss b/src/styles/index.scss index 00290ceba55d9e8512cbf1c9e72259a2dcca7ace..79f8bc57f99e7e9c54db83b5095bcf5be4661779 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1 +1,33 @@ -@import './animation.scss' \ No newline at end of file +@import './animation.scss'; + +// 小工具样式 +.widget{ + width: 610px; + height: 94%; + top: calc( calc( 6% - 40px) / 2) !important; + left: 5px !important; + .el-drawer{ + width: 100% !important; + background-color: rgba(255, 255, 255, 0.25); + backdrop-filter:blur(40px); + box-shadow: none; + border-radius: 8px; + } +} +// 通知样式 +.notice{ + width: 320px; + height: calc(100% - 40px); + left: auto; + right: 0 !important; + background: transparent; + .el-drawer{ + width: 100% !important; + box-shadow: none; + background-color: rgba(255, 255, 255, 0.88); + backdrop-filter: blur(20px); + } + .el-drawer__close-btn{ + display: none; + } +} \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/views/desktop/Home.vue b/src/views/desktop/Home.vue index f3f1b84621235630d8f572b065b039bd3edf9fab..9f1eb1863bd5191bddb36aa93376c3bcebdfff66 100644 --- a/src/views/desktop/Home.vue +++ b/src/views/desktop/Home.vue @@ -1,17 +1,56 @@