合并版本处理冲突

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/router/index.js

@@ -120,23 +120,42 @@ const routes = [
       name: 'decision2Xldb',
       component: () => import(/* webpackChunkName: "decision2Xldb" */ '../views/Decision/Decision2Xldb.vue'),
     },
-  
   {
-    path: '/decision/decision3',
+    path: '/decision/decision3',//性能对标
     name: 'decision3',
     component: () => import(/* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
   },
   {
-    path: '/decision/decision4',
+    path: '/decision/decision4',//值际对标
     name: 'decision4',
     component: () => import(/* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
   },
   {
+    path: '/decision/decision4czzl',//操作指令统计
+    name: 'decision4czzl',
+    component: () => import(/* webpackChunkName: "decision4czzl" */ '../views/Decision/Decision4Czzl.vue'),
+  },
+  {
     path: '/health',
     name: 'health',
     component: () => import('../views/HealthControl/Health.vue'),
   },
   {
+    path: '/health/healthDay',//风机  日  信息量化评级管理
+    name: 'healthDay',
+    component: () => import('../views/HealthControl/HealthDay.vue'),
+  },
+  {
+    path: '/health/healthMonth',//风机  月  信息量化评级管理
+    name: 'healthMonth',
+    component: () => import('../views/HealthControl/HealthMonth.vue'),
+  },
+  {
+    path: '/health/healthYear',//风机  年  信息量化评级管理
+    name: 'healthYear',
+    component: () => import('../views/HealthControl/HealthYear.vue'),
+  },
+  {
     path: '/health/health1',
     name: 'health1',
     component: () => import('../views/HealthControl/Health1.vue'),

src/views/Decision/Decision1.vue

@@ -153,7 +153,7 @@
 							name: "受累",
 							field: "sl",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 							sortable:true
 						},
 						{
@@ -188,7 +188,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: [],
@@ -269,17 +269,15 @@
 				this.AjaxCommon();
 			},
 			TypeClick(val) {
-				if (val != this.TypeClass && this.TypeClass) {
-					this.TypeClass = val;
-					// 重置状态start
-					this.value1 = [];
-					this.value2 = [];
-					this.value3 = [];
-					this.value4 = this.getTime(1);
-					this.value5 = this.getTime(2);
-					this.AjaxCommon();
-					// 重置状态end
-				}
+				this.TypeClass = val;
+				// 重置状态start
+				this.value1 = [];
+				this.value2 = [];
+				this.value3 = [];
+				this.value4 = this.getTime(1);
+				this.value5 = this.getTime(2);
+				this.AjaxCommon();
+				// 重置状态end
 			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();

src/views/Decision/Decision1Mx.vue

@@ -54,8 +54,8 @@
 				</div>
 			</div>
 			<div class="query-actions">
-				<button class="btn">搜索</button>
-				<button class="btn green" @click="mxClick()">明细信息</button>
+				<button class="btn" @click="mxClick()">搜索</button>
+				<button class="btn green">明细信息</button>
 				<button class="btn">导出</button>
 			</div>
 		</div>
@@ -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() {
@@ -318,17 +320,15 @@
 				this.AjaxCommon();
 			},
 			TypeClick(val) {
-				if (val != this.TypeClass && this.TypeClass) {
-					this.TypeClass = val;
-					// 重置状态start
-					this.value1 = [];
-					this.value2 = [];
-					this.value3 = [];
-					this.value4 = this.getTime(1);
-					this.value5 = this.getTime(2);
-					this.AjaxCommon();
-					// 重置状态end
-				}
+				this.TypeClass = val;
+				// 重置状态start
+				this.value1 = [];
+				this.value2 = [];
+				this.value3 = [];
+				this.value4 = this.getTime(1);
+				this.value5 = this.getTime(2);
+				this.AjaxCommon();
+				// 重置状态end
 			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();

src/views/Decision/Decision2.vue

@@ -56,10 +56,12 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-
+		
 		<div v-show="detailShow==1">
+			<toolbar-panel title="风机绩效榜" :showLine="false"></toolbar-panel>
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
@@ -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;
@@ -144,15 +148,6 @@
 								return "<input class='check curCheckBox' type='CheckBox' />";
 							},
 							click: function(event, data) {
-                console.log(11111,event)
-                console.log(22222,data)
-								// checkbox 事件
-								// event.target checkbox or td 需进行判断
-								// event.target.checked 判断 checkbox 是否选中
-								// data  当前数据
-								// console.log(that);
-								// console.log(event.target);
-								// console.log(event.target.checked);
 								var dataId = that.tableIdArr[data.index - 1];
 								if (event.target.checked == false && that.checkLength <= 2) {
 									that.tableId.forEach((item, i) => {
@@ -197,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,
@@ -445,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,
@@ -958,6 +953,9 @@
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back(){
+				this.detailShow = 1;
 			}
 		}
 	};
@@ -975,7 +973,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/Decision/Decision2Cjdb.vue

@@ -36,10 +36,11 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-
 		<div v-show="detailShow==1">
+			<toolbar-panel title="场际对标" :showLine="false"></toolbar-panel>
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
@@ -73,6 +74,7 @@
 				</panel>
 			</el-col>
 		</el-row>
+
 		<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 +89,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 +98,7 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
@@ -170,68 +174,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 +252,7 @@
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						},{
+						}, {
 							name: "故障损失率排名",
 							field: "gzsslpm",
 							is_num: false,
@@ -321,7 +325,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 +420,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 +560,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -570,7 +574,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 +615,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 +791,7 @@
 					windData1: data[0].slssl,
 					windData2: data[1].slssl
 				}];
-				
+
 				that.radarValue = [{
 					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
 					data: [{
@@ -800,7 +804,7 @@
 						]
 					}]
 				}];
