From 4c3a0a7dd0afbcf1f6eb438e481a274b9385fb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Wed, 27 Jul 2022 09:53:57 +0800
Subject: [PATCH] up

---
 src/views/order/parkorder.vue  | 16 +++++++++++-----
 src/views/resource/parking.vue | 23 ++++++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/views/order/parkorder.vue b/src/views/order/parkorder.vue
index bf4f3a3..a80e9e4 100644
--- a/src/views/order/parkorder.vue
+++ b/src/views/order/parkorder.vue
@@ -13,7 +13,7 @@
                 style="margin-left: 10px;">
               </el-date-picker>
 
-              <el-select style="margin-left: 10px;" v-model="searchFields.type" placeholder="请选择类型">
+              <el-select style="margin-left: 10px;margin-right: 10px;" v-model="searchFields.type" placeholder="请选择类型">
                 <el-option value="">
                 </el-option>
                 <el-option v-for="item in parameters.parkType" :key="item.id" :label="item.value" :value="item.id">
@@ -35,9 +35,9 @@
       </div>
       <div class="table-tree">
         <el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"> </el-table-column>
+          <el-table-column type="index" width="50" align="center" fixed="left" label="序号"> </el-table-column>
           <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
-            :label="column.title" :width="column.width">
+            :label="column.title" :width="column.width" :fixed="column.fixed">
             <template slot-scope="scope">
               <div v-if="column.type=='opt'">
                 <Button ghost size="small" @click="show(scope.row)" type="primary"
@@ -191,23 +191,27 @@
         columns: [{
             field: "time",
             title: "预约时间",
-            type: "string",
-            
+            type: "string",
+            width: 220,
+
           },
           {
             field: "plate",
             title: "车牌号",
             type: "string",
+            width: 120,
           },
           {
             field: "type",
             title: "车位类型",
             type: "type",
+            width: 120,
           },
           {
             field: "mobile",
             title: "联系方式",
             type: "string",
+            width: 120,
           },
           {
             field: "orderType",
@@ -223,11 +227,13 @@
             field: "in_date",
             title: "入场时间",
             type: "string",
+            width: 220,
           },
           {
             field: "out_date",
             title: "出场时间",
             type: "string",
+            width: 220,
           },
           {
             field: "teamunit",
diff --git a/src/views/resource/parking.vue b/src/views/resource/parking.vue
index c10d1c1..e0fb3d7 100644
--- a/src/views/resource/parking.vue
+++ b/src/views/resource/parking.vue
@@ -15,7 +15,7 @@
         </LxHeader>
       </div>
       <div class="table-tree">
-        <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+        <el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"> </el-table-column>
           <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
             :label="column.title" :width="column.width">
@@ -105,8 +105,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="大车位数" prop="big_park_total">
-              <el-input v-model="form.big_park_total" placeholder="请填写大车位数" autocomplete="off"></el-input>
+            <el-form-item label="大车位数(09:00至12:00)" prop="big_park_total">
+              <el-input v-model="form.big_park_total" placeholder="请填写大车位数(09:00至12:00)" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="大车位数(13:00至16:00)" prop="big_park_total">
+              <el-input v-model="form.big_park_total2" placeholder="请填写大车位数(13:00至16:00)" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -170,7 +175,8 @@
           end_time: "",
           charge_total: "",
           small_park_total: "",
-          big_park_total: "",
+          big_park_total: "",
+          big_park_total2: "",
           special_park_total:"",
           longitude: "",
           latitude: "",
@@ -208,7 +214,14 @@
           },
           {
             field: "big_park_total",
-            title: "大车位数",
+            title: "大车位数上午",
+            type: "string",
+            align: "center",
+            width: 120
+          },
+          {
+            field: "big_park_total2",
+            title: "大车位数下午",
             type: "string",
             align: "center",
             width: 120