From 8b2fc551d8bee2d2143a36e1e2fcd7e81d051b18 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Sun, 15 Jan 2023 15:21:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/api/activity/index.js | 39 ++++++++++++++++++++-------------------
src/views/activity/index.vue | 20 ++++++++++++++++----
2 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/src/api/activity/index.js b/src/api/activity/index.js
index 4a74fc3..551a0a1 100644
--- a/src/api/activity/index.js
+++ b/src/api/activity/index.js
@@ -3,10 +3,10 @@
/**
* 获取活动列表
- * @param {*}
- * @returns
+ * @param {*}
+ * @returns
*/
-export const getSecurityList = (current, size, type, name, startTime, endTime) => {
+export const getSecurityList = (current, size, type, name, startTime, endTime,deptId) => {
return request({
url: `/api/security/security/page`,
method: 'get',
@@ -17,14 +17,15 @@
name,
startTime,
endTime,
+ deptId
}
})
}
/**
* 获取警车列表
- * @param {*} params
- * @returns
+ * @param {*} params
+ * @returns
*/
export const getCarList = (params) => {
return request({
@@ -36,8 +37,8 @@
/**
* 获取警员列表
- * @param {*} params
- * @returns
+ * @param {*} params
+ * @returns
*/
export const getPoliceList = (params) => {
return request({
@@ -53,7 +54,7 @@
* @param {*} position 坐标
* @param {*} securityId 活动ID
* @param {*} type 范围类型
- * @returns
+ * @returns
*/
export const addCarAndRange = (carId, position, securityId, type) => {
return request({
@@ -72,7 +73,7 @@
* 活动修改警车
* @param {*} carId 警员ID
* @param {*} id 数据唯一标识
- * @returns
+ * @returns
*/
export const updateActivityCar = (id, carId) => {
return request({
@@ -91,7 +92,7 @@
* @param {*} position 坐标
* @param {*} securityId 活动ID
* @param {*} type 范围类型
- * @returns
+ * @returns
*/
export const addActivityPolice = (policemanId, position, securityId, type) => {
return request({
@@ -110,7 +111,7 @@
* 活动修改警员
* @param {*} policemanId 警员ID
* @param {*} id 数据唯一标识
- * @returns
+ * @returns
*/
export const updateActivityPolice = (id, policemanId) => {
return request({
@@ -126,7 +127,7 @@
/**
* 获取活动人员分布信息
* @param {*} securityId 活动ID
- * @returns
+ * @returns
*/
export const getSecurityPoliceList = (securityId) => {
return request({
@@ -142,7 +143,7 @@
/**
* 获取活动警车分布信息
* @param {*} securityId 活动ID
- * @returns
+ * @returns
*/
export const getSecurityCarList = (securityId) => {
return request({
@@ -156,7 +157,7 @@
/**
* 获取业务字典
- * @returns
+ * @returns
*/
export const getServiceDictionary = () => {
return request({
@@ -167,7 +168,7 @@
/**
* 获取活动类型
- * @returns
+ * @returns
*/
export const getActivityType = (parentId) => {
return request({
@@ -181,7 +182,7 @@
* @param {*} securityId 活动ID
* @param {*} position 坐标
* @param {*} type 箭头类型
- * @returns
+ * @returns
*/
export const addSecurityPlot = (securityId, position, type) => {
return request({
@@ -198,7 +199,7 @@
/**
* 获得活动标绘箭头列表
* @param {*} securityId 活动ID
- * @returns
+ * @returns
*/
export const getSecurityPlotList = (securityId) => {
return request({
@@ -213,7 +214,7 @@
/**
* 获得活动标绘箭头列表
* @param {*} securityId 活动ID
- * @returns
+ * @returns
*/
export const updateSecurityPlot = (id, position) => {
return request({
@@ -224,4 +225,4 @@
position
}
})
-}
\ No newline at end of file
+}
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index e0b6247..ed2c5eb 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -5,8 +5,8 @@
* @LastEditTime: 2023-01-03 15:52:12
* @FilePath: \srs-police-affairs\src\views\activity\index.vue
* @Description: 安保活动
- *
- * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved.
+ *
+ * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved.
-->
<template>
@@ -545,9 +545,17 @@
isHavePoliceMan: false,
isHaveArrow: false,
isHaveLine: false,
+ //当前登录用户的数据
+ userInfo:{},
}
},
created () {
+ let userInfo = sessionStorage.getItem("userInfo");
+ if (userInfo != null) {
+ // 将JSON格式的对象解析为js对象
+ this.userInfo= JSON.parse(userInfo);
+ }
+
// 获取下拉列表数据
this.getActivityType()
@@ -786,8 +794,12 @@
// 获取活动列表
getSecurityList (current, size, type, name, startTime, endTime) {
this.loading()
+ var deptId = ""
+ if (this.userInfo.dept_id != '1123598813738675201'){
+ deptId = this.userInfo.dept_id
+ }
- getSecurityList(current, size, type, name, startTime, endTime).then(res => {
+ getSecurityList(current, size, type, name, startTime, endTime,deptId).then(res => {
this.activityList = res.data.data.records.map(item => {
item.startTime = item.startTime.substring(0, 16)
item.endTime = item.endTime.substring(0, 16)
@@ -1873,4 +1885,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3