Merge remote-tracking branch 'origin/master'

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

@@ -19,7 +19,29 @@ const api = {
      return resp
    })
  },
  // 获取公司类型列表
  getCompanyTypesList () {
    return $default.get('/sp/employeeManagement/queryCompanyList').then(resp => {
      return resp
    }).catch((err) => { return err })
  },
  // 获取部门类型列表
  queryCycleChildOrg (id) {
    return $default.get(`/sp/employeeManagement/queryCycleChildOrg?orgId=${id}`).then(resp => {
      const data = resp.data.data
      if (!Array.isArray(data)) return resp
      // 将平铺的数组变为树形数组
      resp.data = nest(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 })
  },
  // 查询单个用户信息详情
  getEmployeeByOrgid (orgId) {
    return $default
      .get(`/sp/workEmployee/queryEmployeeByOrg?orgId=${orgId}`)

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

@@ -187,6 +187,9 @@ const api = {
  },
  getDepartments() {
    return $default.get('/sp/workEmployee/queryAllOrganize')
  },
  getListFileUrl(data) {
    return $default.get(`/sp/uploadFile/getListFileUrl?fileNameList=${data.join(',')}`)
  }
}

security-protection-platform/src/modules/attendance/abnormal/index.vue

@@ -8,7 +8,7 @@
        </div>
        <div class="keep-row">
          <span>部门/员工：</span>
          <dept-staff-cascader v-model="form" @inited="handleInited" />
          <dept-staff-cascader v-model="form" @inited="handleInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
        </div>
        <div class="search-btn">
          <t-button color="primary" @click="handSearchAttendance">查询</t-button>
@@ -84,11 +84,14 @@ export default {
    const now = new Date()
    return {
      form: {
        month: formatDateTime(new Date().setMonth(now.getMonth() - 1), 'yyyy-MM'),
        userid: null,
        depId: '',
        orgId: '',
        current: 1,
        pageSize: 10,
        month: formatDateTime(now.setMonth(now.getMonth() - 1), 'yyyy-MM')
        pageSize: 10
      },
      total: 40,
      total: 0,
      attendanceModal: false,
      agreement: '',
      tableData: [],
@@ -98,6 +101,15 @@ export default {
    }
  },
  methods: {
    getDailyOrgId(id) {
      this.form.orgId = id
    },
    getDailyDepId(id) {
      this.form.depId = id
    },
    getDailyStaffId(id) {
      this.form.userid = id
    },
    handleInited() {
      this.getTableData()
    },

security-protection-platform/src/modules/attendance/components/DeptStaffCascader/index.vue

@@ -1,9 +1,28 @@
<template>
  <t-cascader v-model="staff" :data-source="source" :loader="loadStuffData" :change-on-select="true" />
  <div class="row">
    <div class="col-3">
      <t-select v-model="companyTypeId" width="200px" @change="getOrgId">
        <t-option v-for="item in companyTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
      </t-select>
    </div>
    <div class="col-3" style="margin-left:35px">
      <!-- <t-select v-model="departmentTypeId" width="200px">
            <t-option v-for="item in departmentTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
          </t-select> -->
      <template>
        <t-select-tree v-model="departmentTypeId" :node-data="departmentTypesList" width="200px" node-key="id" @change="getDepId"></t-select-tree>
      </template>
    </div>
    <div class="col-3" style="margin-left:35px">
      <t-select v-model="staffTypeId" width="200px" @change="getStaffId">
        <t-option v-for="item in staffTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
      </t-select>
    </div>
  </div>
</template>
<script>
import commonapi from '@/api/common'
import commonApi from '@/api/common'
export default {
  props: {
    value: {
@@ -15,7 +34,14 @@ export default {
  },
  data() {
    return {
      source: []
      source: [],
      // 公司、部门、员工、列表
      companyTypesList: [],
      departmentTypesList: [],
      staffTypesList: [],
      companyTypeId: '',
      departmentTypeId: '',
      staffTypeId: ''
    }
  },
  computed: {
@@ -30,54 +56,103 @@ export default {
      }
    }
  },
  watch: {
    companyTypeId (val) {
      // 重置部门回显
      this.departmentTypeId = ''
      // 查询部门列表
      this.queryCycleChildOrg(val)
    },
    departmentTypeId (val) {
      // 重置人员回显
      this.staffTypeId = ''
      // 重置人员列表
      this.staffTypesList = []
      // 减少查询请求
      if (val !== '') {
        this.getStaffTypesList(val)
      }
    }
  },
  created() {
    this.getDepartments()
    this.getCompanyTypesList()
  },
  methods: {
    getDepartments() {
      commonapi.getDepartments().then(resp => {
        this.staff = []
        this.source = resp.data.map(item => {
          const children = item.departments.map(dept => {
            return {
              label: dept.name,
              value: dept.id,
              children: [],
              loading: false
    getOrgId() {
      console.log(123);
      this.$emit('getOrgId', this.companyTypeId)
    },
    getDepId() {
      this.$emit('getDepId', this.departmentTypeId)
    },
    getStaffId() {
      this.$emit('getStaffId', this.staffTypeId)
    },
    // 向服务器发送请求获取公司类型列表数据
    async getCompanyTypesList () {
      const res = await commonApi.getCompanyTypesList()
      if (res.status === 200) {
        this.companyTypesList = res.data.data
      } else {
        this.$Message.danger('公司类型列表数据获取失败！')
      }
    },
    // 获取部门列表
    async queryCycleChildOrg (id) {
      const res = await commonApi.queryCycleChildOrg(id)
      if (res.status === 200) {
        const data = []
        // 递归 实现tree组件所需部门数据结构
        this.nextDepartment(res.data, data)
        // 深拷贝data
        const data1 = JSON.parse(JSON.stringify(data))
        // 用部门id映射关系代替code与parentCode父子映射关系
        data.forEach(item => {
          // 删除pid为"-1"的的pid属性，否则tree渲染的时候没有根节点渲染不出来
          if (item.pid === '-1') {
            delete item.pid
          }
          item.id = item.orgId
          data1.some((item1) => {
            if (item.pid === item1.id) {
              item.pid = item1.orgId
            } else {
              return false
            }
          })
          children.unshift({
            label: '全部',
            value: item.id,
            children: [],
            loading: false
          })
          return {
        })
        // 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 commonApi.getStaffTypesList(id)
      if (res.status === 200) {
        this.staffTypesList = res.data.data
      } else {
        this.$Message.danger('用户类型列表数据获取失败！')
      }
    },
    // 如果部门还有下级 递归
    nextDepartment (data, arr) {
      if (data.length > 0) {
        data.forEach(item => {
          arr.push({
            orgId: item.id + '',
            id: item.code,
            label: item.name,
            value: item.id,
            children
          }
            pid: item.parentCode
          })
          this.nextDepartment(item.departments, arr)
        })
        // if (this.source.length > 0) {
        //   const orgId = this.source[0].value
        //   // const depId = this.source[0].children[0].value
        //   this.staff = [orgId]
        // }
        this.$emit('inited')
      }, err => {
        this.$Message.danger('获取部门列表失败！')
        console.log(err)
      })
      }
    },
    loadStuffData(item, callback) {
      item.loading = true
      commonapi.getEmployeeByOrgid(item.value).then(res => {
      commonApi.getEmployeeByOrgid(item.value).then(res => {
        console.log(res)
        let arr = []

security-protection-platform/src/modules/attendance/report/index.vue

@@ -11,7 +11,7 @@
            </div>
            <div class="keep-row">
              <span>部门/员工：</span>
              <dept-staff-cascader v-model="dailyForm" @inited="handleDailyInited" />
              <dept-staff-cascader v-model="dailyForm" @inited="handleDailyInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
            </div>
            <div class="search-btn">
              <t-button color="primary" @click="handSearchDay">查询</t-button>
@@ -41,7 +41,7 @@
            </div>
            <div class="keep-row">
              <span>部门/员工：</span>
              <dept-staff-cascader v-model="monthlyForm" />
              <dept-staff-cascader v-model="monthlyForm" @getOrgId="getMonthOrgId" @getDepId="getMonthDepId" @getStaffId="getMonthStaffId" />
            </div>
            <div class="search-btn">
              <t-button color="primary" @click="handSearchMonth">查询</t-button>
@@ -113,7 +113,6 @@ import atdapi from '@/api/attendance'
import formatDateTime from '@/utils/formatDateTime.js'
import AttendanceDialog from '../components/AttendanceDialog'
import DeptStaffCascader from '../components/DeptStaffCascader'
export default {
  components: { AttendanceDialog, DeptStaffCascader },
  data () {
@@ -128,7 +127,10 @@ export default {
      loadDetail: false,
      loadDailyTable: false,
      loadMonthTable: false,
      // 公司、部门、员工、列表
      companyTypesList: [],
      departmentTypesList: [],
      getStaffTypesList: [],
      monthlyTotal: 0,
      dailyTotal: 0,
      monthlyForm: {
@@ -150,6 +152,24 @@ export default {
    }
  },
  methods: {
    getDailyOrgId(id) {
      this.dailyForm.orgId = id
    },
    getDailyDepId(id) {
      this.dailyForm.depId = id
    },
    getDailyStaffId(id) {
      this.dailyForm.userid = id
    },
    getMonthOrgId(id) {
      this.monthlyForm.orgId = id
    },
    getMonthDepId(id) {
      this.monthlyForm.depId = id
    },
    getMonthStaffId(id) {
      this.monthlyForm.userid = id
    },
    handleDailyInited () {
      // this.getDailyTable()
    },
@@ -178,6 +198,68 @@ export default {
      this.monthlyForm.current = val
      this.getMonthTable()
    },
    // // 向服务器发送请求获取公司类型列表数据
    // async getCompanyTypesList () {
    //   const res = await commonApi.getCompanyTypesList()
    //   if (res.status === 200) {
    //     this.companyTypesList = res.data.data
    //   } else {
    //     this.$Message.danger('公司类型列表数据获取失败！')
    //   }
    // },
    // // 获取部门列表
    // async queryCycleChildOrg (id) {
    //   const res = await commonApi.queryCycleChildOrg(id)
    //   if (res.status === 200) {
    //     const data = []
    //     // 递归 实现tree组件所需部门数据结构
    //     this.nextDepartment(res.data, data)
    //     // 深拷贝data
    //     const data1 = JSON.parse(JSON.stringify(data))
    //     // 用部门id映射关系代替code与parentCode父子映射关系
    //     data.forEach(item => {
    //       // 删除pid为"-1"的的pid属性，否则tree渲染的时候没有根节点渲染不出来
    //       if (item.pid === '-1') {
    //         delete item.pid
    //       }
    //       item.id = item.orgId
    //       data1.some((item1) => {
    //         if (item.pid === item1.id) {
    //           item.pid = item1.orgId
    //         } else {
    //           return false
    //         }
    //       })
    //     })
    //     // 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 commonApi.getStaffTypesList(id)
    //   if (res.status === 200) {
    //     this.staffTypesList = res.data.data
    //   } else {
    //     this.$Message.danger('用户类型列表数据获取失败！')
    //   }
    // },
    // // 如果部门还有下级 递归
    // nextDepartment (data, arr) {
    //   if (data.length > 0) {
    //     data.forEach(item => {
    //       arr.push({
    //         orgId: item.id + '',
    //         id: item.code,
    //         label: item.name,
    //         pid: item.parentCode
    //       })
    //       this.nextDepartment(item.departments, arr)
    //     })
    //   }
    // },
    // 重置日报数据
    resetDailyData() {
      this.$nextTick(() => {

security-protection-platform/src/modules/system/monitor/HomePageSettings/ShiftCameraDialog.vue

@@ -30,7 +30,7 @@
          <div>
            <img
              :class="item.resourceToolId == form.resourceToolId ? 'hover' : ''"
              :src="item.pictureUrl"
              :src="item.imageUrl"
              style="height: 120px; width: 158px"
              alt=""
            />
@@ -129,10 +129,20 @@ export default {
        nameAsLike: this.searchValue // 设备名称(模糊匹配)
      }
      sysapi.getResourceTool(params).then((resp) => {
        this.cameraList = resp.data.data.data || []
        const res = resp.data.data.data || []
        let data = []
        res.forEach(item => data.push(item.pictureUrl))
        this.getListFileUrl(res, data)
        this.total = resp.data.data.total
      })
    },
    async getListFileUrl(res, data) {
      const resp = await sysapi.getListFileUrl(data)
      res.filter((item, index) => {
        item.imageUrl = resp.data.data[index]
      })
      this.cameraList = res
    },
    groupClick(item) {
      // 选中更换摄像头
      this.form.resourceToolName = item.resourceToolName

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

@@ -1,33 +1,33 @@
<template>
  <t-modal :visibled.sync="isVisibled" :mask-closable="false">
  <t-modal :visibled.sync="isVisibled" :mask-closable="false" width="600px">
    <template slot="header">
      <div class="device-modal-title">{{ isEdit?'用户编辑':'新增用户' }}</div>
    </template>
    <t-form ref="addUserModal" :model="addUserModal" :rules="addUserModalRules" label-position="right">
      <t-form-item label="姓名：" prop="name">
        <t-input v-model="addUserModal.name" placeholder="请输入姓名"></t-input>
        <t-input v-model="addUserModal.name" style="width:300px" placeholder="请输入姓名"></t-input>
      </t-form-item>
      <t-form-item label="员工编号：" prop="code">
        <t-input v-model="addUserModal.code" placeholder="请输入员工编号"></t-input>
        <t-input v-model="addUserModal.code" placeholder="请输入员工编号" style="width:300px"></t-input>
      </t-form-item>
      <t-form-item label="公司：" prop="apartments">
        <t-select v-model="addUserModal.apartments" placeholder="请选择公司" clearable>
        <t-select v-model="addUserModal.apartments" width="300px" placeholder="请选择公司" clearable>
          <t-option v-for="(item,index) in companyList" :value="item.id" :key="index">{{ item.name }}</t-option>
        </t-select>
      </t-form-item>
      <t-form-item v-if="addUserModal.apartments!==''" label="部门：" prop="organizeCode">
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" node-value="code" node-key="code"></t-select-tree>
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" width="300px" node-value="data" node-key="data"></t-select-tree>
      </t-form-item>
      <t-form-item label="职务：" prop="mainJobPosition">
        <t-select v-model="addUserModal.mainJobPosition" placeholder="请选择职务" clearable>
        <t-select v-model="addUserModal.mainJobPosition" width="300px" placeholder="请选择职务" clearable>
          <t-option v-for="(item,index) in jobPoisitonList" :value="item.code" :key="index">{{ item.value }}</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-date-picker v-model="addUserModal.birthday" style="width:300px" 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-input v-model="addUserModal.mainWirelessCall" style="width:300px" placeholder="请输入11位手机号"></t-input>
      </t-form-item>
      <t-form-item label="人脸图片：" style="display:flex" prop="facePicture">
        <div style="display:flex">
@@ -49,14 +49,32 @@
              <span style="color:rgba(0, 0, 0, 0.45)">上传照片</span>
            </div>
          </t-upload>
          <img v-show="showPicture" :src="showPicture" style="width:120px;height:160px;margin-left:12px"/>
          <img v-show="showPicture" :src="showPicture" class="upload-img"/>
          <!-- <div v-show="showPicture" class="upload-edit">
            修改 </div> -->
          <t-upload
            v-show="showPicture"
            ref="uploader"
            :show-uploaded="false"
            :allowed-ext="['jpg','jpeg','png']"
            :max-size="2048"
            :before-upload="$_onUploadBeforeUpload"
            multiple
            type="drag"
            action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
            class="upload-edit"
            @success = "$_onUploadSuccess"
          >
            <div>上传</div>
          </t-upload>
          <img v-show="showPicture" :src="showPicture" class="upload-edit-img"/>
        </div>
        <span style="color:rgba(0, 0, 0, 0.45);font-size:12px">照片格式：jpg、png或bmp文件，且不超过2M</span>
      </t-form-item>
    </t-form>
    <template slot="footer">
      <t-button @click="resetModalData">取消</t-button>
      <t-button v-if="isEdit" :loading="loadingSubmit" color="primary" @click="submitModalData">修改</t-button>
      <t-button v-if="isEdit" :loading="loadingSubmit" color="primary" @click="editModalData">修改</t-button>
      <t-button v-else color="primary" @click="submitModalData">提交</t-button>
    </template>
  </t-modal>
@@ -167,10 +185,6 @@ export default {
      this.getCompanyList()
    }
  },
  created() {
    // console.log(this.editUserModal)
    // this.addUserModal.apartments = this.editUserModal.field4
  },
  mounted() {
    this.getJobPositionList()
  },
@@ -202,12 +216,41 @@ export default {
        }
      })
    },
    // 修改用户个人信息
    editModalData() {
      this.loadingSubmit = true
      let obj = {
        id: this.editUserModal.employeeId, // 主键ID
        name: this.addUserModal.name, // 员工姓名
        code: this.addUserModal.code, // 员工编号
        organizeCode: this.addUserModal.organizeCode, // 部门CODE
        mainWirelessCall: this.addUserModal.mainWirelessCall, // 手机号码
        mainJobPosition: this.addUserModal.mainJobPosition, // 职务
        field1: this.addUserModal.field1, // 照片标识
        field4: this.addUserModal.apartments, // 公司ID
        birthday: +new Date(this.addUserModal.birthday) // 生日(时间戳)
      }
      sysapi.editUserDetail(obj).then(res => {
        if (res.status === 200) {
          this.$Message.success('修改成功!')
          this.isVisibled = false
          this.resetModalData()
          this.$emit('getUserList')
        } else {
          this.$Message.danger('修改失败!')
        }
        this.loadingSubmit = false
      })
    },
    // 重置表单数据
    resetModalData () {
      this.$refs['addUserModal'].resetFields()
      this.imgUrl = ''
      this.isEdit = false
      this.isVisibled = false
      this.showPicture = ''
    },
    // 获得编辑回显数据
    getCompanyList() {
      this.$nextTick(() => {
        this.addUserModal = {
@@ -216,11 +259,12 @@ export default {
          'organizeCode': this.editUserModal.organizationCode, // 部门CODE
          'mainWirelessCall': this.editUserModal.mainWirelessCall, // 手机号码
          'mainJobPosition': this.editUserModal.employeePosition, // 职务
          'field1': this.editUserModal.field1, // 照片标识
          'apartments': this.editUserModal.field4, // 公司ID
          'apartments': '', // 公司ID
          'birthday': formatDateTime(new Date(this.editUserModal.birthday - 0)) // 生日(时间戳)
        }
        // this.isEdit = true
        this.addUserModal.apartments = parseInt(this.editUserModal.field4)
        this.showPicture = this.editUserModal.pictureUrl// 照片标识
        this.isEdit = true
      })
    },
    // 查询职务列表
@@ -258,6 +302,9 @@ export default {
        })
        // eslint-disable-next-line no-return-assign
        this.departmentTypesList = data.filter(item => item.data = item.id)
        this.$nextTick(() => {
          this.addUserModal.organizeCode = this.editUserModal.organizationCode
        })
      } else {
        this.$Message.danger('部门类型列表数据获取失败！')
      }
@@ -273,7 +320,7 @@ export default {
            id: item.code,
            label: item.name,
            pid: item.parentCode,
            code: item.code
            data: item.code
          })
          this.nextDepartment(item.departments, arr)
        })
@@ -339,8 +386,33 @@ export default {
<style lang="scss" scoped>
.demo-upload-list{
  .upload--drag{
  background-color:#FFFFFF
  background-color:#FFFFFF;
  align-items: center;
  justify-content: center;
  display: flex
}
}
.upload-img{
  width:120px;
  height:160px;
  margin-left:12px
}
.upload-edit{
  width:120px;
  height:160px;
  margin-left:12px;
  background-color:rgba(0, 0, 0, 0.5);
  justify-content: center;
  align-items: center;
  color: white;
  display: flex;
  cursor: pointer;
  z-index: 2;
}
.upload-edit-img{
  margin-left:-120px;
  width:120px;
  height:160px;
}
.picture-upload{
  display:flex;

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

@@ -64,7 +64,7 @@
        </t-pager>
      </div>
    </t-card>
    <add-user-modal :edit-user-modal="currentEditDevice" :company-list="companyTypesList" :visible.sync="addDeviceModal"></add-user-modal>
    <add-user-modal :edit-user-modal="currentEditDevice" :company-list="companyTypesList" :visible.sync="addDeviceModal" @getUserList="getUserList"></add-user-modal>
    <auditModal :auditshow.sync="auditshow" :auditid="auditid" :company-name="companyName" @refeshUserList="getUserList"></auditModal>
  </div>
</template>