回退后的上线版本

pages/device-Manage/device-Manage.vue

@@ -17,9 +17,9 @@
 			</view>
 		</view>
 		
-		<view class="btn-area submitBottomBtn padding-lr-sm" v-if="this.num!=1">
+		<!-- <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> -->
 		
 		
 	</view>
@@ -74,16 +74,23 @@
 			
 			// 页面跳转
 			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{
+				
+				uni.navigateTo({
+					url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+				// 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/deviceAdd/deviceAdd.vue

@@ -42,13 +42,17 @@
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备类型:</view>
 				<select name="" id="" v-model="formMess.deviceType" filterable clearable>
-					<option value="">请选择</option>
+					<!-- <option value="">请选择</option>
 					<option value="1">183用电设备</option>
 					<option value="2">视频监控设备</option>
 					<option value="3">171用电设备</option>
-					<option value="4">173用电设备</option>	
+					<option value="4">173用电设备</option>	 -->
 					<!-- <option value="5">158智能网关</option>	
 					<option value="6">其他</option>	 -->
+					
+					<option value="">请选择</option>
+										<option value="1">智慧用电</option>
+										<option value="2">视频监测</option>
 				</select>
 			</view>
 			<view class="form-item">
@@ -102,11 +106,15 @@
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备类型:</view>
 				<select name="" id="" v-model="deviceMessage.deviceType" filterable clearable>
-					<option value="">请选择</option>
+					<!-- <option value="">请选择</option>
 					<option value="1">183用电设备</option>
 					<option value="2">视频监控设备</option>
 					<option value="3">171用电设备</option>
-					<option value="4">173用电设备</option>	
+					<option value="4">173用电设备</option>	 -->
+					
+					<option value="">请选择</option>
+										<option value="1">智慧用电</option>
+										<option value="2">视频监测</option>
 				</select>
 			</view>
 			<view class="form-item">

pages/index/index.vue

@@ -201,7 +201,6 @@
 			}
 			
 			
-			
 			// this.getData();
 
 			this.hackReset = false;