功能样式及功能修改

src/views/gradeEvaluation/GradeEvaluation.vue

@@ -273,7 +273,7 @@
 				<div style="text-align: center;">
 					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage2"
 					 :page-sizes="[10, 50, 100, 1000]"
-					 :page-size="pagesize" layout="sizes, prev, pager, next" :total="1000">
+					 :page-size="pagesize" layout="total,sizes, prev, pager, next" :total="total">
 					</el-pagination>
 				</div>
 			</el-main>
@@ -329,7 +329,7 @@
 				<div style="text-align: center;">
 					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage2"
 					 :page-sizes="[10, 50, 100, 1000]"
-					 :page-size="pagesize" layout="sizes, prev, pager, next" :total="1000">
+					 :page-size="pagesize" layout="total,sizes, prev, pager, next" :total="totalMonth">
 					</el-pagination>
 				</div>
 			</el-main>
@@ -385,7 +385,7 @@
 				<div style="text-align: center;">
 					<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage2"
 					 :page-sizes="[10, 50, 100, 1000]"
-					 :page-size="pagesize" layout="sizes, prev, pager, next" :total="1000">
+					 :page-size="pagesize" layout="total,sizes, prev, pager, next" :total="totalYear">
 					</el-pagination>
 				</div>
 			</el-main>
@@ -443,6 +443,9 @@ import excelHelper from "@/utils/excelHelper";
 				score2:'',
 				orderByColumn:'windturbineid',
 				isAsc:'asc',
+				total:'',
+				totalMonth:'',
+				totalYear:'',
 
 			}
 		},
@@ -605,6 +608,7 @@ import excelHelper from "@/utils/excelHelper";
 				page.append('recorddate', this.value1);
 				this.$http.post("/benchmarking/gadaylistByPage", page).then((res) => {
 					that.gridData = res.data.data.list;
+					that.total = res.data.data.total;
 				})
 
 			},
@@ -620,6 +624,7 @@ import excelHelper from "@/utils/excelHelper";
 				pagemonth.append('month',this.monthvalue);
 				this.$http.post("/benchmarking/gamonthlistByPage",pagemonth).then((res) => {
 					that.gridDataMonth = res.data.data.list;
+					that.totalMonth = res.data.data.total;
 					
 				})
 			},
@@ -633,7 +638,8 @@ import excelHelper from "@/utils/excelHelper";
 				pageyear.append('year',this.yearvalue);
 				this.$http.post("/benchmarking/gayearlistByPage",pageyear).then((res) =>{
 					that.gridDataYear = res.data.data.list;
-					console.log(that.gridDataYear)
+					that.totalYear = res.data.data.total;
+					// console.log(that.gridDataYear)
 				})
 
 			},

src/views/gradeEvaluation/PerformanceAnalysis.vue

@@ -52,7 +52,7 @@
             @sort-change="changeTableSort"
             @row-click="tableDatawindturbineName"
             border
-            style="font-size: 10px;margin-top:1%">
+            style="font-size: 10px;margin-top:1%;cursor: pointer;">
             <el-table-column
               type="index"
               width="40">

src/views/gradeEvaluation/PerformanceAnalysisOperation.vue

@@ -10,40 +10,40 @@
                 @sort-change="changeTableSort"
                 :data="tableDataAll"
                 border
-                style="width: 100%;margin-top:2%;margin-left:1.5%">
+                style="width: 100%;margin-top:2%;margin-left:6%;">
                 <el-table-column
                 prop="name"
                 label="指标名称"
-                width="330">
+                width="300">
                 </el-table-column>
                 <el-table-column
                 prop="byz"
                 label="本月值"
-                width="330">
+                width="300">
                 </el-table-column>
                 <el-table-column
                 prop="qntq"
                 label="去年同期"
-                width="330">
+                width="300">
                 </el-table-column>
                 <el-table-column
                 prop="tbzzl"
                 label="同比增长率（%）"
-                width="330">
+                width="300">
                 </el-table-column>
                 <el-table-column
                 prop="hb"
                 label="环比"
-                width="330">
+                width="300">
                 </el-table-column>
                 <el-table-column
                 prop="hq"
                 label="环比增减值（%）"
