Merge remote-tracking branch 'origin/master'

jiangping

2025-04-01 92e2f86210ebaca3f0b4af21c64d22cc91dffba4

 admin/src/views/statistics/platformRecord.vue

@@ -1,15 +1,31 @@
<template>
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
    <el-table v-loading="loading" :data="list" stripe>
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
      <template #selDate>
        <div>
          <el-date-picker v-model="filters.beginWorkDateStart"  type="date" value-format="yyyy-MM-dd" class="w200"
            @change="getList(1)" />
          <el-date-picker v-model="filters.beginWorkDateEnd" type="date" value-format="yyyy-MM-dd" class="w200"
            @change="getList(1)" />
        </div>
      </template>
      <template #fastdate>
        <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
          <el-radio-button label="6">近7天</el-radio-button>
          <el-radio-button label="29">近30天</el-radio-button>
        </el-radio-group>
      </template>
    </QueryForm>
    <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
      <el-table-column prop="platformName" label="月台名称" min-width="100" show-overflow-tooltip />
      <el-table-column prop="platformGroupName" label="月台组" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeFront" label="车前牌照号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeBack" label="车后牌照号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="startDate" label="作业开始" min-width="100" show-overflow-tooltip />
      <el-table-column prop="doneDate" label="作业结束" min-width="100" show-overflow-tooltip />
      <el-table-column prop="workTime" label="作业时长" min-width="100" show-overflow-tooltip /><el-table-column prop="name"
        label="运输单号/合同号" min-width="100" show-overflow-tooltip>
      <el-table-column prop="param1" label="作业开始" min-width="100" show-overflow-tooltip />
      <el-table-column prop="param2" label="作业结束" min-width="100" show-overflow-tooltip />
      <el-table-column prop="workTime" label="作业时长" min-width="100" show-overflow-tooltip />
      <el-table-column prop="name" label="运输单号/合同号" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
        </template>
@@ -26,9 +42,11 @@
import QueryForm from '@/components/common/QueryForm'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import { platformLogPage, getPlatformGroupList } from '@/api'
import BaseComputHeight from '@/components/base/BaseComputHeight'
dayjs.extend(duration)
import { platformJobPage, getPlatformGroupList } from '@/api'
export default {
  extends: BaseComputHeight,
  components: {
    Pagination,
    QueryForm
@@ -41,7 +59,11 @@
        page: 1,
        total: 0
      },
      filters: {},
      filters: {
        fastdate: 0,
        beginWorkDateStart: '',
        beginWorkDateEnd: ''
      },
      list: [],
      total: 0,
      queryFormConfig: {
@@ -64,20 +86,33 @@
            label: '车牌号'
          },
          {
            type: 'slot',
            filed: 'selDate',
            type: 'daterange',
            label: '日期'
          }
          },
          {
            type: 'slot',
            filed: 'fastdate',
            label: ''
          },
        ],
        online: true
      }
    }
  },
  created() {
    this.getList()
    // this.getList()
    this.getGroupList()
    this.changeRadio('0')
  },
  methods: {
    changeRadio(day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
      this.filters.beginWorkDateStart = arr[0]
      this.filters.beginWorkDateEnd = arr[1]
      this.filters.fastdate = day
      this.getList()
    },
    handleSub() {
      this.$refs.ruleForm.validate((valid) => {
        if (valid) {
@@ -99,14 +134,15 @@
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      platformJobPage({

      platformLogPage({
        model: {
          ...filters,
          queryStatus: '5,6,9,10',
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          queryStatus: '6,7,8',
          // beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          // beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
        },
        sorts: [{ direction: 'DESC', property: 'START_DATE' }],
        sorts: [{ direction: 'DESC', property: 'param1' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
@@ -115,7 +151,14 @@
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
          item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒')
          // item.workTime = dayjs.duration(item.param3, 'seconds').format('H时m分s秒')
          if (item.param3 > 3600) {
            item.workTime = Math.ceil(item.param3 / 3600) + '时' + Math.ceil(Math.ceil(item.param3 % 3600) / 60) + '分' + item.param3 % 60 + '秒'
          } else if (item.param3 > 60) {
            item.workTime = Math.ceil(item.param3 / 60) + '分' + item.param3 % 60 + '秒'
          } else {
            item.workTime = item.param3 + '秒'
          }
        })
        this.pagination.total = res.total || 0
      }, () => {
@@ -130,9 +173,14 @@
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList(1)
    }
  }
}
</script>

<style></style>
<style scoped>
::v-deep .el-table {
  margin-bottom: 60px;
}
</style>