lizaixun пре 4 година
родитељ
комит
d259a68aa5
1 измењених фајлова са 85 додато и 67 уклоњено
  1. 85 67
      src/views/gradeEvaluation/GradeEvaluation.vue

+ 85 - 67
src/views/gradeEvaluation/GradeEvaluation.vue

@@ -222,50 +222,51 @@
 				</el-tabs>
 
 			<el-main v-if="dailyInformation == true">
-				<el-table id="daytable" :data="gridData" height="595" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				<el-table id="daytable" :data="gridData" height="600" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				 @sort-change="changeTableSort"
 				 :cell-style="{ textAlign: 'center' }" style="font-size: 10px;">
 					<el-table-column label="等级评定日信息查看">
-						<el-table-column type="selection" width="55">
+						<el-table-column type="selection" width="40">
 						</el-table-column>
-						<el-table-column prop="windturbineid" label="风机编号" width="85">
+						<el-table-column :sortable="'custom'" prop="windturbineid" label="风机" width="75">
 						</el-table-column>
-						<el-table-column prop="level" label="等级" width="65">
+						<el-table-column :sortable="'custom'" prop="level" label="等级" width="70">
 						</el-table-column>
-						<el-table-column prop="rank" label="综合排名" width="85">
+						<el-table-column :sortable="'custom'" prop="rank" label="排名" width="70">
 						</el-table-column>
-						<el-table-column prop="dayfdl" label="发电量" width="75">
+						<el-table-column :sortable="'custom'" prop="dayfdl" label="发电量" width="85">
 						</el-table-column>
-						<el-table-column prop="dayllfdl" label="理论发电量" width="105">
+						<el-table-column :sortable="'custom'" prop="dayllfdl" label="理论电量" width="95">
 						</el-table-column>
-						<el-table-column prop="dayfs" label="平均风速" width="85">
+						<el-table-column :sortable="'custom'" prop="dayfs" label="风速" width="70">
 						</el-table-column>
-						<el-table-column prop="daygl" label="平均功率" width="85">
+						<el-table-column :sortable="'custom'" prop="daygl" label="功率" width="70">
 						</el-table-column>
-						<el-table-column prop="daygzssdl" label="故障损失" width="85">
+						<el-table-column :sortable="'custom'" prop="daygzssdl" label="故障损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayxdssdl" label="限电损失" width="85">
+						<el-table-column :sortable="'custom'" prop="dayxdssdl" label="限电损失" width="95">
 						</el-table-column>
-						<el-table-column prop="daywhssdl" label="维护损失" width="85">
+						<el-table-column :sortable="'custom'" prop="daywhssdl" label="维护损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayxnssdl" label="性能损失" width="85">
+						<el-table-column :sortable="'custom'" prop="dayxnssdl" label="性能损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayslssdl" label="日受累损失电量" width="120">
+						<el-table-column :sortable="'custom'" prop="dayslssdl" label="受累损失" width="95">
 						</el-table-column>
-						<el-table-column prop="daylyxs" label="利用小时数" width="105">
+						<el-table-column :sortable="'custom'" prop="daylyxs" label="利用小时数" width="105">
 						</el-table-column>
-						<el-table-column prop="daynhyd" label="拟合优度" width="85">
+						<el-table-column :sortable="'custom'" prop="daynhyd" label="拟合优度" width="95">
 						</el-table-column>
-						<el-table-column prop="daysbklyl" label="设备可利用率" width="105">
+						<el-table-column :sortable="'custom'" prop="daysbklyl" label="设备可利用率" width="120">
 						</el-table-column>
-						<el-table-column prop="daydxkyxs" label="等效可用系数" width="105">
+						<el-table-column :sortable="'custom'" prop="daydxkyxs" label="等效可用系数" width="120">
 						</el-table-column>
-						<el-table-column prop="dayyxfss" label="有效风时数" width="105">
+						<el-table-column :sortable="'custom'" prop="dayyxfss" label="有效风时数" width="105">
 						</el-table-column>
-						<el-table-column prop="dayxfqr" label="平均切入风速" width="105">
+						<el-table-column :sortable="'custom'" prop="dayxfqr" label="切入风速" width="95">
 						</el-table-column>
-						<el-table-column prop="dayjfpl" label="静风频率" width="85">
+						<el-table-column :sortable="'custom'" prop="dayjfpl" label="静风频率" width="95">
 						</el-table-column>
-						<el-table-column prop="dayglyzxxs" label="功率一致性系数" width="120">
+						<el-table-column :sortable="'custom'" prop="dayglyzxxs" label="功率一致性系数" width="130">
 						</el-table-column>
 					</el-table-column>
 				</el-table>
@@ -277,50 +278,51 @@
 				</div>
 			</el-main>
 			<el-main v-if="monthlyInformation == true">
-				<el-table  id="monthtable" :data="gridDataMonth" height="595" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				<el-table  id="monthtable" :data="gridDataMonth" height="600" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				 @sort-change="changeTableSort"
 				 :cell-style="{ textAlign: 'center' }" style="font-size: 10px;">
 					<el-table-column label="等级评定月信息查看">
