Merge remote-tracking branch 'origin/master'

jiangping

2024-06-11 d0c1633b3a1554ae2e21f96167f8fbe7c1e8a893

Merge remote-tracking branch 'origin/master'

 admin/src/views/business/deviceEvent.vue

@@ -20,7 +20,7 @@
                    <el-option label="人脸认证通过" value="196893"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="起始时间" prop="eventType">
            <el-form-item label="起止时间" prop="eventType">
                <el-date-picker
                    @change="seleTime"
                    v-model="time"
@@ -28,8 +28,8 @@
                    format="yyyy-MM-dd HH:mm:ss"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    range-separator="至"
                    start-placeholder="开始日期"
                    end-placeholder="结束日期">
                    start-placeholder="开始时间"
                    end-placeholder="结束时间">
                </el-date-picker>
            </el-form-item>
            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">

 admin/src/views/business/interfaceLog.vue

@@ -11,7 +11,7 @@
                    <el-option label="推送接受" value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="起始时间" prop="startDate">
            <el-form-item label="起止时间" prop="startDate">
                <el-date-picker
                    @change="seleTime"
                    v-model="time"
@@ -19,8 +19,8 @@
                    format="yyyy-MM-dd HH:mm:ss"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    range-separator="至"
                    start-placeholder="开始日期"
                    end-placeholder="结束日期">
                    start-placeholder="开始时间"
                    end-placeholder="结束时间">
                </el-date-picker>
            </el-form-item>
            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">

 admin/src/views/business/retention.vue

@@ -29,7 +29,7 @@
          <el-option label="内部员工" value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="起始时间" prop="startTime">
      <el-form-item label="起止时间" prop="startTime">
        <el-date-picker
          @change="seleTime"
          v-model="time"
@@ -37,8 +37,8 @@
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          start-placeholder="开始时间"
          end-placeholder="结束时间"
        >
        </el-date-picker>
      </el-form-item>

 admin/src/views/meeting/bookings.vue

@@ -46,7 +46,7 @@
          <el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
        </el-select>
      </el-form-item>
      <el-form-item label="会议时间" prop="startTime">
      <el-form-item label="起止时间" prop="startTime">
        <el-date-picker
          v-model="date"
          type="datetimerange"

 admin/src/views/system/InterfaceLog.vue

@@ -108,7 +108,7 @@
          {
            filed: 'selTime',
            type: 'datetimerange',
            label: '起始时间'
            label: '起止时间'
          },
          {
            type: 'slot',

 admin/src/views/task/index.vue

@@ -183,9 +183,10 @@
            ]
          },
          {
            filed: 'selDate',
            filed: 'selTime',
            type: 'datetimerange',
            label: '起始日期'
            label: '起止时间',
            pickerOptions: {}
          },
          {
            type: 'slot',
@@ -220,8 +221,8 @@
  },
  methods: {
    changeRadio (day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
      this.$set(this.filters, 'selDate', arr)
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
      this.$set(this.filters, 'selTime', arr)
      this.getList()
    },
    handleDetail (row) {
@@ -255,7 +256,7 @@
      }
    },
    changeForm (str) {
      if (str === 'selDate') {
      if (str === 'selTime') {
        this.$set(this.filters, 'fastdate', null)
        this.getList()
      }
@@ -264,9 +265,9 @@
      this.getHeadData()
      console.log(this.filters)
      const { filters, pagination } = this
      if (filters.selDate && filters.selDate.length > 0) {
        filters.startDate = filters.selDate[0]
        filters.endDate = filters.selDate[1]
      if (filters.selTime && filters.selTime.length > 0) {
        filters.startDate = filters.selTime[0]
        filters.endDate = filters.selTime[1]
      } else {
        filters.startDate = null
        filters.endDate = null