单击横向对比

src/components/chart/line/double-line-chart.vue

@@ -121,7 +121,7 @@ export default {
     return {
       id: "",
       chart: null,
-      color: ["#05bb4c", "#f8de5b", "#4b55ae", "#fa8c16"],
+      color: ["#05bb4c", "#f8de5b", "#4b55ae", "#fa8c16", "#1DA0D7","#DD5044"],
     };
   },
   computed: {

src/components/coms/table/table.vue

@@ -21,6 +21,7 @@
             <component :is="col.type ? col.type : 'div'" v-bind="col.props" v-html="template(col, row[col.field])" @click="onClick(col, row)"> </component>
           </td>
         </tr>
+		<slot name="tr"></slot>
       </tbody>
     </el-scrollbar>
     <el-pagination class="mg-t-8" v-if="pageable" @current-change="handleCurrentChange" :current-page="currentPage4" :page-size="pageSize" layout="total, prev, pager, next, jumper" :total="data.total"> </el-pagination>
@@ -150,6 +151,7 @@ export default {
       if (col.click) col.click(event, data);
     },
     onSort(col) {
+		this.$emit('onSort');
       if (col.sortable == true) {
         this.sortCol = col.field;
         switch (this.sortType) {

src/router/index.js

@@ -126,6 +126,11 @@ const routes = [
     component: () => import(/* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
   },
   {
+      path: '/decision/decision3db',//单机横向对比
+      name: 'decision3db',
+      component: () => import(/* webpackChunkName: "decision3db" */ '../views/Decision/Decision3Db.vue'),
+    },
+  {
     path: '/decision/decision4',//值际对标
     name: 'decision4',
     component: () => import(/* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
@@ -141,21 +146,6 @@ const routes = [
     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/Decision3.vue

@@ -49,35 +49,13 @@
 			</div>
 		</div>
 		<!-- 列表 -->
+		<toolbar-panel title="性能对标" :showLine="false"></toolbar-panel>
 		<div class="info" v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" ref="curRef" @onSort="onSort"></Table>
 				</div>
 			</div>
-			<!-- 风资源列表 -->
-			<!-- <div class="direction-info mg-b-16">
-				<table class="com-table">
-					<tbody>
-						<tr>
-							<td v-for="(col, i) of tableData.column" :key="i">
-								<div v-if="i == 0">22</div>
-								<div v-if="i == 1">风资源</div>
-								<div v-if="i != 0 && i != 1">
-									<div class="direction-title">3.123</div>
-									<div class="direction-chart">
-										<DirectionRadarChart :width="'70%'" :height="'232px'" :value="90" />
-										<div class="legend mg-t-16">
-											<span class="dot"></span>
-											<span>静风频率为2</span>
-										</div>
-									</div>
-								</div>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div> -->
 			<el-row class="mg-b-16">
 				<el-col :span="12">
 					<panel title="发电量占比">

src/views/Decision/Decision3Db.vue

@@ -5,7 +5,7 @@
 				<div class="query-item">
 					<div class="lable">场站：</div>
 					<div class="search-input">
-						<el-select v-model="value1" @change="ChangZhanChange(value1)" multiple placeholder="请选择"
+						<el-select v-model="value1" @change="ChangZhanChange(value1)" clearable placeholder="请选择"
 							popper-class="select">
 							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
 							</el-option>
@@ -13,10 +13,10 @@
 					</div>
 				</div>
 				<div class="query-item">
-					<div class="lable">项目：</div>
+					<div class="lable">风机：</div>
 					<div class="search-input">
-						<el-select v-model="value2" @change="XiangMuChange(value2)" multiple placeholder="请选择"
-							popper-class="select">
+						<el-select v-model="value2" @change="XiangMuChange(value2)" multiple multiple-limit="5"
+							placeholder="请选择" popper-class="select">
 							<el-option v-for="item in XiangMu" :key="item.id" :value="item.id" :label="item.name">
 							</el-option>
 						</el-select>
@@ -30,14 +30,18 @@
 						</el-date-picker>
 					</div>
 				</div>
+				<div class="query-actions">
+					<button class="btn" @click="reset">重置</button>
+				</div>
 			</div>
 			<div class="actions mg-b-8">
-				<button class="btn green">风场</button>
-				<button class="btn">项目</button>
-				<button class="btn">集电线路</button>
+				<button class="btn" :class="TypeClass==0?'green':''" @click="TypeClick(0)">日风电机对比</button>
+				<button class="btn" :class="TypeClass==1?'green':''" @click="TypeClick(1)">月风电机对比</button>
+				<button class="btn" :class="TypeClass==2?'green':''" @click="TypeClick(2)">年风电机对比</button>
 			</div>
 		</div>
 		<!-- 列表 -->
+		<toolbar-panel title="单机横向对比" :showLine="false"></toolbar-panel>
 		<div class="info">
 			<div class="mg-b-16">
 				<div class="project-table">
@@ -53,13 +57,9 @@
 								<div v-if="i == 0">22</div>
 								<div v-if="i == 1">风资源</div>
 								<div v-if="i != 0 && i != 1">
-									<div class="direction-title">3.123</div>
-									<div class="direction-chart">
-										<DirectionRadarChart :width="'70%'" :height="'232px'" :value="90" />
-										<div class="legend mg-t-16">
-											<span class="dot"></span>
-											<span>静风频率为2</span>
-										</div>
+									<div class="direction-title">{{listName[i - 2]}}</div>
+									<div class="direction-chart" :class="(i-2) < fzyData.length?'':'hide'">
+										<normal-radar-chart :width="'70%'" :height="'232px'" :value="fzyData[i-2]" />
 									</div>
 								</div>
 							</td>
@@ -72,18 +72,13 @@
 				<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 class="tool-block" v-for="(item , index) in listName">
+								<div class="legend" :class="'bg-'+(index + 1)"></div>
+								<div class="legend-text">{{item}}</div>
 							</div>
 						</div>
 					</template>
-					<double-line-chart :height="'200px'" />
-					<normal-line-chart :height="'200px'" />
+					<double-line-chart :height="'200px'" :list="list" />
 				</toolbar-panel>
 			</div>
 		</div>
@@ -93,8 +88,7 @@
 
 <script>
 	import DoubleLineChart from "../../components/chart/line/double-line-chart.vue";
-	import NormalLineChart from "../../components/chart/line/normal-line-chart.vue";
-	import DirectionRadarChart from "../../components/chart/radar/direction-radar-chart.vue";
+	import NormalRadarChart from "../../components/chart/radar/normal-radar-chart.vue";
 	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Table from "../../components/coms/table/table.vue";
@@ -102,10 +96,9 @@
 		components: {
 			Table,
 			SvgIcon,
-			DirectionRadarChart,
 			ToolbarPanel,
 			DoubleLineChart,
-			NormalLineChart
+			NormalRadarChart
 		},
 		data() {
 			return {
@@ -123,91 +116,61 @@
 							is_light: false,
 						},
 						{
-							name: "项目",
-							field: "lqf",
+							name: "",
+							field: "data1",
 							is_num: false,
 							is_light: false,
 						},
 						{
-							name: "项目",
-							field: "yggl",
+							name: "",
+							field: "data2",
 							is_num: false,
 							is_light: false,
 						},
 						{
-							name: "项目",
-							field: "yyy",
+							name: "",
+							field: "data3",
 							is_num: false,
 							is_light: false,
 						},
 						{
-							name: "项目",
-							field: "pcspp",
+							name: "",
+							field: "data4",
 							is_num: false,
 							is_light: false,
-						},
+						}, {
+							name: "",
+							field: "data5",
+							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,
-					}, ],
+					data: [],
 				},
-				options: [{
-						value: "选项1",
-						label: "黄金糕",
-					},
-					{
-						value: "选项2",
-						label: "双皮奶",
-					},
-					{
-						value: "选项3",
-						label: "蚵仔煎",
-					},
-					{
-						value: "选项4",
-						label: "龙须面",
-					},
-					{
-						value: "选项5",
-						label: "北京烤鸭",
-					},
-				],
+				ChangZhan: [], //场站
+				XiangMu: [], //项目
 				value1: [],
 				value2: [],
-				value3: [],
 				value4: "",
-				value5: "",
+				fzyData: [],
+				list: [],
+				listName: [],
+				TypeClass:0,
+				ajaxArr:['daydjhxdbtop','monthdjhxdbtop','yeardjhxdbtop'],
+				ajaxName:'daydjhxdbtop'
 			};
 		},
 		created() {
-			
+			this.ChangZhanVal();
+			this.value4 = this.getTime(1);
+			this.AjaxCommon();
 		},
-		methods:{
+		methods: {
 			ChangZhanVal() {
 				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;
@@ -217,19 +180,17 @@
 			ChangZhanChange(val) {
 				this.value1 = val;
 				this.value2 = [];
-				this.value3 = [];
 				this.AjaxCommon();
 				this.XiangMuVal(val);
-				this.clearDb();
 			},
 			XiangMuVal(val) {
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					baseURL : "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/projectList",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wtList",
 					data: {
-						wpids: val
+						wpid: val
 					},
 					success(res) {
 						that.XiangMu = res.data;
@@ -237,11 +198,176 @@
 				});
 			},
 			XiangMuChange(val) {
-				this.value2 = val;
-				this.value3 = [];
+				var that = this;
+				that.value2 = val;
+				that.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/"+that.ajaxName,
+					data: {
+						wpid: that.value1,
+						wtids: that.value2,
+						date: that.value4,
+						target: '',
+						sort: ''
+					},
+					success(res) {
+						var data = res.data,
+							data2 = [],
+							chart = [],
+							fzy = [],
+							fzyArr = [],
+							jfpl = [],
+							jfplArr = [];
+						let thisItem = [];
+						jfpl = data.pop(); //静风频率
+						fzy = data.pop(); //风资源
+						data.forEach((ele, index) => {
+							for (let key in ele) {
+								if (key !== "name") {
+									thisItem.push(ele[key])
+								}
+							}
+						})
+
+						var count = thisItem.length / data.length;
+
+						data.forEach((item, index) => {
+							data2.push({
+								index: index + 1,
+								name: item.name,
+								data1: thisItem[index * count],
+								data2: count >= 2 ? thisItem[index * count + 1] : [],
+								data3: count >= 3 ? thisItem[index * count + 2] : [],
+								data4: count >= 4 ? thisItem[index * count + 3] : [],
+								data5: count >= 5 ? thisItem[index * count + 4] : [],
+								is_light: false
+							})
+						})
+
+						Object.keys(fzy).map((key) => {
+							fzyArr.push(fzy[key])
+						})
+						Object.keys(jfpl).map((key) => {
+							jfplArr.push(jfpl[key])
+						})
+						fzyArr.pop();
+						var jfplName = jfplArr.pop();
+						var indicator = ["北", "北北西", "北西", "西北西", "西", "西南西", "南西", "南南西", "南", "南南东", "东南", "东南东",
+							"东", "东北东", "北东", "北北东"
+						];
+
+						var fzyDataArr = [];
+						fzyArr.forEach((item, index) => {
+							var arr = [];
+							item.forEach((e, i) => {
+								arr.push(e.value)
+							});
+							fzyDataArr.push([{
+								indicator: indicator,
+								data: [{
+									value: arr
+								}],
+								name: jfplArr[index]
+							}])
+						});
+						that.fzyData = fzyDataArr;
+						that.tableData.data = data2;
+					}
+				});
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/djhxdbbottom",
+					data: {
+						wpid: that.value1,
+						wtids: that.value2,
+						date: that.value4
+					},
+					success(res) {
+						var data = res.data;
+
+						var arrName = [],
+							arrKey = [],
+							arrData = [],
+							tempArray = [];
+						data.forEach(ele => {
+							for (let key in ele) {
+								if (key !== "name") {
+									arrKey.push(key)
+									arrData.push(ele[key])
+								} else {
+									arrName.push(ele[key])
+								}
+							}
+						});
+						that.listName = arrName;
+						for (var i = 0; i < arrKey.length - 1; i++) { //冒泡排序
+							for (var j = 0; j < arrKey.length - 1 - i; j++) {
+								if (parseInt(arrKey[j]) > parseInt(arrKey[j + 1])) {
+									var temp = arrKey[j];
+									arrKey[j] = arrKey[j + 1];
+									arrKey[j + 1] = temp;
+									var temp2 = arrData[j];
+									arrData[j] = arrData[j + 1];
+									arrData[j + 1] = temp2;
+								}
+							}
+						}
+						for (var i = 0; i < data.length; i++) {
+							var arr = [];
+							arrData.forEach((e, index) => {
+								if ((index * data.length + i) < arrData.length) {
+									arr.push({
+										text: arrKey[index * data.length + i],
+										value: arrData[index * data.length + i],
+									})
+								}
+							})
+							tempArray.push({
+								title: arrName[i],
+								value: arr
+							})
+						}
+						that.list = tempArray
+					}
+
+				});
+			},
+			reset() { //重置
+				this.value1 = [];
+				this.value2 = [];
+				this.value4 = this.getTime(1);
+				this.AjaxCommon();
+			},
+			TypeClick(val) {
+				this.TypeClass = val;
+				// 重置状态start
+				this.value1 = [];
+				this.value2 = [];
+				this.value4 = this.getTime(1);
+				this.ajaxName=this.ajaxArr[val];
 				this.AjaxCommon();
-				this.XianLuVal(val);
-				this.clearDb();
+				// 重置状态end
 			},
 		}
 	};
@@ -360,4 +486,28 @@
 			}
 		}
 	}
+
+	.hide {
+		opacity: 0;
+	}
+
+	.bg-1 {
+		background: #05bb4c
+	}
+
+	.bg-2 {
+		background: #f8de5b
+	}
+
+	.bg-3 {
+		background: #4b55ae
+	}
+
+	.bg-4 {
+		background: #fa8c16
+	}
+
+	.bg-5 {
+		background: #1DA0D7
+	}
 </style>

src/views/Decision/Decision4.vue

@@ -25,7 +25,7 @@
 				
 			</div>
 		</div>
-		
+		<toolbar-panel title="值际对标" :showLine="false"></toolbar-panel>
 		<div class="mg-b-16">
 			<div class="project-table">
 				<Table :data="tableData"></Table>

src/views/Decision/Decision4Czzl.vue

@@ -24,7 +24,7 @@
 
 			</div>
 		</div>
-
+		<toolbar-panel title="操作指令统计" :showLine="false"></toolbar-panel>
 		<div class="mg-b-16">
 			<div class="project-table">
 				<Table :data="tableData"></Table>
@@ -58,11 +58,13 @@
 	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";
 	export default {
 		components: {
 			Panel,
 			Table,
-			SvgIcon
+			SvgIcon,
+			ToolbarPanel
 		},
 		data() {
 			let that = this;

src/views/HealthControl/HealthDay.vue

@@ -1,546 +0,0 @@
-<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

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

src/views/HealthControl/HealthYear.vue

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

src/views/layout/Menu.vue

@@ -229,16 +229,25 @@ export default {
               icon: "svg-matrix",
               path: "/decision/decision2Xldb",
             },
-            // {
-            //   text: "决策支持3",
-            //   icon: "svg-matrix",
-            //   path: "/decision/decision3",
-            // },
-            // {
-            //   text: "决策支持4",
-            //   icon: "svg-matrix",
-            //   path: "/decision/decision4",
-            // },
+            {
+              text: "性能对标",
+              icon: "svg-matrix",
+              path: "/decision/decision3",
+            },
+			{
+			  text: "单机横向对比",
+			  icon: "svg-matrix",
+			  path: "/decision/decision3db",
+			},{
+              text: "操作指令统计",
+              icon: "svg-matrix",
+              path: "/decision/decision4czzl",
+            },
+            {
+              text: "值际对标",
+              icon: "svg-matrix",
+              path: "/decision/decision4",
+            },
           ],
         },
         {