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

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

@@ -1,8 +1,4 @@
import http from '@/http'
import { keysMappingReverse } from '@/utils/keysMapping'
// const mapping = {
//   id: 'code'
// }
const $default = http.$default
const api = {
  /**
@@ -18,31 +14,8 @@ const api = {
    return $default.get('/sp/workEmployee/queryAllOrganize').then((resp) => {
      const data = resp.data.data
      if (!Array.isArray(data)) return resp
      console.log(data)
      // eslint-disable-next-line one-var
      // const newData = [],
      //   map = {},
      //   queue = []
      // console.log(data)
      // data.forEach((item) => {
      //   if (item.parentCode === '-1') {
      //     const dep = { id: item.code, name: item.name, departments: [] }
      //     map[item.code] = newData.length
      //     newData.push(dep)
      //   } else {
      //     queue.push(item)
      //   }
      // })
      // queue.forEach((item) => {
      //   if (!(item.parentCode in map)) return
      //   const dep = { id: item.code, name: item.name }
      //   newData[map[item.parentCode]].departments.push(dep)
      // })
      // resp.data = newData
      // console.log(newData)
      // console.log('queryAllOrganize', resp)
      // 将平铺的数组变为树形数组
      resp.data = nest(data)
      // resp.data = keysMappingReverse(nest(data), mapping)
      return resp
    })
  },

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

@@ -23,8 +23,9 @@
            <t-table-column size="sm" prop="userid" label="员工编号"></t-table-column>
            <t-table-column size="sm" prop="duty" label="职务"></t-table-column>
            <t-table-column size="sm" prop="status" label="考勤状态">
              <template v-if="Array.isArray(scope.row.status)" slot-scope="scope">
                <span :class="getStatusClass(scope.row.status)">{{ scope.row.status.join('、') }}</span>
              <template slot-scope="scope">
                <span :class="getStatusClass(scope.row.goToWorkStatus)">{{ scope.row.goToWorkStatus }}</span>
                <span :class="getStatusClass(scope.row.goOffWorkStatus)">{{ scope.row.goOffWorkStatus }}</span>
              </template>
            </t-table-column>
          </t-table>
@@ -146,14 +147,14 @@ export default {
      }
    }
  },
  mounted() {
  mounted () {
    this.getDailyTable()
  },
  methods: {
    handleDailyInited() {
    handleDailyInited () {
      this.getDailyTable()
    },
    changeTabs(tabName) {
    changeTabs (tabName) {
      this.tabName = tabName
      this.getMonthTable()
    },
@@ -176,9 +177,9 @@ export default {
      this.getMonthTable()
    },
    // 获得月报表格数据
    getMonthTable() {
    getMonthTable () {
      this.loadMonthTable = true
      atdapi.getMonthAttendance({params: this.monthlyForm}).then(res => {
      atdapi.getMonthAttendance({ params: this.monthlyForm }).then(res => {
        let tableData = res.data.data
        this.monthTableData = []
        tableData.forEach(element => {
@@ -190,9 +191,9 @@ export default {
      })
    },
    // 获得日报表格数据
    getDailyTable() {
    getDailyTable () {
      this.loadDailyTable = true
      atdapi.getDayAttendance({params: this.dailyForm}).then(res => {
      atdapi.getDayAttendance({ params: this.dailyForm }).then(res => {
        let tableData = res.data.data
        this.dailyTableData = []
        tableData.forEach(element => {
@@ -204,7 +205,7 @@ export default {
      })
    },
    // 弹窗打开
    handleClick(data) {
    handleClick (data) {
      const { userid, beginDay, endDay } = data
      if (beginDay == null) {
        this.$Message.danger('未识别到有效的起止日期')
@@ -223,39 +224,42 @@ export default {
        this.loadDetail = false
      })
    },
    getStatusClass(status) {
      return status.join().match(/[(迟到)(早退)(旷工)(未打卡)]/) === null ? '' : 'abnormalState'
    getStatusClass (status) {
      if (status === '未打卡') {
        return 'abnormalState'
      }
      return ''
    }
  }
}
</script>
<style lang="scss" scoped>
.page-main{
.page-main {
  margin: 20px 20px 16px 20px;
  .abnormalState{
    color: #EDA30F;
  .abnormalState {
    color: #eda30f;
    font-size: 14px;
  }
  .keep-row{
  .keep-row {
    display: flex;
    align-items: center;
  }
  .search-btn{
  .search-btn {
    margin-left: auto;
    margin-right: 15px;
  }
  .icon-txt{
  .icon-txt {
    margin-right: 8px;
  }
  .export-excel{
  .export-excel {
    margin-top: 24px;
    display: flex;
    align-items: center;
  }
  .table-detail{
  .table-detail {
    margin-top: 20px;
  }
  .pager{
  .pager {
    margin-right: auto;
    margin: 21px 21px 0 0;
    float: right;

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

@@ -229,11 +229,12 @@ export default {
      if (data.length > 0) {
        data.forEach(item => {
          arr.push({
            id: item.id + '',
            orgId: item.id + '',
            id: item.code,
            label: item.name,
            pid: item.parentCode
          })
          // 如果没有中值 默认选中一个值 这里是一般是公司的考勤
          // 如果没有中值 默认选中一个值 这里是默认展示根节点的考勤规则
          if (this.treeValue.length === 0) this.handleDeptChange([item.id + ''])
          this.nextDepartment(item.departments, arr)
        })
@@ -244,43 +245,24 @@ export default {
      this.loadDepts = true
      commonapi.getDepartments().then(resp => {
        const data = []
        // console.log(resp.data)
        // resp.data.forEach(item => {
        //   const orgId = item.id + ''
        //   data.push({
        //     id: orgId,
        //     label: item.name
        //     // disabled: true
        //   })
        //   item.departments.forEach(dept => {
        //     const deptId = dept.id + ''
        //     data.push({
        //       id: deptId,
        //       label: dept.name,
        //       pid: orgId
        //     })
        //     if (this.treeValue.length === 0) this.handleDeptChange([deptId])
        //     if (dept.departments.length > 0) {
        //       dept.departments.forEach(child => {
        //         const childId = child.id + ''
        //         data.push({
        //           id: childId,
        //           label: child.name,
        //           pid: deptId
        //         })
        //         this.handleDeptChange([childId])
        //       })
        //     }
        //   })
        // })
        // 递归
        // 递归 实现tree组件所需部门数据结构
        this.nextDepartment(resp.data, data)
        // 删除pid为"-1"的的pid属性，否则tree渲染的时候没有根节点渲染不出来
        // 深拷贝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
            }
          })
        })
        this.treeData = data
      }).finally(() => {

security-protection-platform/src/modules/system/attendance/components/SchedulePanel/ShiftDialog.vue

@@ -5,7 +5,7 @@
        <t-input v-model="form.title" style="width:300px"></t-input>
      </t-form-item>
      <t-table :resizable="false" :data="form.shifts" class="shift-dialog__table" >
      <t-table :resizable="false" :data="form.shifts" class="shift-dialog__table">
        <t-table-column v-slot="{ row, $index }" label="班组名称">
          <t-form-item :prop="`shifts.${$index}.label`" :rules="{ required: true, message: '', trigger: 'blur' }">
            <t-input v-model="row.label"></t-input>
@@ -14,11 +14,7 @@
        <t-table-column v-slot="{ row, $index }" label="考勤时段">
          <t-form-item :prop="`shifts.${$index}.endTime`" :rules="{ required: true, message: '', trigger: 'blur' }">
            <time-range-picker
              v-model="row"
              format="HH:mm"
              style="width: 100%"
            />
            <time-range-picker v-model="row" format="HH:mm" style="width: 100%" />
          </t-form-item>
        </t-table-column>
@@ -56,12 +52,12 @@ export default {
  props: {
    data: {
      type: Object,
      default() {
      default () {
        return {}
      }
    }
  },
  data() {
  data () {
    return {
      visibled: false,
      form: {},
@@ -75,25 +71,25 @@ export default {
    }
  },
  computed: {
    title() {
    title () {
      return this.data.scheduleId == null ? '新增班次' : '编辑班次'
    }
  },
  watch: {
    data(val) {
    data (val) {
      this.form = JSON.parse(JSON.stringify(val))
      // this.$refs['form'] && this.$refs['form'].resetFields()
      this.visibled = true
    }
  },
  methods: {
    handleDelete(index) {
    handleDelete (index) {
      this.form.shifts.splice(index, 1)
    },
    handleAdd() {
    handleAdd () {
      this.form.shifts.push(Object.assign({}, shiftTempl))
    },
    handleSubmit() {
    handleSubmit () {
      this.$refs['form'].validate(valid => {
        if (valid) {
          if (this.form.shifts.length === 0) {
@@ -104,7 +100,7 @@ export default {
        }
      })
    },
    submitSchedule() {
    submitSchedule () {
      this.loadingSubmit = true
      sysapi.submitSchedule(this.form).then(resp => {
        if (resp.data.ScheduleId == null) {
@@ -126,16 +122,17 @@ export default {
<style lang="scss">
.shift-dialog__table {
  border: 1px solid #E8E8E8;
  border: 1px solid #e8e8e8;
  border-radius: 2px;
  td, th {
  td,
  th {
    height: 40px;
    font-weight: normal;
  }
  thead > tr > th {
    background-color: #FAFAFA;
    color: rgba(0, 0, 0, 0.65)
    background-color: #fafafa;
    color: rgba(0, 0, 0, 0.65);
  }
  .form-group {
@@ -147,7 +144,7 @@ export default {
  .table__empty-block {
    min-height: auto;
    border-bottom: 1px solid #E8E8E8;
    border-bottom: 1px solid #e8e8e8;
  }
  &-append {

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

@@ -3,16 +3,10 @@
    <t-loading v-model="loading" />
    <t-button color="primary" style="margin-bottom:30px;" @click="handleCreate">新增</t-button>
    <div class="schedule-card-block">
      <schedule-card
        v-for="item in schedules"
        :key="item.scheduleId"
        :data="item"
        @edit="handleEdit"
        @deleted="handleDeleted"
      />
      <schedule-card v-for="item in schedules" :key="item.scheduleId" :data="item" @edit="handleEdit" @deleted="flushPage()" />
      <div v-if="!loading && schedules.length === 0" class="schedule-card-block__empty">点击 “新增” 按钮增加班次</div>
    </div>
    <shift-dialog :data="dialogData" @submit="handleScheduleSubmit" />
    <shift-dialog :data="dialogData" @submit="flushPage()" />
  </div>
</template>
@@ -22,18 +16,23 @@ import ShiftDialog from './ShiftDialog'
import sysapi from '@/api/system'
export default {
  components: { ScheduleCard, ShiftDialog },
  data() {
  inject: ['reload'],
  data () {
    return {
      schedules: [],
      dialogData: {},
      loading: true
    }
  },
  mounted() {
  mounted () {
    this.getSchedules()
  },
  methods: {
    getSchedules() {
    flushPage () {
      this.getSchedules()
      this.reload()
    },
    getSchedules () {
      this.loading = true
      sysapi.getSchedules().then((resp) => {
        this.schedules = resp.data || []
@@ -41,27 +40,26 @@ export default {
        this.loading = false
      })
    },
    handleEdit(item) {
    handleEdit (item) {
      this.dialogData = Object.assign({}, item)
      console.log(item.shifts)
    },
    handleCreate() {
    handleCreate () {
      this.dialogData = {
        title: '',
        shifts: []
      }
    },
    handleDeleted(index) {
      this.schedules.splice(index, 1)
    },
    handleScheduleSubmit(data) {
      if (this.dialogData.scheduleId != null) {
        const target = this.schedules.find(item => item.scheduleId === this.dialogData.scheduleId)
        Object.assign(target, data)
      } else {
        this.schedules.unshift(data)
      }
    }
    // handleDeleted (index) {
    //   this.schedules.splice(index, 1)
    // },
    // handleScheduleSubmit (data) {
    //   if (this.dialogData.scheduleId != null) {
    //     const target = this.schedules.find(item => item.scheduleId === this.dialogData.scheduleId)
    //     Object.assign(target, data)
    //   } else {
    //     this.schedules.unshift(data)
    //   }
    // }
  }
}
</script>

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

@@ -4,7 +4,7 @@
      <t-tab-panel label="班次时间" panel-id="tab-1">
        <schedule-panel class="sys-attendance__page" />
      </t-tab-panel>
      <t-tab-panel label="考勤规则" panel-id="tab-2">
      <t-tab-panel v-if="isShow" label="考勤规则" panel-id="tab-2">
        <attendance-panel class="sys-attendance__page" />
      </t-tab-panel>
    </t-tabs>
@@ -18,16 +18,25 @@ import AttendancePanel from './components/AttendancePanel'
export default {
  components: { SchedulePanel, AttendancePanel },
  data() {
  provide () {
    return { reload: this.reload }
  },
  data () {
    return {
      isShow: true
    }
  },
  mounted() {
  mounted () {
  },
  methods: {
    // 刷新考勤规则组件
    reload () {
      this.isShow = false
      this.$nextTick(() => {
        this.isShow = true
      })
    }
  }
}
</script>

security-protection-platform/src/modules/system/devicemana/components/modal/addDeviceModal.vue

@@ -110,7 +110,7 @@ export default {
    // 当前编辑设备
    currentEditDevice (val) {
      this.addDeviceModalForm = val
      this.imgUrl = val.toolPictureUrl
      this.imgUrl = val.imgUrl
    }
  },
  mounted () {