Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

public/static/config/modeConfig.js

@@ -11,7 +11,7 @@ let websocketUrl = null;
 if (localTest) {
   // baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
   // baseURL = "http://192.168.10.18:8082/" // 联机调试 - 石林
-  baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+  baseURL = "http://10.155.32.4:9001/" // 联机调试 - 谢生杰
   websocketUrl = (baseURL.replace(/http:\/\//g, "")) + "gyee-websocket";
 } else {
   baseURL = "http://10.155.32.4:8082/" // 正式环境

src/components/chart/pie/dual-pie-chart.vue

@@ -122,7 +122,7 @@ export default {
         },
         series: [
           {
-            name: "访问来源",
+            name: "",
             type: "pie",
             center: ["40%", "50%"],
             radius: [0, "35%"],
@@ -142,7 +142,7 @@ export default {
             data: this.innerData,
           },
           {
-            name: "访问来源",
+            name: "",
             type: "pie",
             center: ["40%", "50%"],
             radius: ["55%", "95%"],

src/router/index.js

@@ -155,7 +155,7 @@ const routes = [
     path: '/health/health4',
     name: 'health4',
     children: [{
-      path: 'healthLineChart', // 健康趋势
+      path: 'healthLineChart/:wtId', // 健康趋势
       component: () => import(/* webpackChunkName: "healthLineChart" */ '../views/HealthControl/healthLineChart.vue'),
     },
     {

src/views/Decision/Decision1Mx.vue

@@ -67,12 +67,12 @@
 		<div class="contentMx">
 			<div class="activeMx">
 				<el-row :type="'flex'" class="content">
-					<el-col :span="12" class="pd-r-8">
+					<el-col :span="10" class="pd-r-8">
 						<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">
+					<el-col :span="14" class="pd-l-8">
 						<panel :title="'项目列表'" :showLine="false">
 							<div class="project-table">
 								<Table :data="tableData"></Table>
@@ -366,7 +366,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
-					subUrl: "benchmarking/fjjxb",
+					subUrl: "benchmarking/fjjxbmx",
 					data: {
 						wpids: that.value1,
 						projectids: that.value2,

src/views/Decision/Decision2.vue

@@ -88,11 +88,6 @@
 						:units='["(万KWh)"]' />
 				</panel>
 			</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>
 		<el-row :type="'flex'" class="content" v-show="detailShow==2">
 			<el-col :span="24" class="pd-l-8">
@@ -103,6 +98,11 @@
 				</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"
+				:analyisDialog="analyisDialog" />
+		</el-dialog>
 	</div>
 </template>
 
@@ -141,7 +141,6 @@
 							is_num: false,
 							is_light: false,
 							template:() => {
-								// return "<el-checkbox v-model='row.checked'></el-checkbox>";
 								return "<input class='check curCheckBox' type='CheckBox' />";
 							},
 							click: function(event, data) {
@@ -412,7 +411,7 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check checkItem' type='CheckBox' check v-model="+checkData+"/>";
+								return "<input class='check checkItem' type='CheckBox'/>";
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
@@ -617,7 +616,7 @@
 				this.value3 = [];
 				this.AjaxCommon();
 				this.XiangMuVal(val);
-        this.$refs.curRef.clearCheckBox()
+				this.clearDb();
 			},
 			XiangMuVal(val) {
 				var that = this;
@@ -637,6 +636,7 @@
 				this.value3 = [];
 				this.AjaxCommon();
 				this.XianLuVal(val);
+				this.clearDb();
 			},
 			XianLuVal(val) {
 				var that = this;
@@ -654,14 +654,17 @@
 			XianLuChange(val) {
 				this.value3 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			BeginChange(val) {
 				this.value4 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			EndChange(val) {
 				this.value5 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();
@@ -943,9 +946,14 @@
 				if (that.tableId.length == 2) {
 					that.dialogVisible = true;
 					this.AjaxDbfx();
+					this.clearDb();
 				}
 			},
-
+			clearDb(){//清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.checkLength = 0;
+			}
 		}
 	};
 </script>
@@ -962,7 +970,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 189px;
+				height: 279px;
 			}
 
 			th,

src/views/Decision/decision2Cjdb.vue

@@ -42,7 +42,7 @@
 		<div v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
-					<Table :data="tableData" :canScroll="false"></Table>
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
 			<el-row class="mg-b-16">
@@ -63,11 +63,6 @@
 						:units='["(万KWh)"]' />
 				</panel>
 			</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>
 		<el-row :type="'flex'" class="content" v-show="detailShow==2">
 			<el-col :span="24" class="pd-l-8">
@@ -78,6 +73,11 @@
 				</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"
+				:analyisDialog="analyisDialog" />
+		</el-dialog>
 	</div>
 </template>
 
@@ -116,7 +116,7 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox' type='CheckBox'/>";
 							},
 							click: function(event, data) {
 								// checkbox 事件
@@ -578,14 +578,17 @@
 			ChangZhanChange(val) {
 				this.value1 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			BeginChange(val) {
 				this.value4 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			EndChange(val) {
 				this.value5 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();
@@ -617,7 +620,6 @@
 						sort: ''
 					},
 					success(res) {
-						console.log(JSON.stringify(res))
 						that.ajaxData = res.data;
 						var dataTab = [], //表格
 							fdl = [],
@@ -864,7 +866,13 @@
 				if (that.tableId.length == 2) {
 					that.dialogVisible = true;
 					this.AjaxDbfx();
+					this.clearDb();
 				}
+			},
+			clearDb(){//清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.checkLength = 0;
 			}
 		}
 	};
@@ -882,7 +890,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 189px;
+				height: 279px;
 			}
 
 			th,

src/views/Decision/Decision2Cndb.vue

@@ -41,7 +41,7 @@
 		<div v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
-					<Table :data="tableData" :canScroll="false"></Table>
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
 			<el-row :type="'flex'" class="content">
@@ -52,11 +52,6 @@
 					</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"
-					:analyisDialog="analyisDialog" />
-			</el-dialog>
 		</div>
 		<el-row :type="'flex'" class="content" v-show="detailShow==2">
 			<el-col :span="24" class="pd-l-8">
@@ -67,6 +62,11 @@
 				</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"
+				:analyisDialog="analyisDialog" />
+		</el-dialog>
 	</div>
 </template>
 
@@ -106,7 +106,7 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox' type='CheckBox'/>";
 							},
 							click: function(event, data) {
 								var dataDate = that.tableDateArr[data.index - 1];
@@ -561,14 +561,17 @@
 			ChangZhanChange(val) {
 				this.value1 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			BeginChange(val) {
 				this.value4 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			EndChange(val) {
 				this.value5 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();
@@ -804,9 +807,6 @@
 					value: slssdl
 				})
 				that.analyisDialog = analyis;
-
-
-
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
@@ -825,7 +825,13 @@
 				if (that.tableDate.length == 2) {
 					that.dialogVisible = true;
 					this.AjaxDbfx();
+					this.clearDb();
 				}
+			},
+			clearDb(){//清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.checkLength = 0;
 			}
 		}
 	};

src/views/Decision/decision2Xldb.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)" clearable placeholder="请选择"
+						<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>
@@ -13,6 +13,16 @@
 					</div>
 				</div>
 				<div class="query-item">
+					<div class="lable">项目：</div>
+					<div class="search-input">
+						<el-select v-model="value2" @change="XiangMuChange(value2)" multiple placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in XiangMu" :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="value3" @change="XianLuChange(value3)" multiple placeholder="请选择"
@@ -52,7 +62,7 @@
 		<div v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
-					<Table :data="tableData" :canScroll="false"></Table>
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
 			<el-row class="mg-b-16">
@@ -73,11 +83,6 @@
 						:units='["(万KWh)"]' />
 				</panel>
 			</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>
 		<el-row :type="'flex'" class="content" v-show="detailShow==2">
 			<el-col :span="24" class="pd-l-8">
@@ -88,6 +93,11 @@
 				</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"
+				:analyisDialog="analyisDialog" />
+		</el-dialog>
 	</div>
 </template>
 
@@ -110,6 +120,7 @@
 		data() {
 			let that = this;
 			return {
+				oneData:[],
 				tableIdArr: [], //放checkbox的id数组
 				tableId: [],
 				checkLength: 0, //对标分析只能选择2个
@@ -126,7 +137,7 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox' type='CheckBox'/>";
 							},
 							click: function(event, data) {
 								// checkbox 事件
@@ -329,7 +340,6 @@
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
 								that.detailShow = 2;
-								// var that = this;
 								that.API.requestData({
 									method: "GET",
 									subUrl: "benchmarking/details",
@@ -411,6 +421,7 @@
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
 								}
+								console.log(that.tableId)
 							},
 						},
 						{
@@ -555,6 +566,7 @@
 				XiangMu: [], //项目
 				XianLu: [], //线路
 				value1: [],
+				value2: [],
 				value3: [],
 				value4: "",
 				value5: "",
@@ -576,9 +588,17 @@
 			};
 		},
 		created() {
+			var that = this;
 			this.ChangZhanVal();
 			this.value4 = this.getTime(1);
 			this.value5 = this.getTime(2);
+			that.API.requestData({
+				method: "GET",
+				subUrl: "benchmarking/wplist",
+				success(res) {
+					that.value1.push(res.data[0].id)
+				}
+			});
 			this.AjaxCommon();
 		},
 		methods: {
@@ -588,15 +608,39 @@
 					method: "GET",
 					subUrl: "benchmarking/wplist",
 					success(res) {
+						that.oneData = res.data[0].id
 						that.ChangZhan = res.data;
 					}
 				});
 			},
 			ChangZhanChange(val) {
+				console.log(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",
+					subUrl: "benchmarking/projectList",
+					data: {
+						wpids: val
+					},
+					success(res) {
+						that.XiangMu = res.data;
+					}
+				});
+			},
+			XiangMuChange(val) {
+				this.value2 = val;
 				this.value3 = [];
 				this.AjaxCommon();
 				this.XianLuVal(val);
+				this.clearDb();
 			},
 			XianLuVal(val) {
 				var that = this;
@@ -614,14 +658,17 @@
 			XianLuChange(val) {
 				this.value3 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			BeginChange(val) {
 				this.value4 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			EndChange(val) {
 				this.value5 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();
@@ -640,12 +687,13 @@
 			},
 			AjaxCommon() {
 				var that = this;
+				console.log(that.value1)
 				that.API.requestData({ //五项损失率
 					method: "GET",
 					subUrl: "benchmarking/xldb",
 					data: {
 						wpids: that.value1,
-						projectids: '',
+						projectids: that.value2,
 						lineids: that.value3,
 						beginDate: that.value4,
 						endDate: that.value5,
@@ -904,7 +952,13 @@
 				if (that.tableId.length == 2) {
 					that.dialogVisible = true;
 					this.AjaxDbfx();
+					this.clearDb();
 				}
+			},
+			clearDb(){//清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.checkLength = 0;
 			}
 		}
 	};
@@ -922,7 +976,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 189px;
+				height: 279px;
 			}
 
 			th,

src/views/Decision/decision2Xmdb.vue

@@ -52,7 +52,7 @@
 		<div v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
-					<Table :data="tableData" :canScroll="false"></Table>
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
 			<el-row class="mg-b-16">
@@ -73,11 +73,6 @@
 						:units='["(万KWh)"]' />
 				</panel>
 			</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>
 		<el-row :type="'flex'" class="content" v-show="detailShow==2">
 			<el-col :span="24" class="pd-l-8">
@@ -88,6 +83,11 @@
 				</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"
+				:analyisDialog="analyisDialog" />
+		</el-dialog>
 	</div>
 </template>
 
@@ -126,7 +126,7 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox' type='CheckBox'/>";
 							},
 							click: function(event, data) {
 								// checkbox 事件
@@ -596,6 +596,7 @@
 				this.value2 = [];
 				this.AjaxCommon();
 				this.XiangMuVal(val);
+				this.clearDb();
 			},
 			XiangMuVal(val) {
 				var that = this;
@@ -613,14 +614,17 @@
 			XiangMuChange(val) {
 				this.value2 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			BeginChange(val) {
 				this.value4 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			EndChange(val) {
 				this.value5 = val;
 				this.AjaxCommon();
+				this.clearDb();
 			},
 			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
 				var date = new Date();
@@ -882,8 +886,6 @@
 					value: slssdl
 				})
 				that.analyisDialog = analyis;
-				
-				
 			},
 			tooltip(param, callback) {
 				var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
@@ -902,7 +904,13 @@
 				if (that.tableId.length == 2) {
 					that.dialogVisible = true;
 					this.AjaxDbfx();
+					this.clearDb();
 				}
+			},
+			clearDb(){//清空对标状态
+				this.$refs.curRef.clearCheckBox();
+				this.tableId = [];
+				this.checkLength = 0;
 			}
 		}
 	};
@@ -920,7 +928,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 189px;
+				height: 279px;
 			}
 
 			th,

src/views/HealthControl/Health4.vue

@@ -31,6 +31,7 @@ export default {
   data() {
     return {
       activeIndex:0,
+      wtId:"",
       menuDatas: [{
         icon: "svg-agc",
         path: "/health/health4/healthLineChart",
@@ -43,7 +44,10 @@ export default {
   },
 
   created() {
-   
+   this.wtId = this.$route.params.wtId;
+   this.menuDatas.forEach(ele=>{
+     ele.path += ('/'+this.wtId);
+   });
   },
   
   methods:{

src/views/HealthControl/healthLineChart.vue

@@ -18,7 +18,7 @@ export default {
   },
 
   created() {
-    
+    this.wtId = this.$route.params.wtId;
   },
   
   methods:{

src/views/layout/Menu.vue

@@ -122,11 +122,6 @@ export default {
             //   path: "/health/health3",
             // },
             {
-              text: "健康管理4",
-              icon: "svg-wind-site",
-              path: "/health/health4/healthLineChart",
-            },
-            {
               text: "健康管理5",
               icon: "svg-wind-site",
               path: "/health/health5",
@@ -136,11 +131,6 @@ export default {
               icon: "svg-wind-site",
               path: "/health/health6",
             },
-            {
-              text: "健康管理7",
-              icon: "svg-wind-site",
-              path: "/health/health7",
-            },
           ],
         },
         {
@@ -148,25 +138,45 @@ export default {
           text: "决策支持",
           data: [
             {
-              text: "决策支持1",
+              text: "风机绩效榜",
               icon: "svg-matrix",
               path: "/decision/decision1",
             },
             {
-              text: "决策支持2",
+              text: "五项损失率",
               icon: "svg-matrix",
               path: "/decision/decision2",
             },
             {
-              text: "决策支持3",
+              text: "场内对标",
+              icon: "svg-matrix",
+              path: "/decision/decision2Cndb",
+            },
+            {
+              text: "场际对标",
+              icon: "svg-matrix",
+              path: "/decision/decision2Cjdb",
+            },
+            {
+              text: "项目对标",
               icon: "svg-matrix",
-              path: "/decision/decision3",
+              path: "/decision/decision2Xmdb",
             },
             {
-              text: "决策支持4",
+              text: "线路对标",
               icon: "svg-matrix",
-              path: "/decision/decision4",
+              path: "/decision/decision2Xldb",
             },
+            // {
+            //   text: "决策支持3",
+            //   icon: "svg-matrix",
+            //   path: "/decision/decision3",
+            // },
+            // {
+            //   text: "决策支持4",
+            //   icon: "svg-matrix",
+            //   path: "/decision/decision4",
+            // },
           ],
         },
         {