From c46b118a8f0797fffec69e00324a17e9ad48fa7f Mon Sep 17 00:00:00 2001
From: zz <2510566342@qq.com>
Date: Fri, 19 Jul 2024 15:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=94=B5=E3=80=81=E5=85=85=E7=94=B5?=
 =?UTF-8?q?=20=E7=9A=84=E9=9A=90=E8=97=8F=E6=8F=90=E4=BA=A47.19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charge_battery/charging_real_result/index.vue | 13 +++++++------
 src/views/fault_log/repaired_info/index.vue       | 11 +++++++++--
 src/views/replace_battery/replace_log/index.vue   | 15 +++++++++------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/views/charge_battery/charging_real_result/index.vue b/src/views/charge_battery/charging_real_result/index.vue
index e99bbfc..772d9f7 100644
--- a/src/views/charge_battery/charging_real_result/index.vue
+++ b/src/views/charge_battery/charging_real_result/index.vue
@@ -82,22 +82,23 @@
 				<el-table-column prop="valleyElecCount" :label="$t('message.charging_real_result.offPeakPeriodEnergy')" align="center" show-overflow-tooltip />
 				<el-table-column prop="elecPriceModelVersion" :label="$t('message.charging_real_result.tariffVersionNumber')" align="center" show-overflow-tooltip />
 				<el-table-column prop="swapOrderSn" :label="$t('message.charging_real_result.batteryChangeOrderNumber')" width="100" align="center" show-overflow-tooltip />
-				<el-table-column prop="cloudReportStatus" :label="$t('message.charging_real_result.cloudPlatformUploadStatus')" width="130" align="center" show-overflow-tooltip>
+				<!-- <el-table-column prop="cloudReportStatus" :label="$t('message.charging_real_result.cloudPlatformUploadStatus')" width="130" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.cloudReportStatus === 0"> {{ $t('message.charging_real_result.notUploaded') }} </el-tag>
 						<el-tag v-if="scope.row.cloudReportStatus === 1"> {{ $t('message.charging_real_result.uploaded') }} </el-tag>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 
-				<el-table-column :label="$t('message.charging_real_result.operation')" width="150" fixed="right" align="center" show-overflow-tooltip>
+				<!-- <el-table-column :label="$t('message.charging_real_result.operation')" width="150" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text type="primary" @click="uploadcloud(scope.row)" :disabled="scope.row.cmdStatus != 1 && scope.row.cloudReportStatus == 0">
 							{{ $t('message.charging_real_result.reportToCloud') }}
 						</el-button>
-						<!-- <el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTenant(scope.row)"> 编辑 </el-button> -->
-						<!-- <el-button icon="el-icon-delete" size="small" text type="primary" @click="delReplace(scope.row)"> 删除 </el-button> -->
+						
 					</template>
-				</el-table-column>
+				</el-table-column> -->
+				<!-- <el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTenant(scope.row)"> 编辑 </el-button> -->
+						<!-- <el-button icon="el-icon-delete" size="small" text type="primary" @click="delReplace(scope.row)"> 删除 </el-button> -->
 			</el-table>
 			<el-pagination
 				v-model:currentPage="state.tableParams.pageNum"
diff --git a/src/views/fault_log/repaired_info/index.vue b/src/views/fault_log/repaired_info/index.vue
index 33124e4..64f05f3 100644
--- a/src/views/fault_log/repaired_info/index.vue
+++ b/src/views/fault_log/repaired_info/index.vue
@@ -12,9 +12,14 @@
 			</el-form-item>
 				<el-form-item>
 				<label class="label"> {{$t('message.un_repair_info.Start_time')}}：</label>
-				<el-date-picker v-model="state.queryParams.startTime" type="datetime" :placeholder="$t('message.un_repair_info.Please_enter')" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+				<!-- <el-date-picker v-model="state.queryParams.startTime" type="datetime" :placeholder="$t('message.un_repair_info.Please_enter')" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" /> -->
+				<el-date-picker v-model="state.queryParams.startTime" type="datetime"	placeholder="" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
 				
 				<!-- <el-input v-model="state.queryParams.startTime" :placeholder="$t('message.un_repair_info.Please_enter')" clearable /> -->
+			</el-form-item>
+			<el-form-item :label="$t('message.replace_log.endTime')">
+						
+				<el-date-picker v-model="state.queryParams.processTime" type="datetime" placeholder="" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
 			</el-form-item>
 				<!-- <el-form-item :label="$t('message.un_repair_info.Device_code')">
 					<el-input v-model="state.queryParams.equipCode" :placeholder="$t('message.un_repair_info.Please_enter')" clearable />
