From 1f700ccb3297e1251b7eac7c75ca5ef5b0a59d3e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 三月 2025 11:02:28 +0800
Subject: [PATCH] ll
---
admin/src/components/common/QueryForm/queryForm.vue | 6
admin/src/views/platform/queueUp.vue | 7
admin/src/views/statistics/platformRecord.vue | 53 +++++++-
h5/pages/staff/meetingSel.vue | 2
admin/src/views/platform/LogisticsRecord/operationCity.vue | 43 +++---
h5/pages/visitorApplication/memberSel.vue | 1
admin/src/views/statistics/platformStatic.vue | 69 +++++++----
h5/pages/applicationRecord/applicationRecord.vue | 9
h5/pages/staff/task/index.vue | 5
pda/pages/index/queueup.vue | 6
admin/src/views/business/platformBroadcastLog.vue | 38 +++--
admin/src/views/business/platformEvent.vue | 35 +++--
h5/pages/staff/memberSel.vue | 1
admin/src/views/platform/LogisticsRecord/operation.vue | 66 +++++-----
h5/pages/staff/vehicle/applePeo.vue | 2
15 files changed, 206 insertions(+), 137 deletions(-)
diff --git a/admin/src/components/common/QueryForm/queryForm.vue b/admin/src/components/common/QueryForm/queryForm.vue
index 1b8e052..52caa69 100644
--- a/admin/src/components/common/QueryForm/queryForm.vue
+++ b/admin/src/components/common/QueryForm/queryForm.vue
@@ -30,7 +30,8 @@
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:placeholder="item.label" :picker-options="item.pickerOptions || {}" @change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item :label="item.label ? item.label : '璧锋鏃堕棿'" v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
+ <el-form-item :label="item.label ? 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"
@@ -60,7 +61,8 @@
:start-placeholder="item.start || '寮�濮嬫椂闂�'" :end-placeholder="item.end || '缁撴潫鏃堕棿'" class="w400"
@change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed">
+ <el-form-item :label="item.label ? item.label : ''"
+ v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed">
<slot :name="item.filed" />
</el-form-item>
</template>
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
index e0312ff..68238b4 100644
--- a/admin/src/views/business/platformBroadcastLog.vue
+++ b/admin/src/views/business/platformBroadcastLog.vue
@@ -23,10 +23,11 @@
<el-option label="涓嬪彂澶辫触" value="3"></el-option>
</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>
+ <el-form-item label="" prop="eventType">
+ <el-date-picker @change="changeDate" v-model="searchForm.startDate" type="datetime"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
+ <el-date-picker @change="changeDate" v-model="searchForm.endDate" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -113,26 +114,33 @@
})
},
methods: {
+ changeDate(e) {
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.endDate = this.searchForm.startDate
+ this.search()
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ } else {
+ this.search()
+ }
+ },
changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
+ // this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
- this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
+ this.searchForm.endDate = timeForMat(6)[1]
+ // this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startDate = timeForMat(29)[0]
- this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ this.searchForm.endDate = timeForMat(29)[1]
+ // this.time = timeForMat(29)
}
- this.search()
- },
- seleTime(e) {
- this.searchForm.startTime = e[0]
- this.searchForm.endTime = e[1]
- this.searchForm.radio = null
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.startDate = this.searchForm.endDate
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.search()
},
reset() {
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
index c4ac24f..438a834 100644
--- a/admin/src/views/business/platformEvent.vue
+++ b/admin/src/views/business/platformEvent.vue
@@ -18,10 +18,11 @@
<el-option label="杩涘叆" value="enter"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <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 label="" prop="startDate">
+ <el-date-picker @change="changeDate" v-model="searchForm.startDate" type="datetime"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
+ <el-date-picker @change="changeDate" v-model="searchForm.endDate" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -120,26 +121,33 @@
})
},
methods: {
+ changeDate(e) {
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.endDate = this.searchForm.startDate
+ this.search()
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }else{
+ this.search()
+ }
+ },
changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
+ // this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
+ // this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startDate = timeForMat(29)[0]
this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ // this.time = timeForMat(29)
}
- this.search()
- },
- seleTime(e) {
- this.searchForm.startDate = e[0]
- this.searchForm.endDate = e[1]
- this.searchForm.radio = null
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.startDate = this.searchForm.endDate
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.search()
},
reset() {
@@ -147,7 +155,6 @@
this.searchForm.startDate = ''
this.searchForm.endDate = ''
this.searchForm.radio = ''
- this.time = []
this.search()
}
}
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index b00d6d3..ce36fbc 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/admin/src/views/platform/LogisticsRecord/operation.vue
@@ -1,12 +1,9 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)" @clear="clear">
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)"
+ @clear="clear">
<template #fastdate>
- <el-radio-group
- v-model="filters.fastdate"
- size="small"
- @input="changeRadio"
- >
+ <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
<el-radio-button label="6">杩�7澶�</el-radio-button>
<el-radio-button label="29">杩�30澶�</el-radio-button>
@@ -14,9 +11,10 @@
</template>
</QueryForm>
<div class="pt16">
- <el-button :loading="exLoading" @click="handleEx" v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
+ <el-button :loading="exLoading" @click="handleEx"
+ v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
@@ -49,7 +47,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { platformJobPage, platformJobExport,platformJobDel } from '@/api'
+import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { statusMap } from '../config'
import DriverDetail from "@/views/task/driverDetail"
import GlobalWindow from '@/components/common/GlobalWindow'
@@ -57,8 +55,8 @@
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
-dayjs.extend(duration);
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+dayjs.extend(duration)
+import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
extends: BaseComputHeight,
components: {
@@ -81,12 +79,14 @@
},
filters: {
selDate: [],
- fastdate: 0
+ fastdate: 0,
+ createDateStart: '',
+ createDateEnd: ''
},
list: [],
queryFormConfig: {
formItems: [
- {
+ {
filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
@@ -102,15 +102,14 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '',
- pickerOptions: {}
+ filed1: 'createDateStart',
+ filed2: 'createDateEnd',
+ type: 'datetime',
+ label: '浣滀笟鏃堕棿'
},
{
type: 'slot',
- filed: 'fastdate',
- label: '浣滀笟鏃堕棿'
+ filed: 'fastdate'
}
],
online: true
@@ -122,16 +121,18 @@
this.getList()
},
methods: {
- changeRadio (day) {
+ 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, 'selDate', arr)
- this.getList()
+ this.filters.createDateStart = arr[0]
+ this.filters.createDateEnd = arr[1]
+ this.getList(1)
},
- changeForm (str) {
- if (str === 'selDate') {
- this.$set(this.filters, 'fastdate', null)
- this.getList()
+ changeForm(str) {
+ if(this.filters.createDateStart > this.filters.createDateEnd){
+ this.filters.createDateStart = this.filters.createDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
+ this.getList()
},
getList(page) {
const { pagination, filters } = this
@@ -140,8 +141,6 @@
model: {
...filters,
jobType: '0',
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: pagination.pageSize,
@@ -152,10 +151,10 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- if(item.workTime && item.workTime>=24*60*60 ){
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�');
- }else{
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ if (item.workTime && item.workTime >= 24 * 60 * 60) {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�')
+ } else {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
}
})
this.pagination.total = res.total || 0
@@ -180,8 +179,7 @@
model: {
...filters,
jobType: 0,
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: 10000,
diff --git a/admin/src/views/platform/LogisticsRecord/operationCity.vue b/admin/src/views/platform/LogisticsRecord/operationCity.vue
index 2714f42..c390db5 100644
--- a/admin/src/views/platform/LogisticsRecord/operationCity.vue
+++ b/admin/src/views/platform/LogisticsRecord/operationCity.vue
@@ -14,7 +14,7 @@
<el-button :loading="exLoading" @click="handleEx"
v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="contractNum" label="鍚堝悓鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="reason" label="鍏ュ洯鍘熷洜" min-width="100" show-overflow-tooltip />
<el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="120" show-overflow-tooltip />
@@ -57,7 +57,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
extends: BaseComputHeight,
components: {
@@ -79,7 +79,8 @@
total: 0
},
filters: {
- selDate: [],
+ createDateStart: '',
+ createDateEnd: '',
fastdate: 0
},
list: [],
@@ -101,10 +102,10 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '',
- pickerOptions: {}
+ filed1: 'createDateStart',
+ filed2: 'createDateEnd',
+ type: 'datetime',
+ label: '浣滀笟鏃堕棿'
},
{
type: 'slot',
@@ -123,14 +124,16 @@
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, 'selDate', arr)
- this.getList()
+ this.filters.createDateStart = arr[0]
+ this.filters.createDateEnd = arr[1]
+ this.getList(1)
},
changeForm(str) {
- if (str === 'selDate') {
- this.$set(this.filters, 'fastdate', null)
- this.getList()
+ if (this.filters.createDateStart > this.filters.createDateEnd) {
+ this.filters.createDateStart = this.filters.createDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
+ this.getList()
},
getList(page) {
const { pagination, filters } = this
@@ -138,9 +141,7 @@
platformJobPage({
model: {
...filters,
- jobType: 1,
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ jobType: 1
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: pagination.pageSize,
@@ -151,10 +152,10 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- if(item.workTime && item.workTime>=24*60*60 ){
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�');
- }else{
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ if (item.workTime && item.workTime >= 24 * 60 * 60) {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�')
+ } else {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
}
// item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
})
@@ -179,9 +180,7 @@
platformJobExport({
model: {
...filters,
- jobType: 1,
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null
+ jobType: 1
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: 10000,
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 40d2439..d06cc24 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -21,7 +21,7 @@
<span></span>
</div>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
<el-table-column type="index" label="搴忓彿" width="80" />
<el-table-column label="杞︾墝鍙�" width="130">
<template slot-scope="{ row }">
@@ -33,7 +33,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
<template v-slot="scope">
<span>{{ scope.row.carrierName || '-' }}</span>
</template>
@@ -57,7 +57,8 @@
<el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
<el-table-column label="鐘舵��" align="center" width="80">
<template slot-scope="{ row }">
- <span v-if="row.status == 2" class="red">鏈堝彴绛夊緟</span>
+ <!-- <span v-if="row.status == 2" class="red">鏈堝彴绛夊緟</span> -->
+ <span v-if="row.status == 2" class="red">绛夊緟鍙彿</span>
<span v-if="row.status == 3" class="primaryColor">鍏ュ洯绛夊緟</span>
<span v-if="row.status == 7" class="primaryColor">杞Щ涓�</span>
</template>
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 556fcc8..013426c 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -1,7 +1,23 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
- <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
+ <template #selDate>
+ <div>
+ <el-date-picker v-model="filters.beginWorkDateStart" type="date" value-format="yyyy-MM-dd" class="w200"
+ @change="getList(1)" />
+ <el-date-picker v-model="filters.beginWorkDateEnd" type="date" value-format="yyyy-MM-dd" class="w200"
+ @change="getList(1)" />
+ </div>
+ </template>
+ <template #fastdate>
+ <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="6">杩�7澶�</el-radio-button>
+ <el-radio-button label="29">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ </template>
+ </QueryForm>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="100" show-overflow-tooltip />
<el-table-column prop="platformGroupName" label="鏈堝彴缁�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞﹀墠鐗岀収鍙�" min-width="100" show-overflow-tooltip />
@@ -43,7 +59,11 @@
page: 1,
total: 0
},
- filters: {},
+ filters: {
+ fastdate: 0,
+ beginWorkDateStart: '',
+ beginWorkDateEnd: ''
+ },
list: [],
total: 0,
queryFormConfig: {
@@ -66,20 +86,33 @@
label: '杞︾墝鍙�'
},
{
+ type: 'slot',
filed: 'selDate',
- type: 'daterange',
label: '鏃ユ湡'
- }
+ },
+ {
+ type: 'slot',
+ filed: 'fastdate',
+ label: ''
+ },
],
online: true
}
}
},
created() {
- this.getList()
+ // this.getList()
this.getGroupList()
+ this.changeRadio('0')
},
methods: {
+ changeRadio(day) {
+ const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
+ this.filters.beginWorkDateStart = arr[0]
+ this.filters.beginWorkDateEnd = arr[1]
+ this.filters.fastdate = day
+ this.getList()
+ },
handleSub() {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
@@ -101,12 +134,13 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
+
platformLogPage({
model: {
...filters,
queryStatus: '6,7,8',
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ // beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ // beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
@@ -146,8 +180,7 @@
</script>
<style scoped>
-::v-deep .el-table{
+::v-deep .el-table {
margin-bottom: 60px;
}
-
</style>
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index 8d495d2..0125d09 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -1,6 +1,14 @@
<template>
<div class="main_app" style="overflow: auto;height: calc(100% - 100px);">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
+ <template #selDate>
+ <div>
+ <el-date-picker v-model="filters.queryDateStart" type="date" value-format="yyyy-MM-dd" class="w200" :clearable="false"
+ @change="getList(1)" />
+ <el-date-picker v-model="filters.queryDateEnd" type="date" value-format="yyyy-MM-dd" class="w200" :clearable="false"
+ @change="getList(1)" />
+ </div>
+ </template>
<template #fastdate>
<el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -19,8 +27,9 @@
<div v-if="this.list" style="width: 100%;display: flex;height: 50px;padding-top: 20px;font-size: 18px;color: red">
<div style="flex: 1;min-width: 100px"></div>
<div style="flex: 1;min-width: 100px;">鍚堣锛�</div>
- <div style="flex: 1;min-width: 100px;"> <span style="font-weight: bold; ">{{totalStopCount}}</span>娆� </div>
- <div style="flex: 2;min-width: 100px;"> <span style="font-weight: bold;">{{totalWorkTime.toFixed(2)}}</span>鏃�</div>
+ <div style="flex: 1;min-width: 100px;"> <span style="font-weight: bold; ">{{ totalStopCount }}</span>娆� </div>
+ <div style="flex: 2;min-width: 100px;"> <span style="font-weight: bold;">{{ totalWorkTime.toFixed(2) }}</span>鏃�
+ </div>
</div>
<!-- <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> -->
</div>
@@ -46,10 +55,11 @@
},
filters: {
fastdate: 0,
- selDate: []
+ queryDateStart: '',
+ queryDateEnd: ''
},
- totalStopCount:0,
- totalWorkTime:0,
+ totalStopCount: 0,
+ totalWorkTime: 0,
list: [],
total: 0,
queryFormConfig: {
@@ -68,15 +78,14 @@
},
{
type: 'slot',
+ filed: 'selDate',
+ label: '鏃ユ湡'
+ },
+ {
+ type: 'slot',
filed: 'fastdate',
label: ''
},
- {
- filed: 'selDate',
- type: 'daterange',
- clearable: false,
- label: '鏃ユ湡'
- }
],
online: true
}
@@ -88,32 +97,34 @@
},
methods: {
getSummaries(param) {
- const { columns, data } = param;
- const sums = [];
+ const { columns, data } = param
+ const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '鍚堣';
+ sums[index] = '鍚堣'
} else {
- const values = data.map(item => parseInt(item[column.property]));
+ const values = data.map(item => parseInt(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
- const value = parseInt(curr);
+ const value = parseInt(curr)
if (!isNaN(value)) {
- return prev + curr;
+ return prev + curr
} else {
- return prev;
+ return prev
}
- }, 0);
+ }, 0)
} else {
- sums[index] = '0';
+ sums[index] = '0'
}
}
- });
- return sums;
+ })
+ return sums
},
changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
- this.$set(this.filters, 'selDate', arr)
+ this.filters.queryDateStart = arr[0]
+ this.filters.queryDateEnd = arr[1]
+ this.filters.fastdate = day
this.getList()
},
handleSub() {
@@ -138,11 +149,15 @@
this.totalStopCount = 0
this.totalWorkTime = 0
const { pagination, filters } = this
+ if (filters.queryDateStart > filters.queryDateEnd) {
+ this.filters.queryDateStart = this.filters.queryDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.loading = true
platformWorkReportPage({
...filters,
- queryDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- queryDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ // queryDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ // queryDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
}).then(res => {
this.loading = false
this.list = res || []
@@ -162,8 +177,8 @@
selDate: [],
fastdate: ''
}
- this.getList()
- // this.changeRadio('0')
+ // this.getList()
+ this.changeRadio('0')
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index c7b2b4e..5739e07e 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -179,17 +179,18 @@
align-items: center;
justify-content: space-between;
.active {
- border: 1rpx solid $uni-color-primary !important;
+ border: 2rpx solid $uni-color-primary !important;
color: $uni-color-primary !important;
}
.box_head_item {
width: 156rpx;
text-align: center;
height: 60rpx;
- line-height: 60rpx;
- box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: center;
border-radius: 30rpx;
- border: 1rpx solid #999999;
+ border: 2rpx solid #999999;
font-size: 26rpx;
font-weight: 400;
color: #333333;
diff --git a/h5/pages/staff/meetingSel.vue b/h5/pages/staff/meetingSel.vue
index cac37aa..8e93b4f 100644
--- a/h5/pages/staff/meetingSel.vue
+++ b/h5/pages/staff/meetingSel.vue
@@ -2,7 +2,7 @@
<view class="main_app" :class="{ popupShow: isShowSelMem }">
<view class="search_inp df_ac">
<image class="mr12 search" src="../../static/ic_search@2x.png" mode="widthFix"></image>
- <input v-model="param.queryParam" @confirm="initData()" type="text" placeholder="鎼滅储"
+ <input v-model="param.queryParam" @confirm="initData()" confirm-type="search" type="text" placeholder="鎼滅储"
placeholder-style="color: #999999;" />
</view>
<view class="member_list">
diff --git a/h5/pages/staff/memberSel.vue b/h5/pages/staff/memberSel.vue
index 5f0f99d..f4aed46 100644
--- a/h5/pages/staff/memberSel.vue
+++ b/h5/pages/staff/memberSel.vue
@@ -11,6 +11,7 @@
@blur="initData()"
type="text"
placeholder="璇疯緭鍏ュ鍚嶈繘琛屾悳绱�"
+ confirm-type="search"
placeholder-style="color: #999999;"
/>
</view>
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 275c5e4..eaa6655 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -8,6 +8,7 @@
v-model="search.title"
@blur="querylist"
type="text"
+ confirm-type="search"
placeholder="鎼滅储浠诲姟鍚嶇О"
/>
</view>
@@ -497,7 +498,7 @@
justify-content: space-between;
align-items: center;
.active {
- border: 1rpx solid #4c99a8 !important;
+ border: 2rpx solid #4c99a8 !important;
color: #4c99a8 !important;
}
.box_head_item {
@@ -507,7 +508,7 @@
line-height: 60rpx;
box-sizing: border-box;
border-radius: 30rpx;
- border: 1rpx solid #999999;
+ border: 2rpx solid #999999;
font-size: 26rpx;
font-weight: 400;
color: #333333;
diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index a8b3503..c47defd 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/h5/pages/staff/vehicle/applePeo.vue
@@ -2,7 +2,7 @@
<view class="main_app" :style="{ height: windowHeight + 'px' }" :class="{ popupShow: isShowSelMem }">
<view class="search_inp df_ac">
<image class="mr12 search" src="@/static/ic_search@2x.png" mode="widthFix"></image>
- <input v-model="param.queryParam" @confirm="initData()" type="text" placeholder="鎼滅储"
+ <input v-model="param.queryParam" @confirm="initData()" confirm-type="search" type="text" placeholder="鎼滅储"
placeholder-style="color: #999999;" />
</view>
<view class="member_list">
diff --git a/h5/pages/visitorApplication/memberSel.vue b/h5/pages/visitorApplication/memberSel.vue
index 7df8de5..77cd060 100644
--- a/h5/pages/visitorApplication/memberSel.vue
+++ b/h5/pages/visitorApplication/memberSel.vue
@@ -10,6 +10,7 @@
v-model="param.name"
@confirm="initData()"
type="text"
+ confirm-type="search"
placeholder="璇疯緭鍏ュ鍚嶈繘琛屾悳绱�"
placeholder-style="color: #999999;"
/>
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index 5cb664e..f1bac4f 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -17,6 +17,7 @@
type="text"
placeholder="鎼滅储杞﹁締鐗岀収"
placeholder-class="placeholder9"
+ confirm-type="search"
@confirm="handleQuery"
/>
</view>
@@ -26,7 +27,7 @@
</view>
<!-- -->
<view class="dataList">
- <view class="item" v-for="item in platformLineUpList" :key="item.id">
+ <view class="item" v-for="item,i in platformLineUpList" :key="i">
<view class="head">
<view v-if="item.carCodeFront" class="code">
<text>{{ item.carCodeFront.slice(0, 1) }}</text>
@@ -34,7 +35,8 @@
<text>路</text>
<text>{{ item.carCodeFront.slice(2) }}</text>
</view>
- <view class="status green" v-if="item.status == 2">鏈堝彴绛夊緟</view >
+ <!-- <view class="status green" v-if="item.status == 2">鏈堝彴绛夊緟</view > -->
+ <view class="status green" v-if="item.status == 2">绛夊緟鍙彿</view >
<view class="status" v-if="item.status == 3">鍏ュ洯绛夊緟</view >
<view class="status" v-if="item.status == 7">杞Щ涓�</view >
</view>
--
Gitblit v1.9.3