Merge branch 'master' of 47.111.81.118:yuanMM/uniapp2

pages/device-Manage/device-Manage.vue

@@ -28,6 +28,8 @@
 				deviceData:[],
 				
 				modalName: null,
+				companyCode:"",
+				deviceType:""
 			};
 		},
 		
@@ -41,7 +43,7 @@
 		onNavigationBarButtonTap(e) {
 			console.log(e)
 			uni.navigateTo({
-				url: './electricalSystem/index?siteId=1'
+				url: './electricalSystem/index?siteId=1&deviceType='+this.deviceType+'&companyCode='+this.companyCode
 			});
 		},
 		methods: {

pages/device-Manage/deviceDetail/deviceDetail.vue

@@ -81,8 +81,6 @@
 			this.deviceType=option.deviceType
 			this.getDeviceDetail({"companyCode":option.companyCode,"deviceType":option.deviceType,"deviceCode":option.deviceCode})
 		},
-		
-		
 		methods: {
 			
 			async getDeviceDetail(ming={}) {

pages/device-Manage/electricalSystem/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<web-view :src="'http://localhost:8081/vuefiv/#/?siteId='+siteId" allow></web-view>
+		<web-view :src="'https://pcdev.ewoogi.com/vuefiv/#/?siteId='+siteId" allow></web-view>
 	</view>
 </template>
 
@@ -18,7 +18,15 @@
 			// console.log(111)
 			// console.log(option)
 			this.siteId = option.siteId
+			this.companyCode=option.companyCode
+			this.deviceType=option.deviceType
 		},
+		onBackPress(event){
+            uni.redirectTo({
+                url:'../device-Manage?deviceType=1&companyCode='+this.companyCode
+            });
+           return true;
+        },
 		mounted () {
 		},
 		methods: {