加页面标题，删除table多余字

src/helper/partten.js

@@ -9,6 +9,9 @@ const color = [
     { key: "blue", value: "#1a93cf" },
     { key: "red", value: "#BA3237" },
     { key: "pink", value: "#c531c7" },
+	{ key: "cyan", value: "#1cbbb4" },
+	{ key: "brown", value: "#a5673f" },
+	{ key: "mauve", value: "#9c26b0" },
 ];
 
 function getColor(key) {

src/views/Decision/Decision1.vue

@@ -151,7 +151,7 @@
 							name: "受累",
 							field: "sl",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable:true
 						},
 						{
@@ -186,7 +186,7 @@
 				value3: [],
 				value4: "",
 				value5: "",
-				barColor: [partten.getColor("green"), partten.getColor("orange"), partten.getColor("yellow"), partten.getColor("red"), partten.getColor("purple"), partten.getColor("blue")],
+				barColor: [partten.getColor("purple"), partten.getColor("green"), partten.getColor("pink"), partten.getColor("red"), partten.getColor("orange"), partten.getColor("grayl")],
 				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
 				bardata: [],
 				lineData: [],

src/views/Decision/Decision1Mx.vue

@@ -91,12 +91,14 @@
 	import Panel from "../../components/coms/panel/panel.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Table from "../../components/coms/table/table.vue";
+	import partten from "@/helper/partten.js";
 	export default {
 		components: {
 			ToolbarPanel,
 			BarLineChart,
 			Panel,
 			Table,
+			partten,
 			SvgIcon
 		},
 		data() {
@@ -237,6 +239,7 @@
 				value3: [],
 				value4: "",
 				value5: "",
+				barColor: [partten.getColor("purple"), partten.getColor("green"), partten.getColor("pink"), partten.getColor("red"), partten.getColor("orange"), partten.getColor("grayl"),partten.getColor("yellow"),partten.getColor("gray"),partten.getColor("blue"),partten.getColor("cyan"),partten.getColor("brown"),partten.getColor("mauve")],
 				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
 				bardata: [],
 				lineData: [],
@@ -247,7 +250,6 @@
 			this.value4 = this.getTime(1);
 			this.value5 = this.getTime(2);
 			this.AjaxCommon();
-
 		},
 		methods: {
 			ChangZhanVal() {

src/views/Decision/Decision2.vue

@@ -58,7 +58,8 @@
 				<button class="btn">导出</button>
 			</div>
 		</div>
-
+		<toolbar-panel title="风机绩效榜" :showLine="false">
+		
 		<div v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
@@ -98,6 +99,7 @@
 				</panel>
 			</el-col>
 		</el-row>
+		</toolbar-panel>
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -112,6 +114,7 @@
 	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 	import Panel from "../../components/coms/panel/panel.vue";
 	import Table from "../../components/coms/table/table.vue";
+	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
 		components: {
@@ -120,7 +123,8 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
-			Dayinfo
+			Dayinfo,
+			ToolbarPanel
 		},
 		data() {
 			let that = this;
@@ -188,68 +192,68 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量排名",
+							name: "故障损失排名",
 							field: "gzssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -340,7 +344,7 @@
 								// var that = this;
 								that.API.requestData({
 									method: "GET",
-									baseURL : "10.155.32.4:8034",
+									baseURL : "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -436,61 +440,61 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -596,7 +600,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "10.155.32.4:8034",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -615,7 +619,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "10.155.32.4:8034",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -636,7 +640,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "10.155.32.4:8034",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/lineList",
 					data: {
 						projects: val
@@ -680,7 +684,7 @@
 				var that = this;
 				that.API.requestData({ //五项损失率
 					method: "GET",
-					baseURL : "10.155.32.4:8034",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wxssl",
 					data: {
 						wpids: that.value1,
@@ -966,7 +970,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/Decision/Decision2Cjdb.vue

@@ -38,41 +38,42 @@
 				<button class="btn">导出</button>
 			</div>
 		</div>
-
-		<div v-show="detailShow==1">
-			<div class="mg-b-16">
-				<div class="project-table">
-					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+		<toolbar-panel title="场际对标" :showLine="false">
+			<div v-show="detailShow==1">
+				<div class="mg-b-16">
+					<div class="project-table">
+						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+					</div>
 				</div>
-			</div>
-			<el-row class="mg-b-16">
-				<el-col :span="12">
-					<panel title="发电量占比">
-						<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+				<el-row class="mg-b-16">
+					<el-col :span="12">
+						<panel title="发电量占比">
+							<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+						</panel>
+					</el-col>
+					<el-col :span="12">
+						<panel title="各场站损失电量占比">
+							<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
+						</panel>
+					</el-col>
+				</el-row>
+				<div>
+					<panel title="损失电量分析">
+						<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+							:units='["(万KWh)"]' />
 					</panel>
-				</el-col>
-				<el-col :span="12">
-					<panel title="各场站损失电量占比">
-						<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
+				</div>
+			</div>
+			<el-row :type="'flex'" class="content" v-show="detailShow==2">
+				<el-col :span="24" class="pd-l-8">
+					<panel :title="'风机对标列表明细'" :showLine="false">
+						<div class="project-table">
+							<Table :data="tableDataDetail"></Table>
+						</div>
 					</panel>
 				</el-col>
 			</el-row>
-			<div>
-				<panel title="损失电量分析">
-					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
-						:units='["(万KWh)"]' />
-				</panel>
-			</div>
-		</div>
-		<el-row :type="'flex'" class="content" v-show="detailShow==2">
-			<el-col :span="24" class="pd-l-8">
-				<panel :title="'风机对标列表明细'" :showLine="false">
-					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
-					</div>
-				</panel>
-			</el-col>
-		</el-row>
+		</toolbar-panel>
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -87,6 +88,7 @@
 	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 	import Panel from "../../components/coms/panel/panel.vue";
 	import Table from "../../components/coms/table/table.vue";
+	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
 		components: {
@@ -95,6 +97,7 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
@@ -170,68 +173,68 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量排名",
+							name: "故障损失排名",
 							field: "gzssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -248,7 +251,7 @@
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						},{
+						}, {
 							name: "故障损失率排名",
 							field: "gzsslpm",
 							is_num: false,
@@ -321,7 +324,7 @@
 								that.detailShow = 2;
 								that.API.requestData({
 									method: "GET",
-									baseURL : "http://10.155.32.4:9001/",
+									baseURL: "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -416,61 +419,61 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -556,7 +559,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -570,7 +573,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -611,7 +614,7 @@
 				var that = this;
 				that.API.requestData({ //五项损失率
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/cjdb",
 					data: {
 						wpids: that.value1,
@@ -787,7 +790,7 @@
 					windData1: data[0].slssl,
 					windData2: data[1].slssl
 				}];
-				
+
 				that.radarValue = [{
 					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
 					data: [{
@@ -800,7 +803,7 @@
 						]
 					}]
 				}];
-				
+
 				var analyis = [],
 					gzssdl = [],
 					jxssdl = [],
@@ -872,7 +875,7 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
@@ -893,7 +896,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/Decision/Decision2Cndb.vue

@@ -38,30 +38,32 @@
 				<button class="btn">导出</button>
 			</div>
 		</div>
-		<div v-show="detailShow==1">
-			<div class="mg-b-16">
-				<div class="project-table">
-					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+		<toolbar-panel title="场内对标" :showLine="false">
+			<div v-show="detailShow==1">
+				<div class="mg-b-16">
+					<div class="project-table">
+						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+					</div>
 				</div>
+				<el-row :type="'flex'" class="content">
+					<el-col :span="24" class="pd-l-8">
+						<panel title="损失电量分析">
+							<multiple-bar-chart height="400px" :list="analyis" :customerTooltip="true"
+								@tooltip="tooltip" :units='["(万KWh)"]' />
+						</panel>
+					</el-col>
+				</el-row>
 			</div>
-			<el-row :type="'flex'" class="content">
+			<el-row :type="'flex'" class="content" v-show="detailShow==2">
 				<el-col :span="24" class="pd-l-8">
-					<panel title="损失电量分析">
-						<multiple-bar-chart height="400px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
-							:units='["(万KWh)"]' />
+					<panel :title="'风机对标列表明细'" :showLine="false">
+						<div class="project-table">
+							<Table :data="tableDataDetail"></Table>
+						</div>
 					</panel>
 				</el-col>
 			</el-row>
-		</div>
-		<el-row :type="'flex'" class="content" v-show="detailShow==2">
-			<el-col :span="24" class="pd-l-8">
-				<panel :title="'风机对标列表明细'" :showLine="false">
-					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
-					</div>
-				</panel>
-			</el-col>
-		</el-row>
+		</toolbar-panel>
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -76,6 +78,7 @@
 	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 	import Panel from "../../components/coms/panel/panel.vue";
 	import Table from "../../components/coms/table/table.vue";
+	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
 		components: {
@@ -84,6 +87,7 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
@@ -153,68 +157,68 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量排名",
+							name: "故障损失排名",
 							field: "gzssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -306,7 +310,7 @@
 								// var that = this;
 								that.API.requestData({
 									method: "GET",
-									baseURL : "http://10.155.32.4:9001/",
+									baseURL: "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -400,61 +404,61 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -538,7 +542,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -552,7 +556,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -594,7 +598,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/cndb",
 					data: {
 						wpid: that.value1,
@@ -831,7 +835,7 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;

src/views/Decision/Decision2Xldb.vue

@@ -58,41 +58,42 @@
 				<button class="btn">导出</button>
 			</div>
 		</div>
-
-		<div v-show="detailShow==1">
-			<div class="mg-b-16">
-				<div class="project-table">
-					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+		<toolbar-panel title="线路对标" :showLine="false">
+			<div v-show="detailShow==1">
+				<div class="mg-b-16">
+					<div class="project-table">
+						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+					</div>
 				</div>
-			</div>
-			<el-row class="mg-b-16">
-				<el-col :span="12">
-					<panel title="发电量占比">
-						<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+				<el-row class="mg-b-16">
+					<el-col :span="12">
+						<panel title="发电量占比">
+							<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+						</panel>
+					</el-col>
+					<el-col :span="12">
+						<panel title="各场站损失电量占比">
+							<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
+						</panel>
+					</el-col>
+				</el-row>
+				<div>
+					<panel title="损失电量分析">
+						<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+							:units='["(万KWh)"]' />
 					</panel>
-				</el-col>
-				<el-col :span="12">
-					<panel title="各场站损失电量占比">
-						<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
+				</div>
+			</div>
+			<el-row :type="'flex'" class="content" v-show="detailShow==2">
+				<el-col :span="24" class="pd-l-8">
+					<panel :title="'风机对标列表明细'" :showLine="false">
+						<div class="project-table">
+							<Table :data="tableDataDetail"></Table>
+						</div>
 					</panel>
 				</el-col>
 			</el-row>
-			<div>
-				<panel title="损失电量分析">
-					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
-						:units='["(万KWh)"]' />
-				</panel>
-			</div>
-		</div>
-		<el-row :type="'flex'" class="content" v-show="detailShow==2">
-			<el-col :span="24" class="pd-l-8">
-				<panel :title="'风机对标列表明细'" :showLine="false">
-					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
-					</div>
-				</panel>
-			</el-col>
-		</el-row>
+		</toolbar-panel>
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -107,6 +108,7 @@
 	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 	import Panel from "../../components/coms/panel/panel.vue";
 	import Table from "../../components/coms/table/table.vue";
+	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
 		components: {
@@ -115,12 +117,13 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
 			let that = this;
 			return {
-				oneData:[],
+				oneData: [],
 				tableIdArr: [], //放checkbox的id数组
 				tableId: [],
 				checkLength: 0, //对标分析只能选择2个
@@ -191,68 +194,68 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量排名",
+							name: "故障损失排名",
 							field: "gzssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -269,7 +272,7 @@
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						},{
+						}, {
 							name: "故障损失率排名",
 							field: "gzsslpm",
 							is_num: false,
@@ -342,7 +345,7 @@
 								that.detailShow = 2;
 								that.API.requestData({
 									method: "GET",
-									baseURL : "http://10.155.32.4:9001/",
+									baseURL: "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -439,61 +442,61 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -585,7 +588,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -595,7 +598,7 @@
 			this.value5 = this.getTime(2);
 			that.API.requestData({
 				method: "GET",
-				baseURL : "http://10.155.32.4:9001/",
+				baseURL: "http://10.155.32.4:9001/",
 				subUrl: "benchmarking/wplist",
 				success(res) {
 					that.value1.push(res.data[0].id)
@@ -608,7 +611,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.oneData = res.data[0].id
@@ -629,7 +632,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -650,7 +653,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/lineList",
 					data: {
 						projects: val
@@ -695,7 +698,7 @@
 				console.log(JSON.stringify(that.value1))
 				that.API.requestData({ //五项损失率
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/xldb",
 					data: {
 						wpids: that.value1,
@@ -825,7 +828,7 @@
 				});
 			},
 			AjaxDbfx() {
-				
+
 				var that = this;
 				var data = that.ajaxData;
 				that.windNum = data[0].name;
@@ -875,7 +878,7 @@
 					windData1: data[0].slssl,
 					windData2: data[1].slssl
 				}];
-				
+
 				that.radarValue = [{
 					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
 					data: [{
@@ -888,7 +891,7 @@
 						]
 					}]
 				}];
-				
+
 				var analyis = [],
 					gzssdl = [],
 					jxssdl = [],
@@ -939,7 +942,7 @@
 					value: slssdl
 				})
 				that.analyisDialog = analyis;
-				
+
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
@@ -961,7 +964,7 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
@@ -982,7 +985,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/Decision/Decision2Xmdb.vue

@@ -48,41 +48,42 @@
 				<button class="btn">导出</button>
 			</div>
 		</div>
-
-		<div v-show="detailShow==1">
-			<div class="mg-b-16">
-				<div class="project-table">
-					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+		<toolbar-panel title="项目对标" :showLine="false">
+			<div v-show="detailShow==1">
+				<div class="mg-b-16">
+					<div class="project-table">
+						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+					</div>
 				</div>
-			</div>
-			<el-row class="mg-b-16">
-				<el-col :span="12">
-					<panel title="发电量占比">
-						<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+				<el-row class="mg-b-16">
+					<el-col :span="12">
+						<panel title="发电量占比">
+							<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+						</panel>
+					</el-col>
+					<el-col :span="12">
+						<panel title="各场站损失电量占比">
+							<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
+						</panel>
+					</el-col>
+				</el-row>
+				<div>
+					<panel title="损失电量分析">
+						<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+							:units='["(万KWh)"]' />
 					</panel>
-				</el-col>
-				<el-col :span="12">
-					<panel title="各场站损失电量占比">
-						<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
+				</div>
+			</div>
+			<el-row :type="'flex'" class="content" v-show="detailShow==2">
+				<el-col :span="24" class="pd-l-8">
+					<panel :title="'风机对标列表明细'" :showLine="false">
+						<div class="project-table">
+							<Table :data="tableDataDetail"></Table>
+						</div>
 					</panel>
 				</el-col>
 			</el-row>
-			<div>
-				<panel title="损失电量分析">
-					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
-						:units='["(万KWh)"]' />
-				</panel>
-			</div>
-		</div>
-		<el-row :type="'flex'" class="content" v-show="detailShow==2">
-			<el-col :span="24" class="pd-l-8">
-				<panel :title="'风机对标列表明细'" :showLine="false">
-					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
-					</div>
-				</panel>
-			</el-col>
-		</el-row>
+		</toolbar-panel>
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -97,6 +98,7 @@
 	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 	import Panel from "../../components/coms/panel/panel.vue";
 	import Table from "../../components/coms/table/table.vue";
+	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
 		components: {
@@ -105,6 +107,7 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
@@ -180,68 +183,68 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量排名",
+							name: "故障损失排名",
 							field: "gzssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -258,7 +261,7 @@
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						},{
+						}, {
 							name: "故障损失率排名",
 							field: "gzsslpm",
 							is_num: false,
@@ -332,7 +335,7 @@
 								// var that = this;
 								that.API.requestData({
 									method: "GET",
-									baseURL : "http://10.155.32.4:9001/",
+									baseURL: "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -428,61 +431,61 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
+							name: "故障损失",
 							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
+							name: "检修损失排名",
 							field: "jxssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
+							name: "检修损失",
 							field: "jxssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
+							name: "性能损失排名",
 							field: "xnssdlpm",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
+							name: "性能损失",
 							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
+							name: "限电损失排名",
 							field: "xdssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
+							name: "限电损失",
 							field: "xdssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
+							name: "受累损失排名",
 							field: "slssdlpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
+							name: "受累损失",
 							field: "slssdl",
 							is_num: false,
 							is_light: false,
@@ -572,7 +575,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -586,7 +589,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -604,7 +607,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -648,7 +651,7 @@
 				var that = this;
 				that.API.requestData({ //五项损失率
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
+					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/xmdb",
 					data: {
 						wpids: that.value1,
@@ -826,7 +829,7 @@
 					windData1: data[0].slssl,
 					windData2: data[1].slssl
 				}];
-				
+
 				that.radarValue = [{
 					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
 					data: [{
@@ -839,7 +842,7 @@
 						]
 					}]
 				}];
-				
+
 				var analyis = [],
 					gzssdl = [],
 					jxssdl = [],
@@ -911,7 +914,7 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
@@ -932,7 +935,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/HealthControl/HealthDay.vue

@@ -279,8 +279,8 @@
 								// var that = this;
 								that.API.requestData({
 									method: "GET",
-									baseURL : "http://10.155.32.4:9001/",
-									subUrl: "benchmarking/details",
+									baseURL : "10.155.32.4:8034",
+									subUrl: "evaluation/details",
 									data: {
 										id: dataId,
 										beginDate: that.value4,
@@ -347,46 +347,48 @@
 			this.ChangZhanVal();
 			this.value3 = this.getTime(1);
 			this.AjaxCommon();
+			this.MoKuaiVal();
 		},
 		methods: {
-			ChangZhanVal() {
+			MoKuaiVal(val) {
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/wplist",
+					baseURL : "10.155.32.4:8034",
+					subUrl: "evaluation/sourceList",
+					data: {
+						wpids: val
+					},
 					success(res) {
-						that.ChangZhan = res.data;
+						console.log(JSON.stringify(res))
+						that.MoKuai = res.data;
 					}
 				});
 			},
-			ChangZhanChange(val) {
-				this.value1 = val;
-				this.value2 = [];
+			MoKuaiChange(val) {
+				this.value2 = val;
 				this.value3 = [];
 				this.AjaxCommon();
-				this.MoKuaiVal(val);
+				this.XianLuVal(val);
 				this.clearDb();
 			},
-			MoKuaiVal(val) {
+			ChangZhanVal() {
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/projectList",
-					data: {
-						wpids: val
-					},
+					baseURL : "10.155.32.4:8034",
+					subUrl: "evaluation/wplist",
 					success(res) {
-						that.MoKuai = res.data;
+						that.ChangZhan = res.data;
 					}
 				});
 			},
-			MoKuaiChange(val) {
-				this.value2 = val;
+			ChangZhanChange(val) {
+				this.value1 = val;
+				this.value2 = [];
 				this.value3 = [];
 				this.AjaxCommon();
-				this.XianLuVal(val);
+				this.MoKuaiVal(val);
 				this.clearDb();
 			},
 			BeginChange(val) {
@@ -413,8 +415,8 @@
 				var that = this;
 				that.API.requestData({ //五项损失率
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/wxssl",
+					baseURL : "10.155.32.4:8034",
+					subUrl: "evaluation/wxssl",
 					data: {
 						wpids: that.value1,
 						projectids: that.value2,