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

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

@@ -28,6 +28,9 @@
        </div>
      </div>
    </div>
    <div slot="footer" class="modal-foot">
      <t-button @click="_visibled=false">关闭</t-button>
    </div>
    <attrndance-calendar :range="data.range" :data="data.detail" />
  </t-modal>
</template>
@@ -44,7 +47,7 @@ export default {
    },
    data: {
      type: Object,
      default() {
      default () {
        return {}
      }
    },
@@ -53,21 +56,21 @@ export default {
      default: true
    }
  },
  data() {
  data () {
    return {
    }
  },
  computed: {
    _visibled: {
      get() {
      get () {
        return this.visibled
      },
      set(val) {
      set (val) {
        this.$emit('update:visibled', val)
      }
    },
    attendanceTime() {
    attendanceTime () {
      const dateStart = this.data.range ? this.data.range[0] : Date.now()
      const dateEnd = this.data.range ? this.data.range[1] : Date.now()
      return `${formatDateTime(new Date(dateStart), 'yyyy-MM-dd')} ~ ${formatDateTime(new Date(dateEnd), 'yyyy-MM-dd')}`
@@ -77,138 +80,138 @@ export default {
</script>
<style lang="scss">
.modal-state{
.modal-state {
  margin-top: 22px;
  display: flex;
  margin-left: auto;
  align-items: center;
  .square-differ{
  .square-differ {
    margin-left: 20px;
    width: 12px;
    height: 12px;
    background-color: rgba(237, 163, 15, 0.1);
  }
  .square{
  .square {
    width: 12px;
    height: 12px;
    background-color: #ffffff;
    border: 1px solid rgba(232, 232, 232, 1);
  }
}
.modal-head{
.modal-head {
  display: flex;
  margin-bottom: 24px;
  .modal-head-left{
  .modal-head-left {
    width: 256px;
    margin-left: 4px;
    height: 114px;
    display: flex;
    align-items: center;
    .modal-img{
      width:72px;
      height:72px;
    .modal-img {
      width: 72px;
      height: 72px;
    }
    .modal-detail{
    .modal-detail {
      margin-left: 16px;
      display: flex;
      flex-direction: column;
      .modal-head-txt{
        .head-name-txt
        {
        margin-bottom: 12px;
        font-size: 14px;
      .modal-head-txt {
        .head-name-txt {
          margin-bottom: 12px;
          font-size: 14px;
        }
        width: 120px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.45);
      }
      .head-name-txt{
      .head-name-txt {
        font-weight: 600;
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
    }
    .divice-line{
    .divice-line {
      width: 1px;
      margin-left: 24px;
      background-color: #E8E8E8;
      background-color: #e8e8e8;
      height: 114px;
    }
  }
}
.modal-head-right{
.modal-foot {
  padding-right: 10px;
}
.modal-head-right {
  display: flex;
  width: 100%;
  .leaveTime{
  .leaveTime {
    display: flex;
    flex-direction: column;
    margin-top: 46px;
    .modal-head-txt{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-txt {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
      margin-top: 24px;
    }
    .modal-head-top{
      .head-name-txt
      {
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-top {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
    }
  }
  .absenteeism{
  .absenteeism {
    display: flex;
    flex-direction: column;
    margin-left: auto;
    .modal-head-txt{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-txt {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
      margin-top: 24px;
    }
    .modal-head-top{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    }
    .modal-head-top {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
    }
  }
  .keep-column{
  .keep-column {
    display: flex;
    flex-direction: column;
    margin-left: 24px;
    .modal-head-txt{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-txt {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);
      margin-top: 24px;
    }
    .modal-head-top{
      .head-name-txt{
      margin-bottom: 12px;
      font-size: 14px;
      color: rgba(0, 0, 0, 0.65);
    .modal-head-top {
      .head-name-txt {
        margin-bottom: 12px;
        font-size: 14px;
        color: rgba(0, 0, 0, 0.65);
      }
      font-size: 14px;
      color: rgba(0, 0, 0, 0.45);

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

@@ -31,7 +31,7 @@
    <div slot="footer">
      <t-button @click="visibled=false">取消</t-button>
      <t-button :loading="loadingSubmit" type="primary" @click="handleSubmit">保存</t-button>
      <t-button :loading="loadingSubmit" color="primary" @click="handleSubmit">保存</t-button>
    </div>
  </t-modal>
</template>

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

@@ -1,7 +1,9 @@
<template>
  <div>
    <t-loading v-model="loading" />
    <t-button color="primary" style="margin-bottom:30px;" @click="handleCreate">新增</t-button>
    <t-button color="primary" style="margin-bottom:30px;" @click="handleCreate">
      <t-icon icon="plus-circle-outline" size="16"></t-icon> 新增
    </t-button>
    <div class="schedule-card-block">
      <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>

security-protection-platform/src/modules/workorder/components/modal/workorderinfomodal.vue

@@ -15,7 +15,7 @@
    </div>
    <div v-if="status" class="approval-info row">
      <div class="col-6">审批人：<span>{{ data.approver }}</span></div>
      <div class="col-6">审批结果：<span>{{ data.result==='0'?'失败':'成功' }}</span></div>
      <div class="col-6">审批结果：<span>{{ data.result==='0'?'拒绝':'同意' }}</span></div>
      <div class="col-12">审批时间：<span>{{ data.approveTime }}</span></div>
      <div class="col-12">审批意见：<span>{{ data.comments }}</span></div>
    </div>