Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx into mw

src/App.vue

@@ -316,9 +316,6 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
 // 导入header.vue文件
 import Menu from "@/views/layout/Menu.vue";
 import Header from "@/views/layout/Header.vue";
-
-import { mapMutations } from "vuex";
-
 import LoginPage from "./views/layout/login-page.vue";
 import sisView from "./views/sisView/index.vue";
 

src/store/index.js

@@ -23,6 +23,9 @@ const mutations = {
   },
   update(state, newData) {
     state.windturbineMap = newData.data
+  },
+  changeMenuData(state, newData) {
+    state.menuData = newData;
   }
 };
 
@@ -46,7 +49,8 @@ const getters = {
   themeName: state => state.themeName,
   asidez: state => state.z,
   mainy: state => state.y,
-  login: state => state.login
+  login: state => state.login,
+  menuData: state => state.menuData
 }
 
 export default createStore({