Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

6 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 admin/src/views/platform/queueUp.vue

@@ -1,7 +1,7 @@
<template>
  <div class="main_app">
    <div class="mb20 main_header">
      <div class="platgroup_tabs">
    <div class="main_header">
      <div class="platgroup_tabs pt20">
        <div class="tab" :class="{ active: activeGroup.id === item.id }" @click="platgroupClick(item)"
          v-for="(item, i) in PlatGroupList" :key="i">
          {{ item.name }}
@@ -11,9 +11,11 @@
    <div class="df_sb">
      <QueryForm v-model="filters" :query-form-config="queryQueueUpConfig" @handleQuery="getList(1)" @clear="clear">
      </QueryForm>
      <el-button @click="openSign" type="primary" style="align-self: flex-start;">车辆签到</el-button>
      <div>
        <el-button @click="openSign" type="primary" style="align-self: flex-start;">车辆签到</el-button>
      </div>
    </div>
    <div class="main_content">
    <div class="common-header">
      <div class="static_wrap">
        <span>等待：<span class="num">{{ staticParam.waitNum }}</span></span>
        <span class="mr30">{{ }}</span>
@@ -213,7 +215,7 @@
    },
    handleSizeChange(e) {
      this.pagination.pageSize = e
      this.getList()
      this.getList(1)
    },
    handlePageChange(e) {
      this.pagination.page = e
@@ -255,14 +257,24 @@
<style lang="scss" scoped>
@import "@/assets/style/variables.scss";

.main_content {
  background-color: #fff;
  position: relative;
  z-index: 999;
  top: -10;
  margin: -20px;
.main_app {
  padding: 0 20px;

  .doumee-filter {
    padding-top: 20px;
    border: 0;
  }
}

.common-header {
  background-color: #fff;
  /* position: relative; */
  /* z-index: 999; */
  /* top: -10; */
  /* margin: -20px; */
  padding: 0 20px;

  /* border: 1px solid red; */
  .static_wrap {
    height: 50px;
    line-height: 50px;
@@ -271,7 +283,7 @@
    padding: 0 20px;
    background: #F4FAFB;
    border-radius: 2px 2px 0px 0px;
    margin-bottom: 36px;
    /* margin-bottom: 36px; */

    .num {
      color: #111111;