等级评估功能月数据年数据

src/App.vue

@@ -24,8 +24,9 @@
             </el-submenu>
           </el-submenu>
           <el-submenu index="3">
-            <template slot="title">性能分析</template></el-submenu
-          >
+            <template slot="title">性能分析</template>
+            <el-menu-item index="/gradeEvaluation">等级评估</el-menu-item>
+          </el-submenu>
           <el-submenu index="4">
             <template slot="title">对标管理</template>
           </el-submenu>
@@ -45,7 +46,6 @@
           <el-submenu index="8">
             <template slot="title">报表管理</template>
           </el-submenu>
-		  <el-menu-item index="/gradeEvaluation">等级评估</el-menu-item>
         </el-menu>
       </el-header>
       <el-main>

src/components/gradeEvaluation/GradeEvaluation.vue

@@ -1,14 +1,6 @@
 <template>
 <div class="box">
-	<div class="left">
-		<el-menu :default-openeds="['1', '3']">
-				<el-submenu index="1">
-					<template slot="title"><i class="el-icon-message"></i>等级评估</template>
-					<el-menu-item index="1-1">风机等级评估</el-menu-item>
-				</el-submenu>
-		</el-menu>
-	</div>
-	<div class="right">
+	<div class="overallSituation">
 				<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" style="width: 100%;margin: 0.5%;height: 130px;">
 					<el-tab-pane label="风机日信息等级评估管理" name="first" :key="'first'">
 						<div style="float: left;">查询条件</div>
@@ -90,8 +82,10 @@
 						</div>
 						<div class="block" style="width:20%;float: left;">
 							<span>日期</span>
-							<el-date-picker v-model="value1" type="date" placeholder="选择日期" style="margin-left: 5%;">
-							</el-date-picker>
+							<el-date-picker v-model="value1" type="month" placeholder="选择月" style="margin-left: 5%;">
+    						</el-date-picker>
+							<!-- <el-date-picker v-model="value1" type="date" placeholder="选择日期" style="margin-left: 5%;">
+							</el-date-picker> -->
 						</div>
 						<div style="width: 2%; float:left;margin-left: 10%;">
 							<el-button type="primary" @click="dialogTableVisibleOpenMonth()">对比</el-button>
@@ -160,8 +154,10 @@
 						</div>
 						<div class="block" style="width:20%;float: left;">
 							<span>日期</span>
-							<el-date-picker v-model="value1" type="date" placeholder="选择日期" style="margin-left: 5%;">
+							<el-date-picker v-model="value1" type="year" placeholder="选择年" style="margin-left: 5%;">
 							</el-date-picker>
+							<!-- <el-date-picker v-model="value1" type="date" placeholder="选择日期" style="margin-left: 5%;">
+							</el-date-picker> -->
 						</div>
 						<div style="width: 2%; float:left;margin-left: 10%;">
 							<el-button type="primary" @click="dialogTableVisibleOpenYear()">对比</el-button>
@@ -221,50 +217,50 @@
 				</el-tabs>
 
 			<el-main v-if="dailyInformation == true">
-				<el-table :data="gridData" height="610" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				<el-table :data="gridData" height="595" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
 				 :cell-style="{ textAlign: 'center' }" style="font-size: 10px;">
 					<el-table-column label="等级评定日信息查看">
-						<el-table-column type="selection" width="40">
+						<el-table-column type="selection" width="55">
 						</el-table-column>
 						<el-table-column prop="windturbineid" label="风机编号" width="85">
 						</el-table-column>
-						<el-table-column prop="level" label="等级" width="50">
+						<el-table-column prop="level" label="等级" width="65">
 						</el-table-column>
-						<el-table-column prop="rank" label="综合排名" width="70">
+						<el-table-column prop="rank" label="综合排名" width="85">
 						</el-table-column>
-						<el-table-column prop="dayfdl" label="发电量" width="60">
+						<el-table-column prop="dayfdl" label="发电量" width="75">
 						</el-table-column>
-						<el-table-column prop="dayllfdl" label="理论发电量" width="85">
+						<el-table-column prop="dayllfdl" label="理论发电量" width="105">
 						</el-table-column>
-						<el-table-column prop="dayfs" label="平均风速" width="70">
+						<el-table-column prop="dayfs" label="平均风速" width="85">
 						</el-table-column>
-						<el-table-column prop="daygl" label="平均功率" width="70">
+						<el-table-column prop="daygl" label="平均功率" width="85">
 						</el-table-column>
-						<el-table-column prop="daygzssdl" label="故障损失" width="70">
+						<el-table-column prop="daygzssdl" label="故障损失" width="85">
 						</el-table-column>
-						<el-table-column prop="dayxdssdl" label="限电损失" width="70">
+						<el-table-column prop="dayxdssdl" label="限电损失" width="85">
 						</el-table-column>
-						<el-table-column prop="daywhssdl" label="维护损失" width="70">
+						<el-table-column prop="daywhssdl" label="维护损失" width="85">
 						</el-table-column>
-						<el-table-column prop="dayxnssdl" label="性能损失" width="70">
+						<el-table-column prop="dayxnssdl" label="性能损失" width="85">
 						</el-table-column>
-						<el-table-column prop="dayslssdl" label="日受累损失电量">
+						<el-table-column prop="dayslssdl" label="日受累损失电量" width="120">
 						</el-table-column>
-						<el-table-column prop="daylyxs" label="利用小时数" width="85">
+						<el-table-column prop="daylyxs" label="利用小时数" width="105">
 						</el-table-column>
-						<el-table-column prop="daynhyd" label="拟合优度" width="70">
+						<el-table-column prop="daynhyd" label="拟合优度" width="85">
 						</el-table-column>
-						<el-table-column prop="daysbklyl" label="设备可利用率" width="95">
+						<el-table-column prop="daysbklyl" label="设备可利用率" width="105">
 						</el-table-column>
-						<el-table-column prop="daydxkyxs" label="等效可用系数" width="95">
+						<el-table-column prop="daydxkyxs" label="等效可用系数" width="105">
 						</el-table-column>
-						<el-table-column prop="dayyxfss" label="有效风时数" width="85">
+						<el-table-column prop="dayyxfss" label="有效风时数" width="105">
 						</el-table-column>
-						<el-table-column prop="dayxfqr" label="平均切入风速" width="95">
+						<el-table-column prop="dayxfqr" label="平均切入风速" width="105">
 						</el-table-column>
-						<el-table-column prop="dayjfpl" label="静风频率" width="70">
+						<el-table-column prop="dayjfpl" label="静风频率" width="85">
 						</el-table-column>
-						<el-table-column prop="dayglyzxxs" label="功率一致性系数" width="110">
+						<el-table-column prop="dayglyzxxs" label="功率一致性系数" width="120">
 						</el-table-column>
 					</el-table-column>
 				</el-table>
@@ -275,50 +271,50 @@
 				</div>
 			</el-main>
 			<el-main v-if="monthlyInformation == true">
-				<el-table :data="gridData" height="610" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				<el-table :data="gridDataMonth" height="595" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
 				 :cell-style="{ textAlign: 'center' }" style="font-size: 10px;">
-					<el-table-column label="等级评定日信息查看">
-						<el-table-column type="selection" width="40">
+					<el-table-column label="等级评定月信息查看">
+						<el-table-column type="selection" width="55">
 						</el-table-column>
 						<el-table-column prop="windturbineid" label="风机编号" width="85">
 						</el-table-column>
-						<el-table-column prop="level" label="等级" width="50">
+						<el-table-column prop="level" label="等级" width="65">
 						</el-table-column>
-						<el-table-column prop="rank" label="综合排名" width="70">
+						<el-table-column prop="rank" label="综合排名" width="85">
 						</el-table-column>
-						<el-table-column prop="monthfdl" label="发电量" width="60">
+						<el-table-column prop="dayfdl" label="发电量" width="75">
 						</el-table-column>
-						<el-table-column prop="monthllfdl" label="理论发电量" width="85">
+						<el-table-column prop="dayllfdl" label="理论发电量" width="105">
 						</el-table-column>
-						<el-table-column prop="monthfs" label="平均风速" width="70">
+						<el-table-column prop="dayfs" label="平均风速" width="85">
 						</el-table-column>
-						<el-table-column prop="monthgl" label="平均功率" width="70">
+						<el-table-column prop="daygl" label="平均功率" width="85">
 						</el-table-column>
-						<el-table-column prop="monthgzssdl" label="故障损失" width="70">
+						<el-table-column prop="daygzssdl" label="故障损失" width="85">
 						</el-table-column>
-						<el-table-column prop="monthxdssdl" label="限电损失" width="70">
+						<el-table-column prop="dayxdssdl" label="限电损失" width="85">
 						</el-table-column>
-						<el-table-column prop="monthwhssdl" label="维护损失" width="70">
+						<el-table-column prop="daywhssdl" label="维护损失" width="85">
 						</el-table-column>
-						<el-table-column prop="monthxnssdl" label="性能损失" width="70">
+						<el-table-column prop="dayxnssdl" label="性能损失" width="85">
 						</el-table-column>
-						<el-table-column prop="monthslssdl" label="日受累损失电量">
+						<el-table-column prop="dayslssdl" label="日受累损失电量" width="120">
 						</el-table-column>
-						<el-table-column prop="monthlyxs" label="利用小时数" width="85">
+						<el-table-column prop="daylyxs" label="利用小时数" width="105">
 						</el-table-column>
-						<el-table-column prop="monthnhyd" label="拟合优度" width="70">
+						<el-table-column prop="daynhyd" label="拟合优度" width="85">
 						</el-table-column>
-						<el-table-column prop="monthsbklyl" label="设备可利用率" width="95">
+						<el-table-column prop="daysbklyl" label="设备可利用率" width="105">
 						</el-table-column>
-						<el-table-column prop="monthdxkyxs" label="等效可用系数" width="95">
+						<el-table-column prop="daydxkyxs" label="等效可用系数" width="105">
 						</el-table-column>
-						<el-table-column prop="monthyxfss" label="有效风时数" width="85">
+						<el-table-column prop="dayyxfss" label="有效风时数" width="105">
 						</el-table-column>
-						<el-table-column prop="monthxfqr" label="平均切入风速" width="95">
+						<el-table-column prop="dayxfqr" label="平均切入风速" width="105">
 						</el-table-column>
-						<el-table-column prop="monthjfpl" label="静风频率" width="70">
+						<el-table-column prop="dayjfpl" label="静风频率" width="85">
 						</el-table-column>
-						<el-table-column prop="monthglyzxxs" label="功率一致性系数" width="110">
+						<el-table-column prop="dayglyzxxs" label="功率一致性系数" width="120">
 						</el-table-column>
 					</el-table-column>
 				</el-table>
@@ -329,50 +325,50 @@
 				</div>
 			</el-main>
 			<el-main v-if="annualInformation == true">
-				<el-table :data="gridData" height="610" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				<el-table :data="gridDataYear" height="595" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
 				 :cell-style="{ textAlign: 'center' }" style="font-size: 10px;">
-					<el-table-column label="等级评定日信息查看">
-						<el-table-column type="selection" width="40">
+					<el-table-column label="等级评定年信息查看">
+						<el-table-column type="selection" width="55">
 						</el-table-column>
 						<el-table-column prop="windturbineid" label="风机编号" width="85">
 						</el-table-column>
-						<el-table-column prop="level" label="等级" width="50">
+						<el-table-column prop="level" label="等级" width="65">
 						</el-table-column>
-						<el-table-column prop="rank" label="综合排名" width="70">
+						<el-table-column prop="rank" label="综合排名" width="85">
 						</el-table-column>
-						<el-table-column prop="yearfdl" label="发电量" width="60">
+						<el-table-column prop="dayfdl" label="发电量" width="75">
 						</el-table-column>
-						<el-table-column prop="yearllfdl" label="理论发电量" width="85">
+						<el-table-column prop="dayllfdl" label="理论发电量" width="105">
 						</el-table-column>
-						<el-table-column prop="yearfs" label="平均风速" width="70">
+						<el-table-column prop="dayfs" label="平均风速" width="85">
 						</el-table-column>
-						<el-table-column prop="yeargl" label="平均功率" width="70">
+						<el-table-column prop="daygl" label="平均功率" width="85">
 						</el-table-column>
-						<el-table-column prop="yeargzssdl" label="故障损失" width="70">
+						<el-table-column prop="daygzssdl" label="故障损失" width="85">
 						</el-table-column>
-						<el-table-column prop="yearxdssdl" label="限电损失" width="70">
+						<el-table-column prop="dayxdssdl" label="限电损失" width="85">
 						</el-table-column>
-						<el-table-column prop="yearwhssdl" label="维护损失" width="70">
+						<el-table-column prop="daywhssdl" label="维护损失" width="85">
 						</el-table-column>
-						<el-table-column prop="yearxnssdl" label="性能损失" width="70">
+						<el-table-column prop="dayxnssdl" label="性能损失" width="85">
 						</el-table-column>
-						<el-table-column prop="yearslssdl" label="日受累损失电量">
+						<el-table-column prop="dayslssdl" label="日受累损失电量" width="120">
 						</el-table-column>
-						<el-table-column prop="yearlyxs" label="利用小时数" width="85">
+						<el-table-column prop="daylyxs" label="利用小时数" width="105">
 						</el-table-column>
-						<el-table-column prop="yearnhyd" label="拟合优度" width="70">
+						<el-table-column prop="daynhyd" label="拟合优度" width="85">
 						</el-table-column>
-						<el-table-column prop="yearsbklyl" label="设备可利用率" width="95">
+						<el-table-column prop="daysbklyl" label="设备可利用率" width="105">
 						</el-table-column>
-						<el-table-column prop="yeardxkyxs" label="等效可用系数" width="95">
+						<el-table-column prop="daydxkyxs" label="等效可用系数" width="105">
 						</el-table-column>
-						<el-table-column prop="yearyxfss" label="有效风时数" width="85">
+						<el-table-column prop="dayyxfss" label="有效风时数" width="105">
 						</el-table-column>
-						<el-table-column prop="yearxfqr" label="平均切入风速" width="95">
+						<el-table-column prop="dayxfqr" label="平均切入风速" width="105">
 						</el-table-column>
-						<el-table-column prop="yearjfpl" label="静风频率" width="70">
+						<el-table-column prop="dayjfpl" label="静风频率" width="85">
 						</el-table-column>
-						<el-table-column prop="yearglyzxxs" label="功率一致性系数" width="110">
+						<el-table-column prop="dayglyzxxs" label="功率一致性系数" width="120">
 						</el-table-column>
 					</el-table-column>
 				</el-table>
@@ -398,8 +394,12 @@
 					label: '牛首山'
 				}],
 				gridData: [],
-				value: 'MHS_FDC',
+				gridDataMonth:[],
+				gridDataYear:[],
+				value: 'NSS_FDC',
 				value1: '2021-01-01',
+				yearvalue:'',
+				monthvalue:'',
 				dialogTableVisible: false,
 				dialogTableVisibleMonth: false,
 				dialogTableVisibleYear: false,
@@ -432,6 +432,8 @@
 		},
 		mounted() {
 			this.gradeByDaygData();
+			this.gamonthlistByPage();
+			this.gayearlistByPage();
 		},
 		methods: {
 			handleOpen(key, keyPath) {
@@ -445,6 +447,8 @@
 			},
 			currentSel(){
 				this.gradeByDaygData();
+				this.gamonthlistByPage();
+				this.gayearlistByPage();
 			},
 			handleSelectionChange(val) {
 				this.sortInOrder = [];
@@ -492,6 +496,8 @@
 			handleCurrentChange(val) {
 				// console.log(`当前页: ${val}`);
 				this.gradeByDaygData();
+				this.gamonthlistByPage();
+				this.gayearlistByPage();
 			},
 			dialogTableVisibleOpen() {
 				this.dialogTableVisible = true;
@@ -525,16 +531,22 @@
 					this.monthlyInformation = false
 					this.annualInformation = false
 					this.gradeByDaygData();
+					this.gamonthlistByPage();
+					this.gayearlistByPage();
 				} else if (tab.name === 'second') {
 					this.dailyInformation = false
 					this.monthlyInformation = true
 					this.annualInformation = false
 					this.gradeByDaygData();
+					this.gamonthlistByPage();
+					this.gayearlistByPage();
 				} else if (tab.name === 'cord') {
 					this.dailyInformation = false
 					this.monthlyInformation = false
 					this.annualInformation = true
 					this.gradeByDaygData();
+					this.gamonthlistByPage();
+					this.gayearlistByPage();
 				}
 			},
 			gradeByDaygData() {
@@ -549,6 +561,35 @@
 				})
 
 			},
+			gamonthlistByPage(){
+				let that = this;
+				this.yearvalue = this.value1.slice(0,4);
+				this.monthvalue = this.value1.slice(5,7);
+				var pagemonth = new URLSearchParams();
+				pagemonth.append('pageNum',this.currentPage2);
+				pagemonth.append('pageSize',this.pagesize);
+				pagemonth.append('wpId',this.value);
+				pagemonth.append('year',this.yearvalue);
+				pagemonth.append('month',this.monthvalue);
+				this.$http.post("/benchmarking/gamonthlistByPage",pagemonth).then((res) => {
+					that.gridDataMonth = res.data.data.list;
+					
+				})
+			},
+			gayearlistByPage(){
+				let that = this;
+				this.yearvalue = this.value1.slice(0,4);
+				var pageyear = new URLSearchParams();
+				pageyear.append('pageNum',this.currentPage2);
+				pageyear.append('pageSize',this.pagesize);
+				pageyear.append('wpId',this.value);
+				pageyear.append('year',this.yearvalue);
+				this.$http.post("/benchmarking/gayearlistByPage",pageyear).then((res) =>{
+					that.gridDataYear = res.data.data.list;
+					console.log(that.gridDataYear)
+				})
+
+			},
 			radarChartData() {
 				let that = this;
 				this.$http.get("/benchmarking/wtchart?gaid1=" + this.multipleSelection[0].id +
@@ -732,12 +773,9 @@
  		overflow: hidden;
 	}
 
-	.left{
-		width: 25%;
-		height: 790px;
-		border: 1px solid #F5F7FA;
-	}
-	.right{
+	.overallSituation{
+		width: 100%;
+		flex-grow: 1;
 	}
 
 	.leftNavigation {