From dac0789a79760b3d48f7ea9f24b3c0441f44e26e Mon Sep 17 00:00:00 2001
From: zz <2510566342@qq.com>
Date: Mon, 21 Oct 2024 11:45:27 +0800
Subject: [PATCH] =?UTF-8?q?10.21=2011=EF=BC=9A44=20=20=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api-services/apis/sys-homepage-api.ts     |  2 +-
 src/views/base_config/change_car/index.vue    | 10 +++---
 src/views/base_config/eqmonitor/index.vue     |  2 +-
 .../charging_real_result/index.vue            | 12 +++----
 .../home/homepage/component/myEcharts.vue     |  2 +-
 src/views/home/homepage/index.vue             | 33 +++++++------------
 6 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/src/api-services/apis/sys-homepage-api.ts b/src/api-services/apis/sys-homepage-api.ts
index 0bff926..f9c64a0 100644
--- a/src/api-services/apis/sys-homepage-api.ts
+++ b/src/api-services/apis/sys-homepage-api.ts
@@ -1227,7 +1227,7 @@ export const SysHomePageApiFp = function (configuration?: Configuration) {
         async apiGetChargMonitorChargBinData(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysUser>>> {
             const localVarAxiosArgs = await SysHomePageApiAxiosParamCreator(configuration).apiGetChargMonitorChargBinData(options);
 
-            const second_url = 'http://localhost:5035'
+            const second_url = 'http://192.168.2.14:6035'
 
             return (axios: AxiosInstance = globalAxios, basePath: string = second_url) => {
                 const axiosRequestArgs: AxiosRequestConfig = { ...localVarAxiosArgs.options, url: second_url + localVarAxiosArgs.url };
diff --git a/src/views/base_config/change_car/index.vue b/src/views/base_config/change_car/index.vue
index 38a62ea..e35aa45 100644
--- a/src/views/base_config/change_car/index.vue
+++ b/src/views/base_config/change_car/index.vue
@@ -47,7 +47,7 @@
 						<el-tag v-else> 有水插头 </el-tag>
 					</template>
 				</el-table-column> -->
-				<el-table-column prop="" :label="$t('message.change_car.reservationLock')" align="center" show-overflow-tooltip>
+				<el-table-column prop="" :label="$t('message.change_car.reservationLock')" align="center"  width="140"   show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.amtLock === 0" type="info"> {{$t('message.change_car.notLocked')}} </el-tag>
 						<el-tag v-else type="success"> {{$t('message.change_car.locked')}} </el-tag>
@@ -57,8 +57,8 @@
 				<!-- <el-table-column prop="soe" label="soe" align="center" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="soh" label="soh" align="center" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="batteryEnterSeq" label="电池入仓顺序" align="center" show-overflow-tooltip /> -->
-				<el-table-column prop="inTime" :label="$t('message.change_car.entryTime')" align="center" show-overflow-tooltip />
-				<el-table-column prop="" :label="$t('message.change_car.chargingStatus')" align="center" show-overflow-tooltip>
+				<el-table-column prop="inTime" :label="$t('message.change_car.entryTime')" align="center"  width="140" show-overflow-tooltip />
+				<el-table-column prop="" :label="$t('message.change_car.chargingStatus')" align="center"  width="140" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.chargeStatus === 0"> {{$t('message.change_car.unknown')}} </el-tag>
 						<el-tag v-else-if="scope.row.chargeStatus === 1"> {{ $t('message.change_car.charging') }} </el-tag>
@@ -74,14 +74,14 @@
 						<el-tag v-else> 启用 </el-tag>
 					</template>
 				</el-table-column> -->
-				<el-table-column prop="exists" :label="$t('message.change_car.isBatteryInPosition')" align="center" show-overflow-tooltip>
+				<el-table-column prop="exists" :label="$t('message.change_car.isBatteryInPosition')" align="center"  width="140" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.exists === 0" type="info"> {{ $t('message.change_car.notInPosition') }} </el-tag>
 						<el-tag v-else-if="scope.row.exists === 1" type="success"> {{ $t('message.change_car.inPosition') }} </el-tag>
 						<el-tag v-else type="danger"> {{ $t('message.change_car.invalid') }} </el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="lastChargeFinishTime" :label="$t('message.change_car.lastChargingEndTime')" align="center" show-overflow-tooltip />
+				<el-table-column prop="lastChargeFinishTime" :label="$t('message.change_car.lastChargingEndTime')" align="center"  width="140" show-overflow-tooltip />
 				<el-table-column :label="$t('message.change_car.operation')" width="550" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-button icon="ele-Edit" size="small" text @click="uploadcloud(scope.row)"> {{ $t('message.change_car.edit') }} </el-button>
diff --git a/src/views/base_config/eqmonitor/index.vue b/src/views/base_config/eqmonitor/index.vue
index 603d1ee..b4113cf 100644
--- a/src/views/base_config/eqmonitor/index.vue
+++ b/src/views/base_config/eqmonitor/index.vue
@@ -8,7 +8,7 @@
 		</div>
 		<div class="main_info">
 			<div>
-				<el-form :model="ruleForm_vin" :rules="rules_vin" ref="ruleFormRef" label-width="150px">
+				<el-form :model="ruleForm_vin" :rules="rules_vin" ref="ruleFormRef" label-width="200px">
 					<el-form-item :label="$t('message.missingPiece.vin_code')" prop="vehicleVin">
 						<el-input v-model="ruleForm_vin.vehicleVin" size="large" :placeholder="$t('message.missingPiece.Please_enter_valid_VIN_code')" style="width: 300px; margin-left: 30px" clearable></el-input>
 					</el-form-item>
diff --git a/src/views/charge_battery/charging_real_result/index.vue b/src/views/charge_battery/charging_real_result/index.vue
index d22c324..9ce85a9 100644
--- a/src/views/charge_battery/charging_real_result/index.vue
+++ b/src/views/charge_battery/charging_real_result/index.vue
@@ -45,8 +45,8 @@
 				<el-table-column type="selection" width="55" fixed> </el-table-column>
 				<el-table-column type="index" :label="$t('message.charging_real_result.serialNumber')" width="55" align="center" fixed />
 				<el-table-column prop="sn" :label="$t('message.charging_real_result.orderNumber')" align="center" show-overflow-tooltip />
-				<el-table-column prop="batteryNo" :label="$t('message.charging_real_result.batteryCode')" align="center" show-overflow-tooltip />
-				<el-table-column prop="cmdStatus" :label="$t('message.charging_real_result.startMessageStatus')" width="100" align="center" show-overflow-tooltip>
+				<el-table-column prop="batteryNo" :label="$t('message.charging_real_result.batteryCode')" align="center" width="150" show-overflow-tooltip />
+				<el-table-column prop="cmdStatus" :label="$t('message.charging_real_result.startMessageStatus')" width="120" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.cmdStatus === 0"> {{ $t('message.charging_real_result.initialization') }} </el-tag>
 						<el-tag v-if="scope.row.cmdStatus === 1"> {{ $t('message.charging_real_result.startSuccess') }} </el-tag>
@@ -71,15 +71,15 @@
 				<el-table-column prop="startAcElec" :label="$t('message.charging_real_result.chargingStartAcMeterReadingKwh')" align="center" show-overflow-tooltip />
 				<el-table-column prop="stopAcElec" :label="$t('message.charging_real_result.chargingEndAcMeterReadingKwh')" align="center" show-overflow-tooltip />
 				<el-table-column prop="startDcElec" :label="$t('message.charging_real_result.chargingStartDcMeterReadingKwh')" align="center" show-overflow-tooltip />
-				<el-table-column prop="stopDcElec" :label="$t('message.charging_real_result.chargingEndDcMeterReadingKwh')" align="center" show-overflow-tooltip />
-				<el-table-column :label="$t('message.charging_real_result.startType')" align="center" show-overflow-tooltip width="120">
+				<el-table-column prop="stopDcElec" :label="$t('message.charging_real_result.chargingEndDcMeterReadingKwh')" width="120" align="center" show-overflow-tooltip />
+				<el-table-column :label="$t('message.charging_real_result.startType')" align="center" width="190" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.startType === 0"> {{ $t('message.charging_real_result.stationControlAutoStart') }} </el-tag>
 						<el-tag v-if="scope.row.startType === 1"> {{ $t('message.charging_real_result.stationControlManualStart') }} </el-tag>
 						<el-tag v-if="scope.row.startType === 2"> {{ $t('message.charging_real_result.chargerAutoStart') }} </el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="stopReason" :label="$t('message.charging_real_result.stopReason')" align="center" show-overflow-tooltip>
+				<el-table-column prop="stopReason" :label="$t('message.charging_real_result.stopReason')"  align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag v-if="scope.row.stopReason === 0"> {{ $t('message.charging_real_result.fullChargeAutoStop') }} </el-tag>
 						<el-tag v-if="scope.row.stopReason === 1"> {{ $t('message.charging_real_result.manualStop') }} </el-tag>
@@ -90,7 +90,7 @@
 				<el-table-column prop="flatElecCount" :label="$t('message.charging_real_result.flatPeriodEnergy')" align="center" show-overflow-tooltip />
 				<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="swapOrderSn" :label="$t('message.charging_real_result.batteryChangeOrderNumber')" width="220" 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>
diff --git a/src/views/home/homepage/component/myEcharts.vue b/src/views/home/homepage/component/myEcharts.vue
index 7cb7e0a..617a56a 100644
--- a/src/views/home/homepage/component/myEcharts.vue
+++ b/src/views/home/homepage/component/myEcharts.vue
@@ -173,7 +173,7 @@ const initLineChart = () => {
 	const option = {
 		
 		backgroundColor: '',
-		grid: { top: 70, right: 60, bottom: 30, left: 78 },
+		grid: { top: 70, right: 80, bottom: 30, left: 78 },
 		tooltip: {
 			trigger: 'axis',
 		},
diff --git a/src/views/home/homepage/index.vue b/src/views/home/homepage/index.vue
index b3157cc..551c229 100644
--- a/src/views/home/homepage/index.vue
+++ b/src/views/home/homepage/index.vue
@@ -140,16 +140,15 @@
 							<!-- <div> -->
 								<div   >
 								<div class="tops_title">
-									<span scope="col" style="font-size: 18px">{{ $t('message.missingPiece.Position_position') }}</span>
-									<span scope="col" style="font-size: 18px">{{ $t('message.missingPiece.Charging_pile_number') }}</span>
-									<span scope="col" style="font-size: 18px">{{ $t('message.missingPiece.Connection_status') }}</span>
-									<!--  -->
-									<span scope="col" style="font-size: 18px">{{ $t('message.change_car.chargingStatus') }}</span>
-									<span scope="col" style="font-size: 18px">{{ $t('message.missingPiece.Total_charging_time') }}/h</span>
-									<span scope="col" style="font-size: 18px">{{ $t('message.missingPiece.Total_charge') }}/kwh</span>
-									<span scope="col" style="font-size: 18px">{{ $t('message.missingPiece.Battery_number') }}</span>
-									<span scope="col" style="font-size: 18px">SOC(%)</span>
-									<span scope="col" style="font-size: 18px; border-right: unset">{{ $t('message.missingPiece.State_change') }}</span>
+									<span scope="col" style="font-size:18px;">{{ $t('message.missingPiece.Position_position') }}</span>
+									<span scope="col" style="font-size:18px">{{ $t('message.missingPiece.Charging_pile_number') }}</span>
+									<span scope="col" style="font-size:18px">{{ $t('message.missingPiece.Connection_status') }}</span>									
+									<span scope="col" style="font-size:18px">{{ $t('message.change_car.chargingStatus') }}</span>
+									<span scope="col" style="font-size:18px">{{ $t('message.missingPiece.Total_charging_time') }}/h</span>
+									<span scope="col" style="font-size:18px">{{ $t('message.missingPiece.Total_charge') }}/kwh</span>
+									<span scope="col" style="font-size:18px">{{ $t('message.missingPiece.Battery_number') }}</span>
+									<span scope="col" style="font-size:18px">SOC(%)</span>
+									<span scope="col" style="font-size:18px; border-right: unset">{{ $t('message.missingPiece.State_change') }}</span>
 								</div>
 
 								<div class="eq_box_table">
@@ -332,24 +331,16 @@ const getchargerList = async () => {
 //
 .tops_title {
 	color: #fff;
+	height: 100px;
 	display: flex;
 	justify-content: center;
-	align-items: center;
-	line-height: 35px;
+	align-items: center;	
 	border: 1px solid #fff;
 	box-sizing: border-box;
-	
-	
 
 	span {		
 		flex: 1;	
-		height: 100px;
-		margin: auto ;
-		// line-height: 100px;
-		// width: 11.11;
-		text-align: center;
-		// border: 1px solid #fff;
-		// border-top: 1px solid #fff;
+		text-align: center;		
 		border-right: 1px solid #fff;
 		box-sizing: border-box;
 	}