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/views/activity/index.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
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