Merge branch 'master' of http://47.111.81.118:3000/yuanMM/uniapp2

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/authAdd/authAdd.vue

@@ -246,7 +246,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/authManage/authManage',
 				
 					});
@@ -311,7 +311,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/authManage/authManage',
 					});
 				}, 1000);

pages/authManage/authManage.vue

@@ -81,9 +81,11 @@
 				flag: false,
 				
 				currentPage: 1,
-				size: 10,
+				size: 12,
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
+				
+				deleteStatus:false
 
 
 			};
@@ -118,13 +120,14 @@
 			},
 			
 			EditItem(item){
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/authAdd/authAdd?phone='+item.phone+'',
 				
 				});
 			},
 			  deleteItem(item) {
 				 let deleteT=0;
+				 this.deleteStatus=true
 				 uni.showModal({	
 				     title: '确认删除吗？',
 				     content: '',
@@ -164,6 +167,10 @@
 					data: ming
 				})
 				this.authListRes = 1;
+				if(this.deleteStatus){
+					this.authList=[];
+					this.deleteStatus=false;
+				}
 				if (res.data.total) {
 					this.authList = this.authList.concat(res.data.data)
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
@@ -186,7 +193,7 @@
 
 			// 页面跳转
 			goAddPage(type) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/authAdd/authAdd',
 					success: res => {},
 					fail: () => {},

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,14 +66,32 @@
 				
 			},
 			
+			goDetail(){
+				uni.navigateTo({
+					url: './electricalSystem/index?deviceType='+this.deviceType+'&companyCode='+this.companyCode
+				});
+			},
+			
 			// 页面跳转
 			goDeviceDetail(item) {
+				
 				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,9 +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="1">183用电设备</option>
+					<option value="2">视频监控设备</option>
+					<option value="3">171用电设备</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>
+										<option value="1">智慧用电</option>
+										<option value="2">视频监测</option>
 				</select>
 			</view>
 			<view class="form-item">
@@ -98,8 +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="1">智慧用电</option>
-					<option value="2">视频监测</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="">请选择</option>
+										<option value="1">智慧用电</option>
+										<option value="2">视频监测</option>
 				</select>
 			</view>
 			<view class="form-item">

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/eleControl/controlReport/controlReport.vue

@@ -81,7 +81,7 @@
 		
 			// 页面跳转
 			goAddPage(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/eleControl/controlReport/controlReportAdd/controlReportAdd',
 				});
 			},

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -228,7 +228,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/eleControl/controlReport/controlReport',
 					});
 				}, 1000);
@@ -287,7 +287,7 @@
 			},
 
 			submit() {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/accountManage/success/success',
 				});
 			},

pages/eleControl/powerCut/powerCut.vue

@@ -148,6 +148,8 @@
 				size: 10,
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
+				
+				deleteStatus:false
 			};
 		},
 		onReachBottom() { //上拉触底函数
@@ -169,7 +171,7 @@
 			
 			//编辑
 			editItem(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd?id=' + item.id + '&status_value=' + this.status_value + '',
 				});
 			},
@@ -194,6 +196,7 @@
 			
 			//删除
 			deleteItem(item) {
+				this.deleteStatus=true
 				uni.showModal({
 					title: '确认删除吗？',
 					content: '',
@@ -202,6 +205,7 @@
 							this.setDelSite({
 								"id": item.id
 							})
+							
 						} else if (result.cancel) {
 							// console.log('用户点击取消');
 						}
@@ -241,7 +245,12 @@
 				// console.log('res.data.data')
 				// console.log(res.data.data)
 				// this.planListData = res.data.data
+				if(this.deleteStatus){
+					this.planListData=[];
+					this.deleteStatus=false;
+				}
 				if (res.data.data.length) {
+
 					this.planListData = this.planListData.concat(res.data.data)
 									
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
@@ -273,7 +282,7 @@
 				this.loadData()
 			},
 			goAddPage(id) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd',
 				});
 			},

pages/eleControl/powerCut/powerCutAdd/powerCutAdd.vue

@@ -226,7 +226,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/eleControl/powerCut/powerCut'
 					});
 				}, 1000);
@@ -283,7 +283,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/eleControl/powerCut/powerCut'
 					});
 				}, 1000);

pages/index/components/chart/chart.vue

