合并冲突

licp

2024-07-17 b570615eb2c3e1c5f3f2a3dc046d00a64fc2a39e

 src/components/do/b3-work-time-management/work-time-management.vue

@@ -217,7 +217,9 @@
  },
  data () {
    return{
      entity:{},
      entity:{
        dateTime: []
      },
      down:false,
      add:false,
      componentData: {
@@ -341,13 +343,13 @@
      entityCopy1: {},
      upIndex1:100,
      weekList:[
        {label: '星期一', value: '1',type:'primary'},
        {label: '星期二', value: '2',type:'primary'},
        {label: '星期三', value: '3',type:'primary'},
        {label: '星期四', value: '4',type:'primary'},
        {label: '星期五', value: '5',type:'primary'},
        {label: '星期六', value: '6',type:'primary'},
        {label: '星期日', value: '7',type:'primary'}
        {label: '周一', value: '1',type:'primary'},
        {label: '周二', value: '2',type:'primary'},
        {label: '周三', value: '3',type:'primary'},
        {label: '周四', value: '4',type:'primary'},
        {label: '周五', value: '5',type:'primary'},
        {label: '周六', value: '6',type:'primary'},
        {label: '周日', value: '7',type:'primary'}
      ],
      currentTable:'ValueTable0',
      addVisible:false,
@@ -454,6 +456,9 @@
      }
    }
  },
  created() {
    this.setDate()
  },
  mounted(){
    this.getCurrentWeekNumber()
    this.selectEnumByCategory()
@@ -466,6 +471,17 @@
    this.getPower()
  },
  methods:{
    /** 将时间选择器默认选为当天的日期 */
    setDate(){
      let currentDate = new Date();
      let year = currentDate.getFullYear();
      let month = String(currentDate.getMonth() + 1).padStart(2, '0');
      let day = String(currentDate.getDate()).padStart(2, '0');
      let formattedDate1 = `${year}-${month}-${day} 00:00:00`;
      let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
      this.entity.dateTime.push(formattedDate1);
      this.entity.dateTime.push(formattedDate2);
    },
    getPower(){
      let power = JSON.parse(sessionStorage.getItem('power'))
        let del = false