-				
+
 				var analyis = [],
 					gzssdl = [],
 					jxssdl = [],
@@ -872,10 +876,13 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};
@@ -893,7 +900,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/Decision/Decision2Cndb.vue

@@ -36,9 +36,11 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
 		<div v-show="detailShow==1">
+			<toolbar-panel title="场内对标" :showLine="false"></toolbar-panel>
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
@@ -62,6 +64,7 @@
 				</panel>
 			</el-col>
 		</el-row>
+
 		<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 +79,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 +88,7 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
@@ -153,68 +158,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 +311,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 +405,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 +543,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -552,7 +557,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 +599,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,10 +836,13 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};

src/views/Decision/Decision2Xldb.vue

@@ -56,10 +56,11 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-
 		<div v-show="detailShow==1">
+			<toolbar-panel title="线路对标" :showLine="false"></toolbar-panel>
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
@@ -93,6 +94,7 @@
 				</panel>
 			</el-col>
 		</el-row>
+
 		<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 +109,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 +118,13 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
 			let that = this;
 			return {
-				oneData:[],
+				oneData: [],
 				tableIdArr: [], //放checkbox的id数组
 				tableId: [],
 				checkLength: 0, //对标分析只能选择2个
@@ -191,68 +195,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 +273,7 @@
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						},{
+						}, {
 							name: "故障损失率排名",
 							field: "gzsslpm",
 							is_num: false,
@@ -342,7 +346,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 +443,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 +589,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -595,7 +599,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 +612,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 +633,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 +654,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 +699,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 +829,7 @@
 				});
 			},
 			AjaxDbfx() {
-				
+
 				var that = this;
 				var data = that.ajaxData;
 				that.windNum = data[0].name;
@@ -875,7 +879,7 @@
 					windData1: data[0].slssl,
 					windData2: data[1].slssl
 				}];
-				
+
 				that.radarValue = [{
 					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
 					data: [{
@@ -888,7 +892,7 @@
 						]
 					}]
 				}];
-				
+
 				var analyis = [],
 					gzssdl = [],
 					jxssdl = [],
@@ -939,7 +943,7 @@
 					value: slssdl
 				})
 				that.analyisDialog = analyis;
-				
+
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
@@ -961,10 +965,13 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};
@@ -982,7 +989,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/Decision/Decision2Xmdb.vue

@@ -46,10 +46,11 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-
 		<div v-show="detailShow==1">
+			<toolbar-panel title="项目对标" :showLine="false"></toolbar-panel>
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
@@ -83,6 +84,7 @@
 				</panel>
 			</el-col>
 		</el-row>
+
 		<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 +99,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 +108,7 @@
 			SvgIcon,
 			DualPieChart,
 			MultipleBarChart,
+			ToolbarPanel,
 			Dayinfo
 		},
 		data() {
@@ -180,68 +184,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 +262,7 @@
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						},{
+						}, {
 							name: "故障损失率排名",
 							field: "gzsslpm",
 							is_num: false,
@@ -332,7 +336,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 +432,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 +576,7 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData:[]
+				ajaxData: []
 			};
 		},
 		created() {
@@ -586,7 +590,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 +608,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 +652,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 +830,7 @@
 					windData1: data[0].slssl,
 					windData2: data[1].slssl
 				}];
-				
+
 				that.radarValue = [{
 					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
 					data: [{
@@ -839,7 +843,7 @@
 						]
 					}]
 				}];
