diff --git a/package-lock.json b/package-lock.json index a74277c..6f61ddc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9579,12 +9579,6 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "dev": true }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, "query-string": { "version": "4.3.4", "resolved": "https://registry.npm.taobao.org/query-string/download/query-string-4.3.4.tgz", @@ -9988,6 +9982,14 @@ "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "qs": { + "version": "6.5.3", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "dev": true + } } }, "request-promise-core": { diff --git a/package.json b/package.json index 1eefb88..babebfc 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "vueDatav", + "name": "parkBigScreen2", "version": "0.1.0", "private": true, - "author": "JackChen <278910933@qq.com>", + "author": "weirui", "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", diff --git a/src/api/form.js b/src/api/form.js new file mode 100644 index 0000000..b40f7a2 --- /dev/null +++ b/src/api/form.js @@ -0,0 +1,49 @@ +import request from '@/api/request' + +/** + * 大数据api接口 + */ +export const BiApi = { + // 车场排行 + getParkingRanking: (query) => { + return request({ + url: '/pk/openup/OpenStatisticsController/parkingRanking', + method: 'get', + params: query + }) + }, + + // 广告位-id查询 + getInfo: (id) => { + return request({ + url: '/pk/ad/PkAdPosition/getInfo/' + id, + method: 'get' + }) + }, + + // 新增广告位 + addInfo: (data) => { + return request({ + url: '/pk/ad/PkAdPosition/add', + method: 'post', + data: data + }) + }, + + // 编辑广告位 + updateInfo: (data) => { + return request({ + url: '/pk/ad/PkAdPosition/edit', + method: 'put', + data: data + }) + }, + + // 删除广告位 + delInfo: (id) => { + return request({ + url: '/pk/ad/PkAdPosition/remove/' + id, + method: 'delete' + }) + } +} diff --git a/src/api/request.js b/src/api/request.js new file mode 100644 index 0000000..7020192 --- /dev/null +++ b/src/api/request.js @@ -0,0 +1,78 @@ + + +import axios from 'axios' + +axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' + +// 创建axios实例 +const service = axios.create({ + // axios中请求配置有baseURL选项,表示请求URL公共部分 + baseURL: 'http://192.168.31.128:8866', + // 超时 + timeout: 30000 +}) +// request拦截器 +service.interceptors.request.use(config => { + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?'; + for (const propName of Object.keys(config.params)) { + const value = config.params[propName]; + var part = encodeURIComponent(propName) + "="; + if (value !== null && typeof (value) !== "undefined") { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + let params = propName + '[' + key + ']'; + var subPart = encodeURIComponent(params) + "="; + url += subPart + encodeURIComponent(value[key]) + "&"; + } + } else { + url += part + encodeURIComponent(value) + "&"; + } + } + } + url = url.slice(0, -1); + config.params = {}; + config.url = url; + } + return config +}, error => { + console.log(error) + Promise.reject(error) +}) + +// 响应拦截器 +service.interceptors.response.use(res => { + // console.log(res); + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = res.data.msg + if (code === 401) { + console.log(msg); + } else if (code === 500) { + console.log(msg); + } else if (code !== 200) { + console.log(msg); + } else { + return res.data + } +}, + error => { + console.log('err' + error) + let { message } = error; + if (message == "Network Error") { + message = "后端接口连接异常"; + } + else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } + else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; + } + alert(message) + return Promise.reject(error) + } +) + +export default service diff --git a/src/views/Brand.vue b/src/views/Brand.vue index a3cadf4..e5b8765 100644 --- a/src/views/Brand.vue +++ b/src/views/Brand.vue @@ -163,9 +163,11 @@