From 836eb7cab117d2a027b4aafe7e9ac6ff6ca207fa Mon Sep 17 00:00:00 2001 From: "lily.zhang" Date: Wed, 3 Nov 2021 18:13:03 +0800 Subject: [PATCH] cxw-010203 --- src/mixins/index.js | 6 +- src/router/index.js | 10 +- src/store/actions.js | 5 +- src/store/getters.js | 5 +- src/store/mutations.js | 7 +- src/store/state.js | 3 +- .../brandVolumeTOP10/index.vue | 4 +- src/views/MarketingComparison/index.vue | 45 +++----- .../marketingComparison.vue | 63 +++++++++++ .../MarketingComparison/mcBeginCompare.vue | 101 ++++++++++++++++++ 10 files changed, 206 insertions(+), 43 deletions(-) create mode 100644 src/views/MarketingComparison/marketingComparison.vue create mode 100644 src/views/MarketingComparison/mcBeginCompare.vue diff --git a/src/mixins/index.js b/src/mixins/index.js index 4edc3d3..3302ec8 100644 --- a/src/mixins/index.js +++ b/src/mixins/index.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:56:13 - * @LastEditTime: 2021-11-02 16:17:56 + * @LastEditTime: 2021-11-03 17:03:23 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/mixins/index.js @@ -87,10 +87,10 @@ export default { } }, computed: { - ...mapGetters(['getZoom', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel']) + ...mapGetters(['getZoom', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel','getSComparison']) }, methods: { - ...mapActions(["setZoom", 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel']), + ...mapActions(["setZoom", 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel', 'setSComparison']), // 获取当前日期时间 getDatetime() { let now = new Date(); diff --git a/src/router/index.js b/src/router/index.js index b887f5d..a6f11c5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-08 09:26:29 - * @LastEditTime: 2021-11-03 11:48:10 + * @LastEditTime: 2021-11-03 17:08:47 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/router/index.js @@ -31,7 +31,7 @@ import Login from "@/views/Login" import EventDEC from "@/views/EventDEC" import MarketingAnalysis from "@/views/MarketingAnalysis" import ModelInsight from "@/views/ModelInsight" -import MarketingComparison from "@/views/MarketingComparison" +import mcIndex from "@/views/MarketingComparison" const router = [ { path: '/login', @@ -129,10 +129,10 @@ const router = [ component: ModelInsight }, { - path: '/marketingComparison', - name: "marketingComparison", + path: '/mcIndex', + name: "mcIndex", desc: "营销对比", - component: MarketingComparison + component: mcIndex }, ] }, diff --git a/src/store/actions.js b/src/store/actions.js index fed6820..19493e5 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -36,6 +36,9 @@ const actions = { }, setModel: ({commit}, log) => { commit('setModel', log) - } + }, + setSComparison: ({commit}, log) => { + commit('setSComparison', log) + }, } export default actions diff --git a/src/store/getters.js b/src/store/getters.js index 8f85ef8..98e0c1f 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:37:06 - * @LastEditTime: 2021-10-28 19:36:01 + * @LastEditTime: 2021-11-03 17:00:15 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/getters.js @@ -36,6 +36,9 @@ const getters = { }, getModel(state) { return state.model + }, + getSComparison(state) { + return state.sComparison } } export default getters diff --git a/src/store/mutations.js b/src/store/mutations.js index ddcbdfc..0319867 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:37:35 - * @LastEditTime: 2021-10-28 19:35:17 + * @LastEditTime: 2021-11-03 16:59:16 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/mutations.js @@ -58,6 +58,11 @@ const mutations = { let str = JSON.stringify(obj); sessionStorage.setItem('model', str); }, + setSComparison: (state, log) => { + state.sComparison = log; + let str = JSON.stringify(log); + sessionStorage.setItem('sComparison', str); + }, } diff --git a/src/store/state.js b/src/store/state.js index 10abc8f..3dffcc2 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:37:50 - * @LastEditTime: 2021-10-29 12:56:22 + * @LastEditTime: 2021-11-03 16:56:14 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/state.js @@ -18,5 +18,6 @@ const state = { headerType: sessionStorage.getItem('headerType') || 1, brand: JSON.parse(sessionStorage.getItem('brand')) || {}, model: JSON.parse(sessionStorage.getItem('model')) || {}, + sComparison: JSON.parse(sessionStorage.getItem('sComparison')) || [], } export default state; diff --git a/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue b/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue index f99864b..972b25d 100644 --- a/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue +++ b/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/MarketingComparison/marketingComparison.vue b/src/views/MarketingComparison/marketingComparison.vue new file mode 100644 index 0000000..4e7d8fa --- /dev/null +++ b/src/views/MarketingComparison/marketingComparison.vue @@ -0,0 +1,63 @@ + + + + + + diff --git a/src/views/MarketingComparison/mcBeginCompare.vue b/src/views/MarketingComparison/mcBeginCompare.vue new file mode 100644 index 0000000..ce2dcdc --- /dev/null +++ b/src/views/MarketingComparison/mcBeginCompare.vue @@ -0,0 +1,101 @@ + + + + + + \ No newline at end of file