@@ -83,7 +83,7 @@
 					series: [{
 						name: '报警分析',
 						type: 'pie',
-						radius: ['40%', '60%'], //aa环装圈粗细
+						radius: ['35%', '52%'], //aa环装圈粗细
 						center: ['50%', '55%'],
 
 						itemStyle: {
@@ -103,8 +103,17 @@
 								name: "视频监测",
 								value: this.bindData.videoMonitoringCount?this.bindData.videoMonitoringCount:0
 							},
-
 						],
+						
+						// data: [{
+						// 		name: "电力监测",
+						// 		value: 0
+						// 	},
+						// 	{
+						// 		name: "视频监测",
+						// 		value: 0
+						// 	},
+						// ],
 
 						labelLine: {
 							normal: {

pages/index/components/chart2/chart2.vue

@@ -93,7 +93,7 @@
 					series: [{
 						name: '访问来源',
 						type: 'pie',
-						radius: ['40%', '60%'],
+						radius: ['35%', '52%'],
 						center: ['50%', '55%'],
 						itemStyle: {
 							normal: {

pages/index/index.vue

@@ -193,15 +193,15 @@
 		onLoad: function(option) {
 
 		
-			// if (option.op) {
-			// 	this.getData();
+			if (option.op) {
+				this.getData();
 			
-			// } else {
-			// 	this.init()
-			// }
+			} else {
+				this.init()
+			}
 			
 			
-			this.getData();
+			// this.getData();
 
 			this.hackReset = false;
 			this.$nextTick(() => {

pages/processDetailEle/processDetailEle.vue

@@ -35,10 +35,10 @@
 						<text>线路名称：</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
-					<!-- <view>
+					<view>
 						<text>户号：</text>
 						<text>{{detailMessage.account_number}}</text>
-					</view> -->
+					</view>
 					<view>
 						<text>警告信息：</text>
 						<text>{{detailMessage.measValue}}</text>
@@ -211,7 +211,7 @@
 				}
 
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/processList/processList?companyCode=' + this.companyCode +
 							'&type=' + this.type + '',
 

pages/processDetailEle1/processDetailEle1.vue

@@ -35,10 +35,10 @@
 						<text>线路名称：</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
-					<!-- <view>
+					<view>
 						<text>户号：</text>
 						<text>{{detailMessage.account_number}}</text>
-					</view> -->
+					</view>
 					<view>
 						<text>警告信息：</text>
 						<text>{{detailMessage.measValue}}</text>

pages/processDetailVideo/processDetailVideo.vue

@@ -50,7 +50,7 @@
 				<view class="info-content">
 					<view class="info-one-info ">
 						<text>是否误报：</text>
-						<text>{{detailMessage2.alarmStatus?'误报':'非误报'}}</text>
+						<text>{{detailMessage2.alarmStatus=='1'?'误报':'非误报'}}</text>
 					</view>
 					<view>
 						<text>处理人：</text>

pages/processList/processList.vue

@@ -395,14 +395,14 @@
 
 			// 页面跳转
 			goUnprocessDetail(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/processDetailEle/processDetailEle?companyCode=' + this.companyCode +
 						'&id=' + item.id +
 						'&type=1',
 				});
 			},
 			goProcessedDetail(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/processDetailEle/processDetailEle?companyCode=' + this.companyCode +
 						'&id=' + item.id + '&type=1',
 				});

pages/siteAdd/siteAdd.vue

@@ -510,7 +510,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/siteManage/siteManage',
 					});
 				}, 1000);
@@ -552,7 +552,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/siteManage/siteManage',
 					});
 				}, 1000);

pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -61,21 +61,25 @@
 				</view>
 
 				<view class="form-item  flex justify-between" v-for="(item,index) in problem_two">
-					<view class="title" style="width:60%">{{item.name}}:</view>
-					<view class="margin-right flex align-center">
-						<label class="" v-if="item.where==0">
-							<radio disabled="true" value="否" checked /><text>否</text>
-						</label>
-						
-						<label class="" v-if="item.where==2">
-							<radio disabled="true" value="其他" checked /><text>其他</text>
+					<block  v-if="item.name!=='灭火器超期'">
+						<view class="title" style="width:60%">{{item.name}}:</view>
+						<view class="margin-right flex align-center">
+							<label class="" v-if="item.where==0">
+								<radio disabled="true" value="否" checked /><text>否</text>
+							</label>
 							
