From 4d8a0b2922f9c9b52bbb209c1055bad2d2f67dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=B3=A5=E5=82=B2?= <13203204+he-zhengao@user.noreply.gitee.com> Date: Thu, 7 Dec 2023 15:22:11 +0800 Subject: [PATCH] 2323/12/07/15.21 --- src/api/coastalMap/resource/index.js | 25 ++ src/utils/request.js | 43 ++-- src/views/coastalMap/components/keyPerson.vue | 201 +++++----------- .../coastalMap/components/policeSpread.vue | 7 +- .../coastalMap/components/policeStatus.vue | 227 +++++++++--------- src/views/coastalMap/components/resource.vue | 14 +- 6 files changed, 220 insertions(+), 297 deletions(-) diff --git a/src/api/coastalMap/resource/index.js b/src/api/coastalMap/resource/index.js index 8aa35a2..b5bf7e6 100644 --- a/src/api/coastalMap/resource/index.js +++ b/src/api/coastalMap/resource/index.js @@ -27,6 +27,15 @@ export const keyPersonnelAPI = (data) => { }) } +//*重点人员信息(轮播) +export const MetaImpUserInfo = (data) => { + return request({ + url: '/base/metaImpUserInfo', + method: 'get', + data + }) +} + // * 警力分布 export const PoliceForceDistributionAPI = (data) => { return request({ @@ -36,6 +45,22 @@ export const PoliceForceDistributionAPI = (data) => { }) } +// * 警情统计 +export const PoliceStatisticsAPI = (data) => { + return request({ + url: '/base/bigscreen/policeSituationStatistics', + method: 'post', + data + }) +} +// * 警情信息表 +export const MetaAlarmInfo = (data) => { + return request({ + url: '/base/metaAlarmInfo', + method: 'get', + data + }) +} // * 涉海要素 export const seaRelatedElementsAPI = (data) => { return request({ diff --git a/src/utils/request.js b/src/utils/request.js index 9857ea5..39e0f7f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,32 +1,36 @@ import axios from 'axios' -import vm from "../main"; +import vm from '../main' import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ baseURL: 'http://50.146.63.43:1129/hjapi', //baseURL: 'http://121.41.91.94:12002/hjapi', //baseURL: `http://${window.location.host}/hjapi`, + // baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 timeout: 50000, - headers: { 'content-type': 'application/json' }, + headers: { 'content-type': 'application/json' } }) // request拦截器 -request.interceptors.request.use(config => { - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - // 是否需要防止数据重复提交 - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 +request.interceptors.request.use( + (config) => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + //防止重复提交 + return config + }, + (error) => { + console.log(error) + Promise.reject(error) } - //防止重复提交 - return config -}, error => { - console.log(error) - Promise.reject(error) -}) +) // response 拦截器 // 可以在接口响应后统一处理结果 request.interceptors.response.use( - response => { + (response) => { if (response.data) { switch (response.data.code) { case 200: @@ -36,7 +40,9 @@ request.interceptors.response.use( } // 兼容服务端返回的字符串数据 if (typeof response.data === 'string') { - response.data = response.data ? JSON.parse(response.data) : response.data + response.data = response.data + ? JSON.parse(response.data) + : response.data } return response.data @@ -66,17 +72,14 @@ request.interceptors.response.use( duration: 3 }) return response.data - } } - }, - error => { + (error) => { console.log('err' + error) // for debug return Promise.reject(error) } - ) export default request diff --git a/src/views/coastalMap/components/keyPerson.vue b/src/views/coastalMap/components/keyPerson.vue index e5639b5..263361e 100644 --- a/src/views/coastalMap/components/keyPerson.vue +++ b/src/views/coastalMap/components/keyPerson.vue @@ -14,7 +14,7 @@
重点人员
-
654332
+
{{ importpeople.keyPersonnelCount }}
@@ -26,8 +26,8 @@
-
涉恐人员
-
34%
+
涉稳人员
+
{{ importpeople.swrybl }}
@@ -35,8 +35,8 @@
-
涉毒人员
-
20%
+
涉军访人员
+
{{ importpeople.sjfrybl }}
@@ -44,8 +44,8 @@
-
精神病人
-
4%
+
治安管控人员
+
{{ importpeople.zagkrybl }}
@@ -53,8 +53,8 @@
-
在逃人员
-
17%
+
内保重点人员
+
{{ importpeople.nbzdrybl }}
@@ -62,37 +62,30 @@
-
涉稳人员
-
4%
+
其他利益群体
+
{{ importpeople.qtlyqt }}