Merge branch 'dev' into dev_tides

Crunchy

2025-03-17 0a26d58a3906b9e13946c7cb46fae51a0de98920

 src/views/performance/manHour/workTimeStatistics.vue

@@ -37,20 +37,16 @@
        </div>
      </div>
      <div class="table">
        <TableCard :showForm="false" :showTitle="false">
          <template v-slot:table>
            <limsTable
              :column="tableColumn"
              :table-data="tableData"
              :table-loading="tableLoading"
              :page="page"
              style="padding: 0 15px"
              :height="'calc(100vh - 290px)'"
              @pagination="pagination"
            >
            </limsTable>
          </template>
        </TableCard>
        <limsTable
          :column="tableColumn"
          :table-data="tableData"
          :table-loading="tableLoading"
          :page="page"
          style="padding: 0 15px"
          :height="'calc(100vh - 290px)'"
          @pagination="pagination"
        >
        </limsTable>
      </div>
    </div>
  </div>
@@ -58,13 +54,11 @@

<script>
import { getYearAndMonthAndDays } from "@/utils/date";
import TableCard from "@/components/TableCard/index.vue";
import limsTable from "@/components/Table/lims-table.vue";
import { selectAuxiliaryAllByMonth } from "@/api/performance/manHour";
export default {
  components: {
    limsTable,
    TableCard,
    limsTable
  },
  data() {
    return {