From 00f774f72e2f607b4da23d7183ff4db3bc8c6cb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/carEvent.vue | 144 ++++++++++-------------------------------------
1 files changed, 31 insertions(+), 113 deletions(-)
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index 5ba7970..8087856 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -1,39 +1,21 @@
<template>
<TableLayout :permissions="['business:carevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form
- ref="searchForm"
- slot="search-form"
- :model="searchForm"
- label-width="100px"
- inline
- >
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="杞︾墝鍙�" prop="plateNos">
- <el-input
- v-model="searchForm.plateNos"
- placeholder="璇疯緭鍏ヨ溅鐗屽彿"
- @keypress.enter.native="search"
- ></el-input>
+ <el-input v-model="searchForm.plateNos" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
- <el-input
- v-model="searchForm.keyWords"
- placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�"
- @keypress.enter.native="search"
- ></el-input>
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="缁勭粐" prop="companyName">
- <el-input
- v-model="searchForm.companyName"
- placeholder="璇疯緭鍏ョ粍缁囧悕绉�"
- @keypress.enter.native="search"
- ></el-input>
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="memberType">
- <el-select v-model="searchForm.memberType" placeholder="璇烽�夋嫨">
- <el-option label="鍔冲姟璁垮" value="0"></el-option>
- <el-option label="鏅�氳瀹�" value="1"></el-option>
- <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
+ <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="0"></el-option>
+ <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
+ <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
@@ -45,23 +27,11 @@
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="eventType">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- >
+ <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-radio-group
- v-model="searchForm.radio"
- size="small"
- @input="changeRadio"
- >
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
<el-radio-button label="1">杩�7澶�</el-radio-button>
<el-radio-button label="2">杩�30澶�</el-radio-button>
@@ -75,80 +45,39 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
<li>
- <el-button
- type="primary"
- v-permissions="['business:carevent:sync']"
- @click="$refs.OperaCarEventHkWindow.open('鍚屾杩囪溅璁板綍')"
- >鍚屾</el-button
- >
+ <el-button type="primary" v-permissions="['business:carevent:sync']"
+ @click="$refs.OperaCarEventHkWindow.open('鍚屾杩囪溅璁板綍')">鍚屾</el-button>
</li>
<li>
- <el-button
- type="primary"
- :loading="isWorking.export"
- v-permissions="['business:carevent:exportExcel']"
- @click="exportExcel"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:carevent:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
- <el-table-column
- prop="plateNos"
- label="杞︾墝鍙�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="parkName"
- label="鍋滆溅搴撳悕绉�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="gateName"
- label="鍑哄叆鍙ｅ悕绉�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="eventTypeName"
- label="浜嬩欢绫诲瀷"
- min-width="100px"
- ></el-table-column>
+ <el-table-column prop="plateNos" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="parkName" label="鍋滆溅搴撳悕绉�" min-width="100px"></el-table-column>
+ <el-table-column prop="gateName" label="鍑哄叆鍙ｅ悕绉�" min-width="100px"></el-table-column>
+ <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
<el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
<template slot-scope="{ row }">
<span v-if="row.inoutType === 0">杩涘満</span>
<span v-if="row.inoutType === 1">绂诲洯</span>
</template>
</el-table-column>
- <el-table-column label="褰掑睘鐢ㄦ埛绫诲瀷" min-width="100px">
+ <el-table-column label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{ row }">
- <span v-if="row.personType == 0">鍔冲姟璁垮</span>
- <span v-if="row.personType == 1">鏅�氳瀹�</span>
- <span v-if="row.personType == 2">鍐呴儴浜哄憳</span>
+ <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
+ <span v-else-if="row.companyType == 1">鍐呴儴鍛樺伐</span>
+ <span v-else>璁垮</span>
</template>
</el-table-column>
- <el-table-column
- prop="personName"
- label="濮撳悕"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="personPhone"
- label="鎵嬫満鍙�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="personCompanyName"
- label="缁勭粐"
- min-width="100px"
- ></el-table-column>
+ <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
<el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
<template slot-scope="{ row }">
<div v-if="row.platePicUrl != null">
- <el-image
- style="width: 80px; height: 80px"
- :src="row.platePicUrl"
- :preview-src-list="[row.platePicUrl]"
- >
+ <el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
</el-image>
</div>
</template>
@@ -156,26 +85,15 @@
<el-table-column label="鎶撴媿鍥剧墖" min-width="100px">
<template slot-scope="{ row }">
<div v-if="row.vehiclePicUrl != null">
- <el-image
- style="width: 80px; height: 80px"
- :src="row.vehiclePicUrl"
- :preview-src-list="[row.vehiclePicUrl]"
- >
+ <el-image style="width: 80px; height: 80px" :src="row.vehiclePicUrl"
+ :preview-src-list="[row.vehiclePicUrl]">
</el-image>
</div>
</template>
</el-table-column>
- <el-table-column
- prop="happenTime"
- label="浜嬩欢鏃堕棿"
- min-width="100px"
- ></el-table-column>
+ <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
<OperaCarEventHkWindow ref="OperaCarEventHkWindow" @success="search()" />
--
Gitblit v1.9.3