From 84eba7db079dec7ecfb4119ba6773fdcbf7a13c7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 05 Dec 2022 15:42:23 +0800
Subject: [PATCH] 1
---
src/api/activity/index.js | 14 +++++++-------
src/api/police/index.js | 5 +++--
src/api/dept/index.js | 13 ++++++++++++-
src/router/axios.js | 10 +++++-----
src/api/panorama/index.js | 13 ++++++++++++-
src/styles/index.scss | 2 +-
6 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/src/api/activity/index.js b/src/api/activity/index.js
index f31de84..23d8048 100644
--- a/src/api/activity/index.js
+++ b/src/api/activity/index.js
@@ -6,7 +6,7 @@
* @param {*}
* @returns
*/
-export const getSecurityList = (params, requestBaseUrl = '') => {
+export const getSecurityList = (params, requestBaseUrl = 'outside') => {
return request({
url: `/security/security/all`,
method: 'get',
@@ -20,7 +20,7 @@
* @param {*} params
* @returns
*/
-export const getPoliceList = (params, requestBaseUrl = '') => {
+export const getPoliceList = (params, requestBaseUrl = 'outside') => {
return request({
url: `/policeman/policeman/all`,
method: 'get',
@@ -37,7 +37,7 @@
* @param {*} type 范围类型
* @returns
*/
-export const addCarAndRange = (carId, position, securityId, type, requestBaseUrl = '') => {
+export const addCarAndRange = (carId, position, securityId, type, requestBaseUrl = 'outside') => {
return request({
url: `/securityManageCar/securityManageCar/save`,
method: 'post',
@@ -59,7 +59,7 @@
* @param {*} type 范围类型
* @returns
*/
-export const addActivityPolice = (policemanId, position, securityId, type, requestBaseUrl = '') => {
+export const addActivityPolice = (policemanId, position, securityId, type, requestBaseUrl = 'outside') => {
return request({
url: `/securityManage/securityManage/save`,
method: 'post',
@@ -79,7 +79,7 @@
* @param {*} id 数据唯一标识
* @returns
*/
-export const updateActivityPolice = (id, policemanId, requestBaseUrl = '') => {
+export const updateActivityPolice = (id, policemanId, requestBaseUrl = 'outside') => {
return request({
url: `/securityManage/securityManage/update`,
method: 'post',
@@ -96,7 +96,7 @@
* @param {*} securityId 活动ID
* @returns
*/
-export const getSecurityPoliceList = (securityId, requestBaseUrl = '') => {
+export const getSecurityPoliceList = (securityId, requestBaseUrl = 'outside') => {
return request({
url: `/securityManage/securityManage/all`,
method: 'get',
@@ -113,7 +113,7 @@
* @param {*} securityId 活动ID
* @returns
*/
-export const getSecurityCarList = (securityId, requestBaseUrl = '') => {
+export const getSecurityCarList = (securityId, requestBaseUrl = 'outside') => {
return request({
url: `/securityManageCar/securityManageCar/all`,
method: 'get',
diff --git a/src/api/dept/index.js b/src/api/dept/index.js
index 86ba4d8..107e6e7 100644
--- a/src/api/dept/index.js
+++ b/src/api/dept/index.js
@@ -1,3 +1,13 @@
+/*
+ * @Author: shuishen 1109946754@qq.com
+ * @Date: 2022-11-30 15:18:29
+ * @LastEditors: shuishen 1109946754@qq.com
+ * @LastEditTime: 2022-12-05 15:23:32
+ * @FilePath: \srs-police-affairs\src\api\dept\index.js
+ * @Description:
+ *
+ * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved.
+ */
import request from "@/router/axios.js"
/**
@@ -5,9 +15,10 @@
* @param {*} params
* @returns
*/
-export const getPoliceStationList = () => {
+export const getPoliceStationList = (requestBaseUrl = 'outside') => {
return request({
url: '/blade-system/dept/getAllPoliceStation',
+ requestBaseUrl,
method: 'get',
})
}
diff --git a/src/api/panorama/index.js b/src/api/panorama/index.js
index 868a618..658663f 100644
--- a/src/api/panorama/index.js
+++ b/src/api/panorama/index.js
@@ -1,3 +1,13 @@
+/*
+ * @Author: shuishen 1109946754@qq.com
+ * @Date: 2022-11-30 15:18:29
+ * @LastEditors: shuishen 1109946754@qq.com
+ * @LastEditTime: 2022-12-05 15:23:15
+ * @FilePath: \srs-police-affairs\src\api\panorama\index.js
+ * @Description:
+ *
+ * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved.
+ */
import request from "@/router/axios.js"
/**
@@ -5,9 +15,10 @@
* @param {*} params
* @returns
*/
-export const getPanoramaList = () => {
+export const getPanoramaList = (requestBaseUrl = 'outside') => {
return request({
url: '/panorama/panorama/all',
+ requestBaseUrl,
method: 'get',
})
}
diff --git a/src/api/police/index.js b/src/api/police/index.js
index 8fc59a9..8e2f156 100644
--- a/src/api/police/index.js
+++ b/src/api/police/index.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-11-15 15:10:41
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-11-16 14:27:59
+ * @LastEditTime: 2022-12-05 15:22:33
* @FilePath: \srs-police-affairs\src\api\police\index.js
* @Description:
*
@@ -29,10 +29,11 @@
* @param {*} count 每页数量
* @returns
*/
-export const getCarList = (params = {},) => {
+export const getCarList = (params = {}, requestBaseUrl = 'outside') => {
return request({
url: '/policecar/policecar/all',
method: 'get',
+ requestBaseUrl,
params: {
...params,
}
diff --git a/src/router/axios.js b/src/router/axios.js
index 63b05d6..7d3f821 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-07-29 15:19:13
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-11-15 15:08:30
+ * @LastEditTime: 2022-12-05 15:10:21
* @FilePath: \srs-police-affairs\src\router\axios.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -24,8 +24,8 @@
const service = axios.create({
// baseURL: 'http://36.14.255.242:18080/api',
// baseURL: 'http://192.168.0.102:1888/api',
- // baseURL: 'http://192.168.0.105:8081/api',
- baseURL: 'http://192.168.0.106:1888/api',
+ baseURL: 'http://192.168.0.105:18080/api',
+ // baseURL: 'http://192.168.0.106:1888/api',
timeout: 600000 // request timeout
})
@@ -43,8 +43,8 @@
if (config.requestBaseUrl == 'outside') {
// config.baseURL = 'http://192.168.0.102:1888/api'
- // config.baseURL = 'http://192.168.0.105:8081/api'
- config.baseURL = 'http://192.168.0.106:1888/api'
+ config.baseURL = 'http://192.168.0.105:80/api'
+ // config.baseURL = 'http://192.168.0.106:1888/api'
}
// const token = auth.getToken()
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9c7e281..0500cd0 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -3,4 +3,4 @@
@import "./icon/index.scss";
@import "./tool/index.scss";
@import "./element-ui/element-ui.scss";
-@import "./media/index.scss";
\ No newline at end of file
+// @import "./media/index.scss";
\ No newline at end of file
--
Gitblit v1.9.3