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

src/views/Decision/Decision2.vue

@@ -95,7 +95,7 @@
 			<el-col :span="24" class="pd-l-8">
 				<panel :title="'风机对标列表明细'" :showLine="false">
 					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
+						<Table :data="tableDataDetail" ref="curRef"></Table>
 					</div>
 				</panel>
 			</el-col>
@@ -152,12 +152,14 @@
 								if (event.target.checked == false && that.checkLength <= 2) {
 									that.tableId.forEach((item, i) => {
 										if (item == dataId) {
-											that.tableId.splice(i, 1)
+											that.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -340,6 +342,7 @@
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
+								that.clearDb();
 								that.detailShow = 2;
 								// var that = this;
 								that.API.requestData({
@@ -407,19 +410,21 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check checkItem' type='CheckBox'/>";
+								return "<input class='check curCheckBox checkItem' 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.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -587,6 +592,7 @@
 				analyisDialog: [],
 				detailShow: 1,
 				ajaxData:[],
+				dbData:[]
 			};
 		},
 		created() {
@@ -799,7 +805,6 @@
 							value: slssdl
 						})
 						that.tableData.data = dataTab;
-
 						that.innerFdl = fdl;
 						that.outerFdl = fdl;
 
@@ -815,7 +820,7 @@
 			},
 			AjaxDbfx() {
 				var that = this;
-				var data = that.ajaxData;
+				var data = that.dbData;
 				that.windNum = data[0].name;
 				that.windNum2 = data[1].name;
 				that.tabs = [{
@@ -952,10 +957,12 @@
 			clearDb(){//清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
+				this.dbData = [];
 				this.checkLength = 0;
 			},
 			back(){
 				this.detailShow = 1;
+				this.clearDb();
 			}
 		}
 	};

src/views/Decision/Decision2Cjdb.vue

@@ -69,7 +69,7 @@
 			<el-col :span="24" class="pd-l-8">
 				<panel :title="'风机对标列表明细'" :showLine="false">
 					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
+						<Table :data="tableDataDetail" ref="curRef"></Table>
 					</div>
 				</panel>
 			</el-col>
@@ -134,12 +134,14 @@
 								if (event.target.checked == false && that.checkLength <= 2) {
 									that.tableId.forEach((item, i) => {
 										if (item == dataId) {
-											that.tableId.splice(i, 1)
+											that.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -322,6 +324,7 @@
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
+								that.clearDb();
 								that.detailShow = 2;
 								that.API.requestData({
 									method: "GET",
@@ -387,19 +390,21 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox checkItem' 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.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -560,7 +565,8 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData: []
+				ajaxData: [],
+				dbData:[]
 			};
 		},
 		created() {
@@ -682,11 +688,6 @@
 								name: item.name
 							})
 
-							ll.push({
-								value: item.llfdl,
-								name: item.name
-							})
-
 							gzssdl.push({
 								text: item.name,
 								value: item.gzssdl
@@ -743,7 +744,7 @@
 			},
 			AjaxDbfx() {
 				var that = this;
-				var data = that.ajaxData;
+				var data = that.dbData;
 				that.windNum = data[0].name;
 				that.windNum2 = data[1].name;
 				that.tabs = [{
@@ -879,10 +880,12 @@
 			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
+				this.dbData = [];
 				this.checkLength = 0;
 			},
 			back() {
 				this.detailShow = 1;
+				this.clearDb();
 			}
 		}
 	};

src/views/Decision/Decision2Cndb.vue

@@ -59,7 +59,7 @@
 			<el-col :span="24" class="pd-l-8">
 				<panel :title="'风机对标列表明细'" :showLine="false">
 					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
+						<Table :data="tableDataDetail" ref="curRef"></Table>
 					</div>
 				</panel>
 			</el-col>
@@ -95,8 +95,7 @@
 			let that = this;
 			return {
 				tableIdArr: [], //放checkbox的id数组
-				tableDateArr: [],
-				tableDate: [],
+				tableId: [],
 				checkLength: 0, //对标分析只能选择2个
 				tableData: {
 					column: [{
@@ -114,16 +113,18 @@
 								return "<input class='check curCheckBox' type='CheckBox'/>";
 							},
 							click: function(event, data) {
-								var dataDate = that.tableDateArr[data.index - 1];
+								var dataId = that.tableIdArr[data.index - 1];
 								if (event.target.checked == false && that.checkLength <= 2) {
-									that.tableDate.forEach((item, i) => {
-										if (item == dataDate) {
-											that.tableDate.splice(i, 1)
+									that.tableId.forEach((item, i) => {
+										if (item == dataId) {
+											that.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableDate.push(dataDate)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -306,7 +307,7 @@
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
-								console.log(dataId)
+								that.clearDb();
 								that.detailShow = 2;
 								// var that = this;
 								that.API.requestData({
@@ -323,7 +324,7 @@
 									success(res) {
 										var dataTab = [];
 										res.data.forEach((item, index) => {
-											that.tableIdArr.push(item.id);
+											that.tableIdArr.push(item.date);
 
 											dataTab.push({ //表格
 												index: index + 1,
@@ -372,19 +373,21 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox checkItem' 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.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -543,7 +546,8 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData: []
+				ajaxData: [],
+				dbData:[]
 			};
 		},
 		created() {
@@ -619,8 +623,7 @@
 							xdssdl = [],
 							slssdl = [];
 						res.data.forEach((item, index) => {
-							that.tableDateArr.push(item.date);
-							that.tableIdArr.push(item.id);
+							that.tableIdArr.push(item.date);
 							dataTab.push({ //表格
 								index: index + 1,
 								zhpm: item.zhpm,
@@ -703,9 +706,14 @@
 			},
 			AjaxDbfx() {
 				var that = this;
-				var data = that.ajaxData;
-				that.windNum = data[0].date.substr(0, 10);
-				that.windNum2 = data[1].date.substr(0, 10);
+				var data = that.dbData;
+				if(that.detailShow == 1){
+					that.windNum = data[0].date.substr(0, 10);
+					that.windNum2 = data[1].date.substr(0, 10);
+				}if(that.detailShow == 2){
+					that.windNum = data[0].name;
+					that.windNum2 = data[1].name;
+				}
 				that.tabs = [{
 					name: "发电量",
 					windData1: data[0].fdl,
@@ -830,7 +838,7 @@
 			},
 			dbfx() {
 				var that = this;
-				if (that.tableDate.length == 2) {
+				if (that.tableId.length == 2) {
 					that.dialogVisible = true;
 					this.AjaxDbfx();
 					this.clearDb();
@@ -839,10 +847,12 @@
 			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
+				this.dbData = [];
 				this.checkLength = 0;
 			},
 			back() {
 				this.detailShow = 1;
+				this.clearDb();
 			}
 		}
 	};

src/views/Decision/Decision2Xldb.vue

@@ -89,7 +89,7 @@
 			<el-col :span="24" class="pd-l-8">
 				<panel :title="'风机对标列表明细'" :showLine="false">
 					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
+						<Table :data="tableDataDetail" ref="curRef"></Table>
 					</div>
 				</panel>
 			</el-col>
@@ -155,12 +155,14 @@
 								if (event.target.checked == false && that.checkLength <= 2) {
 									that.tableId.forEach((item, i) => {
 										if (item == dataId) {
-											that.tableId.splice(i, 1)
+											that.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -343,6 +345,7 @@
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
+								that.clearDb();
 								that.detailShow = 2;
 								that.API.requestData({
 									method: "GET",
@@ -409,24 +412,25 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox checkItem' 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.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
 								}
-								console.log(that.tableId)
 							},
 						},
 						{
@@ -589,7 +593,8 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData: []
+				ajaxData: [],
+				dbData:[]
 			};
 		},
 		created() {
@@ -831,7 +836,7 @@
 			AjaxDbfx() {
 
 				var that = this;
-				var data = that.ajaxData;
+				var data = that.dbData;
 				that.windNum = data[0].name;
 				that.windNum2 = data[1].name;
 				that.tabs = [{
@@ -968,10 +973,12 @@
 			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
+				this.dbData = [];
 				this.checkLength = 0;
 			},
 			back() {
 				this.detailShow = 1;
+				this.clearDb();
 			}
 		}
 	};

src/views/Decision/Decision2Xmdb.vue

@@ -79,7 +79,7 @@
 			<el-col :span="24" class="pd-l-8">
 				<panel :title="'风机对标列表明细'" :showLine="false">
 					<div class="project-table">
-						<Table :data="tableDataDetail"></Table>
+						<Table :data="tableDataDetail" ref="curRef"></Table>
 					</div>
 				</panel>
 			</el-col>
@@ -144,12 +144,14 @@
 								if (event.target.checked == false && that.checkLength <= 2) {
 									that.tableId.forEach((item, i) => {
 										if (item == dataId) {
-											that.tableId.splice(i, 1)
+											that.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -332,6 +334,7 @@
 							},
 							click: function(event, data) {
 								var dataId = that.tableIdArr[data.index - 1];
+								that.clearDb();
 								that.detailShow = 2;
 								// var that = this;
 								that.API.requestData({
@@ -399,19 +402,21 @@
 							is_num: false,
 							is_light: false,
 							template: function() {
-								return "<input class='check' type='CheckBox'/>";
+								return "<input class='check curCheckBox checkItem' 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.tableId.splice(i, 1);
+											that.dbData.splice(i, 1);
 										}
 									})
 									that.checkLength--;
 								} else if (event.target.checked && that.checkLength < 2) {
-									that.tableId.push(dataId)
+									that.tableId.push(dataId);
+									that.dbData.push(data);
 									that.checkLength++;
 								} else if (that.checkLength == 2) {
 									event.target.checked = false;
@@ -576,7 +581,8 @@
 				tabs: [],
 				analyisDialog: [],
 				detailShow: 1,
-				ajaxData: []
+				ajaxData: [],
+				dbData:[]
 			};
 		},
 		created() {
@@ -782,7 +788,7 @@
 			},
 			AjaxDbfx() {
 				var that = this;
-				var data = that.ajaxData;
+				var data = that.dbData;
 				that.windNum = data[0].name;
 				that.windNum2 = data[1].name;
 				that.tabs = [{
@@ -918,10 +924,12 @@
 			clearDb() { //清空对标状态
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
+				this.dbData = [];
 				this.checkLength = 0;
 			},
 			back() {
 				this.detailShow = 1;
+				this.clearDb();
 			}
 		}
 	};