-                width="330">
+                width="300">
                 </el-table-column>
             </el-table>
-            <div style="width:90%;margin-left:4%;margin-top:1%">本月{{text1}}设备小时数{{sbxxs}}小时、同比{{tbsbxxs}}小时，设备可利用率{{sbklly}}%、同比{{tbsbklly}}%，等效可用系数{{dxkyxs}}%、同比{{tbdxkyxs}}%，静风频率达到{{jfpl}}%、同比{{tbjfpl}}%，机组功率特性一致性系数达到{{gltxyzx}}%、同比{{tbglyzxxs}}%。</div>
-            <div style="width:70%;margin-left:4%;margin-top:1%">{{text2}}</div>
+            <div style="width:90%;margin-left:6%;margin-top:1%">本月{{text1}}设备小时数{{sbxxs}}小时、同比{{tbsbxxs}}小时，设备可利用率{{sbklly}}%、同比{{tbsbklly}}%，等效可用系数{{dxkyxs}}%、同比{{tbdxkyxs}}%，静风频率达到{{jfpl}}%、同比{{tbjfpl}}%，机组功率特性一致性系数达到{{gltxyzx}}%、同比{{tbglyzxxs}}%。</div>
+            <div style="width:70%;margin-left:6%;margin-top:1%">{{text2}}</div>
             <div id="chartHistogram" style="width: 100%; height: 400px; margin: auto"></div>
             <div id="losschartHistogram" style="width: 100%; height: 400px; margin: auto"></div>
             <div id="windchartHistogram" style="width: 100%; height: 400px; margin: auto"></div>

src/views/rankingIndex/CutAndSpeed.vue

@@ -58,141 +58,169 @@
                width="80">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="inputsmallratio"
               label="总小风切入"
               width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="inputbigratio"
               label="总大风切入"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="outputsmallratio"
               label="总小风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="outputbigmaxratio"
               label="总大风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayinputsmall"
               label="日小风切入"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayinputsmallratio"
               label="日小风切入合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayoutputsmall"
               label="日小风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayoutputsmallratio"
               label="日小风切出合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayinputbig"
               label="日大风切入"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayinputbigratio"
               label="日大风切入合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayoutputbig"
               label="日大风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="dayoutputbigratio"
               label="日大风切出合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthinputsmall"
               label="月小风切入"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthinputsmallratio"
               label="月小风切入合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthinputbig"
               label="月大风切入"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthinputbigratio"
               label="月大风切入合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthoutputsmall"
               label="月小风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthoutputsmallratio"
               label="月小风切出合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthoutputbig"
               label="月大风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="monthoutputbigratio"
               label="月大风切出合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearinputsmall"
               label="年小风切入"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearinputsmallratio"
               label="年小风切入合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearinputbig"
               label="年大风切入"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearinputbigratio"
               label="年大风切入合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearoutputsmall"
               label="年小风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearoutputsmallratio"
               label="年小风切出合格"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearoutputbig"
               label="年大风切出"
                width="60">
             </el-table-column>
             <el-table-column
+            :sortable="'custom'"
               prop="yearoutputbigratio"
               label="年大风切出合格"
                width="60">

src/views/rankingIndex/PlannedGeneration.vue

@@ -31,9 +31,11 @@
                 </el-form-item>
                 <el-form-item label="年份：">
                         <el-date-picker
+                        value-format="yyyy"
                         v-model="timeyear"
                         type="year"
                         placeholder="选择年"
+                        format="yyyy"
                         >
                         </el-date-picker>
                 </el-form-item>
@@ -294,7 +296,7 @@ export default {
         project: "",
         line: "",
         },
-        timeyear:'',
+        timeyear:'2021',
         currentPage2: 1,
 	    pagesize: 10,
         gridData:[],

src/views/rankingIndex/RankingCallThePolice.vue

