From d36f8111d46ea3bfa63d1f28c494243d5058b8b9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 26 Dec 2024 09:05:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A3=92=E7=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=B5=B7=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/statistics_bang.vue | 4 ++--
 src/views/statistics/statistics_guan.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index e0503446..fa415af0 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -10,7 +10,7 @@
 				<el-date-picker
 					v-model="query.last_time__gte"
 					type="datetime"
-					placeholder="开始时间"
+					placeholder="变动时间起"
 					value-format="YYYY-MM-DD HH:mm:ss"
 					clearable
 					style="width: 200px; margin: 5px"
@@ -19,7 +19,7 @@
 				<el-date-picker
 					v-model="query.last_time__lte"
 					type="datetime"
-					placeholder="截止时间"
+					placeholder="变动时间止"
 					value-format="YYYY-MM-DD HH:mm:ss"
 					clearable
 					style="width: 200px; margin:0"
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 0d2b54c3..d49b2073 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -10,7 +10,7 @@
 				<el-date-picker
 					v-model="query.last_time__gte"
 					type="datetime"
-					placeholder="开始时间"
+					placeholder="变动时间起"
 					value-format="YYYY-MM-DD HH:mm:ss"
 					clearable
 					style="width: 200px; margin: 5px"
@@ -19,7 +19,7 @@
 				<el-date-picker
 					v-model="query.last_time__lte"
 					type="datetime"
-					placeholder="截止时间"
+					placeholder="变动时间止"
 					value-format="YYYY-MM-DD HH:mm:ss"
 					clearable
 					style="width: 200px; margin:0"

From 4d708e78958a9297a975a10ef026be1a452cfdb6 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 26 Dec 2024 09:24:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BA=A4=E6=8E=A5=E7=8F=AD=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_coal/handoverLog.vue         | 17 ++++++++---------
 src/views/enm_coalbase/handoverLog.vue     | 17 ++++++++---------
 src/views/enm_cogeneration/handoverLog.vue | 17 ++++++++---------
 src/views/enm_kiln/handoverLog.vue         | 17 ++++++++---------
 src/views/enm_kilnbase/handoverLog.vue     | 17 ++++++++---------
 src/views/enm_limestone/handoverLog.vue    | 17 ++++++++---------
 src/views/enm_mill/handoverLog.vue         | 17 ++++++++---------
 src/views/enm_pack/handoverLog.vue         | 17 ++++++++---------
 src/views/enm_rm/handoverLog.vue           | 17 ++++++++---------
 src/views/enm_rmbase/handoverLog.vue       | 17 ++++++++---------
 src/views/enm_slag/handoverLog.vue         | 19 +++++++++----------
 11 files changed, 89 insertions(+), 100 deletions(-)

diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue
index ce6d4a53..13715c5d 100644
--- a/src/views/enm_coal/handoverLog.vue
+++ b/src/views/enm_coal/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_coalbase/handoverLog.vue b/src/views/enm_coalbase/handoverLog.vue
index a06f89f2..33c2ea06 100644
--- a/src/views/enm_coalbase/handoverLog.vue
+++ b/src/views/enm_coalbase/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_cogeneration/handoverLog.vue b/src/views/enm_cogeneration/handoverLog.vue
index 80bcbb5c..8a53c7bd 100644
--- a/src/views/enm_cogeneration/handoverLog.vue
+++ b/src/views/enm_cogeneration/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue
index 8b23addf..d70a83b1 100644
--- a/src/views/enm_kiln/handoverLog.vue
+++ b/src/views/enm_kiln/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_kilnbase/handoverLog.vue b/src/views/enm_kilnbase/handoverLog.vue
index 15ecb5eb..d7782cd9 100644
--- a/src/views/enm_kilnbase/handoverLog.vue
+++ b/src/views/enm_kilnbase/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_limestone/handoverLog.vue b/src/views/enm_limestone/handoverLog.vue
index 15ad9a11..5fe31d27 100644
--- a/src/views/enm_limestone/handoverLog.vue
+++ b/src/views/enm_limestone/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_mill/handoverLog.vue b/src/views/enm_mill/handoverLog.vue
index 848c1fd5..faaf6f98 100644
--- a/src/views/enm_mill/handoverLog.vue
+++ b/src/views/enm_mill/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_pack/handoverLog.vue b/src/views/enm_pack/handoverLog.vue
index a6ebd564..b71e368f 100644
--- a/src/views/enm_pack/handoverLog.vue
+++ b/src/views/enm_pack/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_rm/handoverLog.vue b/src/views/enm_rm/handoverLog.vue
index 8a17c77c..fe2546a3 100644
--- a/src/views/enm_rm/handoverLog.vue
+++ b/src/views/enm_rm/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_rmbase/handoverLog.vue b/src/views/enm_rmbase/handoverLog.vue
index 064d7510..0688f463 100644
--- a/src/views/enm_rmbase/handoverLog.vue
+++ b/src/views/enm_rmbase/handoverLog.vue
@@ -5,19 +5,17 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>
diff --git a/src/views/enm_slag/handoverLog.vue b/src/views/enm_slag/handoverLog.vue
index 14dbf2e8..9a57ff00 100644
--- a/src/views/enm_slag/handoverLog.vue
+++ b/src/views/enm_slag/handoverLog.vue
@@ -5,25 +5,23 @@
 				<div style="margin-right: 20px">交接班日志</div>
 				<el-date-picker
 					v-model="query.start_time__gte"
-					type="date"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="开始时间"
-					style="width: 120px"
+					placeholder="班开始时间起"
+					style="width: 200px"
 				/>
 				<el-date-picker
-					v-model="query.end_time__lt"
-					type="date"
+					v-model="query.start_time__lte"
+					type="datetime"
 					value-format="YYYY-MM-DD HH:mm:ss"
-					format="YYYY-MM-DD"
-					placeholder="结束时间"
-					style="margin-left: 2px; width: 120px"
+					placeholder="班开始时间止"
+					style="margin-left: 2px; width: 200px"
 				/>
 				<el-select
 					v-model="query.shift"
 					placeholder="班次"
 					clearable
-					style="margin-left: 2px; width: 120px"
+					style="margin-left: 2px; width: 200px"
 				>
 					<el-option
 						v-for="item in optionsShift"
@@ -49,6 +47,7 @@
 					type="primary"
 					icon="el-icon-search"
 					@click="handleQuery"
+					style="margin-left: 2px"
 				></el-button>
 			</div>
 		</el-header>