diff --git a/src/api/api.js b/src/api/api.js index fee723c..7c80ba5 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -26,8 +26,8 @@ export const dayAddressDY = p => post(baseDY+'urban/intelligence/orderPark/query export const weekAddress = p => post(baseWX+'urban/intelligence/orderPark/queryOrderParkNumForLastWeek',p) export const weekAddressDY = p => post(baseDY+'urban/intelligence/orderPark/queryOrderParkNumForLastWeek',p) //....停车场总数 -export const parkAddress = p => post(baseWX+'urban/intelligence/park/queryParkNumStatisticByOrgIds',p) -export const parkAddressDY = p => post(baseDY+'urban/intelligence/park/queryParkNumStatisticByOrgIds',p) +export const parkAddress = p => post(baseWX+'urban/intelligence/park/queryParkNumInfoStatisticByOrgIds',p) +export const parkAddressDY = p => post(baseDY+'urban/intelligence/park/queryParkNumInfoStatisticByOrgIds',p) //....地图 export const baiduMapAddress = p => post(baseWX+'urban/intelligence/berth/queryBerthStatisticForOrgId',p) export const baiduMapAddressDY = p => post(baseDY+'urban/intelligence/berth/queryBerthStatisticForOrgId',p) diff --git a/src/api/httpRequest.js b/src/api/httpRequest.js index 3715829..28ebbde 100644 --- a/src/api/httpRequest.js +++ b/src/api/httpRequest.js @@ -7,6 +7,7 @@ const CancelToken = axios.CancelToken; axios.interceptors.request.use(config => { //发起请求时,取消掉当前正在进行的相同请求 config.headers['x-auth-token'] = '18de1300-c3f2-4365-9f51-62f77614f8c5' + // config.headers['x-auth-token'] = 'fbea6e17-db8a-462a-8816-49a31c20307a' config.data = { ...config.data, sysCode: '1001' diff --git a/src/components/chinaMap/index.vue b/src/components/chinaMap/index.vue index ba16f45..cf1fab7 100644 --- a/src/components/chinaMap/index.vue +++ b/src/components/chinaMap/index.vue @@ -88,7 +88,7 @@ let DYdata = acctDY.data.data console.log(WXdata) console.log(DYdata) - this.parkParams.endVal=WXdata+DYdata + this.parkParams.endVal=WXdata.allNum+DYdata.allNum })) }, @@ -130,28 +130,28 @@ })) - - baiduMapAddress({ - orgIds: this.GLOBAL.paramsvariables - }).then((response)=>{ - let data = response.data.data - console.log(data) - //let mapData = []; - for (let i=0;i{ - console.log(response); - }) + // + // baiduMapAddress({ + // orgIds: this.GLOBAL.paramsvariables + // }).then((response)=>{ + // let data = response.data.data + // console.log(data) + // //let mapData = []; + // for (let i=0;i{ + // console.log(response); + // }) }, @@ -215,6 +215,9 @@ series: series } mapChart.setOption(option); + mapChart.on('click',function (params) { + console.log(params.name) + }) return mapChart; }, //设置 series