suzhou-jichuang-lanhai
/
JiangNingEventMap
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改事件点位接口、接口去除token

Browse Source
Lvtianfang
吕天方 3 days ago
parent d296841e13
commit c7aed03563
7 changed files with 59 additions and 37 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape View File

@ -10,6 +10,6 @@ VUE_APP_BASE_API = 'https://bjh.jndz.cn/bjh-admin-server'
# VUE_APP_BASE_API = 'http://192.168.0.106:9037'
# 看点测试环境
VUE_APP_BASE_API1 = 'https://bjh.jndz.cn/process-server/api'
VUE_APP_BASE_API1 = 'https://bjh.jndz.cn/process-server'
# 看点test环境
# VUE_APP_BASE_API2 = 'https://bjh.jndz.cn/admin-server/api/webapp'
VUE_APP_BASE_API2 = 'https://bjh.jndz.cn/admin-server/api/webapp'

2
.env.production
Unescape View File

@ -9,4 +9,4 @@ VUE_APP_BASE_API = 'https://bjh.jndz.cn/bjh-admin-server'
VUE_APP_BASE_API1 = 'https://bjh.jndz.cn/process-server/api'
# test环境
# VUE_APP_BASE_API2 = 'https://bjh.jndz.cn/admin-server/api/webapp'
VUE_APP_BASE_API2 = 'https://bjh.jndz.cn/admin-server/api/webapp'

21
src/api/root/index.js
Unescape View File

