فهرست منبع

修改条件编译,适配H5和app

shilin 5 سال پیش
والد
کامیت
4c0de446b1
1فایلهای تغییر یافته به همراه26 افزوده شده و 18 حذف شده
  1. 26 18
      common/common.js

+ 26 - 18
common/common.js

@@ -41,39 +41,47 @@ class Common {
 		//  	 }
 		//首页
 		if (page[page.length - 1].route == "pages/index/Index") {
-			page[page.length - 1].$vm.FDC= uni.getStorageSync('windPowerStationId');
+			page[page.length - 1].$vm.FDC = uni.getStorageSync('windPowerStationId');
 			page[page.length - 1].$vm.target_comprehensive_indicators();
 			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();	
-			
-		}else if (page[page.length - 1].route == "components/monitor/MatrixMonitor") {
-			page[page.length - 1].$vm.FDC= uni.getStorageSync('windPowerStationId');
+			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].$refs.r1.address=uni.getStorageSync('windpowerstationName');
+		} else if (page[page.length - 1].route == "pages/forecast/Forecast") {
+
+			//#ifndef H5
+			page[page.length - 1].$refs.r1.viewUserid();
+			page[page.length - 1].$refs.r1.address = uni.getStorageSync('windpowerstationName');
 			page[page.length - 1].$refs.r1.FDC = uni.getStorageSync('windPowerStationId');
 			page[page.length - 1].$refs.r1.windStationName = windpowerstationName.replace('风电场', '');
-			
+
 			page[page.length - 1].$refs.r1.getWeatherDataToday();
 			page[page.length - 1].$refs.r1.getWeatherData7();
 			page[page.length - 1].$refs.r1.getWeatherData();
 			page[page.length - 1].$refs.r1.getWeatherData40();
-		
-			
-			
-			// page[page.length - 1].$vm.$children[0].getWeatherDataToday();
-			// page[page.length - 1].$vm.$children[0].getWeatherData7();
-			// page[page.length - 1].$vm.$children[0].getWeatherData();
-			// page[page.length - 1].$vm.$children[0].getWeatherData40();
+			//#endif
+
+
+			//#ifndef APP-PLUS
+			page[page.length - 1].$vm.$children[0].address = uni.getStorageSync('windpowerstationName');
+			page[page.length - 1].$vm.$children[0].FDC = uni.getStorageSync('windPowerStationId');
+			page[page.length - 1].$vm.$children[0].windStationName = windpowerstationName.replace('风电场', '');
 
-			
 
+			page[page.length - 1].$vm.$children[0].getWeatherDataToday();
+			page[page.length - 1].$vm.$children[0].getWeatherData7();
+			page[page.length - 1].$vm.$children[0].getWeatherData();
+			page[page.length - 1].$vm.$children[0].getWeatherData40();
+			//#endif
 			
+
+
+
 		}
 
 		//    uni.showModal({