Commit edfd140a authored by ninglx's avatar ninglx

初始化带参数地址进入系统时读取中心点&层级 供首次定位展示使用

parent 61167a82
...@@ -18,13 +18,21 @@ export default { ...@@ -18,13 +18,21 @@ export default {
methods: { methods: {
initMap(option) { initMap(option) {
// mapboxgl.accessToken = 'pk.eyJ1IjoibmluZ2x4IiwiYSI6ImNsYnlnM2s2ODBnNmIzcHBpbzY5aDh3bHAifQ.hQL4zLjBss5i4x-zuFp9tg' // mapboxgl.accessToken = 'pk.eyJ1IjoibmluZ2x4IiwiYSI6ImNsYnlnM2s2ODBnNmIzcHBpbzY5aDh3bHAifQ.hQL4zLjBss5i4x-zuFp9tg'
let center = map_config.MAP_CENTER
let zoom = map_config.MAP_ZOOM
if(this.$store.state.mapInit.center){
center = this.$store.state.mapInit.center
}
if(this.$store.state.mapInit.zoom){
zoom = this.$store.state.mapInit.zoom
}
let options = Object.assign( let options = Object.assign(
{}, {},
{ {
container: this.mapId, container: this.mapId,
style: map_config.MAP_STYLE, style: map_config.MAP_STYLE,
center: map_config.MAP_CENTER, center: center,
zoom: map_config.MAP_ZOOM, zoom: zoom,
maxZoom: map_config.MAX_ZOOM, maxZoom: map_config.MAX_ZOOM,
pitch: map_config.MAP_PITCH, pitch: map_config.MAP_PITCH,
}, },
......
...@@ -44,24 +44,40 @@ router.beforeEach((to, from, next) => { ...@@ -44,24 +44,40 @@ router.beforeEach((to, from, next) => {
return; return;
} }
const parentId = map_config.SYS_ID; const parentId = map_config.SYS_ID;
//针对济南特殊处理:根据url中得tokenId,进行base32加密用户名和密码,然后请求登录接口获取token //针对济南特殊处理:根据url中得tokenId,进行base32加密用户名和密码,然后请求登录接口获取token
const urls = location.href; const urls = location.href;
var tokenId=""; let tokenId = "";
if (urls.indexOf("?") != -1) { if (urls.indexOf("?") != -1) {
const arr = urls.split("?"); // const arr = urls.split("?");
const search = arr[arr.length - 1]; // const search = arr[arr.length - 1];
const params = search.split("&"); // const params = search.split("&");
params.forEach(val => { // params.forEach(val => {
const temp = val.split("="); // const temp = val.split("=");
if(temp[0]=="tokenId" && temp[1]!=null){ // if(temp[0]=="tokenId" && temp[1]!=null){
tokenId=temp[1]; // tokenId=temp[1];
// }
// });
let arr = urls.split('?')
let paramsArr = arr[1].split('&')
let resObj = paramsArr.reduce((a, b) => {
let [key, value] = b.split('=')
a[key] = value
return a
}, {})
tokenId = resObj.tokenId
// 读取params的 center&zoom 并存储store
if (resObj.lon && resObj.lat) {
store.commit('setCenter', [Number(resObj.lon), Number(resObj.lat)])
} }
}); if (resObj.zoom) {
store.commit('setZoom', Number(resObj.zoom))
} }
if(tokenId){ }
var base32 = require('base32'); if (tokenId) {
let base32 = require('base32');
//alert('basetokenId:'+base32.encode("haixin;haixin123").toUpperCase()); //alert('basetokenId:'+base32.encode("haixin;haixin123").toUpperCase());
var tokenStr=base32.decode(tokenId.toLowerCase()); let tokenStr = base32.decode(tokenId.toLowerCase());
// alert("tokenId..."+tokenStr); // alert("tokenId..."+tokenStr);
SsoDao.login({ SsoDao.login({
data: { data: {
...@@ -83,7 +99,7 @@ router.beforeEach((to, from, next) => { ...@@ -83,7 +99,7 @@ router.beforeEach((to, from, next) => {
} }
} }
}); });
}else{ } else {
if (res.data.code == "10401") { if (res.data.code == "10401") {
this.$refs.user_authorization.getPage(res.data); this.$refs.user_authorization.getPage(res.data);
} else { } else {
...@@ -91,7 +107,7 @@ router.beforeEach((to, from, next) => { ...@@ -91,7 +107,7 @@ router.beforeEach((to, from, next) => {
} }
} }
}); });
}else{ } else {
AuthDao.queryMenu({ AuthDao.queryMenu({
params: { params: {
parentId, parentId,
...@@ -107,10 +123,8 @@ router.beforeEach((to, from, next) => { ...@@ -107,10 +123,8 @@ router.beforeEach((to, from, next) => {
}); });
} }
}); });
router.afterEach((to, from) =>{ router.afterEach((to, from) => {
store.commit("setPathActive", to.fullPath); store.commit("setPathActive", to.fullPath);
}) })
export default router; export default router;
...@@ -4,6 +4,7 @@ import app from "./modules/app"; ...@@ -4,6 +4,7 @@ import app from "./modules/app";
import dataset from "./modules/dataset"; import dataset from "./modules/dataset";
import menudata from "./modules/menudata"; import menudata from "./modules/menudata";
import dicts from './modules/dict' import dicts from './modules/dict'
import mapInit from './modules/mapInit';
Vue.use(Vuex); Vue.use(Vuex);
...@@ -13,7 +14,8 @@ const store = new Vuex.Store({ ...@@ -13,7 +14,8 @@ const store = new Vuex.Store({
app, app,
dataset, dataset,
menudata, menudata,
dicts dicts,
mapInit
}, },
getters: { getters: {
menu: state => state.app.menu, menu: state => state.app.menu,
......
const mapInit = {
state: {
center: null,
zoom: null,
},
mutations: {
setCenter(state, center) {
state.center = center;
},
setZoom(state, zoom) {
state.zoom = zoom;
},
}
};
export default mapInit;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment