优化调整页面15处

src/views/efficiencyAnalysis/contRast/energyConsu/index.vue

@@ -31,7 +31,7 @@
 						<div v-for="(ftem, fndex) in energyFlow1" :key="fndex"
 							:style="{ height: ftem.heig + '%' }" class="flex flex-direction"
 							:class="fndex == 2?'justify-center':'justify-around'">
-							<el-card class="box-card" :body-style="{ padding: '5px !important' }"
+							<el-card class="bor-rcard" :body-style="{ padding: '5px !important' }"
 								:class="fndex == 2?'margin-top':''"
 								 v-for="(fstem, fsndex) in ftem.rows" :key="fsndex">
 								<div class="flex justify-between align-center">
@@ -45,7 +45,7 @@
 						<div v-for="(ftem, fndex) in energyFlow2" :key="fndex"
 							:style="{ height: ftem.heig + '%' }" class="flex flex-direction"
 							:class="fndex == 4?'justify-center':'justify-around'">
-							<el-card class="box-card" :body-style="{ padding: '5px !important' }"
+							<el-card class="bor-rcard" :body-style="{ padding: '5px !important' }"
 								:class="fndex == 4?'margin-top':''"
 								 v-for="(fstem, fsndex) in ftem.rows" :key="fsndex">
 								<div class="flex justify-between align-center">
@@ -59,7 +59,7 @@
 						<div v-for="(ftem, fndex) in energyFlow3" :key="fndex"
 							:style="{ height: ftem.heig + '%' }" class="flex flex-direction"
 							:class="fndex == 4?'justify-center':'justify-around'">
-							<el-card class="box-card" :body-style="{ padding: '5px !important' }"
+							<el-card class="bor-rcard" :body-style="{ padding: '5px !important' }"
 								:class="fndex == 4?'margin-top':''"
 								 v-for="(fstem, fsndex) in ftem.rows" :key="fsndex">
 								<div class="flex justify-between align-center">
@@ -76,7 +76,7 @@
 			<el-card class="text-xs box-card" :body-style="{ padding: '10px !important' }">
 				<div class="text-bold text-center text-bGray">耗能末端</div>
 				<div style="height: calc(66.66vh - 170px);" class="flex flex-direction justify-around">
-					<el-card class="box-card" :body-style="{ padding: '4px 5px !important' }" 
+					<el-card class="bor-rcard" :body-style="{ padding: '4px 5px !important' }" 
 						v-for="(etem, endex) in energyEnd" :key="endex">
 						<div class="flex justify-between align-center">
 							<span class="text-bGray">{{ etem.name }}</span>
@@ -281,4 +281,7 @@
 	.box-card{
 		border-radius: 16px;
 	}
+	.bor-rcard{
+		border-radius: 7px;
+	}
 </style>

src/views/efficiencyAnalysis/contRast/index.vue

@@ -47,8 +47,9 @@
 								  v-model="oilsForm.startTime"
 								  type="date"
 								  size="small"
+								  class="dateSelet"
 								  style="width: 100%;"
-								  start-placeholder="开始日期">
+								  placeholder="开始日期">
 								</el-date-picker>
 							</el-form-item>
 							<el-form-item style="margin-bottom: 15px;">
@@ -57,8 +58,9 @@
 								  v-model="oilsForm.endTime"
 								  type="date"
 								  size="small"
+								  class="dateSelet"
 								  style="width: 100%;"
-								  end-placeholder="结束日期">
+								  placeholder="结束日期">
 								</el-date-picker>
 							</el-form-item>
 							<el-form-item style="margin-bottom: 0;">
@@ -289,8 +291,29 @@
 		}
 	});
 	const { consumeData, oilsData, oilsForm, OilStorage } = toRefs(data);
+	const getOptions = function(){
+		timeUnitOptions.value = [{
+			label: "年",
+			value: 0
+		},{
+			label: "月",
+			value: 1
+		},{
+			label: "日",
+			value: 2
+		},{
+			label: "时",
+			value: 3
+		},{
+			label: "分",
+			value: 4
+		}];
+	}
+	getOptions();
 </script>
 
 <style scoped lang="scss">
-	
+	::v-deep .dateSelet .el-input__wrapper{
+		box-shadow: 0 0 7px 2px #dcdcdc;
+	}
 </style>

src/views/efficiencyAnalysis/distriBution/index.vue

@@ -8,14 +8,15 @@
 						<div class="sTitleSty" style="letter-spacing: 2px;">{{utem.name}}</div>
 						<line-chart :name="utem.className" :data="utem" height="calc(30vh - 65px)"/>
 					</div>
-					<div style="width: 30%;padding: 0 2%;">
-						<el-form ref="oilsFormRef" :model="oilsForm" label-width="0px">
+					<div style="width: 30%;padding: 0 2% 0 4%;">
+						<el-form ref="unitsFormRef" :model="unitForm" label-width="0px">
 							<el-form-item style="margin-bottom: 0px;">
 								<div>开始时间：</div>
 								<el-date-picker
-								  v-model="oilsForm.startTime"
+								  v-model="unitForm[undex].startTime"
 								  type="date"
 								  size="small"
+								  class="dateSelet"
 								  style="width: 100%;"
 								  placeholder="开始日期">
 								</el-date-picker>
@@ -23,9 +24,10 @@
 							<el-form-item style="margin-bottom: 8px;">
 								<div>结束时间：</div>
 								<el-date-picker
-								  v-model="oilsForm.endTime"
+								  v-model="unitForm[undex].endTime"
 								  type="date"
 								  size="small"
+								  class="dateSelet"
 								  style="width: 100%;"
 								  placeholder="结束日期">
 								</el-date-picker>
@@ -46,14 +48,15 @@
 						<div class="sTitleSty" style="letter-spacing: 2px;">{{stem.name}}</div>
 						<line-chart :name="stem.className" :data="stem" height="calc(30vh - 65px)"/>
 					</div>
-					<div style="width: 30%;padding: 0 2%;">
-						<el-form ref="oilsFormRef" :model="oilsForm" label-width="0px">
+					<div style="width: 30%;padding: 0 2% 0 4%;">
+						<el-form ref="timesFormRef" :model="timeForm" label-width="0px">
 							<el-form-item style="margin-bottom: 0px;">
 								<div>开始时间：</div>
 								<el-date-picker
-								  v-model="oilsForm.startTime"
+								  v-model="timeForm[sndex].startTime"
 								  type="date"
 								  size="small"
+								  class="dateSelet"
 								  style="width: 100%;"
 								  placeholder="开始日期">
 								</el-date-picker>
@@ -61,9 +64,10 @@
 							<el-form-item style="margin-bottom: 8px;">
 								<div>结束时间：</div>
 								<el-date-picker
-								  v-model="oilsForm.endTime"
+								  v-model="timeForm[sndex].endTime"
 								  type="date"
 								  size="small"
+								  class="dateSelet"
 								  style="width: 100%;"
 								  placeholder="结束日期">
 								</el-date-picker>
@@ -81,39 +85,65 @@
 				<el-row :gutter="30">
 					<template v-for="(item,index) in linesData" :key="index">
 						<el-col :xl="8" :lg="8" :md="8" :sm="24" :xs="24">
-							<div style="position: relative;">
+							<div style="position: relative;padding: 0 3% 0 1%;">
 								<div class="sTitleSty" style="letter-spacing: 2px;">{{item.name}}</div>
 								<line-chart :name="item.className" :data="item" height="calc(40vh - 116px)"/>
 							</div>
 							<div>
-								<el-form ref="oilsFormRef" class="flex justify-center" :model="oilsForm" label-width="100px">
-									<el-form-item style="margin-bottom: 0;" label="航次消耗对比：" v-if="index == 0">
-										<el-select v-model="oilsForm.equipId" placeholder="请选择" size="small" style="width: 100%;">
+								<el-form v-if="index == 0" ref="voyageFormRef" class="flex justify-center" :model="voyageForm" label-width="100px">
+									<el-form-item style="margin-bottom: 0;" label="航次消耗对比：">
+										<el-select v-model="voyageForm.voyageId" placeholder="请选择" size="small" style="width: 100%;">
 											<el-option
-											  v-for="item in timeUnitOptions"
+											  v-for="item in voyageOptions"
 											  :key="item.value"
 											  :label="item.label"
 											  :value="item.value">
 											</el-option>
 										</el-select>
 									</el-form-item>
-									<el-form-item style="margin-bottom: 0;" label="查询方式：" v-if="index != 0">
-										<el-select v-model="oilsForm.equipId" placeholder="请选择" size="small" style="width: 100%;">
+								</el-form>
+								<el-form v-if="index == 1" ref="cotwoFormRef" class="flex justify-center" :model="cotwoForm" label-width="100px">
+									<el-form-item style="margin-bottom: 0;" label="查询方式：">
+										<el-select v-model="cotwoForm.cotwoId" placeholder="请选择" size="small" style="width: 100%;">
 											<el-option
-											  v-for="item in timeUnitOptions"
+											  v-for="item in cotwoOptions"
 											  :key="item.value"
 											  :label="item.label"
 											  :value="item.value">
 											</el-option>
 										</el-select>
 									</el-form-item>
-									<el-form-item label="时间：" style="margin-bottom: 0px;" v-if="index != 0">
+									<el-form-item label="时间：" style="margin-bottom: 0px;">
 										<div></div>
 										<el-date-picker
-										  v-model="oilsForm.startTime"
+										  v-model="cotwoForm.startEndTime"
 										  type="daterange"
 										  size="small"
-										  style="width: 50%;"
+										  style="width: 50%;box-shadow: 0 0 7px 2px #dcdcdc;"
+										  range-separator=" ~ "
+										  start-placeholder="开始日期"
+										  end-placeholder="结束日期">
+										</el-date-picker>
+									</el-form-item>
+								</el-form>
+								<el-form v-if="index == 2" ref="eeofFormRef" class="flex justify-center" :model="eeofForm" label-width="100px">
+									<el-form-item style="margin-bottom: 0;" label="查询方式：">
+										<el-select v-model="eeofForm.eeofId" placeholder="请选择" size="small" style="width: 100%;">
+											<el-option
+											  v-for="item in eeofOptions"
+											  :key="item.value"
+											  :label="item.label"
+											  :value="item.value">
+											</el-option>
+										</el-select>
+									</el-form-item>
+									<el-form-item label="时间：" style="margin-bottom: 0px;">
+										<div></div>
+										<el-date-picker
+										  v-model="eeofForm.startEndTime"
+										  type="daterange"
+										  size="small"
+										  style="width: 50%;box-shadow: 0 0 7px 2px #dcdcdc;"
 										  range-separator=" ~ "
 										  start-placeholder="开始日期"
 										  end-placeholder="结束日期">
@@ -131,7 +161,10 @@
 
 <script setup>
 	import lineChart from "@/components/Echarts/LineChart";
-	const timeUnitOptions = ref([]);
+	const voyageOptions = ref([]);
+	const eeofOptions = ref([]);
+	const cotwoOptions = ref([]);
+	
 	const data = reactive({
 		unitConsData: [{
 			name: "单位航行距离燃油消耗量",
@@ -307,13 +340,43 @@
 				data: [10, 14, 18, 19, 13, 10, 18, 19, 13, 10]
 			}]
 		}],
-		oilsForm: {
-			timeUnit: null,
-			startTime: null,
-			endTime: null
-		}
+		voyageForm: {},
+		eeofForm: {},
+		cotwoForm: {},
+		unitForm: [{}, {}],
+		timeForm: [{}, {}]
 	});
-	const { linesData, oilsForm, timeConsData, unitConsData } = toRefs(data);
+	const { linesData, voyageForm, eeofForm, cotwoForm, unitForm, timeForm, timeConsData, unitConsData } = toRefs(data);
+	const getOptions = function(){
+		voyageOptions.value = [{
+			label: "青岛-大连",
+			value: 0
+		},{
+			label: "大连-福州",
+			value: 1
+		},{
+			label: "福州-广州",
+			value: 2
+		},{
+			label: "上海-广州",
+			value: 3
+		}];
+		eeofOptions.value = [{
+			label: "时间",
+			value: 0
+		},{
+			label: "航次",
+			value: 1
+		}];
+		cotwoOptions.value = [{
+			label: "时间",
+			value: 0
+		},{
+			label: "航次",
+			value: 1
+		}];
+	}
+	getOptions();
 </script>
 
 <style scoped lang="scss">
@@ -324,4 +387,7 @@
 	.sTitleSty{
 		font-size: 0.8rem;
 	}
+	::v-deep .dateSelet .el-input__wrapper{
+		box-shadow: 0 0 7px 2px #dcdcdc;
+	}
 </style>

src/views/efficiencyAnalysis/historyPage/index.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="margin-bottom">
-		<el-row :gutter="14">
+		<el-row :gutter="20">
 			<el-col :span="12" :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
 				<el-card class="box-card cardSty" :body-style="{ padding: '10px !important' }">
 					<el-form ref="systemFormRef" :model="systemForm" label-width="100px" class="grid">
 						<el-form-item label="系统选择：" class="flex-twice" style="margin-bottom: 8px;">
-							<el-select v-model="systemForm.systemId" placeholder="请选择" size="small" style="width: 100%;">
+							<el-select v-model="systemForm.systemId" placeholder="请选择" size="small" style="width: 80%;">
 								<el-option
 								  v-for="item in systemOptions"
 								  :key="item.value"
@@ -19,25 +19,25 @@
 							  v-model="systemForm.sendTime"
 							  type="daterange"
 							  size="small"
-							   style="width: 100%;"
+							  style="width: 80%;flex-grow: 0;box-shadow: 0 0 7px 2px #dcdcdc;"
 							  range-separator=" - "
 							  start-placeholder="开始日期"
 							  end-placeholder="结束日期">
 							</el-date-picker>
 						</el-form-item>
-						<div class="flex-sub padding-left">
-							<el-button type="primary" size="small">查询</el-button>
+						<div class="flex-sub text-center">
+							<el-button style="width: 80%;" type="primary" size="small">查询</el-button>
 						</div>
 					</el-form>
-					<div style="position: relative;">
+					<div style="position: relative;padding: 0 2%;">
 						<div class="sTitleSty text-sm">温度</div>
 						<line-chart name="HostTempl" :data="templData" height="calc(33.33vh - 88px)"/>
 					</div>
-					<div class="margin-tb" style="position: relative;">
+					<div style="position: relative;padding: 0 2%;margin: 16px 0;">
 						<div class="sTitleSty">压力</div>
 						<line-chart name="HostPressure" :data="pressureData" height="calc(33.33vh - 88px)"/>
 					</div>
-					<div style="position: relative;">
+					<div style="position: relative;padding: 0 2%;">
 						<div class="sTitleSty">轴转速</div>
 						<line-chart name="HostSpeed" :data="speedData" height="calc(33.33vh - 89px)"/>
 					</div>
@@ -48,7 +48,7 @@
 				<el-card class="box-card cardSty" :body-style="{ padding: '10px !important' }">
 					<el-form ref="equipFormRef" :model="equipForm" label-width="100px" class="grid">
 						<el-form-item label="设备选择：" class="flex-twice" style="margin-bottom: 8px;">
-							<el-select v-model="equipForm.equipId" placeholder="请选择" size="small" style="width: 100%;">
+							<el-select v-model="equipForm.equipId" placeholder="请选择" size="small" style="width: 80%;">
 								<el-option
 								  v-for="item in equipOptions"
 								  :key="item.value"
@@ -62,25 +62,25 @@
 							  v-model="equipForm.sendTime"
 							  type="daterange"
 							  size="small"
-							  style="width: 100%;"
+							  style="width: 80%;flex-grow: 0;box-shadow: 0 0 7px 2px #dcdcdc;"
 							  range-separator=" - "
 							  start-placeholder="开始日期"
 							  end-placeholder="结束日期">
 							</el-date-picker>
 						</el-form-item>
-						<div class="flex-sub padding-left">
-							<el-button type="primary" size="small">查询</el-button>
+						<div class="flex-sub text-center">
+							<el-button style="width: 80%;" type="primary" size="small">查询</el-button>
 						</div>
 					</el-form>
-					<div style="position: relative;">
+					<div style="position: relative;padding: 0 2%;">
 						<div class="sTitleSty">温度</div>
 						<line-chart name="EngiTempl" :data="eTemplData" height="calc(33.33vh - 88px)"/>
 					</div>
-					<div style="position: relative;margin: 16px 0;">
+					<div style="position: relative;padding: 0 2%;margin: 16px 0;">
 						<div class="sTitleSty">压力</div>
 						<line-chart name="EngiPressure" :data="ePressureData" height="calc(33.33vh - 88px)"/>
 					</div>
-					<div style="position: relative;">
+					<div style="position: relative;padding: 0 2%;">
 						<div class="sTitleSty">功率</div>
 						<line-chart name="EngiPower" :data="powerData" height="calc(33.33vh - 89px)"/>
 					</div>
@@ -232,6 +232,29 @@
 			ePressureData,
 			powerData
 	} = toRefs(data);
+	const getOptions = function(){
+		systemOptions.value = [{
+			label: "冷却系统",
+			value: 0
+		},{
+			label: "润滑系统",
+			value: 1
+		},{
+			label: "燃油系统",
+			value: 2
+		},{
+			label: "进气和排气系统",
+			value: 3
+		}];
+		equipOptions.value = [{
+			label: "X号辅机",
+			value: 0
+		},{
+			label: "锅炉",
+			value: 1
+		}]
+	}
+	getOptions();
 </script>
 
 <style scoped lang="scss">

src/views/efficiencyMana/EnergyReport/FuelData/index.vue

@@ -93,6 +93,7 @@
 					</el-input>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="描述"
 					  class="areaInput"
 					  style="height: calc(23.33vh - 110px);"
@@ -103,6 +104,7 @@
 					<div class="text-bold text-sm">测量航行距离的方法</div>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="方法"
 					  class="margin-top-xs areaInput"
 					  style="height: calc(20vh - 80px);"
@@ -144,6 +146,7 @@
 					<div class="text-bold text-sm">测量航行小时数的方法</div>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="方法"
 					  class="margin-top-xs areaInput"
 					  style="height: calc(23.33vh - 90px);"
@@ -154,6 +157,7 @@
 					<div class="text-bold text-sm">用于向主管机关报告数据的程序</div>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="评估程序"
 					  class="margin-top-xs areaInput"
 					  style="height: calc(23.33vh - 90px);"
@@ -164,6 +168,7 @@
 					<div class="text-bold text-sm">数据质量</div>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="数据质量"
 					  class="margin-top-xs areaInput"
 					  style="height: calc(23.33vh - 90px);"

src/views/efficiencyMana/EnergyReport/ImproveEnergy/index.vue

@@ -8,38 +8,44 @@
 					<el-form ref="eupLogRefs" :rules="rules" :model="increaseForm">
 						<el-table :data="increaseForm.eupLogData" stripe style="width: 100%" 
 							height="calc(75vh - 156px)"
+							@row-dblclick="changeEdit"
+							:highlight-current-row="true"
 							:cell-style="{ fontSize: '0.75rem' }"
 							:header-cell-style="{ backgroundColor: '#a9cbe2',color: '#4a4a4a' }">
 							<el-table-column prop="timeLine" label="日期/时间线">
 								<template #default="scope">
-									<el-form-item :prop="`eupLogData.${scope.$index}.timeLine`" :rules="rules.timeLine" style="margin: 0;">
+									<el-form-item v-if="eupLogEdit[scope.row.id]" :prop="`eupLogData.${scope.$index}.timeLine`" :rules="rules.timeLine" style="margin: 0;">
 										<el-date-picker
 										  v-model="scope.row.timeLine"
 										  type="date"
 										  placeholder="日期/时间线">
 										</el-date-picker>
 									</el-form-item>
+									<span v-else>{{scope.row.timeLine}}</span>
 								</template>
 							</el-table-column>
 							<el-table-column prop="upSection" label="更新部分">
 								<template #default="scope">
-									<el-form-item :prop="`eupLogData.${scope.$index}.upSection`" :rules="rules.upSection" style="margin: 0;">
+									<el-form-item v-if="eupLogEdit[scope.row.id]" :prop="`eupLogData.${scope.$index}.upSection`" :rules="rules.upSection" style="margin: 0;">
 										<el-input type="text" v-model="scope.row.upSection" placeholder="输入加油量"/>
 									</el-form-item>
+									<span v-else>{{scope.row.upSection}}</span>
 								</template>
 							</el-table-column>
 							<el-table-column prop="eCreator" label="编制者">
 								<template #default="scope">
-									<el-form-item :prop="`eupLogData.${scope.$index}.eCreator`" :rules="rules.eCreator" style="margin: 0;">
+									<el-form-item v-if="eupLogEdit[scope.row.id]" :prop="`eupLogData.${scope.$index}.eCreator`" :rules="rules.eCreator" style="margin: 0;">
 										<el-input type="text" v-model="scope.row.eCreator" placeholder="输入加油量"/>
 									</el-form-item>
+									<span v-else>{{scope.row.eCreator}}</span>
 								</template>
 							</el-table-column>
 							<el-table-column prop="ePerformer" label="执行者">
 								<template #default="scope">
-									<el-form-item :prop="`eupLogData.${scope.$index}.ePerformer`" :rules="rules.ePerformer" style="margin: 0;">
+									<el-form-item v-if="eupLogEdit[scope.row.id]" :prop="`eupLogData.${scope.$index}.ePerformer`" :rules="rules.ePerformer" style="margin: 0;">
 										<el-input type="text" v-model="scope.row.ePerformer" placeholder="输入加油量"/>
 									</el-form-item>
+									<span v-else>{{scope.row.ePerformer}}</span>
 								</template>
 							</el-table-column>
 						</el-table>
@@ -143,6 +149,7 @@
 					<div class="sTitleSty" style="letter-spacing:0;">目标</div>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="可测量的目标"
 					  class="margin-top-xs areaInput"
 					  style="height: calc(23.33vh - 100px);"
@@ -153,6 +160,7 @@
 					<div class="sTitleSty" style="letter-spacing:0;">监测</div>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="监测工具的描述"
 					  class="margin-top-xs areaInput"
 					  style="height: calc(23.33vh - 100px);"
@@ -163,6 +171,7 @@
 					<div class="sTitleSty" style="letter-spacing:0;">评估</div>
 					<el-input
 					  type="textarea"
+					  resize="none"
 					  placeholder="评估程序"
 					  class="margin-top-xs areaInput"
 					  style="height: calc(23.33vh - 100px);"
@@ -180,6 +189,7 @@
 	const distanceArea = ref("");
 	const compilationOptions = ref([]);
 	const executionOptions = ref([]);