-						<el-table-column type="selection" width="55">
+						<el-table-column type="selection" width="40">
 						</el-table-column>
-						<el-table-column prop="windturbineid" label="风机编号" width="85">
+						<el-table-column :sortable="'custom'" prop="windturbineid" label="风机" width="75">
 						</el-table-column>
-						<el-table-column prop="level" label="等级" width="65">
+						<el-table-column :sortable="'custom'" prop="level" label="等级" width="70">
 						</el-table-column>
-						<el-table-column prop="rank" label="综合排名" width="85">
+						<el-table-column :sortable="'custom'" prop="rank" label="排名" width="70">
 						</el-table-column>
-						<el-table-column prop="dayfdl" label="发电量" width="75">
+						<el-table-column :sortable="'custom'" prop="dayfdl" label="发电量" width="85">
 						</el-table-column>
-						<el-table-column prop="dayllfdl" label="理论发电量" width="105">
+						<el-table-column :sortable="'custom'" prop="dayllfdl" label="理论电量" width="95">
 						</el-table-column>
-						<el-table-column prop="dayfs" label="平均风速" width="85">
+						<el-table-column :sortable="'custom'" prop="dayfs" label="风速" width="70">
 						</el-table-column>
-						<el-table-column prop="daygl" label="平均功率" width="85">
+						<el-table-column :sortable="'custom'" prop="daygl" label="功率" width="70">
 						</el-table-column>
-						<el-table-column prop="daygzssdl" label="故障损失" width="85">
+						<el-table-column :sortable="'custom'" prop="daygzssdl" label="故障损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayxdssdl" label="限电损失" width="85">
+						<el-table-column :sortable="'custom'" prop="dayxdssdl" label="限电损失" width="95">
 						</el-table-column>
-						<el-table-column prop="daywhssdl" label="维护损失" width="85">
+						<el-table-column :sortable="'custom'" prop="daywhssdl" label="维护损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayxnssdl" label="性能损失" width="85">
+						<el-table-column :sortable="'custom'" prop="dayxnssdl" label="性能损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayslssdl" label="日受累损失电量" width="120">
+						<el-table-column :sortable="'custom'" prop="dayslssdl" label="受累损失" width="95">
 						</el-table-column>
-						<el-table-column prop="daylyxs" label="利用小时数" width="105">
+						<el-table-column :sortable="'custom'" prop="daylyxs" label="利用小时数" width="105">
 						</el-table-column>
-						<el-table-column prop="daynhyd" label="拟合优度" width="85">
+						<el-table-column :sortable="'custom'" prop="daynhyd" label="拟合优度" width="95">
 						</el-table-column>
-						<el-table-column prop="daysbklyl" label="设备可利用率" width="105">
+						<el-table-column :sortable="'custom'" prop="daysbklyl" label="设备可利用率" width="120">
 						</el-table-column>
-						<el-table-column prop="daydxkyxs" label="等效可用系数" width="105">
+						<el-table-column :sortable="'custom'" prop="daydxkyxs" label="等效可用系数" width="120">
 						</el-table-column>
-						<el-table-column prop="dayyxfss" label="有效风时数" width="105">
+						<el-table-column :sortable="'custom'" prop="dayyxfss" label="有效风时数" width="105">
 						</el-table-column>
-						<el-table-column prop="dayxfqr" label="平均切入风速" width="105">
+						<el-table-column :sortable="'custom'" prop="dayxfqr" label="切入风速" width="95">
 						</el-table-column>
-						<el-table-column prop="dayjfpl" label="静风频率" width="85">
+						<el-table-column :sortable="'custom'" prop="dayjfpl" label="静风频率" width="95">
 						</el-table-column>
-						<el-table-column prop="dayglyzxxs" label="功率一致性系数" width="120">
+						<el-table-column :sortable="'custom'" prop="dayglyzxxs" label="功率一致性系数" width="130">
 						</el-table-column>
 					</el-table-column>
 				</el-table>
@@ -332,50 +334,51 @@
 				</div>
 			</el-main>
 			<el-main v-if="annualInformation == true">
-				<el-table  id="yeartable" :data="gridDataYear" height="595" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				<el-table  id="yeartable" :data="gridDataYear" height="600" @selection-change="handleSelectionChange" :header-cell-style="headStyle"
+				 @sort-change="changeTableSort"
 				 :cell-style="{ textAlign: 'center' }" style="font-size: 10px;">
 					<el-table-column label="等级评定年信息查看">
-						<el-table-column type="selection" width="55">
+						<el-table-column type="selection" width="40">
 						</el-table-column>
-						<el-table-column prop="windturbineid" label="风机编号" width="85">
+						<el-table-column :sortable="'custom'" prop="windturbineid" label="风机" width="75">
 						</el-table-column>
-						<el-table-column prop="level" label="等级" width="65">
+						<el-table-column :sortable="'custom'" prop="level" label="等级" width="70">
 						</el-table-column>
