bug修复完善

pages.json

@@ -99,14 +99,14 @@
 				"navigationBarTitleText": "设备管理",
 				"app-plus": {
 					"titleNView": {
-						"buttons": [
-							{
-								"text": "系统配电图",
-								"fontSize": "22rpx",
-								"float": "right",
-								"width": "auto"
-							}
-						]
+						// "buttons": [
+						// 	{
+						// 		"text": "系统配电图",
+						// 		"fontSize": "22rpx",
+						// 		"float": "right",
+						// 		"width": "auto"
+						// 	}
+						// ]
 					}
 				}
 			}

pages/device-Manage/device-Manage.vue

@@ -17,6 +17,10 @@
 			</view>
 		</view>
 		
+		<view class="btn-area submitBottomBtn padding-lr-sm" v-if="this.num!=1">
+			<button class="bg-blue round  margin-top" @click="goDetail"> 配电系统模拟图 </button>
+		</view>
+		
 		
 	</view>
 </template>
@@ -29,25 +33,26 @@
 				
 				modalName: null,
 				companyCode:"",
-				deviceType:""
+				deviceType:"",
+				num:''
 			};
 		},
 		
 		onLoad:function(option){
-			console.log(111)
-			console.log(option.companyCode)
 			this.companyCode=option.companyCode
 			this.deviceType=option.deviceType
 			this.getDeviceManage({"companyCode":option.companyCode,"deviceType":option.deviceType})
+			this.num=option.num;
+			console.log('this.num')
+			console.log(this.num)
 		},
-		onNavigationBarButtonTap(e) {
-			console.log(e)
-			uni.navigateTo({
-				url: './electricalSystem/index?siteId=1&deviceType='+this.deviceType+'&companyCode='+this.companyCode
-			});
-		},
+		// onNavigationBarButtonTap(e) {
+		// 	console.log(e)
+		// 	uni.navigateTo({
+		// 		url: './electricalSystem/index?deviceType='+this.deviceType+'&companyCode='+this.companyCode
+		// 	});
+		// },
 		methods: {
-			
 			async getDeviceManage(ming={}) {
 				const res= await this.$myRequest({
 					url:'OperationMonitoring/getDeviceList',
@@ -61,16 +66,27 @@
 				
 			},
 			
-			// 页面跳转
-			goDeviceDetail(item) {
+			goDetail(){
 				uni.navigateTo({
-					url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+					url: './electricalSystem/index?deviceType='+this.deviceType+'&companyCode='+this.companyCode
 				});
 			},
 			
+			// 页面跳转
+			goDeviceDetail(item) {
+				if(this.num==1){
+					uni.navigateTo({
+						url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+				}else{
+					
+				}
+				
+			},
+			
 
 
 

pages/deviceType/deviceType.vue

@@ -97,7 +97,7 @@
 			goDeviceManage(item){
 				if(this.powerDeviceCount){
 					uni.navigateTo({
-						url: '/pages/device-Manage/device-Manage?deviceType=1&companyCode='+this.companyCode+'',
+						url: '/pages/device-Manage/device-Manage?num='+this.powerDeviceCount+'&deviceType=1&companyCode='+this.companyCode+'',
 						success: res => {},
 						fail: () => {},
 						complete: () => {}

pages/index/index.vue

@@ -193,12 +193,12 @@
 		onLoad: function(option) {
 
 		
-			// if (option.op) {
-			// 	this.getData();
+		// 	if (option.op) {
+		// 		this.getData();
 			
-			// } else {
-			// 	this.init()
-			// }
+		// 	} else {
+		// 		this.init()
+		// 	}
 			
 			
 			this.getData();

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -295,6 +295,7 @@
 			<view class="form-item extraDis radioSec" style="display:block">
 				<view class="title"><text class="necessary">*</text>是否具备照明:</view>
 				<view class="radioCameraflex">
+
 					<evan-radio v-model="formMess.lighting" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.lighting" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.lighting" label="2" class="margin-right-xs">其他</evan-radio>
@@ -471,7 +472,7 @@
 					overdue_electrician_certificate_picture: '',
 
 					charged_display_picture: '',
-					lighting: '',
+					// lighting: '',
 
 
 					blanket_insufficient_configuration_picture: '',

util/api.js

@@ -1,10 +1,9 @@
 // const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
+const BASE_URL = 'https://qhome.usky.cn/USKYOF/USKYOF.php/Home/' //(正式域名新)  
+const websiteUrl = 'https://qhome.usky.cn'
 
-const BASE_URL = 'https://qhome.usky.cn//USKYOF/USKYOF.php/Home/' //(正式域名新)  
-const websiteUrl = 'https://qhome.usky.cn/'
-
-// const websiteUrl = 'https://qhome.usky.cn/'
-// const BASE_URL='http://https://qhome.usky.cn//USKYOF/USKYOF.php/Home/'
+// const websiteUrl = 'https://qhome.usky.cn'
+// const BASE_URL='http://https://qhome.usky.cn/USKYOF/USKYOF.php/Home/'
 // 同时发送异步代码的次数，防止一次点击中有多次请求，用于处理
 let ajaxTimes = 0;
 
@@ -63,7 +62,7 @@ function myRequest(options){
 				let notIndexFail = ['Index/getDataStatistics', 'Com/getAuthorizationUrl'];
 				if (notIndexFail.includes(options.url)) {
 					window.location.href =
-						'https://qhome.usky.cn//wx/index.html#/pages/index/index';
+						'https://qhome.usky.cn/wx/index.html#/pages/index/index';
 				} else {
 					uni.showModal({
 						showCancel: false,