diff --git a/src/api/home.js b/src/api/home.js index 8f23405..3279aaa 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -11,7 +11,7 @@ export function getWeatherApi() { // 核心景区视频 export function getVideoListApi(data) { return request({ - url: '/api/video/list', + url: 'http://36.138.38.16:6180/fjtcc-api/api/video/list', method: 'get', params: data }) @@ -20,8 +20,25 @@ export function getVideoListApi(data) { // 刷新播放地址 export function postRefreshApi(data) { return request({ - url: '/api/video/refresh', + url: 'http://36.138.38.16:6180/fjtcc-api/api/video/refresh', method: 'POST', - data: data + data + }) +} + +// 景区 +export function getSpotListApi() { + return request({ + url: '/api/largeScreen/spot/list', + method: 'get' + }) +} + +// 百度地图拥堵 +export function getBaiduMapCrowdedApi(data) { + return request({ + url: '/api/largeScreen/spot/baiduMapCrowded', + method: 'get', + params: data }) } diff --git a/src/api/news.js b/src/api/news.js new file mode 100644 index 0000000..d1425e7 --- /dev/null +++ b/src/api/news.js @@ -0,0 +1,33 @@ +import request from './request' + +// 最新消息 +export function getNewsListApi() { + return request({ + url: '/api/largeScreen/news/list', + method: 'get' + }) +} + +// 异常点位告警排行 +export function getNewsPointRankApi() { + return request({ + url: '/api/largeScreen/news/pointRank', + method: 'get' + }) +} + +// 消息分类统计 +export function getNewsStateApi() { + return request({ + url: '/api/largeScreen/news/state', + method: 'get' + }) +} + +// 消息统计 +export function getNewsTotalApi() { + return request({ + url: '/api/largeScreen/news/total', + method: 'get' + }) +} diff --git a/src/api/request.js b/src/api/request.js index 4f96b6b..4c0b2ca 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -4,95 +4,11 @@ import { ElMessage } from 'element-plus' const router = useRouter() -const CODE_MESSAGE = { - 200: '服务器成功返回请求数据', - 201: '新建或修改数据成功', - 202: '一个请求已经进入后台排队(异步任务)', - 204: '删除数据成功', - 400: '发出信息有误', - 401: '用户没有权限(令牌失效、用户名、密码错误、登录过期)', - 402: '令牌过期', - 403: '用户得到授权，但是访问是被禁止的', - 404: '访问资源不存在', - 406: '请求格式不可得', - 410: '请求资源被永久删除，且不会被看到', - 500: '服务器发生错误', - 502: '网关错误', - 503: '服务不可用，服务器暂时过载或维护', - 504: '网关超时' -} - -/** - * axios响应拦截器 - * @param config 请求配置 - * @param data response数据 - * @param status HTTP status - * @param statusText HTTP status text - * @returns {Promise<*|*>} - */ -const handleData = async ({ data, status, statusText }) => { - // 若data.code存在，覆盖默认code - let code = data && data['code'] ? data['code'] : status - // 若code属于操作正常code，则status修改为200 - const codeVerificationArray = [200, 1, '200', '1'] - if (codeVerificationArray.indexOf(data['code']) + 1) code = 1 - switch (code) { - case 1: - // 业务层级错误处理，以下是假定restful有一套统一输出格式(指不管成功与否都有相应的数据格式)情况下进行处理 - // 例如响应内容： - // 错误内容：{ code: 0, msg: '非法参数' } - // 正确内容：{ code: 1, data: { }, msg: '操作正常' } - // return data - return data - case 401: - router - .push({ - path: '/', - replace: true - }) - .then(() => {}) - break - case 402: - router - .push({ - path: '/', - replace: true - }) - .then(() => {}) - break - case 403: - router - .push({ - path: '/' - }) - .then(() => {}) - break - } - // 异常处理 - // 若data.msg存在，覆盖默认提醒消息 - let errMsg = `${ - data && data['msg'] ? data['msg'] : CODE_MESSAGE[code] ? CODE_MESSAGE[code] : statusText - }` - if (code === 401) { - errMsg = '您的登录信息已过期,请重新登录...' - } else if (code == 500 && errMsg == '房间不存在') { - console.log('') //大屏直播页面没有直播时做了轮询,如果没有房间，会一直报异常，这里把异常弹窗去掉 - } else { - // 是否显示高亮错误(与errorHandler钩子触发逻辑一致) - // $baseMessage(errMsg, 'error', 'vab-hey-message-error', false) - ElMessage({ - message: errMsg, - type: 'error', - duration: 5 * 1000 - }) - } - return Promise.reject(data) -} - /** * @description axios初始化 */ const instance = axios.create({ + // baseURL: 'http://36.138.38.16:6180/fjtcc-api', baseURL: 'http://36.138.38.16:8001/fjtcc-api', timeout: 100000, headers: { @@ -102,13 +18,18 @@ const instance = axios.create({ } }) +const isHttpsOrHttp = (url) => { + return /^https?:\/\//i.test(url) +} + /** * @description axios请求拦截器 */ instance.interceptors.request.use( (config) => { - if (config.data && config.headers['Content-Type'] === 'application/json";charset=UTF-8') - config.data = config.data + if (isHttpsOrHttp(config.url)) { + config.baseURL = '' + } return config }, (error) => { @@ -116,21 +37,17 @@ instance.interceptors.request.use( } ) -/** - * @description axios响应拦截器 - */ instance.interceptors.response.use( - (response) => handleData(response), - (error) => { - const { response } = error - if (response === undefined) { - // Message({ - // message: '连接后台接口失败，可能由以下原因造成：后端不支持跨域CORS、接口地址不存在、请求超时等，请联系管理员排查后端接口问题', - // type: 'error', - // duration: 5 * 1000, - // }) - return {} - } else return handleData(response) + (res) => { + if (res.data.code == 200) { + return res.data + } else { + return Promise.reject(res.data) + } + }, + (err) => { + // 对响应错误做些什么 + return Promise.reject(err.response) } ) diff --git a/src/assets/images/dot-error.svg b/src/assets/images/dot-error.svg new file mode 100644 index 0000000..0d89c50 --- /dev/null +++ b/src/assets/images/dot-error.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/images/dian.svg b/src/assets/images/dot-primary.svg similarity index 100% rename from src/assets/images/dian.svg rename to src/assets/images/dot-primary.svg diff --git a/src/assets/images/dot-success.svg b/src/assets/images/dot-success.svg new file mode 100644 index 0000000..dbc320c --- /dev/null +++ b/src/assets/images/dot-success.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/images/dot-warning.svg b/src/assets/images/dot-warning.svg new file mode 100644 index 0000000..74b2312 --- /dev/null +++ b/src/assets/images/dot-warning.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/images/mask-error.png b/src/assets/images/mask-error.png index 52f5efd..2cde2e4 100644 Binary files a/src/assets/images/mask-error.png and b/src/assets/images/mask-error.png differ diff --git a/src/assets/images/mask-primary.png b/src/assets/images/mask-primary.png new file mode 100644 index 0000000..4c8cac9 Binary files /dev/null and b/src/assets/images/mask-primary.png differ diff --git a/src/assets/images/mask-success.png b/src/assets/images/mask-success.png index 369a485..ba35917 100644 Binary files a/src/assets/images/mask-success.png and b/src/assets/images/mask-success.png differ diff --git a/src/assets/images/mask-warning.png b/src/assets/images/mask-warning.png new file mode 100644 index 0000000..064a5fd Binary files /dev/null and b/src/assets/images/mask-warning.png differ diff --git a/src/views/scenic/components/progress-1.vue b/src/components/CircleProgress/index.vue similarity index 100% rename from src/views/scenic/components/progress-1.vue rename to src/components/CircleProgress/index.vue diff --git a/src/components/CoreVideo/index.vue b/src/components/CoreVideo/index.vue index 99de71b..40456cd 100644 --- a/src/components/CoreVideo/index.vue +++ b/src/components/CoreVideo/index.vue @@ -11,12 +11,11 @@ >

- 三峡之巅-最新异常名称三峡之巅-最新异常名称三峡之巅-最新异常名称 + {{ item.cameraName }}

-