-						<el-table-column prop="rank" label="综合排名" width="85">
+						<el-table-column :sortable="'custom'" prop="rank" label="排名" width="70">
 						</el-table-column>
-						<el-table-column prop="dayfdl" label="发电量" width="75">
+						<el-table-column :sortable="'custom'" prop="dayfdl" label="发电量" width="85">
 						</el-table-column>
-						<el-table-column prop="dayllfdl" label="理论发电量" width="105">
+						<el-table-column :sortable="'custom'" prop="dayllfdl" label="理论电量" width="95">
 						</el-table-column>
-						<el-table-column prop="dayfs" label="平均风速" width="85">
+						<el-table-column :sortable="'custom'" prop="dayfs" label="风速" width="70">
 						</el-table-column>
-						<el-table-column prop="daygl" label="平均功率" width="85">
+						<el-table-column :sortable="'custom'" prop="daygl" label="功率" width="70">
 						</el-table-column>
-						<el-table-column prop="daygzssdl" label="故障损失" width="85">
+						<el-table-column :sortable="'custom'" prop="daygzssdl" label="故障损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayxdssdl" label="限电损失" width="85">
+						<el-table-column :sortable="'custom'" prop="dayxdssdl" label="限电损失" width="95">
 						</el-table-column>
-						<el-table-column prop="daywhssdl" label="维护损失" width="85">
+						<el-table-column :sortable="'custom'" prop="daywhssdl" label="维护损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayxnssdl" label="性能损失" width="85">
+						<el-table-column :sortable="'custom'" prop="dayxnssdl" label="性能损失" width="95">
 						</el-table-column>
-						<el-table-column prop="dayslssdl" label="日受累损失电量" width="120">
+						<el-table-column :sortable="'custom'" prop="dayslssdl" label="受累损失" width="95">
 						</el-table-column>
-						<el-table-column prop="daylyxs" label="利用小时数" width="105">
+						<el-table-column :sortable="'custom'" prop="daylyxs" label="利用小时数" width="105">
 						</el-table-column>
-						<el-table-column prop="daynhyd" label="拟合优度" width="85">
+						<el-table-column :sortable="'custom'" prop="daynhyd" label="拟合优度" width="95">
 						</el-table-column>
-						<el-table-column prop="daysbklyl" label="设备可利用率" width="105">
+						<el-table-column :sortable="'custom'" prop="daysbklyl" label="设备可利用率" width="120">
 						</el-table-column>
-						<el-table-column prop="daydxkyxs" label="等效可用系数" width="105">
+						<el-table-column :sortable="'custom'" prop="daydxkyxs" label="等效可用系数" width="120">
 						</el-table-column>
-						<el-table-column prop="dayyxfss" label="有效风时数" width="105">
+						<el-table-column :sortable="'custom'" prop="dayyxfss" label="有效风时数" width="105">
 						</el-table-column>
-						<el-table-column prop="dayxfqr" label="平均切入风速" width="105">
+						<el-table-column :sortable="'custom'" prop="dayxfqr" label="切入风速" width="95">
 						</el-table-column>
-						<el-table-column prop="dayjfpl" label="静风频率" width="85">
+						<el-table-column :sortable="'custom'" prop="dayjfpl" label="静风频率" width="95">
 						</el-table-column>
-						<el-table-column prop="dayglyzxxs" label="功率一致性系数" width="120">
+						<el-table-column :sortable="'custom'" prop="dayglyzxxs" label="功率一致性系数" width="130">
 						</el-table-column>
 					</el-table-column>
 				</el-table>
@@ -437,7 +440,10 @@ import excelHelper from "@/utils/excelHelper";
 				ranking1:'',
 				ranking2:'',
 				score1:'',
-				score2:''
+				score2:'',
+				orderByColumn:'windturbineid',
+				isAsc:'asc',
+
 			}
 		},
 		created() {
@@ -463,6 +469,16 @@ import excelHelper from "@/utils/excelHelper";
 				this.gamonthlistByPage();
 				this.gayearlistByPage();
 			},
+			changeTableSort(column){
+				this.orderByColumn = column.prop;
+				if(column.order == "descending"){
+					this.isAsc = 'desc';
+				}else if(column.order == "ascending"){
+					this.isAsc = "asc";
+				}
+				
+				this.gradeByDaygData();
+			},
 			handleSelectionChange(val) {
 				this.sortInOrder = [];
 				this.sortInOrderTop = [];
@@ -583,6 +599,8 @@ import excelHelper from "@/utils/excelHelper";
 				var page = new URLSearchParams();
 				page.append('pageNum', this.currentPage2);
 				page.append('pageSize', this.pagesize);
+				page.append('orderByColumn',this.orderByColumn);
+				page.append('isAsc',this.isAsc);
 				page.append('wpId', this.value);
 				page.append('recorddate', this.value1);
 				this.$http.post("/benchmarking/gadaylistByPage", page).then((res) => {