Merge branch 'master' of http://49.4.49.126:3000/Gyee_web/sisMobilePhone

common/common.js

@@ -46,9 +46,13 @@ class Common {
 			page[page.length - 1].$vm.target_windSpeed_power();
 			page[page.length - 1].$vm.index_windturbine_status();
 			page[page.length - 1].$vm.index_electricQuantity();
-			page[page.length - 1].$vm.index_target_basic_indicators();
-		}
-		if (page[page.length - 1].route == "pages/forecast/Forecast") {
+			page[page.length - 1].$vm.index_target_basic_indicators();	
+			
+		}else if (page[page.length - 1].route == "components/monitor/MatrixMonitor") {
+			page[page.length - 1].$vm.FDC= uni.getStorageSync('windPowerStationId');
+			page[page.length - 1].$vm.windStationName = windpowerstationName.replace('风电场', '');
+			
+		}else	if (page[page.length - 1].route == "pages/forecast/Forecast") {
 
 			//page[page.length-1].$refs.r1.viewUserid();
 			page[page.length - 1].$vm.$children[0].getWeatherDataToday();

common/store.js

@@ -5,8 +5,8 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
     state: {
-		wholeSituationBackStageIp:'192.168.3.24',
-		wholeSituationBackStagePort:'8082',
+		wholeSituationBackStageIp:'117.78.18.24',
+		wholeSituationBackStagePort:'9988',
 		windpowerstationNameToId:{
            "宁夏新能源公司":"0","麻黄山风电场":"MHS_FDC","牛首山风电场":"NSS_FDC","青山风电场":"SBQ_FDC","石板泉风电场":"QS_FDC","香山风电场":"QS_FDC"
 		},

components/drawer/threeLineDrawer.vue

@@ -19,10 +19,7 @@
 						<div v-if="(index==2)" @tap="common.navTo('/components/monitor/MatrixMonitor')">
 							{{item.name}}
 							</div>
-							<div v-if="(index==3)" @tap="common.navTo('/components/monitor/WindMonitor')">
-								{{item.name}}
-								</div>
-								<div v-if="(index==4)" @tap="common.navTo('/components/monitor/PersonalMonitor')">
+						<div v-if="(index==3)" @tap="common.navTo('/components/monitor/PersonalMonitor')">
 									{{item.name}}
 									</div>
 					</view>

components/weatherProphethomepage/WeatherProphethomepage.vue

@@ -12,6 +12,7 @@
 					</view>
 			</block>
 			<block slot="right">
+					
 			</block>
 		    <block slot="content">{{address}}</block>
 			<block slot="right">

pages/index/Index.vue

@@ -907,9 +907,6 @@
 						name: '矩阵监视'
 					},
 					{
-						name: '风场监视'
-					},
-					{
 						name: '人员监视'
 					}
 				],