+	const eupLogEdit = ref({});
 	const data = reactive({
 		rules: {
 			person: [{
@@ -220,75 +230,91 @@
 		},
 		increaseForm: {
 			eupLogData: [{
+				id: 121,
 				timeLine: '2016-05-02',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			},{
+				id: 122,
 				timeLine: '2016-05-04',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			},{
+				id: 123,
 				timeLine: '2016-05-01',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			},{
+				id: 124,
 				timeLine: '2016-05-03',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			},{
+				id: 125,
 				timeLine: '2016-05-02',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			},{
+				id: 126,
 				timeLine: '2016-05-04',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			},{
+				id: 127,
 				timeLine: '2016-05-01',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			},{
+				id: 181,
 				timeLine: '2016-05-03',
 				upSection: "更新了哈哈哈",
 				eCreator: '王小虎',
 				ePerformer: '温大壮'
 			}],
 			measuresData: [{
+				id: 195,
 				executionDate: '2016-05-02',
 				person: '王小虎',
 				energyMeasures: '上海市'
 			},{
+				id: 196,
 				executionDate: '2016-05-04',
 				person: '王小虎',
 				energyMeasures: '普陀区'
 			},{
+				id: 198,
 				executionDate: '2016-05-01',
 				person: '王小虎',
 				energyMeasures: '金沙江路'
 			},{
+				id: 221,
 				executionDate: '2016-05-03',
 				person: '王小虎',
 				energyMeasures: '1516弄'
 			},{
+				id: 226,
 				executionDate: '2016-05-02',
 				person: '王小虎',
 				energyMeasures: '上海市'
 			},{
+				id: 274,
 				executionDate: '2016-05-04',
 				person: '王小虎',
 				energyMeasures: '普陀区'
 			},{
+				id: 279,
 				executionDate: '2016-05-01',
 				person: '王小虎',
 				energyMeasures: '金沙江路'
 			},{
+				id: 244,
 				executionDate: '2016-05-03',
 				person: '王小虎',
 				energyMeasures: '1516弄'
@@ -296,8 +322,15 @@
 		}
 	});
 	const { increaseForm, rules } = toRefs(data);
+	const changeEdit = function(row, column, event){
+		eupLogEdit.value[row.id] = true;
+	}
 </script>
 
 <style scoped lang="scss">
-	
+	::v-deep .el-table--striped .el-table__body tr.el-table__row:hover,
+	::v-deep .el-table__body tr.current-row >td,
+	::v-deep .el-table--striped .el-table__body tr.el-table__row--striped.current-row td.el-table__cell{
+		background-color: var(--greenShadow);
+	}
 </style>

src/views/efficiencyMana/EnergyReport/index.vue

@@ -74,7 +74,7 @@
 	import FuelData from "./FuelData/index.vue";
 	import ImproveEnergy from "./ImproveEnergy/index.vue";
 	const calendarVal = ref("");
-	const reportTye = ref(1);
+	const reportTye = ref(0);
 	const data = reactive({
 		
 	});
@@ -112,8 +112,11 @@
 		color: var(--bGray);
 		font-weight: 700;
 	}
-	::v-deep table .el-input__wrapper{
+	::v-deep table .el-input__wrapper,::v-deep .el-calendar{
 		background-color: transparent;
 		box-shadow: none;
 	}
+	::v-deep .el-calendar-table td.is-selected{
+		background-color: var(--blueShadow);
+	}
 </style>

src/views/homePage/index.vue

@@ -29,8 +29,9 @@
 				<el-card class="box-card cardSty" :body-style="{ padding: '10px !important' }">
 					<div class="grid col-4 text-purple">
 						<div v-for="(aitem,andex) in aisForm" :key="andex">
-							<div class="titleSty">{{aitem.name}}</div>
-							<div style="height: calc(14vh - 72px);line-height: calc(14vh - 72px);font-size: 1.8rem;" class="text-center text-bold text-purple">
+							<div class="titleSty text-right" style="width: calc(40% + 5px);line-height: 48px;">{{aitem.name}}:</div>
+							<div style="height: calc(14vh - 72px);line-height: calc(14vh - 72px);font-size: 1.8rem;padding-left: 40%;" 
+								class="text-bold text-purple">
 								{{aitem.value}}{{aitem.unit}}
 							</div>
 						</div>