-				
+
 				var analyis = [],
 					gzssdl = [],
 					jxssdl = [],
@@ -911,10 +915,13 @@
 					this.clearDb();
 				}
 			},
-			clearDb(){//清空对标状态
+			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};
@@ -932,7 +939,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 279px;
+				height: 239px;
 			}
 
 			th,

src/views/Decision/Decision4.vue

@@ -1,301 +1,235 @@
 <template>
-  <div class="decision-page-4">
-    <!-- 查询样式统一处理 样式在 assets/styles/form.less 文件中 -->
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select v-model="value1" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">项目：</div>
-          <div class="search-input">
-            <el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">线路：</div>
-          <div class="search-input">
-            <el-select v-model="value3" multiple placeholder="请选择" popper-class="select">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker v-model="value4" type="date" placeholder="选择日期" popper-class="date-select"> </el-date-picker>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker v-model="value5" type="date" placeholder="选择日期" popper-class="date-select"> </el-date-picker>
-            <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="''" />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions">
-        <button class="btn green">搜索</button>
-        <button class="btn">明细信息</button>
-        <button class="btn">导出</button>
-      </div>
-    </div>
-    <div class="actions mg-b-8">
-      <button class="btn green">风场</button>
-      <button class="btn">项目</button>
-      <button class="btn">集电线路</button>
-    </div>
-    <div class="mg-b-16">
-      <div class="project-table">
-        <Table :data="tableData"></Table>
-      </div>
-    </div>
-    <div>
-      <panel title=""> </panel>
-
-      <toolbar-panel :title="'日度损失电量分析'">
-        <template v-slot:tools>
-          <div class="tools">
-            <div class="tool-block">
-              <div class="legend bg-green"></div>
-              <div class="legend-text">理论功率</div>
-            </div>
-            <div class="tool-block">
-              <div class="legend bg-orange"></div>
-              <div class="legend-text">预测功率4小时</div>
-            </div>
-          </div>
-        </template>
-        <multiple-bar-chart height="240px" />
-      </toolbar-panel>
-    </div>
-  </div>
+	<div class="decision-page-4">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				
+				<div class="query-item">
+					<div class="lable">开始日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value4" @change="BeginChange(value4)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">结束日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value5" @change="EndChange(value5)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+						<div class="unit svg-icon svg-icon-gray">
+							<svg-icon :svgid="''" />
+						</div>
+					</div>
+				</div>
+				
+			</div>
+		</div>
+		
+		<div class="mg-b-16">
+			<div class="project-table">
+				<Table :data="tableData"></Table>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
-import SvgIcon from "../../components/coms/icon/svg-icon.vue";
-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";
-export default {
-  components: { Panel, Table, SvgIcon, MultipleBarChart, ToolbarPanel },
-  data() {
-    return {
-      tableData: {
-        column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "",
-            field: "check",
-            is_num: false,
-            is_light: false,
-            template: function() {
-              return "<input class='check' type='CheckBox' >";
-            },
-          },
-          {
-            name: "名称",
-            field: "name",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "理论发电量",
-            field: "lqf",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "SCADA发电量",
-            field: "yggl",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "风速",
-            field: "yyy",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "非计划检修",
-            field: "pcspp",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "计划检修",
-            field: "u1",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "受累",
-            field: "u2",
-            is_num: false,
-            is_light: true,
-          },
-          {
-            name: "限电",
-            field: "v1",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "性能",
-            field: "v2",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "风能率用率%",
-            field: "w1",
-            is_num: false,
-            is_light: false,
-          },
-        ],
-        data: [
-          {
-            index: 1,
-            name: "MG01-01",
-            lqf: "0.1000",
-            yggl: "0.1000",
-            yyy: "0.10",
-            pcspp: "0.1000",
-            u1: "0.1000",
-            u2: "0.1000",
-            v1: "0.1000",
-            v2: "0.1000",
-            w1: "0.1000",
-            w2: "0.1000",
-            zca: "0.1000",
-            zcb: "0.1000",
-            clx: "0.1000",
-            clx1: "0.1000",
-            clx2: "0.1000",
-            jc: "0.1000",
-            hh: "0.1000",
-            hj: "0.1000",
-            is_light: false,
-          },
-        ],
-      },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎",
-        },
-        {
-          value: "选项4",
-          label: "龙须面",
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭",
-        },
-      ],
-      value1: [],
-      value2: [],
-      value3: [],
-      value4: "",
-      value5: "",
-    };
-  },
-  created() {
-    for (let i = 1; i < 50; i++) {
-      this.tableData.data.push(JSON.parse(JSON.stringify(this.tableData.data[0])));
-      this.tableData.data[i].index = i + 1;
-    }
-  },
-};
+	import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
+	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
+	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";
+	export default {
+		components: {
+			Panel,
+			Table,
+			SvgIcon,
+			MultipleBarChart,
+			ToolbarPanel
+		},
+		data() {
+			return {
+				tableData: {
+					column: [{
+							name: "",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "值际",
+							field: "dutyname",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "理论发电量",
+							field: "theoreticalgeneratity",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "实际发电量",
+							field: "generatity",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "故障损失",
+							field: "faultloss",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "维护损失",
+							field: "mainloss",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "性能损失",
+							field: "performanceloss",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "限电损失",
+							field: "rationingloss",
+							is_num: false,
+							is_light: true,
+						},
+						{
+							name: "受累损失",
+							field: "involvesloss",
+							is_num: false,
+							is_light: false,
+						}
+					],
+					data: []
+				},
+				value4: "",
+				value5: "",
+			};
+		},
+		created() {
+			this.value4 = this.getTime(1);
+			this.value5 = this.getTime(2);
+			this.AjaxCommon();
+		},
+		methods: {
+			BeginChange(val) {
+				this.value4 = val;
+				this.AjaxCommon();
+			},
+			EndChange(val) {
+				this.value5 = val;
+				this.AjaxCommon();
+			},
+			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+				var date = new Date();
+				var year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate();
+				month >= 1 && month <= 9 ? (month = '0' + month) : '';
+				day >= 0 && day <= 9 ? (day = '0' + day) : '';
+				var begin = year + '-' + month + '-01';
+				var end = year + '-' + month + '-' + day;
+				if (val == 1) {
+					return begin;
+				} else if (val == 2) {
+					return end;
+				}
+			},
+			AjaxCommon() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/zjwxssl",
+					data: {
+						beginDate: that.value4,
+						endDate: that.value5,
+					},
+					success(res) {
+						var data = [];
+						
+						res.data.forEach((item, index) => {
+							data.push({
+								index: index + 1,
+								dutyname: item.dutyname,
+								theoreticalgeneratity: item.theoreticalgeneratity,
+								generatity: item.generatity,
+								faultloss: item.faultloss,
+								mainloss: item.mainloss,
+								performanceloss: item.performanceloss,
+								rationingloss: item.rationingloss,
+								involvesloss: item.involvesloss,
+								is_light: false
+							})
+						})
+						that.tableData.data = data;
+					}
+				});
+			},
+		}
+	};
 </script>
 
 <style lang="less">
