diff --git a/src/components/map.vue b/src/components/map.vue index 4bd7d15..ae698e0 100644 --- a/src/components/map.vue +++ b/src/components/map.vue @@ -58,11 +58,11 @@ export default { this.$nextTick(() => { this.initMap(); }); - window.addEventListener('message',(e)=>{ - console.log(e,"e"); - // if(e.data) - this.onLoad = true; - },false) + // window.addEventListener('message',(e)=>{ + // console.log(e,"e"); + // // if(e.data) + // this.onLoad = true; + // },false) }, methods:{ initMap() { @@ -130,11 +130,6 @@ export default { this.map.removeLayer(this.mapLayers.mapLayer2) this.map.removeLayer(this.mapLayers.mapLayer3) } - robotLogin({username:"superAdmin",password:"sa@123456"}).then(res=>{ - if(res.code == 200) { - localStorage.setItem('robotToken',res.result.token) - } - }) // 点位信息 this.eventPoint(); // 重点区域 @@ -177,10 +172,9 @@ export default { this.markerInfo = element; }) }, + // 去处理 dispose(){ - if(this.onLoad) { - window.parent.postMessage('go-back','*') - } + window.parent.postMessage({ action: 'to-task-detail', id: this.markerInfo.id }, '*'); }, // 网格数据 wanggeMap() { diff --git a/src/main.js b/src/main.js index b3073aa..f55f217 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2024-01-12 19:27:38 * @LastEditors: JC9527 - * @LastEditTime: 2024-01-15 11:08:38 + * @LastEditTime: 2024-03-01 13:14:45 */ import Vue from 'vue' import App from './App.vue' @@ -12,6 +12,7 @@ import router from './router' import Element from 'element-ui' import "@/assets/style/index.scss" import 'element-ui/lib/theme-chalk/index.css'; +import './permission' import L from "leaflet"; import 'leaflet/dist/leaflet.css' // leaflet样式 L.Icon.Default.mergeOptions({ diff --git a/src/permission.js b/src/permission.js new file mode 100644 index 0000000..f070b54 --- /dev/null +++ b/src/permission.js @@ -0,0 +1,21 @@ +import router from './router' + +router.beforeEach((to, from, next) => { + console.log(to,"去往的路由"); + if (window.location.href.includes("token=")) { + var tokenReg = new RegExp(/[?&]token=([^&#]+)/) + var t = window.location.href.match(tokenReg); + const token = t && t[1]; + localStorage.setItem('robotToken',token); + next(); + } else { + next(); + } + // else { + // if (localStorage.getItem('robotToken')) { + // next() + // } else { + + // } + // } +}) diff --git a/vue.config.js b/vue.config.js index f8e2ef8..031850a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,7 +12,7 @@ const name = process.env.VUE_APP_TITLE || '事件上图' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 module.exports = { transpileDependencies: true, - publicPath: process.env.NODE_ENV === "production" ? "./" : "/demo/JiangNingEventMap", + publicPath: process.env.NODE_ENV === "production" ? "/demo/JiangNingEventMap" : "/", // publicPath: process.env.NODE_ENV === "production" ? "/demo/JiangNingUmaleWeb" : "/", // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist) outputDir: 'dist',