diff --git a/src/lycomponents/iHeader/index.vue b/src/lycomponents/iHeader/index.vue index 13c07bb..d5ed754 100644 --- a/src/lycomponents/iHeader/index.vue +++ b/src/lycomponents/iHeader/index.vue @@ -124,6 +124,7 @@ export default { }, // 点击个人中心 handlerMyself() { + this.setHeaderType(4); this.$router.push("/myself"); }, // 菜单 diff --git a/src/lycomponents/iHeaderMa/index.vue b/src/lycomponents/iHeaderMa/index.vue index f105af2..a923932 100644 --- a/src/lycomponents/iHeaderMa/index.vue +++ b/src/lycomponents/iHeaderMa/index.vue @@ -140,6 +140,7 @@ export default { }, // 点击个人中心 handlerMyself() { + this.setHeaderType(4); this.$router.push("/myself"); }, // 菜单 diff --git a/src/lycomponents/iHeaderMyself/index.vue b/src/lycomponents/iHeaderMyself/index.vue new file mode 100644 index 0000000..3b3b2d3 --- /dev/null +++ b/src/lycomponents/iHeaderMyself/index.vue @@ -0,0 +1,255 @@ + + + + + + diff --git a/src/lycomponents/iLayout/index.vue b/src/lycomponents/iLayout/index.vue index d87319b..387c3c7 100644 --- a/src/lycomponents/iLayout/index.vue +++ b/src/lycomponents/iLayout/index.vue @@ -11,6 +11,7 @@ +
diff --git a/src/lycomponents/index.js b/src/lycomponents/index.js index 04b0ace..d159024 100644 --- a/src/lycomponents/index.js +++ b/src/lycomponents/index.js @@ -11,6 +11,7 @@ import iSwitchBrand from "@/lycomponents/iSwitchBrand"; import iSwitchModel from "@/lycomponents/iSwitchModel"; import iHeaderMa from "@/lycomponents/iHeaderMa" import iHeaderBrand from "@/lycomponents/iHeaderBrand" +import iHeaderMyself from "@/lycomponents/iHeaderMyself"; export default { install(Vue) { Vue.mixin({ @@ -19,7 +20,8 @@ export default { iSwitchBrand, iHeaderMa, iSwitchModel, - iHeaderBrand + iHeaderBrand, + iHeaderMyself } }) } diff --git a/src/mixins/index.js b/src/mixins/index.js index 58426b1..2079be2 100644 --- a/src/mixins/index.js +++ b/src/mixins/index.js @@ -127,10 +127,10 @@ export default { } }, computed: { - ...mapGetters(['getZoom', 'getLoading', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel', 'getSComparison', 'getBComparison', 'getMComparison', 'getEComparison', 'getLevelBtn', 'getMenu', 'getChangeSTime']) + ...mapGetters(['getZoom', 'getLoading', 'getToken', 'getUser', 'getAccount', 'getCommTime', 'getCtime', 'getCtime2', 'getHeaderType', 'getBrand', 'getModel', 'getSComparison', 'getBComparison', 'getMComparison', 'getEComparison', 'getLevelBtn', 'getMenu', 'getChangeSTime', 'getMcStatus']) }, methods: { - ...mapActions(["setZoom", 'setLoading', 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel', 'setSComparison', 'setBComparison', 'setMComparison', 'setEComparison', 'setLevelBtn', 'setMenu', 'setChangeSTime']), + ...mapActions(["setZoom", 'setLoading', 'setToken', 'setUser', 'setAccount', 'setCommTime', 'setCtime', 'setCtime2', 'setHeaderType', 'setBrand', 'setModel', 'setSComparison', 'setBComparison', 'setMComparison', 'setEComparison', 'setLevelBtn', 'setMenu', 'setChangeSTime','setMcStatus']), // 获取当前日期时间 getDatetime() { let now = new Date(); diff --git a/src/store/actions.js b/src/store/actions.js index 9a0e394..de6362f 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -46,6 +46,9 @@ const actions = { setSComparison: ({commit}, log) => { commit('setSComparison', log) }, + setMcStatus: ({commit}, log) => { + commit('setMcStatus', log) + }, setMComparison: ({commit}, log) => { commit('setMComparison', log) }, diff --git a/src/store/getters.js b/src/store/getters.js index 7d34dc1..4eb549b 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -54,6 +54,9 @@ const getters = { getMComparison(state) { return state.mComparison }, + getMcStatus(state) { + return state.mcStatus + }, getEComparison(state) { return state.eComparison }, diff --git a/src/store/mutations.js b/src/store/mutations.js index 210f056..e90b1a1 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -75,6 +75,10 @@ const mutations = { let str = JSON.stringify(log); sessionStorage.setItem('sComparison', str); }, + setMcStatus: (state, log) => { + state.mcStatus = log; + sessionStorage.setItem('mcStatus', log); + }, setChangeSTime: (state, log) => { state.changeSTime = log; }, diff --git a/src/store/state.js b/src/store/state.js index 5f374b1..36b5968 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -23,6 +23,7 @@ const state = { sComparison: JSON.parse(sessionStorage.getItem('sComparison')) || [], changeSTime: 1, mComparison: JSON.parse(sessionStorage.getItem('mComparison')) || [], + mcStatus: sessionStorage.getItem('mcStatus') || false, eComparison: JSON.parse(sessionStorage.getItem('eComparison')) || [], levelBtn: JSON.parse(sessionStorage.getItem('levelBtn')) || [], menu: giveMenu() || JSON.parse(sessionStorage.getItem('menu')) || [], diff --git a/src/views/BrandInsight/index.vue b/src/views/BrandInsight/index.vue index 4be1369..61976e1 100644 --- a/src/views/BrandInsight/index.vue +++ b/src/views/BrandInsight/index.vue @@ -89,7 +89,7 @@ --> - + diff --git a/src/views/MarketingComparison/index.vue b/src/views/MarketingComparison/index.vue index 16f7781..ad521ac 100644 --- a/src/views/MarketingComparison/index.vue +++ b/src/views/MarketingComparison/index.vue @@ -8,7 +8,7 @@ --> @@ -28,7 +28,7 @@ export default { } }, created() { - this.hasData = this.getSComparison.length > 0 ? true : false; + this.hasData = this.getMcStatus; } } diff --git a/src/views/MarketingComparison/mcBeginCompare.vue b/src/views/MarketingComparison/mcBeginCompare.vue index 33b7ad7..d488fc6 100644 --- a/src/views/MarketingComparison/mcBeginCompare.vue +++ b/src/views/MarketingComparison/mcBeginCompare.vue @@ -7,163 +7,171 @@ * @FilePath: /data-show/src/views/MarketingComparison/mcBeginCompare.vue --> \ No newline at end of file diff --git a/src/views/MarketingComparison/mcChooseModel/index.vue b/src/views/MarketingComparison/mcChooseModel/index.vue index f1375b6..196c5d3 100644 --- a/src/views/MarketingComparison/mcChooseModel/index.vue +++ b/src/views/MarketingComparison/mcChooseModel/index.vue @@ -161,13 +161,20 @@ export default { }, created() { this.brand = this.getBrand.brandname || "奥迪"; + if(this.getSComparison == []) { + this.setMcStatus(); + } if (this.getChangeSTime) { + const arr = []; this.list.forEach((e) => { - e.startTime = this.getCtime.sStartTime; - e.endTime = this.getCtime.sEndTime; + if(e.brand && e.model) { + e.startTime = this.getCtime.sStartTime; + e.endTime = this.getCtime.sEndTime; + arr.push(e); + } }); + this.setSComparison(arr); } - this.modelData(); }, methods: { @@ -208,6 +215,9 @@ export default { let filterArr = this.list.filter((ele) => { return ele.brand && ele.model && ele.startTime && ele.endTime; }); + if(filterArr.length === 0) { + this.setMcStatus(false); + } this.$emit("del", n); this.$emit("change", filterArr); }, diff --git a/src/views/ModelInsight/index.vue b/src/views/ModelInsight/index.vue index 60e51e9..95b49c2 100644 --- a/src/views/ModelInsight/index.vue +++ b/src/views/ModelInsight/index.vue @@ -23,7 +23,7 @@
- +
@@ -119,7 +119,7 @@ import mlRearWingPropagationSituation from "./mlRearWingPropagationSituation"; import mlPopularwordCloud from "./mlPopularwordCloud"; //骨架屏 import mlBrandDataStoken from "./ml-brand-dataStoken"; -import mlTtsStoken from "./ml-ttsStoken"; +import mlttsStoken from "./ml-ttsStoken"; import mlPopularEventsStoken from "./mlPopularEventsStoken"; import mlPopularEventsListStoken from "./mlPopularEventsListStoken"; import mlWeiboKolStoken from "./mlWeiboKolStoken"; @@ -151,7 +151,7 @@ export default { mlPopularwordCloud, // 热门词云 //骨架屏 mlBrandDataStoken, // 品牌数据 - mlTtsStoken, // 舆情传播趋势 + mlttsStoken, // 舆情传播趋势 mlPopularEventsStoken, // 热门事件列表 mlPopularEventsListStoken, // 热点事件 mlWeiboKolStoken, // 微博KOL diff --git a/src/views/ModelInsight/mlKeyMediaStoken/index.vue b/src/views/ModelInsight/mlKeyMediaStoken/index.vue index 67f4688..1588860 100644 --- a/src/views/ModelInsight/mlKeyMediaStoken/index.vue +++ b/src/views/ModelInsight/mlKeyMediaStoken/index.vue @@ -8,7 +8,7 @@ -->