-.decision-page-4 {
-  .com-panel {
-    .panel-title {
-      color: @gray-l;
-    }
-    .tools {
-      display: flex;
+	.decision-page-4 {
+		.com-panel {
+			.panel-title {
+				color: @gray-l;
+			}
+
+			.tools {
+				display: flex;
+
+				.tool-block {
+					display: flex;
+					align-items: center;
+					margin-left: 0.741vh;
 
-      .tool-block {
-        display: flex;
-        align-items: center;
-        margin-left: 0.741vh;
+					.legend {
+						flex: auto;
+						width: 0.741vh;
+						height: 0.741vh;
+						margin-right: 0.741vh;
 
-        .legend {
-          flex: auto;
-          width: 0.741vh;
-          height: 0.741vh;
-          margin-right: 0.741vh;
+						&.long {
+							width: 2.963vh;
+							height: 0.37vh;
+						}
+					}
 
-          &.long {
-            width: 2.963vh;
-            height: 0.37vh;
-          }
-        }
+					.legend-text {
+						color: @gray-l;
+						font-size: @fontsize-s;
+					}
+				}
+			}
+		}
 
-        .legend-text {
-          color: @gray-l;
-          font-size: @fontsize-s;
-        }
-      }
-    }
-  }
+		.project-table {
+			overflow: auto;
+			height:90vh;
+			tbody {
+				// height: 100vh;
+			}
 
-  .project-table {
-    overflow: auto;
+			th,
+			td {
+				color: #b2bdc0;
 
-    tbody {
-      height: 400px;
-    }
+				&:nth-child(1) {
+					width: 50px;
+				}
 
-    th,
-    td {
-      color: #b2bdc0;
-      &:nth-child(1) {
-        width: 50px;
-      }
-      &:nth-child(2) {
-        width: 50px;
-      }
-    }
-  }
-}
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+	}
 </style>

src/views/Decision/Decision4Czzl.vue

@@ -0,0 +1,369 @@
+<template>
+	<div class="decision-page-4">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">开始日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value4" @change="BeginChange(value4)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">结束日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value5" @change="EndChange(value5)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+						<div class="unit svg-icon svg-icon-gray">
+							<svg-icon :svgid="''" />
+						</div>
+					</div>
+				</div>
+
+			</div>
+		</div>
+
+		<div class="mg-b-16">
+			<div class="project-table">
+				<Table :data="tableData"></Table>
+			</div>
+		</div>
+
+		<el-dialog :title="'操作：' + tabsTit" v-model="dialogVisible" width="20%" top="10vh" custom-class="modal"
+			:close-on-click-modal="false">
+			<div class="health-day-info">
+				<div class="body">
+					<div class="left">
+						<table class="table-form">
+							<tr>
+								<td class="white">风机</td>
+								<td class="white">时间</td>
+							</tr>
+							<tr v-for="item in tabs">
+								<td class="white">{{item.wtid}}</td>
+								<td class="white">{{item.time.substr(0, 10)}}</td>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
+		</el-dialog>
+		<!-- 点击哪个显示哪个的操作记录 -->
+	</div>
+</template>
+
+<script>
+	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";
+	export default {
+		components: {
+			Panel,
+			Table,
+			SvgIcon
+		},
+		data() {
+			let that = this;
+			return {
+				tableData: {
+					column: [{
+							name: "",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "值际",
+							field: "nameOfDuty",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "启动",
+							field: "startCount",
+							is_num: false,
+							is_light: false,
+							param: 1,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "停机",
+							field: "stopCount",
+							is_num: false,
+							is_light: false,
+							param: 2,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "复位",
+							field: "resetCount",
+							is_num: false,
+							is_light: false,
+							param: 3,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "维护",
+							field: "maintainCount",
+							is_num: false,
+							is_light: false,
+							param: 4,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "取消维护",
+							field: "unmaintainCount",
+							is_num: false,
+							is_light: false,
+							param: 5,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "挂牌检修",
+							field: "gpmaintainCount",
+							is_num: false,
+							is_light: true,
+							param: 6,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "故障维修",
+							field: "gpfaultCount",
+							is_num: false,
+							is_light: false,
+							param: 7,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场内受累检修",
+							field: "gponsiteinvolvementMaintainCount",
+							is_num: false,
+							is_light: false,
+							param: 8,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场内受累故障",
+							field: "gponsiteinvolvementFaultCount",
+							is_num: false,
+							is_light: false,
+							param: 9,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场外受累电网",
+							field: "gpoffsiteaffectedgridCount",
+							is_num: false,
+							is_light: false,
+							param: 10,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场外受累天气",
+							field: "gpweatherOutsideCount",
+							is_num: false,
+							is_light: false,
+							param: 11,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "取消挂牌",
+							field: "ungpCount",
+							is_num: false,
+							is_light: false,
+							param: 12,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}
+					],
+					data: []
+				},
+				value4: "",
+				value5: "",
+				dialogVisible: false,
+				tabs: [],
+				tabsTit: "",
+				tabsArr: ['启动', '停机', '复位', '维护', '取消维护', '挂牌检修', '故障维修', '场内受累检修', '场内受累故障', '场外受累电网', '场外受累天气', '取消挂牌'],
+			};
+		},
+		created() {
+			this.value4 = this.getTime(1);
+			this.value5 = this.getTime(2);
+			this.AjaxCommon();
+		},
+		methods: {
+			BeginChange(val) {
+				this.value4 = val;
+				this.AjaxCommon();
+			},
+			EndChange(val) {
+				this.value5 = val;
+				this.AjaxCommon();
+			},
+			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+				var date = new Date();
+				var year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate();
+				month >= 1 && month <= 9 ? (month = '0' + month) : '';
+				day >= 0 && day <= 9 ? (day = '0' + day) : '';
+				var begin = year + '-' + month + '-01';
+				var end = year + '-' + month + '-' + day;
+				if (val == 1) {
+					return begin;
+				} else if (val == 2) {
+					return end;
+				}
+			},
+			AjaxCommon() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/zjlist",
+					data: {
+						beginDate: that.value4,
+						endDate: that.value5,
+					},
+					success(res) {
+						var data = [];
+						res.data.forEach((item, index) => {
+							data.push({
+								index: index + 1,
+								nameOfDuty: item.nameOfDuty,
+								startCount: item.startCount,
+								stopCount: item.stopCount,
+								resetCount: item.resetCount,
+								maintainCount: item.maintainCount,
+								unmaintainCount: item.unmaintainCount,
+								gpmaintainCount: item.gpmaintainCount,
+								gpfaultCount: item.gpfaultCount,
+								gponsiteinvolvementMaintainCount: item.gponsiteinvolvementMaintainCount,
+								gponsiteinvolvementFaultCount: item.gponsiteinvolvementFaultCount,
+								gpoffsiteaffectedgridCount: item.gpoffsiteaffectedgridCount,
+								gpweatherOutsideCount: item.gpweatherOutsideCount,
+								ungpCount: item.ungpCount,
+								is_light: false
+							})
+						})
+						that.tableData.data = data;
+					}
+				});
+			},
+			ajaxClick(dutyname, direct) {
+				var that = this;
+				that.tabsTit = that.tabsArr[direct - 1];
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/zjdrill",
+					data: {
+						beginDate: that.value4,
+						endDate: that.value5,
+						dutyname: dutyname,
+						direct: direct,
+					},
+					success(res) {
+						if(res.data.length){
+							that.tabs = res.data;
+						}else{
+							that.tabs=[{wtid:'暂无数据',time:'暂无数据'}];
+						}
+						that.dialogVisible = true;
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.decision-page-4 {
+		.com-panel {
+			.panel-title {
+				color: @gray-l;
+			}
+
+			.tools {
+				display: flex;
+
+				.tool-block {
+					display: flex;
+					align-items: center;
+					margin-left: 0.741vh;
+
+					.legend {
+						flex: auto;
+						width: 0.741vh;
+						height: 0.741vh;
+						margin-right: 0.741vh;
+
+						&.long {
+							width: 2.963vh;
+							height: 0.37vh;
+						}
+					}
+
+					.legend-text {
+						color: @gray-l;
+						font-size: @fontsize-s;
+					}
+				}
+			}
+		}
+
+		.project-table {
+			overflow: auto;
+			height: 90vh;
+
+			tbody {
+				// height: 100vh;
+			}
+
+			th,
+			td {
+				color: #b2bdc0;
+
+				&:nth-child(1) {
+					width: 50px;
+				}
+
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+
+		.action {
+			text-decoration: underline;
+			color: @green;
+			cursor: pointer;
+		}
+
+		.health-day-info .left {
+			max-height: 75vh;
+			overflow: auto;
+		}
+		
+	}
+</style>

src/views/HealthControl/HealthDay.vue

@@ -0,0 +1,546 @@
+<template>
+	<div class="decision-page-2">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">模块：</div>
+					<div class="search-input">
+						<el-select v-model="value2" @change="MoKuaiChange(value2)" multiple placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in MoKuai" :key="item.id" :value="item.id" :label="item.name">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">风场：</div>
+					<div class="search-input">
+						<el-select v-model="value1" @change="ChangZhanChange(value1)" multiple placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				
+				<div class="query-item">
+					<div class="lable">日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value4" @change="BeginChange(value4)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+					</div>
+				</div>
+			</div>
+			<div class="query-actions">
+				<button class="btn" @click="dbfx">对比</button>
+			</div>
+		</div>
+
+		<div class="mg-b-16">
+			<div class="project-table">
+				<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
+			</div>
+		</div>
+		<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"
+				:analyisDialog="analyisDialog" />
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	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 Dayinfo from "./dayinfo.vue";
+	export default {
+		components: {
+			Panel,
+			Table,
+			SvgIcon,
+			Dayinfo
+		},
+		data() {
+			let that = this;
+			return {
+				tableIdArr: [], //放checkbox的id数组
+				tableId: [],
+				checkLength: 0, //对标分析只能选择2个
+				tableData: {
+					column: [{
+							name: "",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "",
+							field: "check",
+							is_num: false,
+							is_light: false,
+							template:() => {
+								return "<input class='check curCheckBox' type='CheckBox' />";
+							},
+							click: function(event, data) {
+								var dataId = that.tableIdArr[data.index - 1];
+								if (event.target.checked == false && that.checkLength <= 2) {
+									that.tableId.forEach((item, i) => {
+										if (item == dataId) {
+											that.tableId.splice(i, 1)
+										}
+									})
+									that.checkLength--;
+								} else if (event.target.checked && that.checkLength < 2) {
+									that.tableId.push(dataId)
+									that.checkLength++;
+								} else if (that.checkLength == 2) {
+									event.target.checked = false;
+								}
+							},
+						},
+						{
+							name: "风机编号",
+							field: "name",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "等级",
+							field: "dj",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "综合排名",
+							field: "zhpm",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "发电量",
+							field: "fdl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "理论发电量",
+							field: "llfdl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "平均风速",
+							field: "pjfs",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "平均功率",
+							field: "pjgl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "故障损失电量",
+							field: "gzssdl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "限电损失电量",
+							field: "xdssdl",
+							is_num: false,
+							is_light: true,
+							sortable: true,
+						},
+						{
+							name: "维护损失电量",
+							field: "whssdl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "性能损失电量",
+							field: "xnssdl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},
+						{
+							name: "利用小时数",
+							field: "lyxss",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						}, {
+							name: "拟合优度",
+							field: "nhyd",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						}, {
+							name: "设备可利用率",
+							field: "sbklyl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						}, {
+							name: "等效可用系数",
+							field: "dxkyxs",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						}, {
+							name: "有效风时数",
+							field: "yxfss",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						},{
+							name: "平均切入风速",
+							field: "pjqrfs",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						}, {
+							name: "静风频率",
+							field: "jfpl",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						}, {
+							name: "功率一致性系数",
+							field: "glyzxxs",
+							is_num: false,
+							is_light: false,
+							sortable: true,
+						}
+					],
+					data: [],
+				},
+				ChangZhan: [], //场站
+				MoKuai: [], //项目
+				value1: [],
+				value2: [],
+				value3: "",
+				dialogVisible: false,
+				radarValue: [],
+				windNum: 'dd',
+				windNum2: 'dd',
+				tabs: [],
+				analyisDialog: [],
+				ajaxData:[],
+			};
+		},
+		created() {
+			this.ChangZhanVal();
+			this.value3 = this.getTime(1);
+			this.AjaxCommon();
+			this.MoKuaiVal();
+		},
+		methods: {
+			MoKuaiVal(val) {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL : "10.155.32.4:8034",
+					subUrl: "evaluation/modelMainList",
+					success(res) {
+						console.log(JSON.stringify(res))
+						that.MoKuai = res.data;
+					}
+				});
+			},
+			MoKuaiChange(val) {
+				this.value2 = val;
+				this.value3 = [];
+				this.AjaxCommon();
+				this.XianLuVal(val);
+				this.clearDb();
+			},
+			ChangZhanVal() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL : "10.155.32.4:8034",
+					subUrl: "evaluation/wplist",
+					success(res) {
+						that.ChangZhan = res.data;
+					}
+				});
+			},
+			ChangZhanChange(val) {
+				this.value1 = val;
+				this.value2 = [];
+				this.value3 = [];
+				this.AjaxCommon();
+				this.MoKuaiVal(val);
+				this.clearDb();
+			},
+			BeginChange(val) {
+				this.value4 = val;
+				this.AjaxCommon();
+				this.clearDb();
+			},
+			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+				var date = new Date();
+				var year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate();
+				month >= 1 && month <= 9 ? (month = '0' + month) : '';
+				day >= 0 && day <= 9 ? (day = '0' + day) : '';
+				var begin = year + '-' + month + '-01';
+				var end = year + '-' + month + '-' + day;
+				if (val == 1) {
+					return begin;
+				} else if (val == 2) {
+					return end;
+				}
+			},
+			AjaxCommon() {
+				var that = this;
+				that.API.requestData({ //五项损失率
+					method: "GET",
+					baseURL : "10.155.32.4:8034",
+					subUrl: "evaluation/wxssl",
+					data: {
+						wpids: that.value1,
+						projectids: that.value2,
+						lineids: that.value3,
+						beginDate: that.value4,
+						endDate: that.value5,
+						target: '',
+						sort: ''
+					},
+					success(res) {
+						that.ajaxData = res.data;
+						var dataTab = []; //表格
+						res.data.forEach((item, index) => {
+							that.tableIdArr.push(item.id);
+							dataTab.push({ //表格
+								index: index + 1,
+								name: item.name,
+								dj: item.dj,
+								zhpm: item.zhpm,
+								fdl: item.fdl,
+								llfdl: item.llfdl,
+								pjfs: item.gzssdl,
+								pjgl: item.pjgl,
+								gzssdl: item.gzssdl,
+								lyxss: item.lyxss,
+								whssdl: item.whssdl,
+								xnssdl: item.xnssdl,
+								lyxss: item.lyxss,
+								nhyd: item.nhyd,
+								sbklyl: item.sbklyl,
+								dxkyxs: item.dxkyxs,
+								yxfss: item.yxfss,
+								pjqrfs: item.pjqrfs,
+								jfpl: item.jfpl,
+								glyzxxs: item.glyzxxs,
+								jxssl: item.jxssl,
+								qflpm: item.qflpm,
+								qfl: item.qfl,
+								xnsslpm: item.xnsslpm,
+								xnssl: item.xnssl,
+								slsslpm: item.slsslpm,
+								slssl: item.slssl,
+								is_light: false
+							})
+
+						})
+						that.tableData.data = dataTab;
+					}
+				});
+			},
+			AjaxDbfx() {
+				var that = this;
+				var data = that.ajaxData;
+				that.windNum = data[0].name;
+				that.windNum2 = data[1].name;
+				that.tabs = [{
+					name: "发电量",
+					windData1: data[0].fdl,
+					windData2: data[1].fdl
+				}, {
+					name: "故障损失电量",
+					windData1: data[0].gzssdl,
+					windData2: data[1].gzssdl
+				}, {
+					name: "检修损失电量",
+					windData1: data[0].jxssdl,
+					windData2: data[1].jxssdl
+				}, {
+					name: "性能未达标损失电量",
+					windData1: data[0].xnssdl,
+					windData2: data[1].xnssdl
+				}, {
+					name: "受累损失电量",
+					windData1: data[0].slssdl,
+					windData2: data[1].slssdl
+				}, {
+					name: "风能利用率",
+					windData1: data[0].fnlyl,
+					windData2: data[1].fnlyl
+				}, {
+					name: "故障损失率",
+					windData1: data[0].gzssl,
+					windData2: data[1].gzssl
+				}, {
+					name: "检修损失率",
+					windData1: data[0].jxssl,
+					windData2: data[1].jxssl
+				}, {
+					name: "弃风率",
+					windData1: data[0].qfl,
+					windData2: data[1].qfl
+				}, {
+					name: "性能损失率",
+					windData1: data[0].xnssl,
+					windData2: data[1].xnssl
+				}, {
+					name: "受累损失率",
+					windData1: data[0].slssl,
+					windData2: data[1].slssl
+				}];
+				
+				that.radarValue = [{
+					indicator: ["风能利用率", "故障损失率", "检修损失率", "弃风率", "性能损失率", "受累损失率"],
+					data: [{
+						value: [data[0].fnlylpm, data[0].gzsslpm, data[0].jxsslpm, data[0].qflpm,
+							data[0].xnsslpm, data[0].slsslpm
+						]
+					}, {
+						value: [data[1].fnlylpm, data[1].gzsslpm, data[1].jxsslpm, data[1].qflpm,
+							data[1].xnsslpm, data[1].slsslpm
+						]
+					}]
+				}];
+				
+				var analyis = [],
+					gzssdl = [],
+					jxssdl = [],
+					xnssdl = [],
+					xdssdl = [],
+					slssdl = [];
+				data.forEach((item, index) => {
+					gzssdl.push({
+						text: item.name,
+						value: item.gzssdl
+					});
+					jxssdl.push({
+						text: item.name,
+						value: item.jxssdl
+					});
+					xnssdl.push({
+						text: item.name,
+						value: item.xnssdl
+					});
+					xdssdl.push({
+						text: item.name,
+						value: item.xdssdl
+					});
+					slssdl.push({
+						text: item.name,
+						value: item.slssdl
+					});
+				})
+				analyis.push({
+					title: "故障损失电量",
+					yAxisIndex: 0,
+					value: gzssdl
+				}, {
+					title: "检修损失电量",
+					yAxisIndex: 0,
+					value: jxssdl
+				}, {
+					title: "性能损失电量",
+					yAxisIndex: 0,
+					value: xnssdl
+				}, {
+					title: "限电损失电量",
+					yAxisIndex: 0,
+					value: xdssdl
+				}, {
+					title: "受累损失电量",
+					yAxisIndex: 0,
+					value: slssdl
+				})
+				that.analyisDialog = analyis;
+				
+			},
+			tooltip(param, callback) {
+				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
+
+				var result = param[0].axisValue;
+				param.forEach((value, index) => {
+					result += "<br />" +
+						`<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${color[index]};"></span>` +
+						value.seriesName + "：" + value.value;
+				});
+				callback(result);
+				return true;
+			},
+			dbfx() {
+				var that = this;
+				if (that.tableId.length == 2) {
+					that.dialogVisible = true;
+					this.AjaxDbfx();
+					this.clearDb();
+				}
+			},
+			clearDb(){//清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.checkLength = 0;
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.decision-page-2 {
+		.content .project-table {
+			tbody {
+				height: calc(100vh - 24.5vh);
+			}
+		}
+
+		.project-table {
+			overflow: auto;
+
+			tbody {
+				height: 279px;
+			}
+
+			th,
+			td {
+				color: #b2bdc0;
+
+				&:nth-child(1) {
+					width: 50px;
+				}
+
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+
+		.action {
+			text-decoration: underline;
+			color: @green;
+			cursor: pointer;
+		}
+	}
+</style>

src/views/HealthControl/HealthMonth.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/HealthControl/HealthYear.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>