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/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 @@ -->