From 76d7d384741f5d1e7f2cd8564aba13974d983ee1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 18:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/LogisticsCenter.vue | 23 +++++++++++++++++++++++
admin/src/views/business/trainTime.vue | 20 ++++++++++----------
2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/business/trainTime.vue b/admin/src/views/business/trainTime.vue
index e240702..4bfea6a 100644
--- a/admin/src/views/business/trainTime.vue
+++ b/admin/src/views/business/trainTime.vue
@@ -12,9 +12,9 @@
<!-- <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.sendStartDate" value-format="yyyy-MM-dd HH:mm:ss"
+ <el-date-picker type="datetime" v-model="searchForm.startTimeStart" 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"
+ <el-date-picker type="datetime" v-model="searchForm.startTimeEnd" 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">
@@ -92,20 +92,20 @@
changeRadio(e) {
this.searchForm.radio = e
if (e === '0') {
- this.searchForm.sendStartDate = timeForMat(0)[0]
- this.searchForm.sendEndDate = timeForMat(0)[1]
+ this.searchForm.startTimeStart = timeForMat(0)[0]
+ this.searchForm.startTimeEnd = timeForMat(0)[1]
} else if (e === '1') {
- this.searchForm.sendStartDate = timeForMat(6)[0]
- this.searchForm.sendEndDate = timeForMat(6)[1]
+ this.searchForm.startTimeStart = timeForMat(6)[0]
+ this.searchForm.startTimeEnd = timeForMat(6)[1]
} else if (e === '2') {
- this.searchForm.sendStartDate = timeForMat(29)[0]
- this.searchForm.sendEndDate = timeForMat(29)[1]
+ this.searchForm.startTimeStart = timeForMat(29)[0]
+ this.searchForm.startTimeEnd = timeForMat(29)[1]
} else {
this.searchForm.radio = ''
}
- if (this.searchForm.sendStartDate && this.searchForm.sendEndDate && new Date(this.searchForm.sendStartDate).getTime() > new Date(this.searchForm.sendEndDate).getTime()) {
+ if (this.searchForm.startTimeStart && this.searchForm.startTimeEnd && new Date(this.searchForm.startTimeStart).getTime() > new Date(this.searchForm.startTimeEnd).getTime()) {
this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
- this.searchForm.sendStartDate = ''
+ this.searchForm.startTimeStart = ''
return
}
this.search()
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 1e6c142..b124849 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -816,6 +816,29 @@
borderColor: '#fff'
},
},
+ dataZoom: [
+ {
+ type: 'slider', // 婊戝姩鏉＄被鍨�
+ orient: 'vertical',
+ left: 'left',
+ start: 0, // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
+ end: 40, // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
+ width: 10,
+ // backgroundColor: '#04141e', // 婊戝姩鏉¤儗鏅壊
+ // fillerColor: 'rgba(0, 0, 0, 0.2)', // 閫変腑鍖哄煙棰滆壊锛屾棤闃村奖
+ borderColor: '#04141e', // 杈规棰滆壊
+ // showDetail: false, // 闅愯棌閫変腑鑼冨洿鐨勬枃瀛�
+ },
+ {
+ type: 'inside', // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
+ orient: 'vertical',
+ start: 0,
+ end: 40,
+ zoomLock: true, // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+ moveOnMouseWheel: true, // 鍚敤婊氳疆骞崇Щ
+ zoomOnMouseWheel: false // 绂佺敤婊氳疆缂╂斁
+ }
+ ],
grid: {
left: '3%',
right: '4%',
--
Gitblit v1.9.3