-						</label>
-						<view  v-if="item.where==2&&item.describe" style="width:90rpx;margin-left:10rpx;color:#8d8080;font-size:28rpx;line-height:32rpx"> 
-						{{  item.describe}}
+							<label class="" v-if="item.where==2">
+								<radio disabled="true" value="其他" checked /><text>其他</text>
+							</label>
+							<view  v-if="item.where==2&&item.describe" style="max-width:90rpx;margin-left:10rpx;color:#8d8080;font-size:28rpx;line-height:32rpx"> 
+							{{  item.describe}}
+							</view>
+							<view @click="previewImage(item)" v-if="item.picture" style="margin-left:10rpx">
+								<image :src="item.picture" mode="aspectFit"></image>
+							</view>
 						</view>
-						
-					</view>
+					</block>
+
 				</view>
 
 

pages/siteArchive/siteArchive.vue

@@ -2,8 +2,19 @@
 	<view class="site-wrapper">
 
 		<!-- 筛选框start -->
-		<view style="height:100rpx"></view>
+		<view style="height:200rpx"></view>
 		<view class="ding">
+			
+			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
+				<view class="search-form round bg-white" style="position:relative;overflow:auto">
+					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
+						@input="handleInput()" placeholder="请输入或选择所属线路"></input>
+				</view>
+			
+			</view>
+			
+			
+			
 
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white">
@@ -16,7 +27,18 @@
 				</view>
 
 			</view>
+			
+			
 
+		</view>
+		
+		<view class="siteItems" v-if="isShow2" style="max-height:60vh;overflow:auto;position:absolute;z-index:999; margin: 0 32rpx;
+		width: calc(100% - 64rpx);top:100rpx">
+			<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
+			<view class="site-item" v-for="(item,index) in siteItemData" @click="changeModel(item,index)" :key="index"
+				style="padding:16rpx 22rpx">
+				{{item.route_name}}
+			</view>
 		</view>
 
 		<!-- 筛选框end -->
@@ -82,6 +104,14 @@
 				size: 10,
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
+				
+				isShow2: false,
+				formMess: {
+					"siteName": "",
+				},
+				siteItemDataOrigin: [],
+				siteItemData: [],
+				
 			};
 		},
 
@@ -95,10 +125,48 @@
 		onLoad: function(option) {
 
 			this.loadData()
-
+			this.getRoutrBox()
 		},
 
 		methods: {
+			//线路名称下拉数据请求
+			async getRoutrBox(params = {}) {
+				const res = await this.$myRequest({
+					url: 'Archives/getRoutrBox',
+					showLoading: true,
+					data: params
+				})
+				this.siteItemData = res.data.data;
+				this.siteItemDataOrigin = res.data.data;
+				this.siteItemData = this.siteItemDataOrigin;
+			},
+			//选中下拉选项，隐藏框，赋值
+			changeModel: function(item, index) {
+				this.isShow2 = false;
+				this.formMess.siteName = item.route_name;
+			},
+			
+			// 输入框点击 显示隐藏下拉框
+			toggleShow: function() {
+				this.isShow2 = !this.isShow2;
+			},
+			//点击下拉筛选
+			handleInput() {
+				
+				//将元素根据搜索内容过滤出来  这里改变了siteItemData
+				this.siteItemData = this.siteItemDataOrigin;
+				this.siteItemData = this.siteItemData.filter(item => item.route_name.indexOf(this.formMess.siteName) > -1);
+			},
+			focusfns: function(e) {
+				//将元素根据搜索内容过滤出来  这里改变了siteItemData
+				this.siteItemData = this.siteItemDataOrigin;
+				this.siteItemData = this.siteItemData.filter(item => item.route_name.indexOf(this.formMess.siteName) >
+					-1);
+			},
+			
+			
+			
+			
 
 			searchData() {
 				this.currentPage=1,
@@ -110,6 +178,7 @@
 			loadData(){
 				this.getDataList({
 					"site_name": this.siteName,
+					"route_name": this.formMess.siteName,
 					currentPage: this.currentPage,
 					size: this.size,
 				})
@@ -125,7 +194,7 @@
 
 			//编辑
 			editItem(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteArchive/siteArchiveAdd/siteArchiveAdd?id=' + item.id + '',
 				});
 			},
@@ -165,7 +234,7 @@
 				});
 			},
 			goAddPage(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteArchive/siteArchiveAdd/siteArchiveAdd',
 				});
 			},
