diff --git a/packages/grid/AppHomesteadManagement/components/Add.vue b/packages/grid/AppHomesteadManagement/components/Add.vue index 6827200f..4f9d6d04 100644 --- a/packages/grid/AppHomesteadManagement/components/Add.vue +++ b/packages/grid/AppHomesteadManagement/components/Add.vue @@ -32,7 +32,7 @@ - + @@ -203,7 +203,7 @@ export default { } }, computed: { - ...mapState(['user']), + ...mapState(['user','sys']), isEdit() { return !!this.params.id diff --git a/ui/lib/js/modules.js b/ui/lib/js/modules.js index 8c854ddf..874c5fe1 100644 --- a/ui/lib/js/modules.js +++ b/ui/lib/js/modules.js @@ -5,7 +5,10 @@ import Vue from "vue" export const sys = { state: () => ({ info: {}, - theme: {} + theme: {}, + location: {}, + areaId: "", + areaName: "" }), mutations: { setSysInfo(state, info) { @@ -13,17 +16,26 @@ export const sys = { }, setTheme(state, theme) { state.theme = theme + }, + setLocation(state, location) { + state.location = location + }, + setArea(state, area) { + state.areaId = area.areaId + state.areaName = area.areaName } }, actions: { getSystem({commit}, info) { return http.post("/app/appdvcpconfig/getSystemInfo", null, {withoutToken: true}).then(res => { if (res?.data) { - let {systemInfo, colorScheme, enableGreyFilter} = res.data + let {systemInfo, colorScheme, enableGreyFilter, location, areaId, areaName} = res.data systemInfo = JSON.parse(systemInfo || null) || {} colorScheme = JSON.parse(colorScheme || null) || {} commit("setSysInfo", {...info, ...systemInfo}) commit("setTheme", {colorScheme, enableGreyFilter}) + commit("setLocation", location) + commit("setArea", {areaId, areaName}) return res.data } else return Promise.reject() }).catch(() => commit("setSysInfo", info)) @@ -53,7 +65,7 @@ export const user = { setUserExtra(state, extra = {}) { Object.keys(extra).map(e => Vue.set(state, e, extra[e])) }, - setRoutes(state,routes){ + setRoutes(state, routes) { state.routes = routes } },