From e117388027ba76f731a5a00f317cf65df359d804 Mon Sep 17 00:00:00 2001
From: fanzhiqin <12345678@qq.com>
Date: Thu, 28 Sep 2023 13:48:40 +0530
Subject: [PATCH] =?UTF-8?q?24=E5=B0=8F=E6=97=B6=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE-=E6=8A=A5=E5=BA=9F=E6=95=B0=E6=8D=AE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=EF=BC=8C=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E6=8C=89=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/qualityInspectionCurrent.vue   | 27 +++++++++++++++----
 .../modules/monitoring/realtimeEquipment.vue  |  4 +--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/monitoring/qualityInspectionCurrent.vue b/src/views/modules/monitoring/qualityInspectionCurrent.vue
index 2a502bf..49c068b 100644
--- a/src/views/modules/monitoring/qualityInspectionCurrent.vue
+++ b/src/views/modules/monitoring/qualityInspectionCurrent.vue
@@ -1,21 +1,34 @@
 <template>
 	<div class="mod-config">
 		<el-form :inline="true" @keyup.enter.native="getDataList()" class="blueTip" size="small">
-			<el-form-item>
+			<!-- <el-form-item>
 				{{ $t('time') }}
 			</el-form-item>
 			<el-form-item>
-				<!-- type="datetimerange" -->
+				type="datetimerange"
+				:default-time="['00:00:00', '23:59:59']"
 				<el-date-picker
 					type="daterange"
 					v-model="datetime"
+					format="yyyy-MM-dd HH:mm:ss"
 					value-format="yyyy-MM-ddTHH:mm:ss"
 					:start-placeholder="$t('startTime')"
 					:end-placeholder="$t('endTime')"
 					:range-separator="$t('to')"
-					:default-time="['00:00:00', '23:59:59']"
 					:picker-options="quickOptions"
 					clearable />
+			</el-form-item> -->
+			<el-form-item>
+				{{ $t('startTime') }}
+			</el-form-item>
+			<el-form-item>
+				<el-date-picker v-model="startTime" type="datetime" :placeholder="$t('hints.date')" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-ddTHH:mm:ss" />
+			</el-form-item>
+            <el-form-item>
+				{{ $t('endTime') }}
+			</el-form-item>
+			<el-form-item>
+				<el-date-picker v-model="endTime" type="datetime" :placeholder="$t('hints.date')" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-ddTHH:mm:ss" />
 			</el-form-item>
 			<el-form-item>
 				<el-button class="buttonColor" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -222,6 +235,8 @@ export default {
 			dataType: dict[0], // 表格 | 图形
 			showGraph: false,
 			datetime: [],
+			startTime: '',
+            endTime: '',
 			quickOptions: {
 				shortcuts: [
 					{
@@ -267,8 +282,10 @@ export default {
 			this.echartCategories = null
 			this.echartCheckTypes.splice(0)
 			/** 设置默认日期 */
-			const startTime = this.datetime[0] || moment().set({ hour: 0, minute: 0, second: 0 }).format('yyyy-MM-DDTHH:mm:ss')
-			const endTime = this.datetime[1] || moment().set({ hour: 23, minute: 59, second: 59 }).format('yyyy-MM-DDTHH:mm:ss')
+			// const startTime = this.datetime[0] || moment().set({ hour: 0, minute: 0, second: 0 }).format('yyyy-MM-DDTHH:mm:ss')
+			// const endTime = this.datetime[1] || moment().set({ hour: 23, minute: 59, second: 59 }).format('yyyy-MM-DDTHH:mm:ss')
+			const startTime = this.startTime
+			const endTime = this.endTime
 
 			/** [1] 获取上下片数据 */
 			this.fetchList('sx', startTime, endTime).then(({ data: res }) => {
diff --git a/src/views/modules/monitoring/realtimeEquipment.vue b/src/views/modules/monitoring/realtimeEquipment.vue
index 91c4af1..c520793 100644
--- a/src/views/modules/monitoring/realtimeEquipment.vue
+++ b/src/views/modules/monitoring/realtimeEquipment.vue
@@ -134,8 +134,8 @@ export default {
 										children: [
 											{ prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') },
 											{ prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') },
-											{ prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.data') },
-											{ prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate'), filter: val => (val !== '-' ? `${val.toFixed(2)}%` : '-') }
+											// { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.data') },
+											// { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate'), filter: val => (val !== '-' ? `${val.toFixed(2)}%` : '-') }
 										]
 									})
 								}