@@ -165,6 +165,8 @@ export default {
             this.$http.post('/leaderboard/querywarningStatistical',callThePolicRateData).then((res) => {
                 this.gridData = res.data.data
             })
+            this.charFreData = [];
+            this.charNameData = [];
             var callThePolicRateChartData = new URLSearchParams();
             callThePolicRateChartData.append('type',this.value);
 			callThePolicRateChartData.append('beginDate',this.beginDate);

src/views/rankingIndex/SingleMachinePower.vue

@@ -176,23 +176,23 @@
             <el-table-column
               prop="windturbineid"
               label="风机"
-               width="480">
+               width="460">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="speed"
               label="风速"
-              width="480">
+              width="460">
             </el-table-column>
             <el-table-column
               prop="actualpower"   
               label="实际拟合功率"
-              width="480">
+              width="460">
             </el-table-column>
             <el-table-column
               prop="optimalpower"
               label="最优拟合功率"
-              width="480">
+              width="460">
             </el-table-column>
             </el-table-column>        
        </el-table>
@@ -212,28 +212,28 @@
             <el-table-column
               prop="windturbineid"
               label="风机"
-               width="380">
+               width="370">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="speed"
               label="风速"
-              width="380">
+              width="370">
             </el-table-column>
             <el-table-column
               prop="actualpower"   
               label="实际拟合功率"
-              width="380">
+              width="370">
             </el-table-column>
             <el-table-column
               prop="optimalpower"
               label="最优拟合功率"
-              width="380">
+              width="370">
             </el-table-column>
             <el-table-column
                     prop="address"
                     label="操作"
-                    width="380">
+                    width="370">
                     <template slot-scope="scope">
                         <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">修改</el-button>
                     </template>
@@ -256,28 +256,28 @@
             <el-table-column
               prop="windturbineid"
               label="风机"
-               width="380">
+               width="370">
             </el-table-column>
             <el-table-column
             :sortable="'custom'"
               prop="speed"
               label="风速"
-              width="380">
+              width="370">
             </el-table-column>
             <el-table-column
               prop="actualpower"   
               label="实际拟合功率"
-              width="380">
+              width="370">
             </el-table-column>
             <el-table-column
               prop="optimalpower"
               label="最优拟合功率"
-              width="380">
+              width="370">
             </el-table-column>
             <el-table-column
                     prop="address"
                     label="操作"
-                    width="380">
+                    width="370">
                     <template slot-scope="scope">
                         <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">修改</el-button>
                     </template>
@@ -287,7 +287,7 @@
        <div style="text-align: center;">
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage2"
 				:page-sizes="[10, 50, 100, 1000]"
-				:page-size="pagesize" layout="sizes, prev, pager, next" :total="1000">
+				:page-size="pagesize" layout="total,sizes, prev, pager, next" :total="total">
 			</el-pagination>
 		</div>
         <div id="leiDaTu" class="echart"></div>
@@ -330,7 +330,7 @@ export default {
             switchtableall:true,
             switchtableday:false,
             switchtablemonth:false,
-            
+            total:'',
         }
     },
     created(){
@@ -391,6 +391,7 @@ export default {
                 singleMachinePowerData.append('wtId',this.value2);
                 this.$http.post("/powersaturation/powersaturationamonutlist",singleMachinePowerData).then((res) => {
                     this.gridData = res.data.data.list;
+                    this.total = res.data.data.total;
                 })
                 singleMachinePowerDataChart.append('wtId',this.value2);
                 this.$http.post("/powersaturation/powersaturationamonutchart",singleMachinePowerDataChart).then((res) => {
@@ -428,6 +429,7 @@ export default {
                 singleMachinePowerData.append('month',this.timemonth);
                 this.$http.post("/powersaturation/powersaturationmonthlist",singleMachinePowerData).then((res) =>{
                     this.gridData = res.data.data.list;
+                     this.total = res.data.data.total;
                 })
                 singleMachinePowerDataChart.append('wtId',this.value2);
                 singleMachinePowerDataChart.append('year',this.timeyear);
@@ -458,6 +460,7 @@ export default {
                 singleMachinePowerData.append('recorddate',this.time);
                 this.$http.post("/powersaturation/powersaturationlist",singleMachinePowerData).then((res) =>{
                     this.gridData = res.data.data.list;
+                    this.total = res.data.data.total;
                 })
                 singleMachinePowerDataChart.append('wtId',this.value2);
                 singleMachinePowerDataChart.append('recorddate',this.time);