修改初始功能

common/dataprocessing.js

@@ -2,10 +2,32 @@ import store from '../common/store.js'
 
 class Dataprocessing {
 	constructor() {
-
+		this.initial();
 	}
 
+	initial() {
+		let organlist=[];
+		let ip = store.state.wholeSituationBackStageIp;
+		let port = store.state.wholeSituationBackStagePort;
+		uni.request({
+			url: 'http://' + ip + ':' + port + '/GyeeorganController/gyeeOrganAll',
+			data: {},
+			method: 'GET',
+			success: function(res) {
+
 
+				for (let j = 0; j < res.data.data.length; j++) {
+
+					var obj = {};
+					obj.name = res.data.data[j].describes;
+					obj.id = res.data.data[j].name;
+					organlist.push(obj);
+				}
+				
+				uni.setStorageSync('organlist', organlist);
+			}
+		})
+	}
 	//
 	putWindPowerStationName(windPowerStationName) {
 		uni.setStorageSync('windpowerstationName', windPowerStationName);
@@ -24,109 +46,47 @@ class Dataprocessing {
 	}
 
 	getWindPowerStationNameById(name) {
-		if (name == '宁夏新能源公司') {
-			let wpId = '0';
-			return wpId;
-		} else if (name == '麻黄山风电场') {
-
-			let wpId = 'MHS_FDC';
-			return wpId;
-		} else if (name == '牛首山风电场') {
-			let wpId = 'NSS_FDC';
-			return wpId;
-		} else if (name == '石板泉风电场') {
-			let wpId = 'SBQ_FDC';
-			return wpId;
-		} else if (name == '青山风电场') {
-			let wpId = 'QS_FDC';
-			return wpId;
-		} else if (name == '香山风电场') {
-			let wpId = 'XS_FDC';
-			return wpId;
-		} else if (name == '河北能源集团') {
-			let wpId = '0';
-			return wpId;
-		} else if (name == '崇礼风电场') {
-			let wpId = 'CL_FDC';
-			return wpId;
-		} else if (name == '康保风电场') {
-			let wpId = 'KB_FDC';
-			return wpId;
-		} else if (name == '代县风电场') {
-			let wpId = 'DX_FDC';
-			return wpId;
+
+		let organlist=uni.getStorageSync('organlist');
+		for (let j = 0; j < organlist.length; j++) {
+
+			var obj = organlist[j];
+			if (obj.name == name) {
+				return obj.id;
+			}
 		}
+
+
 	}
 
 	getWindPowerStationNameByWeatherId(name) {
+		let organlist=uni.getStorageSync('organlist');
+		for (let j = 0; j <  organlist.length; j++) {
+
+			var obj =  organlist[j];
+			if (obj.name == name) {
+				if (obj.id == "0") {
+					return store.state.default_weather_wpid;
+				} else {
+					return obj.id;
+				}
 
-		if (name == '宁夏新能源公司') {
-			let wpId = 'MHS_FDC';
-			return wpId;
-		} else if (name == '麻黄山风电场') {
-
-			let wpId = 'MHS_FDC';
-			return wpId;
-		} else if (name == '牛首山风电场') {
-			let wpId = 'NSS_FDC';
-			return wpId;
-		} else if (name == '石板泉风电场') {
-			let wpId = 'SBQ_FDC';
-			return wpId;
-		} else if (name == '青山风电场') {
-			let wpId = 'QS_FDC';
-			return wpId;
-		} else if (name == '香山风电场') {
-			let wpId = 'XS_FDC';
-			return wpId;
-		} else if (name == '河北能源集团') {
-			let wpId = 'CL_FDC';
-			return wpId;
-		} else if (name == '崇礼风电场') {
-			let wpId = 'CL_FDC';
-			return wpId;
-		} else if (name == '康保风电场') {
-			let wpId = 'KB_FDC';
-			return wpId;
-		} else if (name == '代县风电场') {
-			let wpId = 'DX_FDC';
-			return wpId;
+			}
 		}
+
 	}
 
 	getWindPowerStationNameByNames(name) {
-		if (name == '宁夏新能源公司') {
-
-			let windStations = ['麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
-			return windStations;
-		} else if (name == '麻黄山风电场') {
-			let windStations = ['麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
-			return windStations;
-		} else if (name == '牛首山风电场') {
-			let windStations = ['牛首山风电场', '麻黄山风电场', '石板泉风电场', '青山风电场', '香山风电场'];
-			return windStations;
-		} else if (name == '石板泉风电场') {
-			let windStations = ['石板泉风电场', '麻黄山风电场', '牛首山风电场', '青山风电场', '香山风电场'];
-			return windStations;
-		} else if (name == '香山风电场') {
-			let windStations = ['香山风电场', '麻黄山风电场', '牛首山风电场', '石板泉风电场', '青山风电场'];
-			return windStations;
-		} else if (name == '青山风电场') {
-			let windStations = ['青山风电场', '麻黄山风电场', '牛首山风电场', '石板泉风电场', '香山风电场'];
-			return windStations;
-		} else if (name == '河北能源集团') {
-			let windStations = ['崇礼风电场', '康保风电场', '代县风电场'];
-			return windStations;
-		} else if (name == '崇礼风电场') {
-			let windStations = ['崇礼风电场', '康保风电场', '代县风电场'];
-			return windStations;
-		} else if (name == '康保风电场') {
-			let windStations = ['康保风电场', '崇礼风电场', '代县风电场'];
-			return windStations;
-		} else if (name == '代县风电场') {
-			let windStations = ['代县风电场', '康保风电场', '崇礼风电场'];
-			return windStations;
+		let organlist=uni.getStorageSync('organlist');
+		let windStations = [];
+		for (let j = 0; j <  organlist.length; j++) {
+
+			var obj =  organlist[j];
+			if (obj.name != name) {
+				windStations.push(obj.name);
+			}
 		}
+		return windStations;
 	}
 
 	viewUserid() {
@@ -151,17 +111,15 @@ class Dataprocessing {
 				}
 				uni.setStorageSync('windpowerstationName', plusDrawerList[0].name);
 				uni.setStorageSync('windPowerStationId', plusDrawerList[0].windId);
-		
+
 
 				for (let j = 0; j < res.data.data.length; j++) {
 
 					var obj = {};
 					obj.name = res.data.data[j].describes;
 
-					if (res.data.data[j].describes == '宁夏新能源公司') {
-						obj.windId = 'MHS_FDC';
-					} else if (res.data.data[j].describes == '河北能源集团') {
-						obj.windId = 'CL_FDC';
+					if (res.data.data[j].name == '0') {
+						obj.windId = store.state.default_weather_wpid;
 					} else {
 						obj.windId = res.data.data[j].name;
 					}
@@ -180,74 +138,75 @@ class Dataprocessing {
 		let ip = store.state.wholeSituationBackStageIp;
 		let port = store.state.wholeSituationBackStagePort;
 		uni.request({
-				url: 'http://' + ip + ':' + port + '/GyeepermissionController/GyeePermissionList?userid=' + userid,
-				data: {},
-				method: 'GET',
-				success: function(res) {
-
-					let leftlist1 = [];
-					let leftlist2 = [];
-					let leftlist3 = [];
-					let leftlist4 = [];
-					let leftlist5 = [];
-
-					for (let j = 0; j < res.data.data.length; j++) {
-
-						let gyeePermissionList = res.data.data[j].gyeePermissionList;
-
-						if (j == 0) {
-							for (let k = 0; k < gyeePermissionList.length; k++) {
-								var obj = {};
-								obj.name = gyeePermissionList[k].permisssionname;
-								obj.remark1 = gyeePermissionList[k].remark1;
-								leftlist1.push(obj);
-							}
-						} else if (j == 1) {
-
-							for (let k = 0; k < gyeePermissionList.length; k++) {
-								var obj = {};
-								obj.name = gyeePermissionList[k].permisssionname;
-								obj.remark1 = gyeePermissionList[k].remark1;
-								leftlist2.push(obj);
-							}
-						} else if (j == 2) {
-
-							for (let k = 0; k < gyeePermissionList.length; k++) {
-								var obj = {};
-								obj.name = gyeePermissionList[k].permisssionname;
-								obj.remark1 = gyeePermissionList[k].remark1;
-								leftlist3.push(obj);
-							}
-						} else if (j == 3) {
-
-							for (let k = 0; k < gyeePermissionList.length; k++) {
-								var obj = {};
-								obj.name = gyeePermissionList[k].permisssionname;
-								obj.remark1 = gyeePermissionList[k].remark1;
-								leftlist4.push(obj);
-							}
-						} else if (j == 4) {
-
-							for (let k = 0; k < gyeePermissionList.length; k++) {
-								var obj = {};
-								obj.id = gyeePermissionList[k].id;
-								obj.name = gyeePermissionList[k].permisssionname;
-								obj.remark1 = gyeePermissionList[k].remark1;
-								leftlist5.push(obj);
-							}
+			url: 'http://' + ip + ':' + port + '/GyeepermissionController/GyeePermissionList?userid=' + userid,
+			data: {},
+			method: 'GET',
+			success: function(res) {
+
+				let leftlist1 = [];
+				let leftlist2 = [];
+				let leftlist3 = [];
+				let leftlist4 = [];
+				let leftlist5 = [];
+
+				for (let j = 0; j < res.data.data.length; j++) {
+
+					let gyeePermissionList = res.data.data[j].gyeePermissionList;
+
+					if (j == 0) {
+						for (let k = 0; k < gyeePermissionList.length; k++) {
+							var obj = {};
+							obj.name = gyeePermissionList[k].permisssionname;
+							obj.remark1 = gyeePermissionList[k].remark1;
+							leftlist1.push(obj);
+						}
+					} else if (j == 1) {
+
+						for (let k = 0; k < gyeePermissionList.length; k++) {
+							var obj = {};
+							obj.name = gyeePermissionList[k].permisssionname;
+							obj.remark1 = gyeePermissionList[k].remark1;
+							leftlist2.push(obj);
+						}
+					} else if (j == 2) {
+
+						for (let k = 0; k < gyeePermissionList.length; k++) {
+							var obj = {};
+							obj.name = gyeePermissionList[k].permisssionname;
+							obj.remark1 = gyeePermissionList[k].remark1;
+							leftlist3.push(obj);
 						}
+					} else if (j == 3) {
 
+						for (let k = 0; k < gyeePermissionList.length; k++) {
+							var obj = {};
+							obj.name = gyeePermissionList[k].permisssionname;
+							obj.remark1 = gyeePermissionList[k].remark1;
+							leftlist4.push(obj);
+						}
+					} else if (j == 4) {
+
+						for (let k = 0; k < gyeePermissionList.length; k++) {
+							var obj = {};
+							obj.id = gyeePermissionList[k].id;
+							obj.name = gyeePermissionList[k].permisssionname;
+							obj.remark1 = gyeePermissionList[k].remark1;
+							leftlist5.push(obj);
+						}
 					}
-					uni.setStorageSync('leftlist1', leftlist1);
-					uni.setStorageSync('leftlist2', leftlist2);
-					uni.setStorageSync('leftlist3', leftlist3);
-					uni.setStorageSync('leftlist4', leftlist4);
-					uni.setStorageSync('leftlist5', leftlist5);
+
 				}
+				uni.setStorageSync('leftlist1', leftlist1);
+				uni.setStorageSync('leftlist2', leftlist2);
+				uni.setStorageSync('leftlist3', leftlist3);
+				uni.setStorageSync('leftlist4', leftlist4);
+				uni.setStorageSync('leftlist5', leftlist5);
+			}
 
 		})
 	}
 }
 
+
 let dataprocessing = new Dataprocessing();
-export default dataprocessing;
+export default  dataprocessing;

common/store.js

@@ -8,16 +8,17 @@ const store = new Vuex.Store({
 		wholeSituationBackStageIp:'117.78.18.24',//117.78.18.24
 		wholeSituationBackStagePort:'9988',
 		
-		GlobalLocalIp:'192.168.1.102',//192.168.1.102
+		GlobalLocalIp:'192.168.3.24',//192.168.1.102
 		GlobalLocalPort:'4397',
 		
 		windpowerstationNameToId:{},
 		
 		default_wpid:'0',	
-		default_wpname:'河北能源集团',
+		default_wpname:'宁夏新能源公司',
+		default_weather_wpid:'CL_FDC',	
 		default_tourist:'2',
 		default_tourist_wpid:'CL_FDC',
-		default_tourist_wpname:'崇礼风电场',
+		default_tourist_wpname:'麻黄山风电场',
         memberData:'',
         initName:''
     },