From a6fd20248270daab943d373c0849ae9b90a69ec8 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 22 十月 2024 22:20:50 +0800
Subject: [PATCH] feat: 修改页面和菜单

---
 src/components/page/park/index.vue      |   19 ++++++++-
 src/components/page/costRule/index.vue  |    8 ++-
 src/store/state.js                      |   30 +++++++++++++++
 src/components/page/whiteList/index.vue |   20 +++++++++-
 4 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/src/components/page/costRule/index.vue b/src/components/page/costRule/index.vue
index 16a8784..cc45dac 100644
--- a/src/components/page/costRule/index.vue
+++ b/src/components/page/costRule/index.vue
@@ -2,9 +2,11 @@
     <div>
         <div style="padding: 10px 10px 0px 10px;">
             <el-form :inline="true" :model="searchForm">
-              <el-select v-model="searchForm.parkId">
-                <el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
+              <el-form-item label="鍋滆溅鍦�">
+                <el-select v-model="searchForm.parkId" clearable>
+                  <el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+                </el-select>
+              </el-form-item>
                 <el-form-item>
                     <el-button type="primary" size="small" @click="onSearch" icon="el-icon-search">鏌ヨ</el-button>
                     <el-button type="primary" size="small" @click="onAdd" icon="el-icon-plus">澧炲姞</el-button>
diff --git a/src/components/page/park/index.vue b/src/components/page/park/index.vue
index a22b3c6..769c778 100644
--- a/src/components/page/park/index.vue
+++ b/src/components/page/park/index.vue
@@ -5,9 +5,14 @@
                 <!--<el-form-item label="鍚嶇О">-->
                     <!--<el-input v-model="searchForm.name"></el-input>-->
                 <!--</el-form-item>-->
+              <el-form-item label="鍋滆溅鍦�">
+                <el-select v-model="searchForm.id" clearable>
+                  <el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+                </el-select>
+              </el-form-item>
                 <el-form-item>
-                    <!--<el-button type="primary" size="small" @click="onSearch" icon="el-icon-search">鏌ヨ</el-button>-->
-                    <el-button type="primary" size="small" @click="onAdd" icon="el-icon-plus">澧炲姞</el-button>
+                   <el-button type="primary" size="small" @click="onSearch" icon="el-icon-search">鏌ヨ</el-button>
+                    <el-button type="primary" size="small" @click="onAdd" icon="el-icon-plus">鏂板</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -73,8 +78,10 @@
             return {
                 flag:false,
                 flag2:false,
+                table1:[],
                 searchForm: {
-                    name: ''
+                    name: '',
+                    id:'',
                 },
                 pageData: this.$byutil.defaultPageData(),
                 formData: {
@@ -89,6 +96,7 @@
         },
         mounted() {
             this.loadData();
+            this.getAllPark();
         },
         methods: {
             onSave(){
@@ -112,6 +120,11 @@
                 this.pageData = this.$byutil.defaultPageData();
                 this.loadData();
             },
+            getAllPark(){
+              this.$byutil.postData(this, this.$systemconfig.basePath+'/ffzf/park/findAll', {}, res => {
+                this.table1 = res.data;
+              })
+            },
             onAdd() {
                 this.flag=true;
                 this.$refs['formData'].resetFields();
diff --git a/src/components/page/whiteList/index.vue b/src/components/page/whiteList/index.vue
index 2153b46..2c8a27c 100644
--- a/src/components/page/whiteList/index.vue
+++ b/src/components/page/whiteList/index.vue
@@ -3,8 +3,21 @@
         <div style="padding: 10px 10px 0px 10px;">
             <el-form :inline="true" :model="searchForm">
                 <el-form-item label="杞︾墝鍙�">
-                <el-input v-model="searchForm.carNo"></el-input>
+                <el-input v-model="searchForm.carNo" clearable></el-input>
                 </el-form-item>
+              <el-form-item label="绫诲瀷">
+              <el-select  v-model="searchForm.type" placeholder="璇烽�夋嫨" clearable>
+                <el-option label="姘镐箙" :value="0"></el-option>
+                <el-option label="鏈堢エ" :value="1"></el-option>
+              </el-select>
+              </el-form-item>
+              <el-form-item label="閫夋嫨缁撴潫鏃堕棿">
+                <div class="date-box">
+                  <el-date-picker type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                                  v-model="searchForm.date" placeholder="" clearable>
+                  </el-date-picker>
+                </div>
+              </el-form-item>
                 <el-form-item>
                     <el-button type="primary" size="small" @click="onSearch" icon="el-icon-search">鏌ヨ</el-button>
                     <el-button type="primary" size="small" @click="onAdd" icon="el-icon-plus">澧炲姞</el-button>
@@ -72,7 +85,10 @@
                 flag:false,
                 flag2:false,
                 searchForm: {
-                    name: ''
+                    name: '',
+                    carNo:'',
+                    type:null,
+                    date: null
                 },
                 pageData: this.$byutil.defaultPageData(),
                 formData: {
diff --git a/src/store/state.js b/src/store/state.js
index 2e0763c..0db3b11 100644
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -139,6 +139,36 @@
                     parentId: 2,
                     indexUrl: "outPark"
                 },
+                {
+                    icon: 'el-icon-document',
+                    name: '鍦哄唴杞﹁締绠$悊',
+                    parentId: 2,
+                    indexUrl: "enterParkCar"
+                },
+                {
+                    icon: 'el-icon-document',
+                    name: '鎵嬪姩鎶潌璁板綍',
+                    parentId: 2,
+                    indexUrl: "barrierOpenLog"
+                },
+                {
+                    icon: 'el-icon-document',
+                    name: '鐧藉悕鍗曠鐞�',
+                    parentId: 2,
+                    indexUrl: "whiteList"
+                },
+                {
+                    icon: 'el-icon-document',
+                    name: '榛戝悕鍗曠鐞�',
+                    parentId: 2,
+                    indexUrl: "ticketBlack"
+                },
+                {
+                    icon: 'el-icon-document',
+                    name: '璁㈠崟缁熻',
+                    parentId: 2,
+                    indexUrl: "orderRecord"
+                },
 
             ]
         },

--
Gitblit v1.9.1