diff --git a/src/mixins/index.js b/src/mixins/index.js index 0b3a40c..8dcefbe 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-05 12:00:57 + * @LastEditTime: 2021-11-05 14:07:28 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/mixins/index.js @@ -78,10 +78,10 @@ export default { } }, computed: { - ...mapGetters(['getZoom', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel','getSComparison']) + ...mapGetters(['getZoom', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel','getSComparison','getBComparison']) }, methods: { - ...mapActions(["setZoom", 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel', 'setSComparison']), + ...mapActions(["setZoom", 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel', 'setSComparison','setBComparison']), // 获取当前日期时间 getDatetime() { let now = new Date(); diff --git a/src/router/index.js b/src/router/index.js index 0669ce2..d1b129c 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-04 15:06:16 + * @LastEditTime: 2021-11-05 13:51:34 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/router/index.js @@ -24,7 +24,7 @@ import iLayout from "@/lycomponents/iLayout" import ForumDetails from "@/views/ForumDetails" import TailInsightDetails from "@/views/TailInsightDetails" import WeiboDetails from "@/views/WeiboDetails" -import BrandComparison from "@/views/BrandComparison" +import brandComparisonIndex from "@/views/BrandComparison" import EventInsight from "@/views/EventInsight" import EventComparison from "@/views/EventComparison" import Login from "@/views/Login" @@ -93,10 +93,10 @@ const router = [ component: WeiboDetails }, { - path: '/brandComparison', - name: "brandComparison", + path: '/brandComparisonIndex', + name: "brandComparisonIndex", desc: "品牌洞察-品牌对比", - component: BrandComparison + component: brandComparisonIndex }, { path: '/eventInsight', diff --git a/src/store/actions.js b/src/store/actions.js index 19493e5..dddb325 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-12 13:36:49 - * @LastEditTime: 2021-10-28 19:34:37 + * @LastEditTime: 2021-11-05 14:03:18 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/actions.js @@ -37,6 +37,9 @@ const actions = { setModel: ({commit}, log) => { commit('setModel', log) }, + setBComparison: ({commit}, log) => { + commit('setBComparison', log) + }, setSComparison: ({commit}, log) => { commit('setSComparison', log) }, diff --git a/src/store/getters.js b/src/store/getters.js index 98e0c1f..57fcdbc 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-11-03 17:00:15 + * @LastEditTime: 2021-11-05 14:04:53 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/getters.js @@ -37,8 +37,11 @@ const getters = { getModel(state) { return state.model }, + getBComparison(state) { + return state.bComparison + }, getSComparison(state) { return state.sComparison - } + }, } export default getters diff --git a/src/store/mutations.js b/src/store/mutations.js index 0319867..f380519 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-11-03 16:59:16 + * @LastEditTime: 2021-11-05 14:04:03 * @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); }, + setBComparison: (state, log) => { + state.bComparison = log; + let str = JSON.stringify(log); + sessionStorage.setItem('bComparison', str); + }, setSComparison: (state, log) => { state.sComparison = log; let str = JSON.stringify(log); diff --git a/src/store/state.js b/src/store/state.js index 3dffcc2..d9b5683 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-11-03 16:56:14 + * @LastEditTime: 2021-11-05 14:02:42 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/store/state.js @@ -18,6 +18,8 @@ const state = { headerType: sessionStorage.getItem('headerType') || 1, brand: JSON.parse(sessionStorage.getItem('brand')) || {}, model: JSON.parse(sessionStorage.getItem('model')) || {}, + bComparison: JSON.parse(sessionStorage.getItem('bComparison')) || [], sComparison: JSON.parse(sessionStorage.getItem('sComparison')) || [], + } export default state; diff --git a/src/views/BrandComparison/BrandBeginComparte.vue b/src/views/BrandComparison/BrandBeginComparte.vue new file mode 100644 index 0000000..789e9c9 --- /dev/null +++ b/src/views/BrandComparison/BrandBeginComparte.vue @@ -0,0 +1,31 @@ + + + + + + \ No newline at end of file diff --git a/src/views/BrandComparison/BrandComparison.vue b/src/views/BrandComparison/BrandComparison.vue new file mode 100644 index 0000000..34e23c6 --- /dev/null +++ b/src/views/BrandComparison/BrandComparison.vue @@ -0,0 +1,196 @@ + + + + + + + + diff --git a/src/views/BrandComparison/brandCompateHeader/index.vue b/src/views/BrandComparison/brandCompateHeader/index.vue new file mode 100644 index 0000000..600e602 --- /dev/null +++ b/src/views/BrandComparison/brandCompateHeader/index.vue @@ -0,0 +1,132 @@ + + + + + + diff --git a/src/views/BrandComparison/brandTonalDistribution/roundata/index.vue b/src/views/BrandComparison/brandTonalDistribution/roundata/index.vue index 13bc39a..8797c66 100644 --- a/src/views/BrandComparison/brandTonalDistribution/roundata/index.vue +++ b/src/views/BrandComparison/brandTonalDistribution/roundata/index.vue @@ -1,7 +1,7 @@ @@ -173,66 +42,7 @@ export default { .bc-outter { padding: 0px 16px 16px 16px; } -.bc-d1 { - width: 100%; - height: 222px; - border: 2px solid #0f2a4d; - .bc-d1-inner { - width: 100%; - height: calc(100% - 48px); - display: flex; - justify-content: flex-start; - align-items: center; - .bc-d1-item { - display: inline-block; - display: flex; - justify-content: flex-start; - } - .d1-m1 { - width: 96px; - height: 102px; - } - .d1-item { - position: relative; - width: 228.5px; - height: 120px; - background-image: url("../../assets/images/BrandInsight/img_pd.png"); - background-repeat: no-repeat; - background-size: 100% 100%; - .s1 { - position: absolute; - font-size: 14px; - color: #b2daf8; - top: 52px; - left: 43px; - } - .s2 { - position: absolute; - top: 50px; - left: 110px; - color: #fff; - font-size: 20px; - } - .s3 { - display: block; - position: absolute; - top: 0px; - right: 0px; - width: 95px; - height: 28px; - background-image: url("../../assets/images/BrandInsight/img_xbut.png"); - background-repeat: no-repeat; - background-size: cover; - color: #4390ba; - text-align: center; - line-height: 28px; - font-size: 12px; - cursor: pointer; - } - } - } -} .bc-d2 { width: 100%; height: auto; diff --git a/src/views/BrandComparison/weiboTuneComparison/index.vue b/src/views/BrandComparison/weiboTuneComparison/index.vue index 3ee670c..23a2b69 100644 --- a/src/views/BrandComparison/weiboTuneComparison/index.vue +++ b/src/views/BrandComparison/weiboTuneComparison/index.vue @@ -1,7 +1,7 @@