五项损失率-checkbox娶不到id

public/static/config/modeConfig.js

@@ -1,6 +1,6 @@
 
 // 本地联调开关
-const localTest = 0;
+const localTest = 1;
 
 // 服务器地址
 let baseURL = null;
@@ -10,7 +10,8 @@ let websocketUrl = null;
 
 if (localTest) {
   // baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
-  baseURL = "http://192.168.10.18:8082/" // 联机调试 - 石林
+  // baseURL = "http://192.168.10.18:8082/" // 联机调试 - 石林
+  baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
   websocketUrl = (baseURL.replace(/http:\/\//g, "")) + "gyee-websocket";
 } else {
   baseURL = "http://10.155.32.4:8082/" // 正式环境

src/components/coms/table/table.vue

@@ -108,6 +108,7 @@ export default {
       if (col.click) col.click(event, data);
     },
     onSort(col) {
+		console.log(col)
       if (col.sortable == true) {
         this.sortCol = col.field;
         switch (this.sortType) {

src/router/index.js

@@ -85,15 +85,42 @@ const routes = [
     name: 'LightMatrix3',
     component: () => import(/* webpackChunkName: "lightmatrix3" */ '../views/LightMatrix3/LightMatrix3.vue'),
   }, {
-    path: '/decision/decision1',
+    path: '/decision/decision1',//风机绩效榜
     name: 'decision1',
     component: () => import(/* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
   },
   {
-    path: '/decision/decision2',
-    name: 'decision2',
-    component: () => import(/* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
+    path: '/decision/decision1Mx',//风机绩效榜明细
+    name: 'decision1Mx',
+    component: () => import(/* webpackChunkName: "decision1Mx" */ '../views/Decision/Decision1Mx.vue'),
   },
+  
+    {
+      path: '/decision/decision2',//五项损失率
+      name: 'decision2',
+      component: () => import(/* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
+    },
+    {
+      path: '/decision/decision2Cndb',//场内对标
+      name: 'decision2Cndb',
+      component: () => import(/* webpackChunkName: "decision2Cndb" */ '../views/Decision/Decision2Cndb.vue'),
+    },
+    {
+      path: '/decision/decision2Cjdb',//场际对标
+      name: 'decision2Cjdb',
+      component: () => import(/* webpackChunkName: "decision2Cjdb" */ '../views/Decision/Decision2Cjdb.vue'),
+    },
+    {
+      path: '/decision/decision2Xmdb',//项目对标
+      name: 'decision2Xmdb',
+      component: () => import(/* webpackChunkName: "decision2Xmdb" */ '../views/Decision/Decision2Xmdb.vue'),
+    },
+    {
+      path: '/decision/decision2Xldb',//线路对标
+      name: 'decision2Xldb',
+      component: () => import(/* webpackChunkName: "decision2Xldb" */ '../views/Decision/Decision2Xldb.vue'),
+    },
+  
   {
     path: '/decision/decision3',
     name: 'decision3',

src/views/Decision/Decision1.vue

@@ -190,26 +190,6 @@
 				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
 				bardata: [],
 				lineData: [],
-				tool: [{ //搜索的表头
-					color: 'bg-purple',
-					name: '实际电量'
-				}, {
-					color: 'bg-blue',
-					name: '计划检修损失'
-				}, {
-					color: 'bg-green',
-					name: '非计划检修损失'
-				}, {
-					color: 'bg-red',
-					name: '限电损失'
-				}, {
-					color: 'bg-orange',
-					name: '受累损失'
-				}, {
-					color: 'bg-yellow',
-					name: '性能损失'
-				}],
-				dataUpDown: []//功能暂未完成，前端部分table表头点击不了
 			};
 		},
 		created() {

src/views/Decision/Decision1Mx.vue

@@ -54,8 +54,8 @@
 				</div>
 			</div>
 			<div class="query-actions">
-				<button class="btn" @click="mxClick()">搜索</button>
-				<button class="btn green">明细信息</button>
+				<button class="btn">搜索</button>
+				<button class="btn green" @click="mxClick()">明细信息</button>
 				<button class="btn">导出</button>
 			</div>
 		</div>
@@ -68,22 +68,14 @@
 			<div class="activeMx">
 				<el-row :type="'flex'" class="content">
 					<el-col :span="12" class="pd-r-8">
-						<toolbar-panel :title="toolTitle" :showLine="false">
-							<template v-slot:tools>
-								<div class="tools">
-									<div class="tool-block" v-for="item in tool">
-										<div class="legend" :class="item.color"></div>
-										<div class="legend-text">{{item.name}}</div>
-									</div>
-								</div>
-							</template>
-							<bar-line-chart :height="'calc(100vh - 200px)'" :bardata="bardata" :lineData="lineData" />
+						<toolbar-panel title="风机绩效榜明细" :showLine="false">
+							<bar-line-chart :height="'calc(100vh - 200px)'" :bardata="bardata" :lineData="lineData" :color="barColor" lineName="理论发电量"/>
 						</toolbar-panel>
 					</el-col>
 					<el-col :span="12" class="pd-l-8">
 						<panel :title="'项目列表'" :showLine="false">
 							<div class="project-table">
-								<Table :data="tableData" @toClick="(res) => { this.thClick(res); }"></Table>
+								<Table :data="tableData"></Table>
 							</div>
 						</panel>
 					</el-col>
@@ -127,96 +119,112 @@
 							field: "llfdl",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "SCADA发电量",
 							field: "sjfdl",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "风速",
 							field: "speed",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "故障损失",
 							field: "fjhjx1",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "故障受累",
 							field: "fjhjx2",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "检修损失",
 							field: "jhjx1",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "检修受累",
 							field: "jhjx2",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "电网受累",
 							field: "sl1",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "天气受累",
 							field: "sl2",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "限电降出",
 							field: "xd1",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "限电停机",
 							field: "xd2",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "待风损失",
 							field: "xn1",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "手动停机",
 							field: "xn2",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "正常发电",
 							field: "xn3",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "缺陷降出",
 							field: "xn4",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						},
 						{
 							name: "风能利用率%",
 							field: "fnlly",
 							is_num: false,
 							is_light: false,
+							sortable:true
 						}
 					],
 					data: [],
@@ -232,45 +240,6 @@
 				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
 				bardata: [],
 				lineData: [],
-				toolTitle: '风机绩效榜明细',
-				tool: [{
-					color: 'bg-purple',
-					name: '实际电量'
-				}, {
-					color: 'bg-blue',
-					name: '故障损失'
-				}, {
-					color: 'bg-green',
-					name: '故障受累'
-				}, {
-					color: 'bg-red',
-					name: '检修受累'
-				}, {
-					color: 'bg-orange',
-					name: '电网受累'
-				}, {
-					color: 'bg-yellow',
-					name: '天气受累'
-				}, {
-					color: 'bg-cyan',
-					name: '限电降出'
-				}, {
-					color: 'bg-mauve',
-					name: '限电停机'
-				}, {
-					color: 'bg-pink',
-					name: '待风损失'
-				}, {
-					color: 'bg-brown',
-					name: '手动停机'
-				}, {
-					color: 'bg-pink2',
-					name: '正常发电'
-				}, {
-					color: 'bg-blue2',
-					name: '缺陷降出'
-				}],
-				dataUpDown: [] //功能暂未完成，前端部分table表头点击不了
 			};
 		},
 		created() {
@@ -472,7 +441,7 @@
 				});
 			},
 			mxClick() {
-				this.$router.push("/decision1")
+				this.$router.push("/decision/decision1")
 			},
 			thClick: function(i) {
 				console.log(i) // 当子组件触发按钮时，msg获取值为 哈哈啊哈哈

src/views/Decision/decision2Cjdb.vue

@@ -1,9 +1,49 @@
 <template>
-	<!-- 场际对标 -->
+	<div class="decision-page-2">
+		场内对标
+		<normal-radar-chart :height="'500px'" />
+	</div>
 </template>
 
 <script>
+	import NormalRadarChart from "../../components/chart/radar/normal-radar-chart.vue";
+	export default {
+		components: {
+			NormalRadarChart
+		},
+		data() {
+			return {}
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	};
 </script>
 
-<style>
+<style lang="less">
+	.decision-page-2 {
+		.project-table {
+			overflow: auto;
+
+			tbody {
+				height: 189px;
+			}
+
+			th,
+			td {
+				color: #b2bdc0;
+
+				&:nth-child(1) {
+					width: 50px;
+				}
+
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+	}
 </style>

src/views/Decision/decision2Xldb.vue

@@ -1,9 +1,49 @@
 <template>
-	<!-- 线路对标 -->
+	<div class="decision-page-2">
+		场内对标
+		<normal-radar-chart :height="'500px'" />
+	</div>
 </template>
 
 <script>
+	import NormalRadarChart from "../../components/chart/radar/normal-radar-chart.vue";
+	export default {
+		components: {
+			NormalRadarChart
+		},
+		data() {
+			return {}
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	};
 </script>
 
-<style>
+<style lang="less">
+	.decision-page-2 {
+		.project-table {
+			overflow: auto;
+
+			tbody {
+				height: 189px;
+			}
+
+			th,
+			td {
+				color: #b2bdc0;
+
+				&:nth-child(1) {
+					width: 50px;
+				}
+
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+	}
 </style>

src/views/Decision/decision2Xmdb.vue

@@ -1,9 +1,49 @@
 <template>
-	<!-- 项目对标 -->
+	<div class="decision-page-2">
+		场内对标
+		<normal-radar-chart :height="'500px'" />
+	</div>
 </template>
 
 <script>
+	import NormalRadarChart from "../../components/chart/radar/normal-radar-chart.vue";
+	export default {
+		components: {
+			NormalRadarChart
+		},
+		data() {
+			return {}
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	};
 </script>
 
-<style>
+<style lang="less">
+	.decision-page-2 {
+		.project-table {
+			overflow: auto;
+
+			tbody {
+				height: 189px;
+			}
+
+			th,
+			td {
+				color: #b2bdc0;
+
+				&:nth-child(1) {
+					width: 50px;
+				}
+
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+	}
 </style>