Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2023-01-15 8b2fc551d8bee2d2143a36e1e2fcd7e81d051b18

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 src/api/activity/index.js

@@ -6,7 +6,7 @@
 * @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,6 +17,7 @@
            name,
            startTime,
            endTime,
            deptId
        }
    })
}

 src/views/activity/index.vue

@@ -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)