修复bug

manifest.json

@@ -142,7 +142,8 @@
                         "^/web" : "/"
                     }
                 }
-            }
+            },
+            "https" : true
         },
         "domain" : "https://qhome.usky.cn/work",
         "sdkConfigs" : {

pages.json

@@ -681,8 +681,8 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8",
-		"enablePullDownRefresh":true
+		"backgroundColor": "#F8F8F8"
+		// "enablePullDownRefresh":true
 	},
 	"tabBar": {
 		"borderStyle": "white",

pages/analyse/monthDetail/monthDetail.vue

@@ -18,7 +18,7 @@
 					<text>{{project_info.approach_time}}</text>
 				</view>
 				<view class="info-one-info ">
-					<text style="width:auto!important">完工日期：</text>
+					<text>完工日期：</text>
 					<text>{{project_info.complete_time}}</text>
 				</view>
 				<view class="info-one-info ">
@@ -39,7 +39,7 @@
 						<th style="width:13%">序号</th>
 						<th style="width:40%">设备名称</th>
 						<th>规格型号</th>
-						<th>数量</th>
+						<th style="width:50px">数量</th>
 					</tr>
 					<tr v-for="(item,index) in instal_device_info" :key="index">
 						<td>{{item.xh}}</td>
@@ -67,8 +67,8 @@
 					<tr>
 						<th style="width:13%">序号</th>
 						<th style="width:40%">监控子系统</th>
-						<th>检测点类型</th>
-						<th>数量</th>
+						<th >检测点类型</th>
+						<th style="width:50px">数量</th>
 
 					</tr>
 					<tr v-for="(item,index) in monitor_point_info">
@@ -91,7 +91,7 @@
 				<text class="cuIcon-titles margin-right-xs"></text>
 				统计时段
 			</view>
-			<view class="info-content">
+			<view class="info-content" style="font-size:30rpx">
 				<view class="info-one-info ">
 					<text style="width:125px!important">统计起始日期：</text>
 					<text>{{count_time.startData}}</text>

pages/deviceDetail/deviceDetail.vue

@@ -23,7 +23,7 @@
 
 					<view class="info-one-info ">
 						<text>设备编号：</text>
-						<text>15221</text>
+						<text>{{getData.owner_code}}</text>
 					</view>
 					<view class="info-one-info ">
 						<text style="width:98px!important">物联网卡号：</text>

pages/deviceType/deviceType.vue

@@ -37,9 +37,18 @@
 
 		methods: {
 			goDeviceType(item) {
-				uni.navigateTo({
-					url: '/pages/device-Manage/device-Manage?dwtype='+item.dwtype,
-				});
+				if(item.num){
+					uni.navigateTo({
+						url: '/pages/device-Manage/device-Manage?dwtype='+item.dwtype,
+					});
+				}else{
+					uni.showToast({
+						title: '暂无数据',
+						icon: "none"
+					})
+					
+				}
+				
 			},
 			
 			// 设备类型数据请求

pages/info/fireBase/fireBase.vue

@@ -59,7 +59,7 @@
 			
 			goDetail(item){
 				uni.navigateTo({
-					url: '/pages/info/fireBashDetail/fireBashDetail?id='+item.id,
+					url: '/pages/info/fireBashDetail/fireBashDetail?id='+item.id+'&title='+item.title,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/info/fireBashDetail/fireBashDetail.vue

@@ -62,6 +62,11 @@
 				'company_code': uni.getStorageSync('selectedCode'),
 				"id": option.id
 			})
+			console.log('option')
+			console.log(option)
+			uni.setNavigationBarTitle({
+				title:option.title
+			});
 		},
 
 		methods: {

pages/processList/processList.vue

@@ -38,7 +38,12 @@
 							<view class="unProcess" @tap="goUnprocessDetail(item)">未处理</view>
 						</view>
 					</view>
-					<view class=" text-center margin-top" v-if="alarm_count === 0">暂无数据...</view>
+					<view class=" text-center margin-top" v-if="alarm_count == 0">暂无数据...</view>
+					
+					<view v-show="isLoadMore&&alarm_count != 0">
+						<uni-load-more :status="loadStatus"></uni-load-more>
+					</view>
+					
 				</view>
 			</view>
 		</block>
@@ -65,13 +70,14 @@
 							<view class="processed" @tap="goProcessedDetail(item)">已处理</view>
 						</view>
 					</view>
-					<view class="text-center margin-top" v-if="alarm_count1 === 0">暂无数据...</view>
+					<view v-show="isLoadMore&&alarm_count1 != 0">
+						<uni-load-more :status="loadStatus"></uni-load-more>
+					</view>
+					<view class="text-center margin-top" v-if="alarm_count1 == 0">暂无数据...</view>
 				</view>
 			</view>
 		</block>
-		<view v-show="isLoadMore">
-			<uni-load-more :status="loadStatus"></uni-load-more>
-		</view>
+		
 	</view>
 </template>
 

pages/processedDetail/processedDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">{{getData.clsj}}</view>
+			<view class="time">{{getData.time}}</view>
 			<button class="cu-btn radius bg-green sm">已处理</button>
 		</view>
 

pages/unprocessDetail/unprocessDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">2021-01-18 15:16:45</view>
+			<view class="time">{{getData.time}}</view>
 			<button class="cu-btn radius bg-red sm">未处理</button>
 		</view>
 		<view>

pages/weiBao/plan/plan.vue

@@ -60,8 +60,9 @@
 					showLoading: true
 				})
 				this.getData = res.data.data;
+				console.log(this.getData)
 				setTimeout(()=>{
-					this.data_res = parseInt(res.data.length)?1:0
+					this.data_res = res.data.data?1:0
 				},100)
 				// this.planList = this.getData.point
 			},

pages/xunJian/plan/plan.vue

@@ -5,7 +5,7 @@
 
 		<view class=" bg-white plan-sec">
 			
-			<view class=" text-center margin-top" v-if="data_res === 0">暂无数据...</view>
+			<view class=" text-center margin-top" v-if="data_res == 0">暂无数据...</view>
 			
 			<view class="cu-list menu-avatar">
 				<view class="cu-item" v-for="(item,index) in getData" :key="index"
@@ -61,10 +61,11 @@
 					showLoading: true
 				})
 				this.getData = res.data.data;
+				console.log(res.data.data)
 				
 				setTimeout(()=>{
-					this.data_res = parseInt(res.data.length)?1:0
-				},100)
+					this.data_res = res.data.data?1:0
+				},1000)
 				
 				// alert(this.data_res)
 				// this.planList = this.getData.point

pages/xunJian/planDetail/planDetail.vue

@@ -9,7 +9,7 @@
 				</view>
 				<input type="text" v-model="reportName">
 			</view>
-			<view class="form-item margin-top" style="margin-left:-6rpx">
+			<view class="form-item margin-top" >
 				<view class="title">
 					<text class="necessary">*</text>
 					巡检状态：