@ -1,4 +1,4 @@
import request from "@/utils/request"
import request from "@/utils/request1"
// 模拟登录
export function robotLogin(data){
@ -9,11 +9,22 @@ export function robotLogin(data){
})
}
// 获取事件列表
export function ViewListPage(params){
export function ViewListPage(params,data){
return request({
// url: "/eform/engine/viewEngine/queryViewListPage",
url: "/jn/queryViewListPage",
method:'get',
url: "/api/eform/engine/viewEngine/queryViewListPage",
// url: "/jn/queryViewListPage",
method:'post',
params,
data,
})
}
// 今日巡查事件
export function listpatrol(params) {
return request({
baseURL: process.env.VUE_APP_BASE_API2,
url: "/event/summary/listpatrol",
method:'get',
params
})
}

52
src/components/map.vue
Unescape View File

@ -11,7 +11,13 @@
</template>
<div>
<el-descriptions :border="false" :column="1" size="mini">
<el-descriptions-item label="事件编号">{{ markerInfo.rand_number }}</el-descriptions-item>
<!-- <el-descriptions-item label="事件编号">{{ markerInfo.rand_number }}</el-descriptions-item>
<el-descriptions-item label="事件标题">{{ markerInfo.name }}</el-descriptions-item>
<el-descriptions-item label="事件类型">{{ markerInfo.type }}</el-descriptions-item>
<el-descriptions-item label="事件地址">{{ markerInfo.address }}</el-descriptions-item>
<el-descriptions-item label="发生时间">{{ markerInfo.open_time }}</el-descriptions-item>
<el-descriptions-item label="所属网格">{{ markerInfo.mesh_occurs }}</el-descriptions-item> -->
<el-descriptions-item label="事件编号">{{ markerInfo.id }}</el-descriptions-item>
<el-descriptions-item label="事件标题">{{ markerInfo.name }}</el-descriptions-item>
<el-descriptions-item label="事件类型">{{ markerInfo.type }}</el-descriptions-item>
<el-descriptions-item label="事件地址">{{ markerInfo.address }}</el-descriptions-item>
@ -33,7 +39,8 @@ import L from "leaflet"
import "@/utils/lib/leaflet.ChineseTmsProviders.js";
// 重点路段 重点区域 网格 图标获取 手机号和人员名称查询 部门查询 部门id查询 imei查询用户信息
import { listZdld, listZdqy, levelQywg, getFenceList } from "@/api/basicsSet";
import { robotLogin, ViewListPage } from "@/api/root";
import { robotLogin, ViewListPage, listpatrol } from "@/api/root";
import axios from 'axios'
export default {
name: 'HelloWorld',
data(){
@ -144,26 +151,29 @@ export default {
// 渲染事件点位
eventPoint(){
let iconUrl1 = require("@/assets/images/icon2.png");
let data = {'queryValue' : [], "myInstanceClassify" : "all", "parameterValue":[], fks: []}
// ViewListPage({viewCode:'event-all-list', pageNo: 1, pageSize:500}, data).then(res=>{
ViewListPage({ pageNo: 1, pageSize:500, token: localStorage.getItem('robotToken')}).then(res=>{
// let data = {'queryValue' : [], 'myInstanceClassify' : 'all', 'parameterValue':[], 'fks': []}
// ViewListPage({viewCode:'event-all-list', pageNo: 1, pageSize:500},data).then(res=>{
listpatrol({current:1,size:1000}).then(res=>{
// ViewListPage({ pageNo: 1, pageSize:500, token: localStorage.getItem('robotToken')}).then(res=>{
// console.log(res,"res");
let messg = JSON.parse(res.msg);
if(messg.code == 200) {
messg.result.records.forEach((element)=>{
let location = element.location?.split(',');
if(location) {
// console.log(location[0],location[1]);
let marker = L.marker({ lng: location[0], lat: location[1] },
{
icon: L.icon({
iconUrl: iconUrl1,
iconSize: [40,45],
iconAnchor:[20,45]
})
}
).addTo(this.map)
this.markerClick(marker, element);
// let messg = JSON.parse(res.msg);
if(res.code == 200) {
res.data.records.forEach((element)=>{
if(element.location) {
let location = element.location.split(',');
if(location) {
// console.log(location[0],location[1]);
let marker = L.marker({ lng: location[0], lat: location[1] },
{
icon: L.icon({
iconUrl: iconUrl1,
iconSize: [40,45],
iconAnchor:[20,45]
})
}
).addTo(this.map)
this.markerClick(marker, element);
}
}
})
}

2
src/permission.js
Unescape View File

@ -9,7 +9,7 @@ router.beforeEach((to, from, next) => {
var tokenReg = new RegExp(/[?&]token=([^&#]+)/)
var t = window.location.href.match(tokenReg);
const token = t && t[1];
localStorage.setItem('robotToken',token);
// localStorage.setItem('robotToken',token);
// robotLogin({username:"superAdmin",password:"sa@123456"}).then(res=>{
// setRobot(res.result.token)
// })

8
src/utils/request.js
Unescape View File

@ -26,10 +26,10 @@ service.interceptors.request.use(config => {
const isToken = (config.headers || {}).isToken === false
// 是否需要防止数据重复提交
const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
config.headers['X-Access-Token'] = getAccess() // 让每个请求携带自定义token 请根据实际情况自行修改
}
// if (getToken() && !isToken) {
// config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
// config.headers['X-Access-Token'] = getAccess() // 让每个请求携带自定义token 请根据实际情况自行修改
// }
// get请求映射params参数
if (config.method === 'get' && config.params) {
let url = config.url + '?' + tansParams(config.params);

7
src/utils/request1.js
Unescape View File

@ -26,9 +26,10 @@ service.interceptors.request.use(config => {
const isToken = (config.headers || {}).isToken === false
// 是否需要防止数据重复提交
const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
if (localStorage.getItem('robotToken') && !isToken) {
config.headers['X-Access-Token'] = localStorage.getItem('robotToken') // 让每个请求携带自定义token 请根据实际情况自行修改
}
// if (localStorage.getItem('robotToken') && !isToken) {
// config.headers['X-Access-Token'] = localStorage.getItem('robotToken') // 让每个请求携带自定义token 请根据实际情况自行修改
// }
// config.headers['X-Access-Token'] = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MjUxMTkxMzYsInVzZXJuYW1lIjoiMTg5MTQ0OTIwODkifQ.1ouv5Y9ZM_kMakBVKKzRmhBrqE0dXxBUSuJU6upkVIo" // 让每个请求携带自定义token 请根据实际情况自行修改
// if (getRobot() && !isToken) {
// config.headers['X-Access-Token'] = getRobot() // 让每个请求携带自定义token 请根据实际情况自行修改
// }

Write Preview
Loading…
Cancel
Save