Merge remote-tracking branch 'origin/dev-security' into dev-security

security-protection-platform/src/api/system/index.js

@@ -81,7 +81,17 @@ const api = {
  },
  // 获取ai任务列表
  getAiTaskList(params) {
    return $default.get('/sp/sysConfigAiTask/queryPageAiTask?', params)
    return $default.get('/sp/sysConfigAiTask/queryPageAiTask', params)
  },
  // 根据ID获取ai任务
  getAiTaskById(params) {
    return $default.get('/sp/sysConfigAiTask/queryAiTask?', params)
  },
  deleteAiTaskData(params) {
    return $default.post(`sp/sysConfigAiTask/deleteAiTask`, params)
  },
  createAiTask(params) {
    return $default.post(`/sp/sysConfigAiTask/createAiTask`, params)
  },
  // 获取设备列表数据
  getDeviceData (data) {
@@ -166,8 +176,8 @@ const api = {
    }
  },
  moveTerminalRelIndex(params) {
    params = keysMapping(params, mappingMonitor, false)
    return $default.put('/sp/monitorSceneTerminal/moveMonitorSceneTerminalRelIndex', {params})
    // params = keysMapping(params, mappingMonitor, false)
    return $default.put('/sp/monitorSceneTerminal/moveMonitorSceneTerminalRelIndex', params)
  },
  getOneMonitorScene(monitorSceneId) {
    return $default.get(`/sp/monitorSceneManagement/queryOneMonitorScene?monitorSceneId=${monitorSceneId}`)

security-protection-platform/src/api/usermana/index.js

@@ -1,6 +1,12 @@
import http from '@/http'
import { keysMapping, keysMappingReverse } from '@/utils/keysMapping'
const { $default } = http
const mapping = {
  userId: 'code',
  departmentName: 'orgName',
  post: 'employeePositionZh',
  telephone: 'mainWirelessCall'
}
const api = {
  // 获取公司类型列表
  getCompanyTypesList () {
@@ -14,15 +20,35 @@ const api = {
      return resp
    }).catch((err) => { return err })
  },
  // 获取部门类型列表
  queryCycleChildOrg (id) {
    return $default.get(`/sp/employeeManagement/queryCycleChildOrg?orgId=${id}`).then(resp => {
      const data = resp.data.data
      console.log(data)
      if (!Array.isArray(data)) return resp
      // 将平铺的数组变为树形数组
      resp.data = nest(data)
      // console.log(resp.data)
      return resp
    }).catch((err) => { return err })
  },
  getStaffTypesList (id) {
    return $default.get(`/sp/employeeManagement/queryEmployeeListByOrgId?orgId=${id}`).then(resp => {
      return resp
    }).catch((err) => { return err })
  },
  // 获取用户列表数据
  getUserList (data) {
    return $default.get(`/sp/employeeManagement/queryEmployeeList`, data).then(resp => {
      resp.data = keysMappingReverse(resp.data.data, mapping)
      return resp
    }).catch((err) => { return err })
  },
  // 删除用户
  deleteUserData (data) {
    if (Array.isArray(data.employeeId)) {
      return $default.delete(`/sp/employeeManagement/deleteEmployee?employeeId=${data.employeeId.join(',')}`).catch((err) => { return err })
    } else {
      return $default.delete(`/sp/employeeManagement/deleteEmployee?employeeId=${data.employeeId}`).catch((err) => { return err })
    }
  }
}
function nest (items, code = '-1', link = 'parentCode') {

security-protection-platform/src/modules/system/monitor/VideoMonitor/index.vue

@@ -340,10 +340,12 @@ export default {
    datadragEnd(evt) {
      if (evt.oldIndex !== evt.newIndex) {
        let params = {
          monitorSceneTerminalRelId: this.areaMonitorList[evt.oldIndex].monitorSceneTerminalRelId, // 场景与终端关联ID
          monitorSceneId: this.currenScene.monitorSceneId, // 场景ID
          resourceToolId: this.areaMonitorList[evt.oldIndex].resourceToolId, // 终端ID
          resourceToolIndex: this.areaMonitorList[evt.newIndex].resourceToolIndex // 移动位置序号
          params:{
            monitorSceneTerminalRelId: this.areaMonitorList[evt.oldIndex].monitorSceneTerminalRelId, // 场景与终端关联ID
            monitorSceneId: this.currenScene.monitorSceneId, // 场景ID
            resourceToolId: this.areaMonitorList[evt.oldIndex].resourceToolId, // 终端ID
            resourceToolIndex: this.areaMonitorList[evt.newIndex].resourceToolIndex // 移动位置序号
          }
        }
        sysapi.moveTerminalRelIndex(params).then((resp) => {})
          .catch((error) => {

security-protection-platform/src/modules/usermana/components/modal/addUser.vue

@@ -0,0 +1,115 @@
<template>
  <div>
    <t-modal :visibled="visible">
      <t-form :model="addUserModal" :rules="addUserModalRules" label-position="right">
        <t-form-item label="姓名：" prop="name">
          <t-input v-model="addUserModal.name" placeholder="请输入姓名"></t-input>
        </t-form-item>
        <t-form-item label="员工编号：" prop="code">
          <t-input v-model="addUserModal.code" placeholder="请输入员工编号"></t-input>
        </t-form-item>
        <t-form-item label="公司：" prop="field4">
          <t-select v-model="addUserModal.field4" placeholder="请选择公司" clearable>
            <t-option v-for="(item,index) in dataList" :value="item.field4" :key="index">{{ item.name }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="部门：" prop="organizeCode">
          <t-select v-model="addUserModal.organizeCode" placeholder="请选择部门" clearable>
            <t-option v-for="(item,index) in dataList" :value="item.value" :key="index">{{ item.name }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="职务：" prop="mainJobPosition">
          <t-select v-model="addUserModal.mainJobPosition" placeholder="请选择职务" clearable>
            <t-option v-for="(item,index) in dataList" :value="item.value" :key="index">{{ item.name }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="年龄：" prop="birthday">
          <t-date-picker v-model="addUserModal.birthday" placeholder="请输入年龄" @date-change="startPickerDateChange"></t-date-picker>
        </t-form-item>
        <t-form-item label="手机：" prop="mainWirelessCall">
          <t-input v-model="addUserModal.mainWirelessCall" placeholder="请输入11位手机号"></t-input>
        </t-form-item>
        <t-form-item label="人脸图片：" prop="facePicture">
          <t-input v-model="addUserModal.facePicture" placeholder="请输入手机号"></t-input>
        </t-form-item>
      </t-form>
    </t-modal>
  </div>
</template>
<script>
export default {
  props: {
    visible: {
      type: Boolean,
      default: false
    },
    value: {
      type: Object,
      dafault: () => []
    }
  },
  data() {
    return {
      dataList: [
        {
          name: '数据一',
          value: 1
        },
        {
          name: '数据二',
          value: 2
        },
        {
          name: '数据三',
          value: 3
        }
      ],
      // 新增用户表单
      addUserModal: {
        name: '',
        code: '',
        organizeCode: '',
        apartments: '',
        mainJobPosition: '',
        birthday: '',
        mainWirelessCall: '',
        facePicture: ''
      },
      // 新增用户表单规则
      addUserModalRules: {
        name: [
          { required: true, message: '姓名不能为空', trigger: 'blur' }
        ],
        code: [
          { required: true, message: '员工编号不能为空', trigger: 'blur' }
        ],
        field4: [
          { required: true, message: '公司不能为空' }
        ],
        organizeCode: [
          { required: true, message: '部门不能为空', trigger: 'change' }
        ],
        mainJobPosition: [
          { required: true, message: '职务不能为空', trigger: 'change' }
        ],
        birthday: [
          { required: true, message: '年龄不能为空', trigger: 'blur' }
        ],
        mainWirelessCall: [
          { required: true, message: '手机不能为空', trigger: 'blur' }
        ],
        facePicture: [
          { required: true, message: '图片不能为空', trigger: 'blur' }
        ]
      }
    }
  },
  methods: {
  }
}
</script>
<style>
</style>

security-protection-platform/src/modules/usermana/index.vue

@@ -29,7 +29,7 @@
        <t-button color="primary" @click="showAddDeviceModal">
          <t-icon icon="plus-circle-outline" size="16"></t-icon>新增
        </t-button>
        <t-button @click="multDeleteDeviceData">
        <t-button @click="multDeleteUserData">
          <t-icon icon="trash" size="16"></t-icon>删除
        </t-button>
      </div>
@@ -42,17 +42,18 @@
          <t-table-column prop="departmentName" label="部门" width="150"></t-table-column>
          <t-table-column prop="post" label="职务" width="100"></t-table-column>
          <t-table-column prop="age" label="年龄" width="80"></t-table-column>
          <t-table-column prop="telephone" label="手机" width="120"></t-table-column>
          <t-table-column prop="telephone" label="手机" width="150"></t-table-column>
          <t-table-column prop="status" label="人脸状态" width="120">
            <template v-slot="{row}">
              <t-tag v-if="row.status=== 'xxx'" state="primary">待审核</t-tag>
              <t-tag v-else state="success">已生效</t-tag>
              <t-tag v-if="row.field2==='5'" state="success">{{ row.status }}</t-tag>
              <t-tag v-else-if="row.field2==='3'" state="danger">{{ row.status }}</t-tag>
              <t-tag v-else state="info">{{ row.status }}</t-tag>
            </template>
          </t-table-column>
          <t-table-column label="操作">
            <template v-slot="{row}">
              <a href="javascript:;" style="color:#0089D4;" @click="editDeviceData(row.resourceToolId)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteDeviceData(row)">删除</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteUserData(row)">删除</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteDeviceData(row)">人脸审核</a>
            </template>
          </t-table-column>
@@ -63,13 +64,17 @@
        </t-pager>
      </div>
    </t-card>
    <add-user-modal :visible="addDeviceModal"></add-user-modal>
  </div>
</template>
<script>
import sysapi from '@/api/usermana'
import addUserModal from './components/modal/addUser'
export default {
  components: {
    addUserModal
  },
  data () {
    return {
      // 公司类型id
@@ -91,9 +96,9 @@ export default {
      // 当前页的数据个数
      limit: 10,
      // 数据总数
      total: 100,
      // 批量删除的设备id
      deleteResourceToolId: [],
      total: 0,
      // 批量删除的用户id
      deleteUserId: [],
      // 当前设备数据
      currentDeviceData: {},
      // 显示/隐藏新增设备对话框
@@ -103,11 +108,20 @@ export default {
  },
  watch: {
    companyTypeId (val) {
      // this.getDepartmentTypesList(val)
      // 重置部门回显
      this.departmentTypeId = ''
      // 查询部门列表
      this.queryCycleChildOrg(val)
    },
    departmentTypeId (val) {
      this.getStaffTypesList(val)
      // 重置人员回显
      this.staffTypeId = ''
      // 重置人员列表
      this.staffTypesList = []
      // 减少查询请求
      if (val !== '') {
        this.getStaffTypesList(val)
      }
    }
  },
  created () {
@@ -115,9 +129,19 @@ export default {
    this.getCompanyTypesList()
  },
  methods: {
    // 获取设备列表数据
    async getDeviceData () {
    // 获取用户列表数据
    async getUserList () {
      const res = await sysapi.getUserList({ params: { pageNumber: this.page, pageSize: this.limit, id: this.staffTypeId, orgId: this.departmentTypeId || this.companyTypeId } })
      if (res.status === 200) {
        // 获取当前公司id的公司名称
        const companyName = this.companyTypesList.filter(item => item.id === this.companyTypeId)[0].name
        // eslint-disable-next-line no-return-assign
        res.data.data.forEach(item => item.companyName = companyName)
        this.userDataList = res.data.data
        this.total = res.data.total
      } else {
        this.$Message.danger('用户列表数据获取失败！')
      }
    },
    // 向服务器发送请求获取公司类型列表数据
    async getCompanyTypesList () {
@@ -129,14 +153,14 @@ export default {
      }
    },
    // 向服务器发送请求获取部门类型列表数据
    async getDepartmentTypesList (id) {
      const res = await sysapi.getDepartmentTypesList(id)
      if (res.status === 200) {
        this.departmentTypesList = res.data.data
      } else {
        this.$Message.danger('部门类型列表数据获取失败！')
      }
    },
    // async getDepartmentTypesList (id) {
    //   const res = await sysapi.getDepartmentTypesList(id)
    //   if (res.status === 200) {
    //     this.departmentTypesList = res.data.data
    //   } else {
    //     this.$Message.danger('部门类型列表数据获取失败！')
    //   }
    // },
    // 如果部门还有下级 递归
    nextDepartment (data, arr) {
      if (data.length > 0) {
@@ -151,6 +175,7 @@ export default {
        })
      }
    },
    // 获取部门列表
    async queryCycleChildOrg (id) {
      const res = await sysapi.queryCycleChildOrg(id)
      if (res.status === 200) {
@@ -174,15 +199,15 @@ export default {
            }
          })
        })
        console.log(data)
        this.departmentTypesList = data
        // eslint-disable-next-line no-return-assign
        this.departmentTypesList = data.filter(item => item.data = item.id)
      } else {
        this.$Message.danger('部门类型列表数据获取失败！')
      }
    },
    // 向服务器发送请求获取用户类型列表数据
    async getStaffTypesList (id) {
      const res = await sysapi.getDepartmentTypesList(id)
      const res = await sysapi.getStaffTypesList(id)
      if (res.status === 200) {
        this.staffTypesList = res.data.data
      } else {
@@ -192,7 +217,7 @@ export default {
    // 查询数据
    selectHandle () {
      this.page = 1
      this.getDeviceData()
      this.getUserList()
    },
    // 重置查询数据
    resetData () {
@@ -200,27 +225,27 @@ export default {
      this.companyTypeId = ''
      this.staffTypeId = ''
      this.departmentTypeId = ''
      this.getDeviceData()
      this.userDataList = []
    },
    // 当前页改变 触发事件
    onChange (page) {
      this.page = page
      this.getDeviceData()
      this.getUserList()
    },
    // 当前页数据总数改变 触发事件
    onSizeChange (pageSize) {
      this.limit = pageSize
      this.getDeviceData()
      this.getUserList()
    },
    // 删除数据
    deleteDeviceData (row) {
    deleteUserData (row) {
      this.$Confirm.confirm({
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
        ok: async () => {
          const res = await sysapi.deleteDeviceData({ resourceToolId: row.resourceToolId })
          const res = await sysapi.deleteUserData({ employeeId: row.id })
          if (res.status === 200) {
            this.getDeviceData()
            this.getUserList()
            this.$Message.success('删除成功！')
          } else {
            this.$Message.danger('删除失败！')
@@ -234,21 +259,21 @@ export default {
    // 当复选框发生改变时 触发事件
    selectChange (data) {
      const arr = []
      data.forEach(item => arr.push(item.resourceToolId))
      this.deleteResourceToolId = arr
      data.forEach(item => arr.push(item.id))
      this.deleteUserId = arr
    },
    // 批量删除数据
    multDeleteDeviceData () {
      if (this.deleteResourceToolId.length === 0) {
    multDeleteUserData () {
      if (this.deleteUserId.length === 0) {
        return this.$Message.warning('请选择要删除的数据！')
      }
      this.$Confirm.confirm({
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
        ok: async () => {
          const res = await sysapi.deleteDeviceData({ resourceToolId: this.deleteResourceToolId })
          const res = await sysapi.deleteUserData({ employeeId: this.deleteUserId })
          if (res.status === 200) {
            this.getDeviceData()
            this.getUserList()
            this.$Message.success('删除成功！')
          } else {
            this.$Message.danger('删除失败！')

security-protection-platform/src/modules/videoSurveillance/index.vue

@@ -12,8 +12,8 @@
      </t-select>
    </div>
    <div class="page-bottom">
      <div v-for="(item,index) in videoList" :key="index" :value="item.id" style="width:400px;margin:24px 0px 0 24px;">
        <rtmp-video :list="getVideoPlayList(item)" @goDistinguishRecord="goDistinguishRecord" @videoReplay="handleReview"></rtmp-video>
      <div v-for="(item,index) in videoList" :key="index" :value="item.resourceToolId" style="width:400px;margin:24px 0px 0 24px;">
        <rtmp-video :list="getVideoPlayList(item)" @goDistinguishRecord="goDistinguishRecord(item.resourceToolId)" @videoReplay="handleReview"></rtmp-video>
      </div>
    </div>
    <t-pager :page-size="videoPageSize" :current="videoCurrent" :total="videoTotal" :sizer-range="[ 5, 10, 20, 30 ]" class="pager" show-elevator @on-change="onChangeGate"></t-pager>