diff --git a/src/components/v-echars/index.vue b/src/components/v-echars/index.vue index 912c79c..ccf6a10 100644 --- a/src/components/v-echars/index.vue +++ b/src/components/v-echars/index.vue @@ -120,7 +120,6 @@ export default { }, // 针对圆特定图形加个默认被选择 roundDefaultSelect(myChart) { - console.log(myChart) if (!myChart.getOption().series[0] || myChart.getOption().series[0].type != "pie") { return; } diff --git a/src/router/index.js b/src/router/index.js index 224a954..8c6ca22 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,27 +15,8 @@ const originalPush = Router.prototype.push Router.prototype.push = function push(location) { return originalPush.call(this, location).catch(err => err) } -import Index from "@/views/Index" -import Myself from "@/views/Myself" -import IndustryDataExport from "@/views/IndustryDataExport" -import BrandInsight from "@/views/BrandInsight" -import EventDetails from "@/views/EventDetails" -import iLayout from "@/lycomponents/iLayout" -import ForumDetails from "@/views/ForumDetails" -import TailInsightDetails from "@/views/TailInsightDetails" -import WeiboDetails from "@/views/WeiboDetails" -import brandComparisonIndex from "@/views/BrandComparison" -import EventInsight from "@/views/EventInsight" -import EventComparison from "@/views/EventComparison" import Login from "@/views/Login" -import EventDEC from "@/views/EventDEC" -import MarketingAnalysis from "@/views/MarketingAnalysis" -import ModelInsight from "@/views/ModelInsight" import mcIndex from "@/views/MarketingComparison" -import ModelTailDetails from "@/views/ModelTailDetails" -import ModelEventDetails from "@/views/ModelEventDetails" -import ModelWeiboDetails from "@/views/ModelWeiboDetails" -import ModelForumDetails from "@/views/ModelForumDetails" import ModelComparison from "@/views/ModelComparison" import SaleRank from "@/views/SaleRank" // 销量排行 @@ -44,12 +25,6 @@ import ThemeData from "@/views/ThemeData" import ThemeBoard from "@/views/ThemeBoard" import ThemeComparison from "@/views/ThemeComparison" import iSwitchEvent from "@/lycomponents/iSwitchEvent" -// 重点媒体 -import KeyMediaBrand from "@/views/KeyMediaBrand" -import KeyMediaSeries from "@/views/KeyMediaSeries" -import KeyMediaEvent from "@/views/KeyMediaEvent" -import KeyMediaTheme from "@/views/KeyMediaTheme" -import KeyMediaHome from "@/views/KeyMediaHome" const router = [ { path: '/login', @@ -59,146 +34,146 @@ const router = [ { path: "/", name: "iLayout", - component: iLayout, + component: resolve => require(["@/lycomponents/iLayout"], resolve), redirect: '/index', children: [ { path: "/index", name: "index", desc: "行业洞察", - component: Index + component: resolve => require(["@/views/Index"], resolve), }, { path: "/keyMediaHome", name: "keyMediaHome", - desc: "行业洞察", - component: KeyMediaHome + desc: "行业洞察-重点媒体", + component: resolve => require(["@/views/KeyMediaHome"], resolve), }, { path: "/myself", name: "myself", desc: "个人中心", - component: Myself + component: resolve => require(["@/views/Myself"], resolve), }, { path: '/industryDataExport', name: "industryDataExport", desc: "行业数据", - component: IndustryDataExport + component: resolve => require(["@/views/IndustryDataExport"], resolve), }, { path: '/brandInsight', name: "brandInsight", desc: "品牌洞察", - component: BrandInsight + component: resolve => require(["@/views/BrandInsight"], resolve), }, { path: '/eventDetails', name: "eventDetails", desc: "品牌洞察-事件详情", - component: EventDetails + component: resolve => require(["@/views/EventDetails"], resolve), }, { path: '/forumDetails', name: "forumDetails", desc: "品牌洞察-论坛详情", - component: ForumDetails + component: resolve => require(["@/views/ForumDetails"], resolve), }, { path: '/tailInsightDetails', name: "tailInsightDetails", desc: "品牌洞察-尾翼详情", - component: TailInsightDetails + component: resolve => require(["@/views/TailInsightDetails"], resolve), }, { path: '/weiboDetails', name: "weiboDetails", desc: "品牌洞察-微博详情", - component: WeiboDetails + component: resolve => require(["@/views/WeiboDetails"], resolve), }, { path: '/keyMediaBrand', name: "keyMediaBrand", desc: "品牌洞察-重点媒体", - component: KeyMediaBrand + component: resolve => require(["@/views/KeyMediaBrand"], resolve), }, { path: '/brandComparisonIndex', name: "brandComparisonIndex", desc: "品牌洞察-品牌对比", - component: brandComparisonIndex + component: resolve => require(["@/views/BrandComparison"], resolve), }, { path: '/eventInsight', name: "eventInsight", desc: "事件洞察", - component: EventInsight + component: resolve => require(["@/views/EventInsight"], resolve), }, { path: '/iSwitchEvent', name: "iSwitchEvent", desc: "事件洞察-切换事件", - component: iSwitchEvent + component: resolve => require(["@/lycomponents/iSwitchEvent"], resolve), }, { path: '/eventComparison', name: "eventComparison", desc: "事件洞察-事件对比", - component: EventComparison + component: resolve => require(["@/views/EventComparison"], resolve), }, { path: '/eventDEC', name: "eventDEC", desc: "事件洞察-事件详情", - component: EventDEC + component: resolve => require(["@/views/EventDEC"], resolve), }, { path: '/keyMediaEvent', name: "keyMediaEvent", desc: "事件洞察-重点媒体", - component: KeyMediaEvent + component: resolve => require(["@/views/KeyMediaEvent"], resolve), }, { path: '/marketingAnalysis', name: "marketingAnalysis", desc: "营销分析", - component: MarketingAnalysis + component: resolve => require(["@/views/MarketingAnalysis"], resolve), }, { path: '/modelInsight', name: "modelInsight", desc: "车型洞察", - component: ModelInsight + component: resolve => require(["@/views/ModelInsight"], resolve), }, { path: '/modelEventDetails', name: "modelEventDetails", desc: "车型事件详情", - component: ModelEventDetails + component: resolve => require(["@/views/ModelEventDetails"], resolve), }, { path: '/modelForumDetails', name: "modelForumDetails", desc: "车型论坛详情", - component: ModelForumDetails + component: resolve => require(["@/views/ModelForumDetails"], resolve), }, { path: '/modelWeiboDetails', name: "modelWeiboDetails", desc: "车型微博详情", - component: ModelWeiboDetails + component: resolve => require(["@/views/ModelWeiboDetails"], resolve), }, { path: '/modelTailDetails', name: "modelTailDetails", desc: "车型尾翼详情", - component: ModelTailDetails + component: resolve => require(["@/views/ModelTailDetails"], resolve), }, { path: '/keyMediaSeries', name: "keyMediaSeries", desc: "车型洞察-重点媒体", - component: KeyMediaSeries + component: resolve => require(["@/views/KeyMediaSeries"], resolve), }, { path: '/modelComparison', @@ -217,7 +192,7 @@ const router = [ name: "saleRank", desc: "销量排行", redirect: 'saleRank/main', - component: SaleRank, + component: resolve => require(["@/views/SaleRank"], resolve), children: [ { path: 'main', //汽车销量排行榜 @@ -396,25 +371,25 @@ const router = [ path: '/ThemeAnalize', name: "ThemeAnalize", desc: "主题分析", - component: ThemeAnalize + component: resolve => require(["@/views/ThemeAnalize"], resolve), }, { path: '/ThemeData', name: "ThemeData", desc: "主题数据", - component: ThemeData + component: resolve => require(["@/views/ThemeData"], resolve), }, { path: '/ThemeBoard', name: "ThemeBoard", desc: "数据看板", - component: ThemeBoard + component: resolve => require(["@/views/ThemeBoard"], resolve), }, { path: '/keyMediaTheme', name: "KeyMediaTheme", desc: "重点媒体-主题", - component: KeyMediaTheme + component: resolve => require(["@/views/KeyMediaTheme"], resolve), }, { path: '/ThemeComparison', diff --git a/src/store/getters.js b/src/store/getters.js index 2c08864..fcbc6cb 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -21,7 +21,9 @@ const getters = { }, getAccount(state) { //这里写解密算法 - state.account.sPwd = window.atob(state.account.sPwd); + if(state.account.sPwd) { + state.account.sPwd = window.atob(state.account.sPwd); + } return state.account }, getCommTime(state) { diff --git a/src/store/mutations.js b/src/store/mutations.js index e31b945..48ed246 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -27,7 +27,9 @@ const mutations = { }, setAccount: (state, log) => { state.account = log; - state.account.sPwd = window.btoa(state.account.sPwd); + if(state.account.sPwd) { + state.account.sPwd = window.btoa(state.account.sPwd); + } let str = JSON.stringify(log); localStorage.setItem('account', str); }, diff --git a/src/views/KeyMediaBrand/index.vue b/src/views/KeyMediaBrand/index.vue index c21867e..958cd8e 100644 --- a/src/views/KeyMediaBrand/index.vue +++ b/src/views/KeyMediaBrand/index.vue @@ -66,26 +66,28 @@ -
+
- - + + +
- - + + +
+
+
+ +
-
- - -
@@ -100,8 +102,8 @@
-
- +
+ diff --git a/src/views/KeyMediaBrand/spreadTOPmodels/index.vue b/src/views/KeyMediaBrand/spreadTOPmodels/index.vue index a406e90..68fb3dd 100644 --- a/src/views/KeyMediaBrand/spreadTOPmodels/index.vue +++ b/src/views/KeyMediaBrand/spreadTOPmodels/index.vue @@ -8,7 +8,7 @@ -->