From c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 11:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/carEvent.vue | 22
admin/src/components/common/QueryForm/queryForm.vue | 20
h5/utils/config.js | 4
admin/src/views/business/wmsInterfaceLog.vue | 146 +++---
admin/src/views/system/loginLog.vue | 61 +
h5/pages/driver/index.vue | 2
h5/pages/login/login.vue | 2
admin/src/views/business/empower.vue | 229 ++++----
admin/src/views/business/trainTime.vue | 18
admin/src/views/business/retention.vue | 23
admin/src/views/system/traceLog.vue | 103 ++-
admin/src/views/business/interfaceLog.vue | 156 +++---
admin/src/views/statistics/platformStatic.vue | 8
admin/src/views/task/index.vue | 50 -
admin/src/views/business/retentionCars.vue | 18
admin/src/views/meeting/bookings.vue | 21
admin/src/views/business/visitEvent.vue | 190 +++----
admin/src/views/business/smsEmail.vue | 34
admin/src/views/operation/serviceCar/apprRecord.vue | 164 ++----
admin/src/views/business/deviceEvent.vue | 18
admin/src/views/meeting/roomRecord.vue | 90 +--
admin/src/views/operation/danger/record.vue | 18
h5/pages/staff/vehicle/apply.vue | 2
23 files changed, 718 insertions(+), 681 deletions(-)
diff --git a/admin/src/components/common/QueryForm/queryForm.vue b/admin/src/components/common/QueryForm/queryForm.vue
index c56d064..8f75358 100644
--- a/admin/src/components/common/QueryForm/queryForm.vue
+++ b/admin/src/components/common/QueryForm/queryForm.vue
@@ -5,8 +5,8 @@
<el-form-item v-if="item.type === 'input' && (showZk || index < listLength)" :key="item.filed">
<el-input v-model="searchForm[item.filed]"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.label" class="w200"
- @change="changeForm(item.filed)" @keyup.enter.native="handlekeyup(item.keyup || false)" />
+ :placeholder="item.label" class="w200" @change="changeForm(item.filed)"
+ @keyup.enter.native="handlekeyup(item.keyup || false)" />
</el-form-item>
<el-form-item v-if="item.type === 'moneySelect' && (showZk || index < listLength)" :key="item.label">
<el-input v-model="searchForm[item.filedStrt]"
@@ -20,8 +20,7 @@
<el-form-item v-if="item.type === 'select' && (showZk || index < listLength)" :key="item.filed">
<el-select v-model="searchForm[item.filed]" :filterable="item.filterable || true"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.label" class="w200"
- @change="changeForm(item.filed)">
+ :placeholder="item.label" class="w200" @change="changeForm(item.filed)">
<el-option v-for="opt, i in item.options" :key="i" :value="item.valueCode ? opt[item.valueCode] : opt.value"
:label="item.labelCode ? opt[item.labelCode] : opt.label" />
</el-select>
@@ -29,8 +28,17 @@
<el-form-item v-if="item.type === 'date' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" type="date" value-format="yyyy-MM-dd" class="w200"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.label" :picker-options="item.pickerOptions || {}"
- @change="changeForm(item.filed)" />
+ :placeholder="item.label" :picker-options="item.pickerOptions || {}" @change="changeForm(item.filed)" />
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
+ <el-date-picker v-model="searchForm[item.filed1]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+ class="w200"
+ :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
+ :placeholder="item.label" @change="changeForm(item.filed)" />
+ <el-date-picker v-model="searchForm[item.filed2]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+ class="w200"
+ :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
+ :placeholder="item.label" @change="changeForm(item.filed)" />
</el-form-item>
<el-form-item v-if="item.type === 'daterange' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" value-format="yyyy-MM-dd" type="daterange"
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index ca1c76e..5460f17 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -28,9 +28,13 @@
</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"
+ <!-- <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -77,7 +81,7 @@
<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 }">
<div v-if="row.platePicUrl != null">
<el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
@@ -93,7 +97,7 @@
</el-image>
</div>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
@@ -157,15 +161,19 @@
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 18b6ada..69a41b9 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -29,9 +29,13 @@
</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"
+ <!-- <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -142,15 +146,19 @@
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index 358967b..8aff320 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -1,114 +1,103 @@
<template>
- <TableLayout :permissions="['business:empower:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕鎵嬫満鍙�" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪彂鐘舵��" prop="sendStatus">
- <el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <el-option label="寰呬笅鍙�" value="0"></el-option>
- <el-option label="浠诲姟鎵ц" value="1"></el-option>
- <el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
- <el-option label="宸插彇娑�" value="3"></el-option>
- <el-option label="涓嬪彂澶辫触" value="4"></el-option>
- <el-option label="浠诲姟涓嬭浇宸茬粨鏉�" value="5"></el-option>
- <el-option label="涓嶇鍚堜笅鍙戞潯浠�" value="6"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="缁勭粐" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璁惧鍚嶇О" prop="deviceName">
- <el-input v-model="searchForm.deviceName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪彂璧峰鏃堕棿" prop="startTime">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- @keypress.enter.native="search"
- 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-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
- <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
-<!-- <li><el-button type="primary" v-permissions="['business:empower:create']">绔嬪嵆涓嬪彂</el-button></li>-->
-<!-- <li><el-button type="primary" v-permissions="['business:empower:create']">鍙栨秷涓嬪彂</el-button></li>-->
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="memberName" label="濮撳悕" min-width="80px"></el-table-column>
- <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
- <el-table-column prop="memberidCard" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="160px"></el-table-column>
- <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="240px"></el-table-column>
- <el-table-column prop="deviceName" show-overflow-tooltip label="璁惧鍚嶇О" min-width="150px"></el-table-column>
- <el-table-column label="闂ㄧ鏈夋晥鏈�" show-overflow-tooltip min-width="170px">
- <template slot-scope="{row}">
- <span v-if="!row.startTime || !row.endTime">闀挎湡</span>
- <div v-else>
- <span>璧凤細{{row.startTime}}</span><br />
- <span>姝細{{row.endTime}}</span>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column label="鏄惁鍒犻櫎" min-width="100px">
- <template slot-scope="{row}">
- <span style="color: green;" v-if="row.isdeleted === 0">鍚�</span>
- <span style="color: red;" v-if="row.isdeleted === 1">鏄�</span>
- </template>
- </el-table-column>
-<!-- <el-table-column prop="createrName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>-->
- <el-table-column label="涓嬪彂鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.sendStatus === 0">寰呬笅鍙�</span>
- <span v-if="row.sendStatus === 1">浠诲姟鎵ц</span>
- <span v-if="row.sendStatus === 2">涓嬪彂鎴愬姛</span>
- <span v-if="row.sendStatus === 3">宸插彇娑�</span>
- <span v-if="row.sendStatus === 4">涓嬪彂澶辫触</span>
- <span v-if="row.sendStatus === 5">浠诲姟涓嬭浇宸茬粨鏉�</span>
- <span v-if="row.sendStatus === 6">涓嶇鍚堜笅鍙戞潯浠�</span>
- </template>
- </el-table-column>
- <el-table-column prop="sendType" label="涓嬪彂绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.sendType === 0">瀹炴椂</span>
- <span v-if="row.sendType === 1">瀹氭椂</span>
- </template>
- </el-table-column>
- <el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column prop="sendInfo" label="涓嬪彂澶囨敞" min-width="150px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ <TableLayout :permissions="['business:empower:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="濮撳悕鎵嬫満鍙�" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="涓嬪彂鐘舵��" prop="sendStatus">
+ <el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+ <el-option label="寰呬笅鍙�" value="0"></el-option>
+ <el-option label="浠诲姟鎵ц" value="1"></el-option>
+ <el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
+ <el-option label="宸插彇娑�" value="3"></el-option>
+ <el-option label="涓嬪彂澶辫触" value="4"></el-option>
+ <el-option label="浠诲姟涓嬭浇宸茬粨鏉�" value="5"></el-option>
+ <el-option label="涓嶇鍚堜笅鍙戞潯浠�" value="6"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="璁惧鍚嶇О" prop="deviceName">
+ <el-input v-model="searchForm.deviceName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="涓嬪彂璧峰鏃堕棿" prop="">
+ <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" 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-date-picker type="datetime" v-model="searchForm.sendStartDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.sendEndDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <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>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
+ <li><el-button type="primary" v-permissions="['business:empower:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button></li>
+ <!-- <li><el-button type="primary" v-permissions="['business:empower:create']">绔嬪嵆涓嬪彂</el-button></li>-->
+ <!-- <li><el-button type="primary" v-permissions="['business:empower:create']">鍙栨秷涓嬪彂</el-button></li>-->
+ </ul>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="memberName" label="濮撳悕" min-width="80px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
+ <el-table-column prop="memberidCard" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="160px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="240px"></el-table-column>
+ <el-table-column prop="deviceName" show-overflow-tooltip label="璁惧鍚嶇О" min-width="150px"></el-table-column>
+ <el-table-column label="闂ㄧ鏈夋晥鏈�" show-overflow-tooltip min-width="170px">
+ <template slot-scope="{row}">
+ <span v-if="!row.startTime || !row.endTime">闀挎湡</span>
+ <div v-else>
+ <span>璧凤細{{ row.startTime }}</span><br />
+ <span>姝細{{ row.endTime }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column label="鏄惁鍒犻櫎" min-width="100px">
+ <template slot-scope="{row}">
+ <span style="color: green;" v-if="row.isdeleted === 0">鍚�</span>
+ <span style="color: red;" v-if="row.isdeleted === 1">鏄�</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="createrName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>-->
+ <el-table-column label="涓嬪彂鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.sendStatus === 0">寰呬笅鍙�</span>
+ <span v-if="row.sendStatus === 1">浠诲姟鎵ц</span>
+ <span v-if="row.sendStatus === 2">涓嬪彂鎴愬姛</span>
+ <span v-if="row.sendStatus === 3">宸插彇娑�</span>
+ <span v-if="row.sendStatus === 4">涓嬪彂澶辫触</span>
+ <span v-if="row.sendStatus === 5">浠诲姟涓嬭浇宸茬粨鏉�</span>
+ <span v-if="row.sendStatus === 6">涓嶇鍚堜笅鍙戞潯浠�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="sendType" label="涓嬪彂绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.sendType === 0">瀹炴椂</span>
+ <span v-if="row.sendType === 1">瀹氭椂</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="sendInfo" label="涓嬪彂澶囨敞" min-width="150px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -120,7 +109,7 @@
name: 'Empower',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -137,7 +126,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '浜哄憳鎺堟潈瀵煎叆璁板綍',
api: '/business/empower',
@@ -148,30 +137,34 @@
this.search()
},
methods: {
- changeRadio (e) {
+ changeRadio(e) {
this.searchForm.radio = e
if (e === '0') {
this.searchForm.sendStartDate = timeForMat(0)[0]
this.searchForm.sendEndDate = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.sendStartDate = timeForMat(6)[0]
this.searchForm.sendEndDate = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.sendStartDate = timeForMat(29)[0]
this.searchForm.sendEndDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.sendStartDate && this.searchForm.sendEndDate && new Date(this.searchForm.sendStartDate).getTime() > new Date(this.searchForm.sendEndDate).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.sendStartDate = ''
+ return
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.sendStartDate = e[0]
this.searchForm.sendEndDate = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm = {}
this.time = []
diff --git a/admin/src/views/business/interfaceLog.vue b/admin/src/views/business/interfaceLog.vue
index 69ce768..f28b1df 100644
--- a/admin/src/views/business/interfaceLog.vue
+++ b/admin/src/views/business/interfaceLog.vue
@@ -1,18 +1,18 @@
<template>
- <TableLayout :permissions="['business:interfacelog:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
- <el-option label="璋冪敤" value="0"></el-option>
- <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker
+ <TableLayout :permissions="['business:interfacelog:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
+ <el-option label="璋冪敤" value="0"></el-option>
+ <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
+ <!-- <el-date-picker
@change="seleTime"
v-model="time"
type="datetimerange"
@@ -21,61 +21,59 @@
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-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
- <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
- <el-table-column label="绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.type == 0">璋冪敤</span>
- <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
- </template>
- </el-table-column>
- <el-table-column label="骞冲彴" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
- <span v-if="row.plat == 1">ERP绯荤粺</span>
- </template>
- </el-table-column>
- <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', {content: row.request})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', {content: row.repose})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
- </TableLayout>
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <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>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
+ <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
+ <el-table-column label="绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == 0">璋冪敤</span>
+ <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="骞冲彴" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
+ <span v-if="row.plat == 1">ERP绯荤粺</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text"
+ @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', { content: row.request })">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text"
+ @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', { content: row.repose })">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange" />
+ </TableLayout>
</template>
<script>
@@ -88,7 +86,7 @@
name: 'InterfaceLog',
extends: BaseTable,
components: { TableLayout, Pagination, OperaInterfaceLogWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -101,7 +99,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍',
api: '/business/interfaceLog',
@@ -111,29 +109,33 @@
this.changeRadio('0')
},
methods: {
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startDate = timeForMat(29)[0]
this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startDate && this.searchForm.endDate && new Date(this.searchForm.startDate).getTime() > new Date(this.searchForm.endDate).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startDate = ''
+ return
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startDate = e[0]
this.searchForm.endDate = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm.startDate = ''
this.searchForm.endDate = ''
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 2818825..0100514 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -17,9 +17,13 @@
</el-select>
</el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="startTime">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ <!-- <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -41,7 +45,8 @@
@click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
@@ -50,7 +55,7 @@
<template slot-scope="{ row }">
<span v-if="row.type === 2 || row.type === 0">{{
row.companyName
- }}</span>
+ }}</span>
<span v-else>{{ row.visitCompanyName }}</span>
</template>
</el-table-column>
@@ -130,15 +135,19 @@
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/business/retentionCars.vue b/admin/src/views/business/retentionCars.vue
index e4756e2..e64eed1 100644
--- a/admin/src/views/business/retentionCars.vue
+++ b/admin/src/views/business/retentionCars.vue
@@ -23,9 +23,13 @@
</el-select>
</el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="startTime">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ <!-- <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -123,15 +127,19 @@
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/business/smsEmail.vue b/admin/src/views/business/smsEmail.vue
index abfca39..ac668f6 100644
--- a/admin/src/views/business/smsEmail.vue
+++ b/admin/src/views/business/smsEmail.vue
@@ -5,7 +5,7 @@
<el-form-item label="" prop="phone">
<el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿/閭鍦板潃" @keypress.enter.native="search"></el-input>
</el-form-item>
-<!-- <el-form-item label="" prop="type">
+ <!-- <el-form-item label="" prop="type">
<el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="绫诲瀷">
<el-option label="鐭俊" value="0"></el-option>
<el-option label="閭" value="1"></el-option>
@@ -25,9 +25,13 @@
</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"
+ <!-- <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -43,10 +47,10 @@
<template v-slot:table-wrap>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
<el-table-column prop="phone" label="鎵嬫満鍙�/閭" min-width="150px">
- <template slot-scope="{ row }">
- <span v-if="row.type == 0">{{ row.phone }}</span>
- <span v-if="row.type == 1">{{ row.email }}</span>
- </template>
+ <template slot-scope="{ row }">
+ <span v-if="row.type == 0">{{ row.phone }}</span>
+ <span v-if="row.type == 1">{{ row.email }}</span>
+ </template>
</el-table-column>
<el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
<el-table-column prop="content" label="鍐呭" min-width="300px"></el-table-column>
@@ -120,25 +124,29 @@
methods: {
reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = ''
- // this.changeRadio('0')
+ // this.searchForm.radio = ''
+ this.changeRadio('0')
this.searchForm = {}
this.time = []
- this.search()
+ // this.search()
},
changeRadio(e) {
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/business/trainTime.vue b/admin/src/views/business/trainTime.vue
index e8c8222..e240702 100644
--- a/admin/src/views/business/trainTime.vue
+++ b/admin/src/views/business/trainTime.vue
@@ -9,9 +9,13 @@
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</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"
+ <!-- <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.sendStartDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.sendEndDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -90,15 +94,19 @@
if (e === '0') {
this.searchForm.sendStartDate = timeForMat(0)[0]
this.searchForm.sendEndDate = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.sendStartDate = timeForMat(6)[0]
this.searchForm.sendEndDate = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.sendStartDate = timeForMat(29)[0]
this.searchForm.sendEndDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.sendStartDate && this.searchForm.sendEndDate && new Date(this.searchForm.sendStartDate).getTime() > new Date(this.searchForm.sendEndDate).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.sendStartDate = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index 8310e30..4af12b0 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -1,95 +1,83 @@
<template>
- <TableLayout :permissions="['business:visitevent:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
- <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="杞︾墝鍙�" prop="carNo">
- <el-input v-model="searchForm.carNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" prop="visitorWorkUint">
- <el-input v-model="searchForm.visitorWorkUint" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
- <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option label="璁垮鐧昏" value="541200006"></el-option>
- <el-option label="璁垮绛剧" value="541200007"></el-option>
- <el-option label="璁垮閫氳" value="541200060"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="杩涘嚭绫诲瀷" prop="inOrOut">
- <el-select v-model="searchForm.inOrOut" placeholder="璇烽�夋嫨">
- <el-option label="杩�" value="0"></el-option>
- <el-option label="鍑�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="carNo">
- <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-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
- <el-table-column prop="idcardDecode" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="visitorWorkUint" label="缁勭粐" min-width="100px"></el-table-column>
- <el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="beVisitedPersonName" label="琚浜�" min-width="100px"></el-table-column>
- <el-table-column prop="beVisitedPersonOrg" label="琚浜虹粍缁�" min-width="100px"></el-table-column>
- <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="inOrOut" label="杩涘嚭绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.inOrOut == '0'">杩�</span>
- <span v-else-if="row.inOrOut == '1'">鍑�</span>
- <span v-else>-</span>
- </template>
- </el-table-column>
- <el-table-column label="鎶撴媿鍥�" min-width="100px">
- <template slot-scope="{row}">
- <el-image v-if="row.captureUrlFull!=null"
- style="width: 80px; height: 80px"
- :src="row.captureUrlFull"
- :preview-src-list="[row.captureUrlFull]">
- </el-image>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ <TableLayout :permissions="['business:visitevent:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="杞︾墝鍙�" prop="carNo">
+ <el-input v-model="searchForm.carNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="visitorWorkUint">
+ <el-input v-model="searchForm.visitorWorkUint" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+ <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮鐧昏" value="541200006"></el-option>
+ <el-option label="璁垮绛剧" value="541200007"></el-option>
+ <el-option label="璁垮閫氳" value="541200060"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩涘嚭绫诲瀷" prop="inOrOut">
+ <el-select v-model="searchForm.inOrOut" placeholder="璇烽�夋嫨">
+ <el-option label="杩�" value="0"></el-option>
+ <el-option label="鍑�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧峰鏃堕棿" prop="carNo">
+ <!-- <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-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <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>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="phone" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="visitorWorkUint" label="缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="beVisitedPersonName" label="琚浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="beVisitedPersonOrg" label="琚浜虹粍缁�" min-width="100px"></el-table-column>
+ <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column prop="inOrOut" label="杩涘嚭绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.inOrOut == '0'">杩�</span>
+ <span v-else-if="row.inOrOut == '1'">鍑�</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶撴媿鍥�" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image v-if="row.captureUrlFull != null" style="width: 80px; height: 80px" :src="row.captureUrlFull"
+ :preview-src-list="[row.captureUrlFull]">
+ </el-image>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -101,7 +89,7 @@
name: 'VisitEvent',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -118,7 +106,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '璁垮浜嬩欢鎺ㄩ�佽褰曡〃',
api: '/business/visitEvent',
@@ -130,29 +118,33 @@
this.search()
},
methods: {
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startTime = e[0]
this.searchForm.endTime = e[1]
this.searchForm.radio = null
this.search()
},
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.time = []
this.searchForm = {}
diff --git a/admin/src/views/business/wmsInterfaceLog.vue b/admin/src/views/business/wmsInterfaceLog.vue
index d8bbce2..ed8d436 100644
--- a/admin/src/views/business/wmsInterfaceLog.vue
+++ b/admin/src/views/business/wmsInterfaceLog.vue
@@ -1,18 +1,18 @@
<template>
- <TableLayout :permissions="['business:wmsinterfacelog:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
- <el-option label="璋冪敤" value="0"></el-option>
- <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker
+ <TableLayout :permissions="['business:wmsinterfacelog:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
+ <el-option label="璋冪敤" value="0"></el-option>
+ <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
+ <!-- <el-date-picker
@change="seleTime"
v-model="time"
type="datetimerange"
@@ -21,61 +21,59 @@
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-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
- <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
- <el-table-column label="绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.type == 0">璋冪敤</span>
- <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
- </template>
- </el-table-column>
-<!-- <el-table-column label="骞冲彴" min-width="100px">
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <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>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
+ <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
+ <el-table-column label="绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == 0">璋冪敤</span>
+ <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column label="骞冲彴" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
<span v-if="row.plat == 1">ERP绯荤粺</span>
</template>
</el-table-column>-->
- <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', {content: row.request})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', {content: row.repose})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
- </TableLayout>
+ <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text"
+ @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', { content: row.request })">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text"
+ @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', { content: row.repose })">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange" />
+ </TableLayout>
</template>
<script>
@@ -88,7 +86,7 @@
name: 'InterfaceLog',
extends: BaseTable,
components: { TableLayout, Pagination, OperaInterfaceLogWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -101,7 +99,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍',
api: '/business/wmsInterfaceLog',
@@ -111,29 +109,33 @@
this.changeRadio('0')
},
methods: {
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startDate = timeForMat(29)[0]
this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startDate && this.searchForm.endDate && new Date(this.searchForm.startDate).getTime() > new Date(this.searchForm.endDate).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startDate = ''
+ return
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startDate = e[0]
this.searchForm.endDate = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm.startDate = ''
this.searchForm.endDate = ''
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index a9b8266..8b1fe08 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -32,10 +32,13 @@
</el-select>
</el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="startTime">
- <el-date-picker v-model="date" type="datetimerange" range-separator="鑷�" value-format="yyyy-MM-dd HH:mm:ss"
+ <!-- <el-date-picker v-model="date" type="datetimerange" range-separator="鑷�" value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿"
- @change="selectDate"></el-date-picker>
- <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫椂闂�" @change="search"/> -->
+ @change="selectDate"></el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -43,7 +46,7 @@
<el-radio-button label="2">杩�30澶�</el-radio-button>
</el-radio-group>
<!-- <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker v-model="searchForm.endTime" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�" @change="search"/>
+ <el-date-picker v-model="searchForm.endTime" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="search"/>
</el-form-item> -->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -213,15 +216,19 @@
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.date = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.date = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.date = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/meeting/roomRecord.vue b/admin/src/views/meeting/roomRecord.vue
index f2020b1..5eedefa 100644
--- a/admin/src/views/meeting/roomRecord.vue
+++ b/admin/src/views/meeting/roomRecord.vue
@@ -3,12 +3,7 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="浼氳瀹�" prop="roomId">
- <el-select
- v-model="searchForm.roomId"
- filterable
- clearable
- placeholder="璇烽�夋嫨浼氳瀹�"
- >
+ <el-select v-model="searchForm.roomId" filterable clearable placeholder="璇烽�夋嫨浼氳瀹�">
<el-option v-for="item in rooms" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
@@ -19,54 +14,43 @@
<el-input v-model="searchForm.meeting" placeholder="璇疯緭鍏ヤ細璁富棰�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="绫诲瀷" prop="status">
- <el-select v-model= "searchForm.objType" placeholder="璇烽�夋嫨鐘舵��">
- <el-option key="0" value="0" label="绠＄悊鍛�" />
- <el-option key="1" value="1" label="鍙備細浜哄憳" />
- <el-option key="2" value="2" label="澶栭儴浜哄憳" />
+ <el-select v-model="searchForm.objType" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option key="0" value="0" label="绠＄悊鍛�" />
+ <el-option key="1" value="1" label="鍙備細浜哄憳" />
+ <el-option key="2" value="2" label="澶栭儴浜哄憳" />
</el-select>
</el-form-item>
<el-form-item label="寮�闂ㄦ椂闂�" prop="startTime">
- <el-date-picker
- v-model="date"
- type="datetimerange"
- range-separator="鑷�"
- value-format="yyyy-MM-dd HH:mm:ss"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- @change="selectDate"
- ></el-date-picker>
- <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫椂闂�" @change="search"/> -->
+ <el-date-picker v-model="date" type="datetimerange" range-separator="鑷�" value-format="yyyy-MM-dd HH:mm:ss"
+ start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" @change="selectDate"></el-date-picker>
+ <!-- <el-date-picker v-model="searchForm.startTime" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="search"/> -->
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:roomrecord:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:roomrecord:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
-<!-- <ul class="toolbar" v-permissions="['business:roomrecord:create', 'business:roomrecord:delete']">
+ <!-- <ul class="toolbar" v-permissions="['business:roomrecord:create', 'business:roomrecord:delete']">
<li><el-button type="primary" @click="$refs.operaRoomRecordWindow.open('鏂板缓浼氳瀹ゅ紑闂ㄨ褰曡〃')" icon="el-icon-plus" v-permissions="['business:roomrecord:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:roomrecord:delete']">鍒犻櫎</el-button></li>
</ul>-->
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
- <el-table-column label="浜哄憳濮撳悕" prop="userName" min-width="100px"></el-table-column>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table-column label="浜哄憳濮撳悕" prop="userName" min-width="100px"></el-table-column>
<el-table-column label="浜哄憳绫诲瀷" prop="objType" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.objType==0" >绠＄悊鍛�</span>
- <span v-else-if="row.objType==1">鍙備細浜哄憳</span>
- <span v-else >澶栭儴浜哄憳</span>
- </template>
+ <template slot-scope="{row}">
+ <span v-if="row.objType == 0">绠＄悊鍛�</span>
+ <span v-else-if="row.objType == 1">鍙備細浜哄憳</span>
+ <span v-else>澶栭儴浜哄憳</span>
+ </template>
</el-table-column>
<el-table-column label="浼氳涓婚" prop="meeting" min-width="100px"></el-table-column>
<el-table-column label="浼氳瀹�" prop="roomName" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="寮�闂ㄦ椂闂�" min-width="100px"></el-table-column>
-<!-- <el-table-column
+ <!-- <el-table-column
v-if="containPermissions(['business:roomrecord:update', 'business:roomrecord:delete'])"
label="鎿嶄綔"
min-width="120"
@@ -78,15 +62,11 @@
</template>
</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>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaRoomRecordWindow ref="operaRoomRecordWindow" @success="handlePageChange"/>
+ <OperaRoomRecordWindow ref="operaRoomRecordWindow" @success="handlePageChange" />
</TableLayout>
</template>
@@ -100,9 +80,9 @@
name: 'RoomRecord',
extends: BaseTable,
components: { TableLayout, Pagination, OperaRoomRecordWindow },
- data () {
+ data() {
return {
- date:[],
+ date: [],
// 鎼滅储
rooms: [
{ name: '201浼氳瀹�', id: '0' }
@@ -112,13 +92,13 @@
userName: '',
roomId: '',
meeting: '',
- objType:null,
+ objType: null,
startDate: null,
endDate: null,
}
}
},
- created () {
+ created() {
this.config({
module: '浼氳瀹ゅ紑闂ㄨ褰曡〃',
api: '/meeting/roomRecord',
@@ -126,9 +106,9 @@
'field.main': 'id'
})
findList({})
- .then(res => {
- this.rooms = res
- })
+ .then(res => {
+ this.rooms = res
+ })
this.search()
},
methods: {
@@ -136,16 +116,16 @@
this.searchForm.endDate = v[1]
this.searchForm.startDate = v[0]
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.date = []
- this.searchForm = {
+ this.searchForm = {
userName: '',
- roomId: '',
- meeting: '',
- objType:null,
- startDate: null,
- endDate: null,
+ roomId: '',
+ meeting: '',
+ objType: null,
+ startDate: null,
+ endDate: null,
}
this.search()
}
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index 9ccf39c..5c45c1b 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -33,10 +33,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎻愭姤鏃堕棿" prop="startTime">
- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
+ <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.queryStartTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.queryEndTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -171,15 +175,19 @@
if (e === '0') {
this.searchForm.queryStartTime = timeForMat(0)[0]
this.searchForm.queryEndTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.queryStartTime = timeForMat(6)[0]
this.searchForm.queryEndTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.queryStartTime = timeForMat(29)[0]
this.searchForm.queryEndTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.queryStartTime && this.searchForm.queryEndTime && new Date(this.searchForm.queryStartTime).getTime() > new Date(this.searchForm.queryEndTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.queryStartTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index d765a20..571b12b 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -1,90 +1,55 @@
<template>
<TableLayout :permissions="['business:carusebook:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form
- ref="searchForm"
- slot="search-form"
- :model="searchForm"
- label-width="100px"
- inline
- >
- <el-form-item label="鐢宠浜�" prop="memberName">
- <el-input
- v-model="searchForm.memberName"
- placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�"
- @keypress.enter.native="search"
- ></el-input>
- </el-form-item>
- <el-form-item label="鐢宠浜虹粍缁�" prop="companyName">
- <el-input
- v-model="searchForm.companyName"
- placeholder="璇疯緭鍏ョ敵璇蜂汉缁勭粐"
- clearable
- @keypress.enter.native="search"
- ></el-input>
- </el-form-item>
- <el-form-item label="杞︾墝鍙�" prop="carCode">
- <el-input
- v-model="searchForm.carCode"
- placeholder="璇疯緭鍏ヨ溅鐗屽彿"
- clearable
- @keypress.enter.native="search"
- ></el-input>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select
- v-model="searchForm.status"
- @change="search"
- clearable
- placeholder="鐘舵��"
- >
- <el-option label="鐢宠涓�" value="0"></el-option>
- <el-option label="瀹℃牳涓�" value="1"></el-option>
- <el-option label="瀹℃壒閫氳繃" value="2"></el-option>
- <el-option label="瀹℃壒涓嶉�氳繃" value="3"></el-option>
- <el-option label="宸叉挙閿�" value="4"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐩殑鍦扮被鍨�" prop="type">
- <el-select
- v-model="searchForm.type"
- @change="search"
- clearable
- placeholder="鐩殑鍦扮被鍨�"
- >
- <el-option label="甯傚唴鐢ㄨ溅" value="0"></el-option>
- <el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐢宠鏃堕棿" prop="startTime">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- @keypress.enter.native="search"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- :default-time="['00:00:00', '23:59:59']"
- 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-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鐢宠浜�" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢宠浜虹粍缁�" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ敵璇蜂汉缁勭粐" clearable
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="杞︾墝鍙�" prop="carCode">
+ <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" clearable
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
+ <el-option label="鐢宠涓�" value="0"></el-option>
+ <el-option label="瀹℃牳涓�" value="1"></el-option>
+ <el-option label="瀹℃壒閫氳繃" value="2"></el-option>
+ <el-option label="瀹℃壒涓嶉�氳繃" value="3"></el-option>
+ <el-option label="宸叉挙閿�" value="4"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐩殑鍦扮被鍨�" prop="type">
+ <el-select v-model="searchForm.type" @change="search" clearable placeholder="鐩殑鍦扮被鍨�">
+ <el-option label="甯傚唴鐢ㄨ溅" value="0"></el-option>
+ <el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
+ <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
+ range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.queryStartTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.queryEndTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <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>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul
@@ -112,12 +77,8 @@
>
</li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
prop="carCode"
@@ -260,8 +221,8 @@
searchForm: {
memberName: '',
companyName: '',
- queryStartTime: '',
- queryEndTime: '',
+ startTime: '',
+ endTime: '',
type: null,
status: null,
radio: 0
@@ -321,20 +282,23 @@
})
})
},
- changeRadio (e) {
- this.searchForm.radio = e
- if (e === 0) {
+ changeRadio(e) {
+ if (e === '0') {
this.searchForm.queryStartTime = timeForMat(0)[0]
this.searchForm.queryEndTime = timeForMat(0)[1]
- this.time = timeForMat(0)
- } else if (e === 1) {
+ } else if (e === '1') {
this.searchForm.queryStartTime = timeForMat(6)[0]
this.searchForm.queryEndTime = timeForMat(6)[1]
- this.time = timeForMat(6)
- } else if (e === 2) {
+ } else if (e === '2') {
this.searchForm.queryStartTime = timeForMat(29)[0]
this.searchForm.queryEndTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.queryStartTime && this.searchForm.queryEndTime && new Date(this.searchForm.queryStartTime).getTime() > new Date(this.searchForm.queryEndTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.queryStartTime = ''
+ return
}
this.search()
},
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index 8449de0..d6daf98 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -159,11 +159,11 @@
},
clear() {
this.filters = {
- // selDate: []
- fastdate: '0'
+ selDate: [],
+ fastdate: ''
}
- // this.getList()
- this.changeRadio('0')
+ this.getList()
+ // this.changeRadio('0')
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
diff --git a/admin/src/views/system/loginLog.vue b/admin/src/views/system/loginLog.vue
index ff319ab..11786a0 100644
--- a/admin/src/views/system/loginLog.vue
+++ b/admin/src/views/system/loginLog.vue
@@ -13,12 +13,12 @@
</el-form-item>
<el-form-item label="鏄惁鐧诲綍鎴愬姛" prop="success">
<el-select v-model="searchForm.success" placeholder="璇烽�夋嫨鏄惁鐧诲綍鐘舵��" clearable @change="search">
- <el-option value="true" label="鐧诲綍鎴愬姛"/>
- <el-option value="false" label="鐧诲綍澶辫触"/>
+ <el-option value="true" label="鐧诲綍鎴愬姛" />
+ <el-option value="false" label="鐧诲綍澶辫触" />
</el-select>
</el-form-item>
<el-form-item label="鐧诲綍鏃堕棿" prop="loginTime">
- <el-date-picker
+ <!-- <el-date-picker
v-model="searchDateRange"
type="datetimerange"
range-separator="鑷�"
@@ -26,7 +26,11 @@
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
@change="handleSearchTimeChange"
- ></el-date-picker>
+ ></el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -36,34 +40,27 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- :default-sort="{prop: 'loginTime', order: 'descending'}"
- @sort-change="handleSortChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe
+ :default-sort="{ prop: 'loginTime', order: 'descending' }" @sort-change="handleSortChange">
<el-table-column prop="loginUsername" label="鐧诲綍鐢ㄦ埛鍚�" min-width="100px"></el-table-column>
<el-table-column prop="ip" label="鐧诲綍IP" min-width="120px"></el-table-column>
<el-table-column prop="location" label="鐧诲綍鍦板潃" min-width="160px"></el-table-column>
<el-table-column prop="clientInfo" label="瀹㈡埛绔�" min-width="160px"></el-table-column>
<el-table-column prop="osInfo" label="鎿嶄綔绯荤粺" min-width="100px"></el-table-column>
<el-table-column prop="platform" label="鐧诲綍骞冲彴" min-width="100px"></el-table-column>
- <el-table-column prop="loginTime" label="鐧诲綍鏃堕棿" min-width="160px" sortable="custom" sort-by="LOGIN_TIME"></el-table-column>
+ <el-table-column prop="loginTime" label="鐧诲綍鏃堕棿" min-width="160px" sortable="custom"
+ sort-by="LOGIN_TIME"></el-table-column>
<el-table-column prop="systemVersion" label="绯荤粺鐗堟湰" min-width="100px"></el-table-column>
<el-table-column prop="serverIp" label="鏈嶅姟鍣↖P" min-width="120px"></el-table-column>
<el-table-column prop="success" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- {{row.success | statusText}}
+ {{ row.success | statusText }}
</template>
</el-table-column>
<el-table-column prop="reason" label="澶辫触鍘熷洜" min-width="160px"></el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- ></pagination>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
</template>
</TableLayout>
</template>
@@ -77,7 +74,7 @@
name: 'SystemLoginLog',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储鏃堕棿鑼冨洿
searchDateRange: [],
@@ -94,7 +91,7 @@
},
filters: {
// 鐧诲綍鐘舵��
- statusText (value) {
+ statusText(value) {
if (value != null && !value) {
return '鐧诲綍澶辫触'
}
@@ -102,8 +99,28 @@
}
},
methods: {
+ reset() {
+ this.searchForm = {
+ loginUsername: '',
+ ip: '',
+ serverIp: '',
+ success: '',
+ startTime: null,
+ endTime: null
+ }
+ this.search()
+ },
+ changeRadio() {
+
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
+ }
+ this.search()
+ },
// 鏃堕棿鎼滅储鑼冨洿鍙樺寲
- handleSearchTimeChange (value) {
+ handleSearchTimeChange(value) {
this.searchForm.startTime = null
this.searchForm.endTime = null
if (value != null) {
@@ -113,7 +130,7 @@
this.search()
}
},
- created () {
+ created() {
this.config({
module: '鐧诲綍鏃ュ織',
api: '/system/loginLog',
diff --git a/admin/src/views/system/traceLog.vue b/admin/src/views/system/traceLog.vue
index c555d1c..8724eb1 100644
--- a/admin/src/views/system/traceLog.vue
+++ b/admin/src/views/system/traceLog.vue
@@ -13,20 +13,20 @@
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="searchForm.status" clearable @change="search">
- <el-option value="-1" label="鏈鐞�"/>
- <el-option value="0" label="澶辫触"/>
- <el-option value="1" label="鎴愬姛"/>
+ <el-option value="-1" label="鏈鐞�" />
+ <el-option value="0" label="澶辫触" />
+ <el-option value="1" label="鎴愬姛" />
</el-select>
</el-form-item>
<el-form-item label="寮傚父绛夌骇" prop="exceptionLevel">
<el-select v-model="searchForm.exceptionLevel" clearable @change="search">
- <el-option value="10" label="楂�"/>
- <el-option value="5" label="涓�"/>
- <el-option value="0" label="浣�"/>
+ <el-option value="10" label="楂�" />
+ <el-option value="5" label="涓�" />
+ <el-option value="0" label="浣�" />
</el-select>
</el-form-item>
<el-form-item label="鎿嶄綔鏃堕棿鑼冨洿">
- <el-date-picker
+ <!-- <el-date-picker
v-model="searchDateRange"
type="datetimerange"
range-separator="鑷�"
@@ -34,7 +34,11 @@
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
@change="handleSearchTimeChange"
- ></el-date-picker>
+ ></el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -49,46 +53,45 @@
</div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- :default-sort="{prop: 'operaTime', order: 'descending'}"
- :row-class-name="tableRowClassName"
- @sort-change="handleSortChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe
+ :default-sort="{ prop: 'operaTime', order: 'descending' }" :row-class-name="tableRowClassName"
+ @sort-change="handleSortChange">
<el-table-column prop="operaModule" label="涓氬姟妯″潡" min-width="100px"></el-table-column>
<el-table-column prop="operaRemark" label="鎿嶄綔璇存槑" min-width="100px"></el-table-column>
<el-table-column prop="requestMethod" label="璇锋眰鏂瑰紡" min-width="80px"></el-table-column>
<el-table-column prop="requestUri" label="璇锋眰鍦板潃" min-width="200px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="80px">
<template slot-scope="{row}">
- {{row.status | statusText}}
+ {{ row.status | statusText }}
</template>
</el-table-column>
<el-table-column prop="requestParams" label="璇锋眰鍙傛暟" min-width="80px">
<template slot-scope="{row}">
- <ColumnDetail v-if="row.requestParams != null" :content="row.requestParams" :limit="0"/>
+ <ColumnDetail v-if="row.requestParams != null" :content="row.requestParams" :limit="0" />
</template>
</el-table-column>
<el-table-column prop="requestResult" label="璇锋眰缁撴灉" min-width="80px">
<template slot-scope="{row}">
- <ColumnDetail v-if="row.requestResult != null" :content="row.requestResult"/>
+ <ColumnDetail v-if="row.requestResult != null" :content="row.requestResult" />
</template>
</el-table-column>
- <el-table-column prop="exceptionLevel" label="寮傚父绛夌骇" sortable="custom" sort-by="EXCEPTION_LEVEL" min-width="100px">
+ <el-table-column prop="exceptionLevel" label="寮傚父绛夌骇" sortable="custom" sort-by="EXCEPTION_LEVEL"
+ min-width="100px">
<template slot-scope="{row}">
- {{row.exceptionLevel | exceptionLevelText}}
+ {{ row.exceptionLevel | exceptionLevelText }}
</template>
</el-table-column>
<el-table-column prop="exceptionStack" label="寮傚父淇℃伅" min-width="170px">
<template slot-scope="{row}">
- <ColumnDetail v-if="row.exceptionStack != null" :content="row.exceptionStack" :button-type="getExceptionButtonType(row.exceptionLevel)"/>
+ <ColumnDetail v-if="row.exceptionStack != null" :content="row.exceptionStack"
+ :button-type="getExceptionButtonType(row.exceptionLevel)" />
</template>
</el-table-column>
- <el-table-column prop="operaSpendTime" label="璇锋眰鑰楁椂(ms)" sortable="custom" sort-by="OPERA_SPEND_TIME" min-width="120px"></el-table-column>
+ <el-table-column prop="operaSpendTime" label="璇锋眰鑰楁椂(ms)" sortable="custom" sort-by="OPERA_SPEND_TIME"
+ min-width="120px"></el-table-column>
<el-table-column prop="userRealname" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column prop="operaTime" label="鎿嶄綔鏃堕棿" sortable="custom" sort-by="OPERA_TIME" min-width="140px"></el-table-column>
+ <el-table-column prop="operaTime" label="鎿嶄綔鏃堕棿" sortable="custom" sort-by="OPERA_TIME"
+ min-width="140px"></el-table-column>
<el-table-column prop="platform" label="鎿嶄綔骞冲彴" min-width="100px"></el-table-column>
<el-table-column prop="systemVersion" label="绯荤粺鐗堟湰" min-width="80px"></el-table-column>
<el-table-column prop="serverIp" label="澶勭悊鏈嶅姟鍣↖P" min-width="100px"></el-table-column>
@@ -96,11 +99,8 @@
<el-table-column prop="clientInfo" label="鐢ㄦ埛瀹㈡埛绔�" min-width="200px"></el-table-column>
<el-table-column prop="osInfo" label="鐢ㄦ埛鎿嶄綔绯荤粺" min-width="100px"></el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- ></pagination>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
</template>
</TableLayout>
</template>
@@ -115,7 +115,7 @@
name: 'SystemTraceLog',
extends: BaseTable,
components: { ColumnDetail, TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储鏃堕棿鍙嶈儍
searchDateRange: [],
@@ -133,7 +133,7 @@
},
filters: {
// 鐘舵��
- statusText (value) {
+ statusText(value) {
if (value === 1) {
return '鎴愬姛'
}
@@ -143,7 +143,7 @@
return '鏈鐞�'
},
// 寮傚父绛夌骇
- exceptionLevelText (value) {
+ exceptionLevelText(value) {
if (value == null) {
return ''
}
@@ -161,15 +161,29 @@
},
methods: {
// 鎼滅储妗嗛噸缃�
- reset () {
- this.$refs.searchForm.resetFields()
- this.searchDateRange = []
- this.searchForm.startTime = null
- this.searchForm.endTime = null
+ reset() {
+ this.searchForm = {
+ userRealname: '',
+ operaModule: '',
+ requestUri: '',
+ status: null,
+ exceptionLevel: null,
+ startTime: null,
+ endTime: null
+ }
+ this.search()
+ },
+ changeRadio() {
+
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
+ }
this.search()
},
// 鏍囪琛宑lass
- tableRowClassName ({ row }) {
+ tableRowClassName({ row }) {
if (row.exceptionLevel === 5 || row.status === -1) {
return 'warning-log'
} else if (row.exceptionLevel === 10) {
@@ -178,7 +192,7 @@
return ''
},
// 鑾峰彇寮傚父鏌ョ湅鎸夐挳绫诲瀷
- getExceptionButtonType (level) {
+ getExceptionButtonType(level) {
if (level === 5) {
return 'warning'
}
@@ -188,7 +202,7 @@
return null
},
// 鏃堕棿鎼滅储鑼冨洿鍙樺寲
- handleSearchTimeChange (value) {
+ handleSearchTimeChange(value) {
this.searchForm.startTime = null
this.searchForm.endTime = null
if (value != null) {
@@ -198,7 +212,7 @@
this.search()
}
},
- created () {
+ created() {
this.config({
api: '/system/traceLog',
sorts: [{
@@ -215,10 +229,12 @@
// 鐘舵�佹爮
.status-bar {
padding: 0 16px;
+
[class^=status-] {
font-size: 13px;
margin-right: 12px;
line-height: 40px;
+
&::before {
position: relative;
top: 2px;
@@ -231,22 +247,27 @@
margin-right: 6px;
}
}
+
.status-warn::before {
background-color: oldlace;
border-color: orange;
}
+
.status-danger::before {
background-color: #fdf0f0;
border-color: indianred;
}
}
+
/deep/ .table-content {
margin-top: 0;
}
+
// 璀﹀憡绾ф棩蹇�
/deep/ .warning-log td {
background-color: oldlace !important;
}
+
// 鍗遍櫓绾ф棩蹇�
/deep/ .danger-log td {
background-color: #fdf0f0 !important;
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 96491fa..6597ea4 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -102,7 +102,9 @@
isShowDriver: false,
filters: {
queryType: '0',
- // fastdate: 0
+ startDate: '',
+ endDate: '',
+ fastdate: '0'
},
queryFormConfig: {
formItems: [
@@ -115,14 +117,14 @@
{ label: '璁垮鎶ュ', value: '1' },
{ label: '鐢ㄨ溅鐢宠', value: '2' },
{ label: '闅愭偅闅忔墜鎷�', value: '3' },
- { label: '鐗╂祦杞︾敵璇�', value: '4' }
+ { label: '鐗╂祦杞︾敵璇�', value: '6' }
]
},
{
- filed: 'selTime',
- type: 'datetimerange',
- label: '璧锋鏃堕棿',
- pickerOptions: {}
+ filed1: 'startDate',
+ filed2: 'endDate',
+ type: 'datetime',
+ label: '璧锋鏃堕棿'
},
{
type: 'slot',
@@ -146,19 +148,20 @@
{ name: '璁垮鎶ュ', id: 1 },
{ name: '鐢ㄨ溅鐢宠', id: 2 },
{ name: '闅愭偅闅忔墜鎷�', id: 3 },
- { name: '鐗╂祦杞︾敵璇�', id: 4 }
+ { name: '鐗╂祦杞︾敵璇�', id: 6 }
]
}
},
created() {
// this.getHeadData()
- // this.changeRadio('0')
- this.getHeadData()
+ this.changeRadio('0')
+ // this.getHeadData()
},
methods: {
changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
- this.$set(this.filters, 'selTime', arr)
+ this.filters.startDate = arr[0]
+ this.filters.endDate = arr[1]
this.getHeadData()
},
SubSuccess(str) {
@@ -230,20 +233,11 @@
}
},
changeForm(str) {
- if (str === 'selTime') {
- this.$set(this.filters, 'fastdate', null)
- this.getHeadData()
- }
+ this.$set(this.filters, 'fastdate', null)
+ this.getHeadData()
},
getList(page) {
const { filters, pagination } = this
- if (filters.selTime && filters.selTime.length > 0) {
- filters.startDate = filters.selTime[0]
- filters.endDate = filters.selTime[1]
- } else {
- filters.startDate = null
- filters.endDate = null
- }
pagination.page = page || pagination.page
taskCenterPage({
model: { ...filters, queryType: Number(filters.queryType) },
@@ -262,13 +256,13 @@
},
getHeadData(page) {
const { filters } = this
- if (filters.selTime && filters.selTime.length > 0) {
- filters.startDate = filters.selTime[0]
- filters.endDate = filters.selTime[1]
- } else {
- filters.startDate = null
- filters.endDate = null
- }
+ // if (filters.selTime && filters.selTime.length > 0) {
+ // filters.startDate = filters.selTime[0]
+ // filters.endDate = filters.selTime[1]
+ // } else {
+ // filters.startDate = null
+ // filters.endDate = null
+ // }
this.loading = true
taskCenterHeadPC({ ...filters, queryType: Number(filters.queryType), isDetail: '1' }).then(res => {
this.headData = res
diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index 8541b74..8887bda 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -13,7 +13,7 @@
<!-- -->
<view class="title_wrap">
<view class="name">浣滀笟浠诲姟</view>
- <view class="placeholder9">{{activeCurrent + 1}}/{{taskList.length}}</view>
+ <view v-if="activeCurrent > 0" class="placeholder9">{{activeCurrent + 1}}/{{taskList.length}}</view>
</view>
<view v-if="taskList && taskList.length > 0" class="task_list">
<swiper circular indicator-dots indicator-active-color="#4d99a8" indicator-color="#e0e2e7" class="task_swiper" @change="changeCur" :current="activeCurrent">
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index cac61df..53074fa 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: ''
+ code: '11'
}
},
onLoad(option) {
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index 0112528..93b9bca 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -132,7 +132,7 @@
},
onLoad(option) {
console.log(option)
- this.param = { ...option }
+ this.param = { ...this.param, ...option }
this.minDate = new Date().getTime()
this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
},
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 05ff784..08884a3 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-// export const baseUrl = 'zhyq_interface/'
+export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
--
Gitblit v1.9.3