首页数据迁移

components/bracelet/braceletHistoryCurve.vue

@@ -1351,7 +1351,7 @@
 	}
 	.font{
 		position: absolute;
-		font-size: 20px;
+		font-size: 16px;
 		font-weight: 1000;
 		top: 10%;
 		left: 8%;
@@ -1369,7 +1369,7 @@
 		left: 8%;
 	}
 	.unit{
-		
+		font-size: 16px;
 		position: absolute;
 		top: 80%;
 		left: 63%;

components/bracelet/raceletDetails/heartbeatDetails.vue

@@ -435,7 +435,7 @@
 	.horizontalSlider {
 		white-space: nowrap;
 		width: 100%;
-		height: 350px;
+		height: 390px;
 		background-color: #242424;
 		/* margin-top: 540px; */
 	}
@@ -459,6 +459,7 @@
 			position: absolute;
 			text-align: center;
 			width: 100%;
+			height: 100px;
 		}
 button{
 			margin: 20upx;
@@ -466,7 +467,6 @@ button{
 		}
 .All{
 	width: 100%;
-	height: 100%;
 	background-color: #242424;
 }
 .heartbeatLabel{
@@ -510,8 +510,9 @@ button{
 }
 .graphHeartbeat{
 	position: relative;
+	padding-bottom: 100px;
 	width: 100%;
-	height: 350px;
+	height: 100%;
 }
 .titleC{
 	margin-top: 3%;

components/weatherProphethomepage/WeatherProphethomepage.vue

@@ -2057,6 +2057,17 @@
 			this.$refs.drawer.closeDrawer();
 			this.hideModal();
 		},
+		computed: {
+					backStageIp: function() {
+						return this.$store.state.wholeSituationBackStageIp;
+					},
+					backStagePort: function() {
+						return this.$store.state.wholeSituationBackStagePort;
+					},
+					windpowerstationNameToId: function() {
+						return this.$store.state.windpowerstationNameToId;
+					}
+				},
 		methods: {
 			openDrawer: function() {
 				this.outThreeLineDrawerIsShow=true;
@@ -2162,7 +2173,7 @@
 				// 按小时数据
 				this.socketTaskHour = uni.connectSocket({
 					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
-					url: "ws://49.4.78.143:8081/websocket/pageNumber_3/functionNumber_2",
+					url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_3/functionNumber_2',
 					success(data) {
 						console.log("websocket连接成功");
 					},
@@ -2170,7 +2181,7 @@
 				// 今天数据
 				this.socketTaskToday = uni.connectSocket({
 					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
-					url: "ws://49.4.78.143:8081/websocket/pageNumber_2/functionNumber_1",
+					url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_2/functionNumber_1',
 					success(data) {
 						console.log("websocket连接成功");
 					},
@@ -2243,7 +2254,7 @@
 				// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
 				this.socketTask7 = uni.connectSocket({
 					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
-					url: "ws://49.4.78.143:8081/websocket/pageNumber_3/functionNumber_1",
+					url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_3/functionNumber_1',
 					success(data) {
 						console.log("websocket连接成功");
 					},
@@ -2293,7 +2304,7 @@
 				let _this = this;
 				this.socketTask8_15 = uni.connectSocket({
 					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
-					url: "ws://49.4.78.143:8081/websocket/pageNumber_4/functionNumber_1",
+					url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_4/functionNumber_1',
 					success(data) {
 						console.log("websocket连接成功");
 					},
@@ -2341,7 +2352,7 @@
 				// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
 				this.socketTask40 = uni.connectSocket({
 					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
-					url: "ws://49.4.78.143:8081/websocket/pageNumber_5/functionNumber_1",
+					url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_5/functionNumber_1',
 					success(data) {
 						console.log("websocket连接成功");
 					},

components/windStationCardDetail/WindStationCardDetail.vue

@@ -192,7 +192,7 @@
 	export default {
 		data: function() {
 			return {
-				FDC: "MHS_FDC",
+				FDC: '',
 				socketTask_comprehensive_target: '',
 				socketTask_index_windSpeed_power_target_detail: '',
 				socketTask_windpowerstationdetail_springbox_target: '',
@@ -230,20 +230,14 @@
 		},
 		onLoad(option) {
 			this.windStationName = option.option;
-			if(this.windStationName == '麻黄山'){
-				this.FDC = 'MHS_FDC'
+			if (this.windStationName == '崇礼') {
+				this.FDC = 'CL_FDC';
 			};
-			if(this.windStationName == '牛首山'){
-				this.FDC = 'NSS_FDC'
+			if (this.windStationName == '代县') {
+				this.FDC = 'DX_FDC';
 			};
-			if(this.windStationName == "石板泉"){
-				this.FDC = 'SBQ_FDC'
-			};
-			if(this.windStationName == "香山"){
-				this.FDC = 'XS_FDC'
-			};
-			if(this.windStationName == "青山"){
-				this.FDC = 'QS_FDC'
+			if (this.windStationName == '康保') {
+				this.FDC = 'KB_FDC';
 			};
 			this.cWidth = uni.upx2px(750);
 			this.cHeight = uni.upx2px(400);

pages/forecast/Forecast.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="content">
-		<view  v-if="toggleSwitch==false">
-		<cu-custom bgColor="bg-blacks" :isBack="false">
+		 <!-- <third-comp :key="menuKey"></third-comp> -->
+		 <view v-if="toggleSwitch==false">
+		<view>
+			<cu-custom bgColor="bg-blacks" :isBack="false">
 				<block slot="right"><image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-left: 2%;" @tap="openDrawer"></image></block>
 				<block slot="right">
 					<view class="icon cuIcon-notice text-white" v-if="badge != 0" style="margin-left: -70%;">
@@ -13,14 +15,16 @@
 				<block slot="right"></block>
 				<block slot="content">{{ address }}</block>
 				<block slot="right"><view class="plus" @tap="showModal" data-target="viewModal">+</view></block>
-		</cu-custom>
+			</cu-custom>
+		</view>
 		<!-- 地图组件 -->
 		<view>
 			<div><drawer ref="drawer" ></drawer></div>
 			<div class="plusDrawer" @tap="hideModal"><plusDrawer ref="plusDrawer"></plusDrawer></div>
 			<view class="page-body">
 				<view class="page-section page-section-gap">
-					<map  style="width: 100%; height: 253px;"
+					<map  style="width: 100%; height: 300px;"
+					
 						:controls="controls"
 						:circles="circles"
 						:polyline="polyline"
@@ -33,7 +37,7 @@
 			</view>
 		</view>
 		<!--经纬度组件-->
-		<!-- <view class="InformationCard">
+		<view class="InformationCard">
 			<view class="informationCardAll">
 				<view class="informationCardTextOne">
 					<view class="informationCardText">
@@ -48,32 +52,35 @@
 					</view>
 				</view>
 			</view>
-		</view> -->
+		</view>
 		<!-- 个人信息组件 -->
-		<!-- <view class="Personal_information_W">
+		<view class="Personal_information_W">
 				<view class="name">姓名：李占国</view>
-				<view class="history"  @click="mapDate"> <span ></span> </view>
+
+				<view class="history"  @click="mapDate"> <span class="navigation"></span> </view>
+
 				<view class="skills">技能：电力类，机械类</view>
-		</view> -->
+		</view>
 		<!-- 历史曲线组件 -->
-		<!-- <view class="curve">
+		<view class="curve">
 			<view class="curve_l">健康情况</view>
 			<view class="curve_r" @tap="common.navTo('/components/bracelet/braceletHistoryCurve?braceletCurve=' + braceletCurve)">历史曲线</view>
 			<div class="greater"></div>
-		</view> -->
+		</view>
 		<!-- 健康详情组件 -->
-		<!-- <view class="healthy">
+		<view class="healthy">
+			
 			<view class="healthy_H">
-				<view class="details_z">心跳频率:({{ bracelet[deviceName][targetName_xtpl][targetName_xtpl_size].value }})</view>
-				<view class="details_m">步数:({{ bracelet[deviceName][targetName_bs][targetName_bs_size].value }})</view>
-				<view class="details_y">收缩频率:({{ bracelet[deviceName][targetName_ssxy][targetName_ssxy_size].value }})</view>
+				<view class="details_z">心跳频率:<!-- ({{ bracelet[deviceName][targetName_xtpl][targetName_xtpl_size].value }}) --></view>
+				<view class="details_m">步数:<!-- ({{ bracelet[deviceName][targetName_bs][targetName_bs_size].value }}) --></view>
+				<view class="details_y">收缩频率:<!-- ({{ bracelet[deviceName][targetName_ssxy][targetName_ssxy_size].value }}) --></view>
 			</view>
 			<view class="healthy_N">
-				<view class="details_z">舒张压:({{ bracelet[deviceName][targetName_szxy][targetName_szxy_size].value }})</view>
-				<view class="details_m">疲劳度:({{ bracelet[deviceName][targetName_pld][targetName_pld_size].value }})</view>
-				<view class="details_y">血氧浓度:({{ bracelet[deviceName][targetName_xynd][targetName_xynd_size].value }})</view>
+				<view class="details_z">舒张压:<!-- ({{ bracelet[deviceName][targetName_szxy][targetName_szxy_size].value }}) --></view>
+				<view class="details_m">疲劳度:<!-- ({{ bracelet[deviceName][targetName_pld][targetName_pld_size].value }}) --></view>
+				<view class="details_y">血氧浓度:<!-- ({{ bracelet[deviceName][targetName_xynd][targetName_xynd_size].value }}) --></view>
 			</view>
-		</view> -->
+		</view>
 		</view>
 		<view v-if="toggleSwitch==true">
 			<WeatherProphethomepage></WeatherProphethomepage>
@@ -199,7 +206,7 @@ export default {
 									x:'',//
 									y: '',//116.399
 									label:{
-									        content:'运动结束',
+									        content:'',
 									        color:'#F76350',
 									        bgColor:'#fff',
 									        padding:5,
@@ -259,6 +266,18 @@ export default {
 				{
 					name: '气象预测'
 				}
+				/* 	{
+						"name": ""
+					},
+					{
+						"name": ""
+					},
+					{
+						"name": ""
+					},
+					{
+						"name": ""
+					}, */
 			],
 			plusDrawerList: [
 				{
@@ -288,7 +307,9 @@ export default {
 			]
 		};
 	},
-
+	mounted() {
+		document.querySelector('body').setAttribute('style', 'background-color:#000000');
+	},
 	onHide() {
 		this.$refs.drawer.closeDrawer();
 		this.hideModal();
@@ -369,10 +390,16 @@ export default {
 	},
 	methods: {
 		mapDate(){
+			
+		
+			
+			
 				if(this.bool){
+					
 					this.$delete(this.polyline[0],'points');
 					this.braceletCurve_LNG = this.bracelet[this.deviceName][this.deviceNameLng];
 					this.braceletCurve_LAT = this.bracelet[this.deviceName][this.deviceNameLat];
+					
 					this.points[0].longitude=this.bracelet[this.deviceName][this.deviceNameLng][0].value;
 					this.points[0].latitude=this.bracelet[this.deviceName][this.deviceNameLat][0].value;
 					this.points[1].longitude=this.bracelet[this.deviceName][this.deviceNameLng][this.braceletCurve_LNG.length-1].value;
@@ -385,8 +412,11 @@ export default {
 					
 				}
 					/* 定义地图经纬度中心 */
-					/* this.latitude =  parseFloat(this.mapBegin_2)+parseFloat(this.mapEnd_2)/2;
-					this.longitude =  parseFloat(this.mapBegin_1)+parseFloat(this.mapEnd_1)/2; */
+					 var lat= parseFloat(this.mapBegin_2)+parseFloat(this.mapEnd_2);
+					 var lng=  parseFloat(this.mapBegin_1)+parseFloat(this.mapEnd_1);
+					 
+					 this.latitude = lat/2;
+					 this.longitude = lng/2;
 				}else{
 					/* this.braceletCurve_LNG = this.bracelet[this.deviceName][this.deviceNameLng];
 					this.braceletCurve_LAT = this.bracelet[this.deviceName][this.deviceNameLat];
@@ -403,7 +433,10 @@ export default {
 					   this.longitude = this.mapBegin_1+this.mapEnd_1/2; */
 					   
 						console.log("false");
-								
+						/* 还原定位中心位置 */
+						this.latitude = this.mapBegin_2;
+						this.longitude = this.mapBegin_1;	
+							
 						this.bool = true;
 						
 					
@@ -426,6 +459,7 @@ export default {
 			uni.getStorageSync('windpowerstationName');
 			return uni.getStorageSync('windpowerstationName');
 		},
+		
 		showModal(e) {
 			this.modalName = e.currentTarget.dataset.target;
 			this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
@@ -517,10 +551,10 @@ export default {
 };
 </script>
 
-<style scoped="scoped">
+<style>
 body {
 	font-family: '方正兰亭细黑_GBK';
-	font-size: 20px;
+	font-size: 15px;
 	color: silver;
 	background: #000;
 }
@@ -685,7 +719,7 @@ page {
 	position: absolute;
 	top: 56%;
 	left: 3%;
-	height: 30px;
+	height: 25px;
 	width: 180px;/* 
 	background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%); */
 	text-align: left;
@@ -710,25 +744,27 @@ page {
 	right: 3%;
 }
 .healthy {
-	margin-top: 6%;
+	/* margin-top: 6%; */
 	margin-left: 3%;
-	height: 200px;
-	width: 95%;/* 
-	background-color:#242424; */
+	height: 180px;
+	width: 95%;
+	margin-bottom: 100px;
 	text-align: center;
 	color: #B8B7B7;
 	font-size: 12px;
-	line-height:50px ;
+	line-height:65px ;
 	font-weight: 1000;
+	
 }
 .healthy_H,
 .healthy_N,
 .healthy_W {
+	background-color:#242424;
 	position: relative;
 	width: 100%;
-	height: 28%;
+	height: 42%;
 	text-align: center;
-	margin-top: 3%;
+	/* padding-bottom: 1%; */
 }
 
 
@@ -736,25 +772,35 @@ page {
 	position: absolute;
 	background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%);	
 	width: 30%;	
-	height: 93%;
+	
+	/* height: 93%; */
 	left:3%;
-	top: 12%;
+	height: 60px;
+	top: 3%;
+	margin-top: 2%;
+	
+	padding-bottom: 3%;
 }
 .details_m {
 	position: absolute;
 	background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%);	
 	width: 30%;
 	left: 35.5%;
-	height: 93%;
-	top: 12%;
+	height: 60px;
+	top: 3%;
+	margin-top: 2%;
+	
+	padding-bottom: 3%;
 }
 .details_y {
 	position: absolute;
 	background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%);
 	width: 30%;
 	left: 68%;
-	height: 93%;
-	top: 12%;
+	height: 60px;
+	top: 3%;
+	margin-top: 2%;
+	padding-bottom: 3%;
 	/* margin-bottom: 0.6%;
 	margin-top: 0.6%;
 	float: right;
@@ -775,7 +821,7 @@ page {
 	padding-top: 8px; */
 }
 
-span::after {
+.navigation::after {
 	content: url(../../static/picture/forcast/position.png);
 }
 	/* .greater {

pages/index/Index.vue

@@ -390,35 +390,36 @@
 				<view class="qiun-chart"><canvas canvas-id="canvasColumnStack" id="canvasColumnStack" class="chart" @touchstart="touchColumn"></canvas></view>
 			</view>
 			<!-- 风电场卡片 -->
+			
 			<view class="windStation">
 				<scroll-view scroll-x class="scrollWindStationCard">
 					<view class="windStationCardContainer">
-						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '麻黄山')">
-							<view class="windStationTitle">麻黄山风电场</view>
+						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '崇礼')">
+							<view class="windStationTitle">崇礼风电场</view>
 							<view class="powerAndSpeedContainer">
 								<view class="powerAndSpeedRed">
 									预测发(万kwh):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl}}</span>
+									<span v-if="cardmodule==false">{{index_windStation_cardmodule.index_windStation_cardmodule.CL_FDC.ycdl}}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									日发(万kwh):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.rfdl }} --></span>
-									<span v-if="cardmodule==false"> {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.rfdl }}</span>
+									<span v-if="cardmodule==false"> {{ index_windStation_cardmodule.index_windStation_cardmodule.CL_FDC.rfdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实风速(m/s):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ssfs }} --></span>
-									<span v-if="cardmodule==false"> {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ssfs }}</span>
+									<span v-if="cardmodule==false"> {{ index_windStation_cardmodule.index_windStation_cardmodule.CL_FDC.ssfs }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实功率(万kw):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ssgl }} --></span>
-									<span v-if="cardmodule==false"> {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ssgl }}
+									<span v-if="cardmodule==false"> {{ index_windStation_cardmodule.index_windStation_cardmodule.CL_FDC.ssgl }}
 									</span>
 								</view>
 							</view>
@@ -442,72 +443,72 @@
 										<image src="../../static/picture/001.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">接入&nbsp;&nbsp;0</span>
-									<span v-if="module==false">接入&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.MHS_FDC.jr }}</span>
+									<span v-if="module==false">接入&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.CL_FDC.jr }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/002.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">待机&nbsp;&nbsp;0</span>
-									<span v-if="module==false">待机&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.MHS_FDC.dj }}</span>
+									<span v-if="module==false">待机&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.CL_FDC.dj }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/003.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">运行&nbsp;&nbsp;0</span>
-									<span v-if="module==false">运行&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.MHS_FDC.yx }}</span>
+									<span v-if="module==false">运行&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.CL_FDC.yx }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/004.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">故障&nbsp;&nbsp;0</span>
-									<span v-if="module==false">故障&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.MHS_FDC.gz }}</span>
+									<span v-if="module==false">故障&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.CL_FDC.gz }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/005.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">维护&nbsp;&nbsp;0</span>
-									<span v-if="module==false">维护&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.MHS_FDC.wh }}</span>
+									<span v-if="module==false">维护&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.CL_FDC.wh }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/006.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">离线&nbsp;&nbsp;0</span>
-									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.MHS_FDC.lx }}</span>
+									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.CL_FDC.lx }}</span>
 								</view>
 							</view>
 						</view>
 
-						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '牛首山')">
-							<view class="windStationTitle">牛首山风电场</view>
+						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '代县')">
+							<view class="windStationTitle">代县风电场</view>
 							<view class="powerAndSpeedContainer">
 								<view class="powerAndSpeedRed">
 									预测发(万kwh):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.NSS_FDC.ycdl }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.DX_FDC.ycdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									日发(万kwh):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.NSS_FDC.rfdl }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.DX_FDC.rfdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实风速(m/s):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.NSS_FDC.ssfs }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.DX_FDC.ssfs }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实功率(万kw):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.NSS_FDC.ssgl }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.DX_FDC.ssgl }}</span>
 								</view>
 							</view>
 							<!-- HQChart图 -->
@@ -530,72 +531,72 @@
 										<image src="../../static/picture/001.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">接入&nbsp;&nbsp;0</span>
-									<span v-if="module==false">接入&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.NSS_FDC.jr }}</span>
+									<span v-if="module==false">接入&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.DX_FDC.jr }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/002.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">待机&nbsp;&nbsp;0</span>
-									<span v-if="module==false">待机&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.NSS_FDC.dj }}</span>
+									<span v-if="module==false">待机&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.DX_FDC.dj }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/003.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">运行&nbsp;&nbsp;0</span>
-									<span v-if="module==false">运行&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.NSS_FDC.yx }}</span>
+									<span v-if="module==false">运行&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.DX_FDC.yx }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/004.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">故障&nbsp;&nbsp;0</span>
-									<span v-if="module==false">故障&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.NSS_FDC.gz }}</span>
+									<span v-if="module==false">故障&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.DX_FDC.gz }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/005.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">维护&nbsp;&nbsp;0</span>
-									<span v-if="module==false">维护&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.NSS_FDC.wh }}</span>
+									<span v-if="module==false">维护&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.DX_FDC.wh }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/006.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">离线&nbsp;&nbsp;0</span>
-									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.NSS_FDC.lx }}</span>
+									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.DX_FDC.lx }}</span>
 								</view>
 							</view>
 						</view>
 
-						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '石板泉')">
-							<view class="windStationTitle">石板泉风电场</view>
+						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '康保')">
+							<view class="windStationTitle">康保风电场</view>
 							<view class="powerAndSpeedContainer">
 								<view class="powerAndSpeedRed">
 									预测发(万kwh):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.SBQ_FDC.ycdl }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.KB_FDC.ycdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									日发(万kwh):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.SBQ_FDC.rfdl }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.KB_FDC.rfdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实风速(m/s):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.SBQ_FDC.ssfs }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.KB_FDC.ssfs }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实功率(万kw):
 									<span v-if="cardmodule">
 										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
-									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.SBQ_FDC.ssgl }}</span>
+									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.KB_FDC.ssgl }}</span>
 								</view>
 							</view>
 							<!-- HQChart图 -->
@@ -618,78 +619,70 @@
 										<image src="../../static/picture/001.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">接入&nbsp;&nbsp;0</span>
-									<span v-if="module==false">接入&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.SBQ_FDC.jr }}</span>
+									<span v-if="module==false">接入&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.KB_FDC.jr }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/002.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">待机&nbsp;&nbsp;0</span>
-									<span v-if="module==false">待机&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.SBQ_FDC.dj }}</span>
+									<span v-if="module==false">待机&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.KB_FDC.dj }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/003.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">运行&nbsp;&nbsp;0</span>
-									<span v-if="module==false">运行&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.SBQ_FDC.yx }}</span>
+									<span v-if="module==false">运行&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.KB_FDC.yx }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/004.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">故障&nbsp;&nbsp;0</span>
-									<span v-if="module==false">故障&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.SBQ_FDC.gz }}</span>
+									<span v-if="module==false">故障&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.KB_FDC.gz }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/005.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">维护&nbsp;&nbsp;0</span>
-									<span v-if="module==false">维护&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.SBQ_FDC.wh }}</span>
+									<span v-if="module==false">维护&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.KB_FDC.wh }}</span>
 								</view>
 								<view class="fanStatus">
 									<view class="statusIcon">
 										<image src="../../static/picture/006.png" style="width: 16px;height: 16px;margin-top: 7px;"></image>
 									</view>
 									<span v-if="module">离线&nbsp;&nbsp;0</span>
-									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.SBQ_FDC.lx }}</span>
+									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.KB_FDC.lx }}</span>
 								</view>
 							</view>
 						</view>
 
-						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '青山')">
+						<!-- <view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '青山')">
 							<view class="windStationTitle">青山风电场</view>
 							<view class="powerAndSpeedContainer">
 								<view class="powerAndSpeedRed">
 									预测发(万kwh):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.QS_FDC.ycdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									日发(万kwh):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.QS_FDC.rfdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实风速(m/s):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.QS_FDC.ssfs }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实功率(万kw):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.QS_FDC.ssgl }}</span>
 								</view>
 							</view>
-							<!-- HQChart图 -->
-							<!-- <view class="HQChart">
-												<div class="divchart" ref="divchart"><div id="minute" style="width: 250px; height: 100px;" ref="minute"></div></div>
-											</view> -->
 							<view class="UChartContainer">
 								<view class="windStationUChart">
 									<view class="windStationQiun-charts">
@@ -697,7 +690,6 @@
 									</view>
 								</view>
 								<view class="UChartTitle">风速功率曲线图</view>
-								<!-- <view class="xTime">时间</view> -->
 							</view>
 
 							<view class="fanStatusContainer">
@@ -744,40 +736,32 @@
 									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.QS_FDC.lx }}</span>
 								</view>
 							</view>
-						</view>
+						</view> -->
 
-						<view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '香山')">
+						<!-- <view class="windStationCard" @tap="common.navTo('/components/windStationCardDetail/WindStationCardDetail?option=' + '香山')">
 							<view class="windStationTitle">香山风电场</view>
 							<view class="powerAndSpeedContainer">
 								<view class="powerAndSpeedRed">
 									预测发(万kwh):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.XS_FDC.ycdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									日发(万kwh):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.XS_FDC.rfdl }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实风速(m/s):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.XS_FDC.ssfs }}</span>
 								</view>
 								<view class="powerAndSpeedRed">
 									实功率(万kw):
 									<span v-if="cardmodule">
-										<!-- {{ index_windStation_cardmodule.index_windStation_cardmodule.MHS_FDC.ycdl }} --></span>
 									<span v-if="cardmodule==false">{{ index_windStation_cardmodule.index_windStation_cardmodule.XS_FDC.ssgl }}</span>
 								</view>
 							</view>
-							<!-- HQChart图 -->
-							<!-- <view class="HQChart">
-												<div class="divchart" ref="divchart"><div id="minute" style="width: 250px; height: 100px;" ref="minute"></div></div>
-											</view> -->
 							<view class="UChartContainer">
 								<view class="windStationUChart">
 									<view class="windStationQiun-charts">
@@ -785,7 +769,6 @@
 									</view>
 								</view>
 								<view class="UChartTitle">风速功率曲线图</view>
-								<!-- <view class="xTime">时间</view> -->
 							</view>
 
 							<view class="fanStatusContainer">
@@ -832,7 +815,7 @@
 									<span v-if="module==false">离线&nbsp;&nbsp;{{ fdcstatusmodule.fdcstatusmodule.XS_FDC.lx }}</span>
 								</view>
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</scroll-view>
 			</view>
@@ -935,25 +918,25 @@
 						windPowerStationId: 'NINGXIAXINNENGYUANGONGSI'
 					},
 					{
-						name: '牛首山风电场',
-						windPowerStationId: 'NSS_FDC'
+						name: '崇礼风电场',
+						windPowerStationId: 'CL_FDC'
 					},
 					{
-						name: '香山风电场',
-						windPowerStationId: 'XS_FDC'
+						name: '代县风电场',
+						windPowerStationId: 'DX_FDC'
 					},
 					{
-						name: '石板泉风电场',
-						windPowerStationId: 'SBQ_FDC'
+						name: '康保风电场',
+						windPowerStationId: 'KB_FDC'
 					},
-					{
+					/* {
 						name: '青山风电场',
 						windPowerStationId: 'QS_FDC'
 					},
 					{
 						name: '麻黄山风电场',
 						windPowerStationId: 'MHS_FDC'
-					}
+					} */
 				],
 				modalName: null,
 				address: '宁夏新能源公司',
@@ -987,7 +970,7 @@
 				monthAngrey: '',
 				yearOlive: '',
 				yearAngrey: '',
-				FDC: 'CL_FDC',
+				FDC:'CL_FDC',
 				socketTask_target_comprehensive_indicators: '',
 				socketTask_target_windSpeed_power: '',
 				socketTask_index_windturbine_status: '',
@@ -998,10 +981,11 @@
 				windpowerstationdetail: {
 					target_comprehensive_indicators: '',
 					target_windSpeed_power: '',
-					index_windturbine_status: '',
+					index_windturbine_status:'',
 					index_electricQuantity: '',
 					index_target_basic_indicators: ''
 				},
+				
 				module: true,
 				cardmodule: true
 			};
@@ -1016,20 +1000,14 @@
 			if (this.address == '宁夏新能源公司') {
 				this.FDC = '0';
 			}
-			if (this.address == '麻黄山风电场') {
-				this.FDC = 'MHS_FDC';
+			if (this.address == '崇礼风电场') {
+				this.FDC = 'CL_FDC';
 			}
-			if (this.address == '牛首山风电场') {
-				this.FDC = 'NSS_FDC';
+			if (this.address == '代县风电场') {
+				this.FDC = 'DX_FDC';
 			}
-			if (this.address == '石板泉风电场') {
-				this.FDC = 'SBQ_FDC';
-			}
-			if (this.address == '青山风电场') {
-				this.FDC = 'QS_FDC';
-			}
-			if (this.address == '香山风电场') {
-				this.FDC = 'XS_FDC';
+			if (this.address == '康保风电场') {
+				this.FDC = 'KB_FDC';
 			}
 			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
 		},
@@ -1041,19 +1019,30 @@
 			_self = this;
 			this.cWidth = uni.upx2px(750);
 			this.cHeight = uni.upx2px(400);
-			this.index_windStation_card();
 			this.getServerData();
-			this.getColumnData();
+			this.getColumnData(); 
 			this.windStationCardCWidth = 250;
 			this.windStationCardCHeight = 150;
-			this.getWindStationCardData();
-			this.index_curve_columnar_windSpeed_power();
-			this.index_curve_columnar_five_loss();
+			/* 
+			
+			
+			
+			
+			
+			
+			 */
 			this.target_comprehensive_indicators();
-			this.target_windSpeed_power();
-			this.index_windturbine_status();
 			this.index_electricQuantity();
+			
 			this.index_target_basic_indicators();
+			
+			this.index_curve_columnar_five_loss();
+			this.target_windSpeed_power();
+			this.index_windturbine_status();
+			this.getWindStationCardData();
+			this.index_curve_columnar_windSpeed_power();
+			this.index_windStation_card();  /* P6F8与P6F4冲突 */
+			
 		},
 		computed: {
 			backStageIp: function() {
@@ -1076,20 +1065,14 @@
 			if (this.address == '宁夏新能源公司') {
 				this.FDC = '0';
 			}
-			if (this.address == '麻黄山风电场') {
-				this.FDC = 'MHS_FDC';
-			}
-			if (this.address == '牛首山风电场') {
-				this.FDC = 'NSS_FDC';
-			}
-			if (this.address == '石板泉风电场') {
-				this.FDC = 'SBQ_FDC';
+			if (this.address == '崇礼风电场') {
+				this.FDC = 'CL_FDC';
 			}
-			if (this.address == '青山风电场') {
-				this.FDC = 'QS_FDC';
+			if (this.address == '代县风电场') {
+				this.FDC = 'DX_FDC';
 			}
-			if (this.address == '香山风电场') {
-				this.FDC = 'XS_FDC';
+			if (this.address == '康保风电场') {
+				this.FDC = 'KB_FDC';
 			}
 		},
 		methods: {
@@ -1310,7 +1293,7 @@
 					});
 				});
 			},
-			async index_windStation_card() {
+			/* async index_windStation_card() {
 				let _this = this;
 				// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
 				this.socketTask_index_windStation_card = uni.connectSocket({
@@ -1333,7 +1316,7 @@
 						console.log();
 					});
 				});
-			},
+			}, */
 			async index_windStation_card() {
 				let _this = this;
 				// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
@@ -1381,7 +1364,8 @@
 				// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
 				this.socketTask_index_curve_columnar_windSpeed_power = uni.connectSocket({
 					// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
-					url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_7/functionNumber_4',
+					url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_6/functionNumber_6',
+					/* url: 'ws://' + this.backStageIp + ':' + this.backStagePort + '/websocket/pageNumber_7/functionNumber_4', */
 					success(data) {
 						console.log('websocket连接成功');
 					}
@@ -1398,7 +1382,7 @@
 						//console.log("收到服务器内容：" + res.data);
 						_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule = JSON.parse(res
 							.data);
-
+						console.log("---");
 						let LineA = {
 							categories: [],
 							series: [{
@@ -1750,6 +1734,7 @@
 						Line.categories = [];
 						Line.series[0].data = [];
 						/* LineA.series[0].name=this.targetName; */
+						console.log(_this.FDC);
 						for (var i = 0; i < _this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
 								_this.FDC]['gl'].length; i++) {
 							let time = new Date(
@@ -1786,9 +1771,9 @@
 						LineA.series[0].data = [];
 						/* LineA.series[0].name=this.targetName; */
 						for (var i = 0; i < _this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
-								'MHS_FDC']['gl'].length; i++) {
+								'CL_FDC']['gl'].length; i++) {
 							let time = new Date(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['CL_FDC'][
 									'gl'
 								][i].pointTime * 1000
 							).Format('hh');
@@ -1796,22 +1781,22 @@
 							LineA.categories.push(time);
 							//console.log(_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC']['gl'][i].pointValueInDouble);
 							LineA.series[0].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['CL_FDC'][
 									'gl'
 								][i].pointValueInDouble
 							);
 							LineA.series[1].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['CL_FDC'][
 									'fs'
 								][i].pointValueInDouble
 							);
 							LineA.series[2].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['CL_FDC'][
 									'llgl'
 								][i].pointValueInDouble
 							);
 							LineA.series[3].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['CL_FDC'][
 									'ycgl'
 								][i].pointValueInDouble
 							);
@@ -1821,9 +1806,9 @@
 						LineB.series[0].data = [];
 						/* LineA.series[0].name=this.targetName; */
 						for (var i = 0; i < _this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
-								'NSS_FDC']['gl'].length; i++) {
+								'DX_FDC']['gl'].length; i++) {
 							let time = new Date(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['NSS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['DX_FDC'][
 									'gl'
 								][i].pointTime * 1000
 							).Format('hh');
@@ -1831,22 +1816,22 @@
 							LineB.categories.push(time);
 							//console.log(_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC']['gl'][i].pointValueInDouble);
 							LineB.series[0].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['NSS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['DX_FDC'][
 									'gl'
 								][i].pointValueInDouble
 							);
 							LineB.series[1].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['NSS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['DX_FDC'][
 									'fs'
 								][i].pointValueInDouble
 							);
 							LineB.series[2].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['NSS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['DX_FDC'][
 									'llgl'
 								][i].pointValueInDouble
 							);
 							LineB.series[3].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['NSS_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['DX_FDC'][
 									'ycgl'
 								][i].pointValueInDouble
 							);
@@ -1856,9 +1841,9 @@
 						LineC.series[0].data = [];
 						/* LineA.series[0].name=this.targetName; */
 						for (var i = 0; i < _this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
-								'SBQ_FDC']['gl'].length; i++) {
+								'KB_FDC']['gl'].length; i++) {
 							let time = new Date(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['SBQ_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['KB_FDC'][
 									'gl'
 								][i].pointTime * 1000
 							).Format('hh');
@@ -1866,29 +1851,28 @@
 							LineC.categories.push(time);
 							//console.log(_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['MHS_FDC']['gl'][i].pointValueInDouble);
 							LineC.series[0].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['SBQ_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['KB_FDC'][
 									'gl'
 								][i].pointValueInDouble
 							);
 							LineC.series[1].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['SBQ_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['KB_FDC'][
 									'fs'
 								][i].pointValueInDouble
 							);
 							LineC.series[2].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['SBQ_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['KB_FDC'][
 									'llgl'
 								][i].pointValueInDouble
 							);
 							LineC.series[3].data.push(
-								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['SBQ_FDC'][
+								_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule['KB_FDC'][
 									'ycgl'
 								][i].pointValueInDouble
 							);
 						}
-						LineD.categories = [];
+						/* LineD.categories = [];
 						LineD.series[0].data = [];
-						/* LineA.series[0].name=this.targetName; */
 						for (var i = 0; i < _this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
 								'QS_FDC']['gl'].length; i++) {
 							let time = new Date(_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
@@ -1921,7 +1905,6 @@
 						}
 						LineE.categories = [];
 						LineE.series[0].data = [];
-						/* LineA.series[0].name=this.targetName; */
 						for (var i = 0; i < _this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
 								'XS_FDC']['gl'].length; i++) {
 							let time = new Date(_this.index_curve_columnar_windSpeed_powermodule.index_curve_columnar_windSpeed_powermodule[
@@ -1951,15 +1934,15 @@
 									'ycgl'
 								][i].pointValueInDouble
 							);
-						}
+						} */
 
 						_this.showLineA('canvasLineA', Line);
 						_this.showWindStationCardLineA1('windStationCanvasLineA', LineA);
-						_this.showWindStationCardLineA1('windStationCanvasLineA', LineA);
+						// _this.showWindStationCardLineA1('windStationCanvasLineA', LineA);
 						_this.showWindStationCardLineA2('windStationCanvasLineB', LineB);
-						_this.showWindStationCardLineA3('windStationCanvasLineC', LineC);
+						_this.showWindStationCardLineA3('windStationCanvasLineC', LineC);/* 
 						_this.showWindStationCardLineA4('windStationCanvasLineD', LineD);
-						_this.showWindStationCardLineA5('windStationCanvasLineE', LineE);
+						_this.showWindStationCardLineA5('windStationCanvasLineE', LineE); */
 					});
 				});
 			},
@@ -2073,6 +2056,7 @@
 						//console.log("收到服务器内容：" + res.data);
 						_this.windpowerstationdetail.index_windturbine_status = JSON.parse(res.data)[_this.FDC];
 						_this.fdcstatusmodule.fdcstatusmodule = JSON.parse(res.data);
+						console.log("---");
 						_this.module = false;
 					});
 				});