diff --git a/src/api/api.js b/src/api/api.js new file mode 100644 index 0000000..7b3a95b --- /dev/null +++ b/src/api/api.js @@ -0,0 +1,10 @@ +import { get, post} from './httpRequest' + +//....用户数 +export const memberAddress = p => post('urban/intelligence/appuser/queryUserPersonStatistic',p) + +//....收费员 +export const tollmanAddress = p => post('urban/intelligence/employee/queryEmployeeStaByOrgIds',p) + +//....设备 +export const deviceAddress = p => post('urban/intelligence/device/queryDeviceStatistic',p) diff --git a/src/api/httpRequest.js b/src/api/httpRequest.js index 94961a4..0648918 100644 --- a/src/api/httpRequest.js +++ b/src/api/httpRequest.js @@ -1,23 +1,12 @@ //引入axios import axios from 'axios' //import qs from 'qs' -let cancel ,promiseArr = {} +let cancel const CancelToken = axios.CancelToken; //请求拦截器 // 在发送请求之前做些什么 axios.interceptors.request.use(config => { //发起请求时,取消掉当前正在进行的相同请求 config.headers['x-auth-token'] = '18de1300-c3f2-4365-9f51-62f77614f8c5' - // if(config.method === 'post') { - // let data = qs.parse(config.data) - // - // config.data = qs.stringify({ - // sysCode: '1001' - // }) - // } else if(config.method === 'get') { - // config.params = { - // sysCode: '1001' - // } - // } config.data = { ...config.data, sysCode: '1001' @@ -91,35 +80,22 @@ axios.defaults.baseURL = 'http://bcp.service.renniting.cn/'; // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'; axios.defaults.timeout = 10000 -export default { - //get请求 - get (url,param) { - return new Promise((resolve,reject) => { - axios({ - method: 'get', - url, - params: param, - cancelToken: new CancelToken(c => { - cancel = c - }) - }).then(res => { - resolve(res) - }) - }) - }, - //post请求 - post (url,param) { - return new Promise((resolve,reject) => { - axios({ - method: 'post', - url, - data: param, - cancelToken: new CancelToken(c => { - cancel = c - }) - }).then(res => { - resolve(res) + +function post(url, params) { + return new Promise((resolve,reject) => { + axios({ + method: 'post', + url, + data: params, + cancelToken: new CancelToken(c => { + cancel = c }) + }).then(res => { + resolve(res) }) - } + }) } + + +export {post} + diff --git a/src/components/device/index.vue b/src/components/device/index.vue index ea8d495..5e2be8a 100644 --- a/src/components/device/index.vue +++ b/src/components/device/index.vue @@ -79,41 +79,41 @@ diff --git a/src/components/memberNum/index.vue b/src/components/memberNum/index.vue index 1ba557b..ff89548 100644 --- a/src/components/memberNum/index.vue +++ b/src/components/memberNum/index.vue @@ -24,38 +24,41 @@