@@ -190,6 +259,10 @@
 				}
 				this.listTouchDirection = null
 			}
+			
+			
+			
+			
 		}
 	}
 </script>

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: '',
@@ -746,7 +747,7 @@
 							delta: 2
 						});
 					} else {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages/siteArchive/siteArchive',
 						});
 					}

pages/siteManage/siteManage.vue

@@ -112,6 +112,8 @@
 				size: 10,
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
+				
+				deleteStatus:false
 
 			};
 		},
@@ -190,13 +192,14 @@
 
 			//编辑
 			editItem(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteAdd/siteAdd?id=' + item.id + '',
 				});
 			},
 
 			//删除
 			deleteItem(item) {
+				this.deleteStatus=true
 				uni.showModal({
 					title: '确认删除吗？',
 					content: '',
@@ -255,7 +258,9 @@
 						title: "删除成功",
 					});
 					setTimeout(() => {
-						this.getSiteList()
+						console.log(this.siteList)
+						// this.siteList=[]
+						this.loadData()
 					}, 1000);
 				}
 
@@ -269,8 +274,15 @@
 				})
 				this.siteListRes = 1;
 				
+				
+				if(this.deleteStatus){
+					this.siteList=[];
+					this.deleteStatus=false;
+				}
 				if (res.data.total) {
 					this.siteList = this.siteList.concat(res.data.data)
+					console.log('this.siteList')
+					console.log(this.siteList)
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 						this.isLoadMore = true
 						this.loadStatus = 'nomore'
@@ -285,7 +297,7 @@
 
 			// 新增跳转
 			goAddPage() {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteAdd/siteAdd',
 					success: res => {},
 					fail: () => {},

pages/videoDetail/videoDetail.vue

@@ -85,10 +85,9 @@
 			console.log(option.deviceCode)
 			this.companyCode = option.companyCode
 			this.deviceType = option.deviceType
-			// this.videoUrl = 'http://cctvalih5ca.v.myalicdn.com/live/cctv1_2/index.m3u8'
 			// this.videoUrl = 'http://videocdn.didano.com/school765class0channelId2761namedingdangm/playlist.m3u8'
 			// this.videoUrl = 'https://iot.usky.cn/hls/' + option.deviceCode + '.m3u8';
-			this.videoUrl = 'http://47.103.74.123/hls/' + option.deviceCode + '.m3u8';
+			this.videoUrl = this.companyCode==2?'http://124.71.175.91:81/hls/' + option.deviceCode + '.m3u8':'http://47.103.74.123/hls/' + option.deviceCode + '.m3u8';
 			console.log(this.videoUrl)
 			this.getDeviceDetail({
 				"companyCode": option.companyCode,

pages/videoList/videoList.vue

@@ -91,7 +91,7 @@
 
 			chk_video() {
 				uni.request({
-					url: 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
+					url:this.companyCode==2?'http://124.71.175.91:80/cgi-bin/demo2.cgi': 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
 					data: 'queryJson:' + JSON.stringify({
 						CMD: 1
 					}),
@@ -107,7 +107,8 @@
 								if (this.openId == this.onLineVideoList[n].DEVICE) {
 									this.reCount++;
 									if (this.onLineVideoList[n].ONAIR) {
-										if ((++this.count) > 2) {
+										console.log(this.count)
+										if ((++this.count) > 0) {
 											// var mask = document.getElementById('videomask');
 											// if (mask != undefined) {
 											// 	removeDIV('videomask');
@@ -182,7 +183,7 @@
 				this.loadingStatus = true
 				// alert('一些loading操作')
 				uni.request({
-					url: 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
+					url:this.companyCode==2?'http://124.71.175.91:80/cgi-bin/demo2.cgi': 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
 					data: 'queryJson:' + JSON.stringify({
 						CMD: 3,
 						BODY: {

util/api.js

@@ -1,10 +1,9 @@
 // const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
+const BASE_URL = 'https://wx.ewoogi.com/USKYOF/USKYOF.php/Home/' //(正式域名新)  
+const websiteUrl = 'https://wx.ewoogi.com'
 
-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://wx.ewoogi.com'
+// const BASE_URL='http://https://wx.ewoogi.com/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://wx.ewoogi.com/wx/index.html#/pages/index/index';
 				} else {
 					uni.showModal({
 						showCancel: false,