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

src/views/Decision/Decision3.vue

@@ -48,6 +48,7 @@
 				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
+		<toolbar-panel title="性能对标" :showLine="false"></toolbar-panel>
 		<!-- 列表 -->
 		<div v-show="detailShow==1">
 			<div class="mg-b-16">
@@ -671,6 +672,7 @@
 						}
 					}
 				],
+				dbData:[]
 			};
 		},
 		created() {
@@ -803,6 +805,7 @@
 				var data = that.dbData;
 				that.windNum = data[0].name;
 				that.windNum2 = data[1].name;
+				console.log(data[0],data[1]);
 				that.tabs = [{
 					name: "发电量",
 					windData1: data[0].fdl,