@@ -87,6 +92,7 @@ const state = reactive({
 		equipCode: undefined,
 		errorLevel:undefined,
 		startTime:undefined,
+		processTime:undefined,
 	},
 	tableParams: {
 		pageNum: 1,
@@ -116,7 +122,8 @@ const resetQuery = () => {
 	state.queryParams.equipCode = undefined;
 	state.queryParams.errorLevel = undefined;
 	state.queryParams.startTime = undefined;
-	(state.queryParams.equipCode = undefined,state.queryParams.errorLevel = undefined,state.queryParams.startTime = undefined), handleQuery();
+	state.queryParams.processTime = undefined;
+	(state.queryParams.equipCode = undefined,state.queryParams.errorLevel = undefined,state.queryParams.startTime = undefined,state.queryParams.processTime = undefined), handleQuery();
 };
 
 const handleExport = async () => {
diff --git a/src/views/replace_battery/replace_log/index.vue b/src/views/replace_battery/replace_log/index.vue
index 71f5dab..b333ac0 100644
--- a/src/views/replace_battery/replace_log/index.vue
+++ b/src/views/replace_battery/replace_log/index.vue
@@ -40,8 +40,10 @@
 						<el-table-column type="selection" width="55" fixed> </el-table-column>
 						<el-table-column type="index" :label="$t('message.replace_log.serialNumber')" width="55" align="center" fixed />
 						<el-table-column prop="sn" :label="$t('message.replace_log.orderNumber')" align="center" show-overflow-tooltip width="200" />
-						<el-table-column prop="cloudSn" :label="$t('message.replace_log.cloudPlatformOrderNumber')" align="center" show-overflow-tooltip width="200" />
-						<el-table-column prop="reportCloudNum" :label="$t('message.replace_log.reportCount')" align="center" show-overflow-tooltip />
+						<!-- 云平台订单号 -->
+						<!-- <el-table-column prop="cloudSn" :label="$t('message.replace_log.cloudPlatformOrderNumber')" align="center" show-overflow-tooltip width="200" /> -->
+						 <!-- 上报次数 -->
+						<!-- <el-table-column prop="reportCloudNum" :label="$t('message.replace_log.reportCount')" align="center" show-overflow-tooltip /> -->
 						<el-table-column prop="vehicleNo" :label="$t('message.replace_log.licensePlate')" align="center" show-overflow-tooltip />
 						<el-table-column prop="vehicleVin" :label="$t('message.replace_log.vehicleVin')" align="center" show-overflow-tooltip width="200" />
 						<el-table-column prop="vehicleEnterTime" :label="$t('message.replace_log.vehicleEntryTime')" header-align="center" align="center" width="200" show-overflow-tooltip />
@@ -62,15 +64,16 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="failReason" :label="$t('message.replace_log.failureReason')" align="center" show-overflow-tooltip />
-						<el-table-column prop="cloudReportStatus" :label="$t('message.replace_log.cloudPlatformUploadStatus')" align="center" show-overflow-tooltip>
+						<!-- 上传云平台状态 -->
+						<!-- <el-table-column prop="cloudReportStatus" :label="$t('message.replace_log.cloudPlatformUploadStatus')" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-tag v-if="scope.row.cloudReportStatus === 0" type="danger"> {{ $t('message.replace_log.notUploaded') }} </el-tag>
 								<el-tag v-if="scope.row.cloudReportStatus === 1"> {{ $t('message.replace_log.uploaded') }} </el-tag>
 							</template>
-						</el-table-column>
+						</el-table-column> -->
 						<el-table-column :label="$t('message.replace_log.operation')" width="250" fixed="right" align="center" show-overflow-tooltip>
 							<template #default="scope">
-								<el-button
+								<!-- <el-button
 									icon="ele-Edit"
 									size="small"
 									text
@@ -79,7 +82,7 @@
 									v-if="scope.row.cloudReportStatus == 0 && scope.row.swapResult == 1 && scope.row.reportCloudNum < 100"
 								>
 									{{ $t('message.replace_log.reportToCloud') }}
-								</el-button>
+								</el-button> -->
 								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTenant(scope.row)"> {{ $t('message.replace_log.edit') }} </el-button>
 								<el-button icon="el-icon-delete" size="small" text type="primary" @click="delReplace(scope.row)"> {{ $t('message.replace_log.delete') }} </el-button>
 							</template>