数据对接bugxiuf

data/json.js

@@ -277,27 +277,27 @@ let deviceType = [{
 		"imgUrl": "/static/dt-ywIcon.png",
 		"dwtype":5
 	},
-	{
-		"id": "11",
-		"title": "地磁设备",
-		"num": "4",
-		"imgUrl": "/static/dt-dcIcon.png",
-		"dwtype":129
-	},
-	{
-		"id": "12",
-		"title": "门禁设备",
-		"num": "4",
-		"imgUrl": "/static/dt-mjIcon.png",
-		"dwtype":130
-	},
-	{
-		"id": "13",
-		"title": "天然气体设备",
-		"num": "4",
-		"imgUrl": "/static/dt-trIcon.png",
-		"dwtype":131
-	},
+	// {
+	// 	"id": "11",
+	// 	"title": "地磁设备",
+	// 	"num": "4",
+	// 	"imgUrl": "/static/dt-dcIcon.png",
+	// 	"dwtype":129
+	// },
+	// {
+	// 	"id": "12",
+	// 	"title": "门禁设备",
+	// 	"num": "4",
+	// 	"imgUrl": "/static/dt-mjIcon.png",
+	// 	"dwtype":130
+	// },
+	// {
+	// 	"id": "13",
+	// 	"title": "天然气体设备",
+	// 	"num": "4",
+	// 	"imgUrl": "/static/dt-trIcon.png",
+	// 	"dwtype":131
+	// },
 	
 ];
 //设备管理

pages.json

@@ -612,6 +612,15 @@
             
         }
         
+        ,{
+            "path" : "pages/inspectList/unprocessDetail/unprocessDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消防支队人工督察单详情页",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	
 	

pages/device-Manage/device-Manage.vue

@@ -56,6 +56,9 @@
 				case 4:
 					url = "消防栓监测"
 					break;
+					case 5:
+						url = "液位"
+						break;
 				case 6:
 					url = "RTU测控终端"
 					break;

pages/deviceDetail/deviceDetail.vue

@@ -102,6 +102,25 @@
 					</table>
 				</view>
 				<!-- RTU end -->
+				
+				<!-- 烟感 start -->
+				<view v-if="this.getData.dwtype==3" class="info-content padding">
+					<table>
+						<tr>
+							<th>烟感状态</th>
+							<th>电池电量</th>
+							<th>信号强度</th>
+							<th>时间</th>
+						</tr>
+						<tr>
+							<td>{{this.getData.device_status}}</td>
+							<td>{{this.getData.battery_level}}</td>
+							<td>{{this.getData.rsrq}}</td>
+							<td>{{this.getData.stime}}</td>
+						</tr>
+					</table>
+				</view>
+				<!-- 烟感 end -->
 
 				<!-- 视频 start -->
 				<view v-if="this.getData.dwtype==16" class="info-content padding">
@@ -111,10 +130,9 @@
 							<th>最后上传时间</th>
 
 						</tr>
-						<tr>
-							<td>{{this.video_data.data4}}</td>
-							<td>{{this.video_data.time}}</td>
-
+						<tr  v-for="(item,index) in this.video_data">
+							<td >{{item.data4}}</td>
+							<td>{{item.time}}</td>
 						</tr>
 					</table>
 				</view>
@@ -127,9 +145,11 @@
 							<th>最后上传值</th>
 							<th>最后上传时间</th>
 						</tr>
-						<tr>
-							<td>{{this.mc_data.data4}}</td>
+						<tr  v-for="(item,index) in this.mc_data" :key="index">
+							<td>{{item.data4}}</td>
+							<td>{{item.time}}</td>
 						</tr>
+					
 					</table>
 				</view>
 				<!-- 井盖 end -->
@@ -138,12 +158,12 @@
 				<view v-if="this.getData.dwtype==4" class="info-content padding">
 					<table>
 						<tr>
-							<th>最后上传值</th>
-							<th>最后上传时间</th>
+							<th>报警内容</th>
+							<th>统计时间</th>
 						</tr>
 						<tr>
 							<td>
-							<!-- {{this.getData.device_status}} -->
+							{{this.getData.device_status}}
 							</td>
 							<td>{{this.getData.stime}}</td>
 						</tr>
@@ -167,6 +187,23 @@
 					</table>
 				</view>
 				<!-- 液位 end -->
+				
+				<!-- 电梯 start -->
+				<view v-if="this.getData.dwtype==17" class="info-content padding">
+					<table>
+						<tr>
+							<th>告警内容</th>
+							<th>告警时间</th>
+						</tr>
+						<tr  v-for="(item,index) in this.getData.elevator_data" :key="index">
+							<td>
+							{{item.data4}}
+							</td>
+							<td>{{item.time}}</td>
+						</tr>
+					</table>
+				</view>
+				<!-- 电梯 end -->
 
 
 
@@ -228,10 +265,10 @@
 				this.getFireData = res.data.data[0].electric_data;
 				this.rtu_data = res.data.data[0].rtu_data;
 				if (this.getData.dwtype == 16) {
-					this.video_data = res.data.data[0].video_data[0];
+					this.video_data = res.data.data[0].video_data;
 				}
 				if (this.getData.dwtype == 128) {
-					this.mc_data = res.data.data[0].mc_data[0];
+					this.mc_data = res.data.data[0].mc_data;
 				}
 				console.log(this.mc_data);
 			},

pages/deviceType/deviceType.vue

@@ -58,7 +58,13 @@
 				this.deviceType[4].num=this.getData.smoke_sensation_device_count
 				this.deviceType[5].num=this.getData.video_device_count
 				this.deviceType[6].num=this.getData.manhole_cover_device_count
-				this.deviceType[6].num=this.getData.fire_hydrant_device_count
+				this.deviceType[7].num=this.getData.fire_hydrant_device_count
+				
+				this.deviceType[8].num=this.getData.fire_hydrant_device_count
+				this.deviceType[9].num=this.getData.level_device_count
+				// this.deviceType[10].num=this.getData.geomagnetism_device_count
+				// this.deviceType[11].num=this.getData.access_control_device_count
+				// this.deviceType[12].num=this.getData.gsa_device_count
 				
 			},
 

pages/index/index.vue

@@ -110,6 +110,7 @@
 
 				searchInput: '',
 				selectedCode:10012,
+				getData:[]
 
 			};
 		},
@@ -127,9 +128,6 @@
 			
 			var res=uni.getStorageSync('selectedCode');
 			var res2=uni.getStorageSync('selectedName');
-			console.log('res');
-			console.log(res);
-			console.log(res2);
 			if(res){
 				uni.setNavigationBarTitle({
 					title: res2
@@ -231,6 +229,12 @@
 					url: 'Index/getCompanyList',
 					data: param
 				})
+				this.getData=res.data.data
+	
+				if(!uni.getStorageSync('selectedCode')){
+					uni.setStorageSync('selectedCode',this.getData[0].owner_code);
+					uni.setStorageSync('selectedName',this.getData[0].owner_name);
+				}
 				res.data.data.forEach(item => {
 					this.searchList.push(item)
 					this.searchList2.push(item);

pages/inspectList/processList/processList.vue

@@ -3,65 +3,65 @@
 		<view style="height:98rpx"></view>
 		<view class="ding">
 			<scroll-view scroll-x class="bg-white nav text-center">
-				<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav" :key="index" @tap="tabSelect"
-				 :data-id="index">
+				<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav"
+					:key="index" @tap="tabSelect" :data-id="index">
 					<view v-if="TabCur==index" class="cu-tag badge">
-						<block class="cu-tag badge">{{TabCur? unporcessList.length:porcessedList.length}} </block>
+						<block class="cu-tag badge">{{TabCur? unporcessList.length:record_count}} </block>
 					</view>
 					{{item}}
 				</view>
 			</scroll-view>
-		</view>
-		
-
+		</view>
 		<block v-if="TabCur==0">
 			<view class="processList">
-					<view class="cu-list menu-avatar">
-						
-						<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
-							<view class="cu-avatar lg" style="background-image:url(../../../static/process-icon.png);"></view>
-							<view class="content">
-								<view class="pro-title">
-									<view class="cut">{{item.title}}</view>
-								</view>
-								<view class="pro-des  ">
-									<view class="text-cut">
-										{{item.des}}
-									</view>
-								</view>
-								<view class="pro-date ">{{item.time}}</view>
+				<view class="cu-list menu-avatar">
+
+					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
+						<view class="cu-avatar lg" style="background-image:url(../../../static/process-icon.png);">
+						</view>
+						<view class="content">
+							<view class="pro-title">
+								<view class="cut">{{item.artificial_code}}</view>
 							</view>
-							<view class="action" style="z-index:99">
-								<view class="unProcess" @tap="goUnprocessDetail(item.id)">未处理</view>
+							<view class="pro-des  ">
+								<view class="text-cut">
+									{{item.content}}
+								</view>
 							</view>
-						</view>
-						<view class=" text-center margin-top" v-if="unporcessList.length === 0">暂无数据...</view>
+							<view class="pro-date ">{{item.timestamp}}</view>
+						</view>
+						<view class="action" style="z-index:99">
+							<view class="unProcess" @tap="goUnprocessDetail(item)">未处理</view>
+						</view>
 					</view>
+					<view class=" text-center margin-top" v-if="record_count === 0">暂无数据...</view>
+				</view>
 			</view>
-		</block>
-		
+		</block>
+
 		<block v-if="TabCur==1">
 			<view class="processList">
-					<view class="cu-list menu-avatar "  >
-						<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
-							<view class="cu-avatar lg" style="background-image:url(../../../static/processed-icon.png);"></view>
-							<view class="content">
-								<view class="pro-title">
-									<view class="cut">{{item.title}}</view>
-								</view>
-								<view class="pro-des  ">
-									<view class="text-cut">
-										{{item.des}}
-									</view>
-								</view>
-								<view class="pro-date ">{{item.time}}</view>
+				<view class="cu-list menu-avatar ">
+					<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
+						<view class="cu-avatar lg" style="background-image:url(../../../static/processed-icon.png);">
+						</view>
+						<view class="content">
+							<view class="pro-title">
+								<view class="cut">{{item.artificial_code}}</view>
 							</view>
-							<view class="action" style="z-index:99">
-								<view class="processed"  @tap="goProcessedDetail(item.id)">已处理</view>
+							<view class="pro-des  ">
+								<view class="text-cut">
+									{{item.content}}
+								</view>
 							</view>
-						</view>
-						<view class="text-center margin-top" v-if="porcessedList.length === 0">暂无数据...</view>
+							<view class="pro-date ">{{item.timestamp}}</view>
+						</view>
+						<view class="action" style="z-index:99">
+							<view class="processed" @tap="goProcessedDetail(item)">已处理</view>
+						</view>
 					</view>
+					<view class="text-center margin-top" v-if="record_count1 === 0">暂无数据...</view>
+				</view>
 			</view>
 		</block>
 
@@ -73,9 +73,9 @@
 	export default {
 		data() {
 			return {
-				 unporcessList: json.inspectUnprocessList,
-				 porcessedList: json.inspectProcessedList,
-				 
+				unporcessList: [],
+				porcessedList: [],
+
 				type: '0',
 				modalName: null,
 				listTouchStart: 0,
@@ -83,71 +83,96 @@
 				CustomBar: this.CustomBar,
 				TabCur: 0,
 				tabNav: ['未处理', '已处理'],
-				
-		
+
+				record_count: '',
+				record_count1: ''
+
+
 			};
 		},
 		onLoad: function(option) {
 
-			
-		},
-		
-		onNavigationBarButtonTap(e) {
-			console.log(e)
-			uni.navigateTo({
-				url: '/pages/export/export',
-				success: res => {},
-				fail: () => {},
-				complete: () => {}
-			});
+			this.getProcessData({
+				"company_code": uni.getStorageSync('selectedCode'),
+				"clzt": 0
+			}, 0);
+
+
+		},
+
+		onNavigationBarButtonTap(e) {
+			console.log(e)
+			uni.navigateTo({
+				url: '/pages/export/export',
+				success: res => {},
+				fail: () => {},
+				complete: () => {}
+			});
 		},
 		methods: {
 
-			
+			async getProcessData(params = {}, whichTab) {
+				const res = await this.$myRequest({
+					url: 'FireInspector/getManualInspectorList',
+					data: params,
+					showLoading: true
+				})
+				this.unporcessList = res.data.data;
+				console.log(this.unporcessList)
 
-			tabSelect(e) {
 
-				console.log(e.currentTarget);
-				this.TabCur = e.currentTarget.dataset.id;
-				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
+				if (whichTab == 0) {
+					this.unporcessList = res.data.data;
+					this.record_count = parseInt(res.data.record_count)
+
+				} else {
+					this.porcessedList = res.data.data;
+					this.record_count1 = parseInt(res.data.record_count)
+				}
+			},
 
 
 
+
+			tabSelect(e) {
+				this.unporcessList = [],
+					this.porcessedList = [],
+					console.log(e.currentTarget);
+				this.TabCur = e.currentTarget.dataset.id;
+				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
+
+				this.getProcessData({
+					"company_code": uni.getStorageSync('selectedCode'),
+					"clzt": e.currentTarget.dataset.id
+				}, this.TabCur);
 			},
 
 			// 页面跳转
-			goUnprocessDetail(id) {
+			goUnprocessDetail(item) {
+				uni.navigateTo({
+					url: '/pages/inspectList/unprocessDetail/unprocessDetail?id='+item.id,
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+
+			goProcessedDetail(item) {
 				uni.navigateTo({
-					url: '/pages/inspectList/unprocessDetail/unprocessDetail',
+					url: '/pages/inspectList/processedDetail/processedDetail?id='+item.id,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}
 				});
-			},
-			
-			goProcessedDetail(id) {
-				uni.navigateTo({
-					url: '/pages/inspectList/processedDetail/processedDetail',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			
-			// goVideoUnprocessDetail(id) {
-			// 	uni.navigateTo({
-			// 		url: '/pages/unprocessDetail/unprocessDetail?companyCode=' + this.companyCode + '&processingStatus=0&id=' + id +
-			// 			'&type=2',
-			// 		success: res => {},
-			// 		fail: () => {},
-			// 		complete: () => {}
-			// 	});
-			// },
-			
+			},
+
+
+
 
 			goVideoProcessedDetail(id) {
 				uni.navigateTo({
-					url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode + '&processingStatus=' + this.processingStatus +
+					url: '/pages/processedDetail/processedDetail?companyCode=' + this.companyCode +
+						'&processingStatus=' + this.processingStatus +
 						'&id=' + id + '&type=2',
 					success: res => {},
 					fail: () => {},
@@ -164,13 +189,16 @@
 		position: relative;
 		border-bottom: 8rpx solid;
 	}
+
 	.cu-tag.badge {
 		top: 14rpx;
 		right: 96rpx;
 	}
+
 	.nav .cu-item {
 		width: 50%;
 		margin: 0;
+
 		.text-blue,
 		.line-blue,
 		.lines-blue {

pages/inspectList/processedDetail/processedDetail.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">2021-01-18 15:16:45</view>
-			<button class="cu-btn radius bg-green sm">已处理</button>
+			<view class="time">{{this.getData.cl_time}}</view>
+			<button class="cu-btn radius bg-green sm">{{this.getData.wtype}}</button>
 		</view>
 	
 		<view >
@@ -14,11 +14,11 @@
 				</view>
 				<view class="info-content">
 					<view class="info-one-info ">
-						<text>[2020]HP第DZ4104号人工督查单</text>
+						<text>{{this.getData.artificial_code}}</text>  
 					</view>
 					
 					<view>
-						<text>事件未处理测试</text>
+						<text>{{this.getData.content}}</text>
 					</view>
 					
 				</view>
@@ -34,16 +34,16 @@
 				<view class="info-content">
 					<view class="info-one-info ">
 						<text>处理账号/电话：</text>
-						<text>13262908435</text>
+						<text>{{this.getData.clr_phone}}</text>
 					</view>
 					<view>
 						<text>处理时间：</text>
-						<text>2021-01-18 18:00:00</text>
+						<text>{{this.getData.cl_time}}</text>
 					</view>
 					
 					<view>
 						<text>处理内容：</text>
-						<text>测试</text>
+						<text>{{this.getData.clnr}}</text>
 					</view>
 				</view>
 			</view>
@@ -62,16 +62,31 @@
 				radio: 'B',
 				modalName: null,
 				type: '0',
-				detailMessage:{},
-				detailMessage2:{}
+				getData:{},
+				detailMessage2:{},
 			}
 		},
-		onLoad: function(option) {
+		onLoad: function(option) {
+			this.getDetailData({
+				"id": option.id,
+				"company_code": uni.getStorageSync('selectedCode')
+			})
 		
 			
 			
 		},
-		methods: {
+		methods: {
+			
+			async getDetailData(params = {}) {
+				const res = await this.$myRequest({
+					url: 'FireInspector/getManualInspectorDetails',
+					data: params,
+					showLoading: true
+			
+				})
+				this.getData = res.data.data[0];
+				console.log(this.getData)
+			},
 			
 			submit() {
 				uni.makePhoneCall({

pages/inspectList/unprocessDetail/unprocessDetail.vue

@@ -0,0 +1,203 @@
+<template>
+	<view>
+		<view class="timeBox flex justify-between align-center padding-lr-sm">
+			<view class="time">{{this.getData.cl_time}}</view>
+			<button class="cu-btn radius bg-green sm">{{this.getData.wtype}}</button>
+		</view>
+	
+		<view >
+			<!-- 基本信息start -->
+			<view class="basic-info">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					基本信息
+				</view>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>{{this.getData.artificial_code}}</text>  
+					</view>
+					
+					<view>
+						<text>{{this.getData.content}}</text>
+					</view>
+					
+				</view>
+			</view>
+			<!-- 基本信息end -->
+			
+			<!-- 处理信息start -->
+			<view class="processStatus">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理内容
+				</view>
+				<view class="padding-lr padding-bottom-lg">
+					<form action="">
+						
+						<radio-group name="gender" class=""  @change="RadioChange">
+							<label class="margin-right">
+								<radio value="0"  checked /><text>单个处理</text>
+							</label>
+							<label>
+								<radio value="1" /><text>批量处理</text>
+							</label>
+						</radio-group>
+						
+						<view class="cu-form-group">
+							
+							<textarea class="JTxtArea lg" 
+							:maxlength="50" 
+							 v-model="msg"
+							:data-maxnum="reason.length+'/50'"   placeholder="备注信息,最多可输入50个字..."
+							auto-height
+							@input="inputReason"
+							:value="reason"></textarea>
+							
+						</view>
+						<view class="btn-area">
+							<button class="bg-blue round  margin-top" @click="powerSubmit()">提 交 </button>
+						</view>
+					</form>
+				</view>
+			</view>
+			<!-- 处理状态end -->
+		</view>
+		
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				reason: '',
+				type: '0',
+			
+				msg: '',
+				msg2: '',
+				flag:false,
+				companyCode:0,
+				
+				getData:{},
+				
+				id:'',
+				radioOne: 0,
+				
+				
+			}
+		},
+		onLoad: function(option) {
+			this.id=option.id;
+			console.log(this.id)
+			this.getDetailData({
+				"id": option.id,
+				"company_code": uni.getStorageSync('selectedCode')
+			})
+		},
+		methods: {
+			
+			RadioChange(e) {
+				this.radioOne = e.detail.value;
+				console.log(this.radioOne)
+			},
+			powerSubmit() {
+				if(!this.msg){
+					uni.showToast({
+						title: "请输入处理内容",
+						icon:"none"
+					});
+				}else{
+					this.powerSubmitRes({
+						"id": this.getData.id,
+						"company_code":this.getData.company_code,
+						"plcl": this.radioOne,
+						"artificial_code": this.getData.artificial_id,
+						"clnr": this.msg,
+						// "clr": this.msg
+					})
+				}
+				
+				
+			},
+			
+			
+			async powerSubmitRes(params = {}) {
+				const res = await this.$myRequest({
+					url: 'FireInspector/setManualInspector',
+					data: params
+				})
+				
+			   if(res.data.flag){
+				  uni.showToast({
+				  	title: "提交成功",
+				  });
+			   }
+			   
+			   // setTimeout(() => {
+			   // 	uni.navigateTo({
+			   // 		url: '/pages/inspectList/processList/processList',
+			   
+			   // 	});
+			   // }, 1000);
+			 
+				
+			},
+			
+			
+			async getDetailData(params = {}) {
+				const res = await this.$myRequest({
+					url: 'FireInspector/getManualInspectorDetails',
+					data: params,
+					showLoading: true
+			
+				})
+				this.getData = res.data.data[0];
+				console.log(this.getData)
+			},
+			
+			submit() {
+				uni.makePhoneCall({
+					phoneNumber: '15122423833' //仅为示例
+				});
+			},
+			// textarea
+			inputReason(e) {
+				this.reason = e.detail.value;
+			},
+			textareaAInput(e) {
+				this.textareaAValue = e.detail.value
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.timeBox {
+		height: 88rpx;
+		background: #EFF4FF;
+		line-height: 88rpx;
+		.time {
+			color: #333
+		}
+	}
+	.info-tit {
+		color: #4074E7;
+		line-height: 90rpx;
+		height: 90rpx;
+	}
+
+	// 基本信息
+	.info-content>view {
+		margin-left: 24rpx;
+		border-bottom: 1px solid #EDEDED;
+		line-height: 92rpx;
+		color: #666;
+	}
+
+	.info-content view text:first-child {
+		width: 160rpx;
+		display: inline-block
+	}
+</style>

pages/processList/processList.vue

@@ -6,7 +6,7 @@
 				<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav"
 					:key="index" @tap="tabSelect" :data-id="index">
 					<view v-if="TabCur==index" class="cu-tag badge">
-						<block class="cu-tag badge">{{TabCur? unporcessList.length:porcessedList.length}} </block>
+						<block class="cu-tag badge">{{TabCur? porcessedList.length:alarm_count}} </block>
 					</view>
 					{{item}}
 				</view>
@@ -34,7 +34,7 @@
 							<view class="unProcess" @tap="goUnprocessDetail(item)">未处理</view>
 						</view>
 					</view>
-					<view class=" text-center margin-top" v-if="unporcessList.length === 0">暂无数据...</view>
+					<view class=" text-center margin-top" v-if="alarm_count === 0">暂无数据...</view>
 				</view>
 			</view>
 		</block>
@@ -60,7 +60,7 @@
 							<view class="processed" @tap="goProcessedDetail(item)">已处理</view>
 						</view>
 					</view>
-					<view class="text-center margin-top" v-if="porcessedList.length === 0">暂无数据...</view>
+					<view class="text-center margin-top" v-if="alarm_count1 === 0">暂无数据...</view>
 				</view>
 			</view>
 		</block>
@@ -83,6 +83,8 @@
 				CustomBar: this.CustomBar,
 				TabCur: 0,
 				tabNav: ['未处理', '已处理'],
+				alarm_count:'',
+				alarm_count1:''
 
 
 			};
@@ -166,19 +168,21 @@
 					showLoading: true
 				})
 				this.unporcessList = res.data.data;
-				console.log('this.unporcessList')
-				console.log(this.unporcessList)
+				// this.alarm_count=res.data.alarm_count
 
 				if (whichTab == 0) {
 					this.unporcessList = res.data.data;
-					this.alarmUntreatedCount = parseInt(res.data.alarmUntreatedCount)
+					this.alarm_count=parseInt(res.data.alarm_count)
+					
 				} else {
 					this.porcessedList = res.data.data;
-					this.alarmUntreatedCount1 = parseInt(res.data.alarmUntreatedCount)
+					this.alarm_count1=parseInt(res.data.alarm_count)
 				}
 			},
 
 			tabSelect(e) {
+				this.unporcessList=[],
+				this.porcessedList=[],
 
 				console.log(e.currentTarget);
 				this.TabCur = e.currentTarget.dataset.id;
@@ -188,7 +192,7 @@
 					"company_code": uni.getStorageSync('selectedCode'),
 					"type": this.type,
 					"processing_status": e.currentTarget.dataset.id
-				}, 1);
+				}, this.TabCur);
 			},
 
 			// 页面跳转

pages/processedDetail/processedDetail.vue

@@ -3,61 +3,61 @@
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
 			<view class="time">{{getData.clsj}}</view>
 			<button class="cu-btn radius bg-green sm">已处理</button>
-		</view>
-	
-		<view >
-			<!-- 基本信息start -->
-			<view class="basic-info">
-				<view class="info-tit margin-left-xs">
-					<text class="cuIcon-titles margin-right-xs"></text>
-					基本信息
-				</view>
-				<view class="info-content">
-					<view class="info-one-info ">
-						<text>设备名称：</text>
-						<text>{{getData.device_name}}</text>
-					</view>
-					
-					<view>
-						<text>设备地址：</text> 
-						<text>{{getData.unitinfo}}</text>
-					</view>
-					<view>
-						<text>告警信息：</text>
-						<text>{{getData.alarm_information}}</text>
-					</view>
-				</view>
-			</view>
-			<!-- 基本信息end -->
-			
-			<!-- 处理信息start -->
-			<view class="processStatus">
-				<view class="info-tit margin-left-xs">
-					<text class="cuIcon-titles margin-right-xs"></text>
-					处理信息
-				</view>
-				<view class="info-content">
-					<view class="info-one-info ">
-						<text>是否误报：</text>
-						<text>{{getData.clwb?'是':'否'}}</text>
-					</view>
-					<view>
-						<text>处理人：</text>
-						<text>{{getData.clr}}</text>
-					</view>
-					<view>
-						<text>处理时间：</text>
-						<text>{{getData.clsj}}</text>
-					</view>
-					<view>
-						<text>处理内容：</text>
-						<text>{{getData.clnr}}</text>
-					</view>
-				</view>
-			</view>
-			<!-- 处理状态end -->
 		</view>
-		
+
+		<view>
+			<!-- 基本信息start -->
+			<view class="basic-info">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					基本信息
+				</view>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>设备名称：</text>
+						<text>{{getData.device_name}}</text>
+					</view>
+
+					<view>
+						<text>设备地址：</text>
+						<text>{{getData.unitinfo}}</text>
+					</view>
+					<view>
+						<text>告警信息：</text>
+						<text>{{getData.alarm_information}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 基本信息end -->
+
+			<!-- 处理信息start -->
+			<view class="processStatus">
+				<view class="info-tit margin-left-xs">
+					<text class="cuIcon-titles margin-right-xs"></text>
+					处理信息
+				</view>
+				<view class="info-content">
+					<view class="info-one-info ">
+						<text>是否误报：</text>
+						<text>{{getData.clwb?'是':'否'}}</text>
+					</view>
+					<view>
+						<text>处理人：</text>
+						<text>{{getData.clr}}</text>
+					</view>
+					<view>
+						<text>处理时间：</text>
+						<text>{{getData.clsj}}</text>
+					</view>
+					<view>
+						<text>处理内容：</text>
+						<text>{{getData.clnr}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 处理状态end -->
+		</view>
+
 
 	</view>
 </template>
@@ -68,48 +68,43 @@
 			return {
 				radio: 'A',
 				radio: 'B',
-				modalName: null,
-				type: '0',
-				detailMessage:{},
-				detailMessage2:{},
-				
-				getData:{}
+				modalName: null,
+				type: '0',
+				detailMessage: {},
+				detailMessage2: {},
+
+				getData: {}
 			}
-		},
-		onLoad: function(option) {
-		
+		},
+		onLoad: function(option) {
+
 			this.getDetailData({
-				
 				"type": option.type,
 				"id": option.id
-			})
-			
+			})
+
 		},
 		methods: {
-			
+
 			async getDetailData(params = {}) {
 				const res = await this.$myRequest({
 					url: 'ComprehensiveAlarm/getAlarmDetails',
 					data: params,
-					showLoading:true
-			
+					showLoading: true
+
 				})
 				this.getData = res.data.data[0];
-			console.log(this.getData)
-				
-			
-			
-				//   console.log(res.data)
+				console.log(this.getData)
 			},
-			
-			
-			
-			submit() {
-				uni.makePhoneCall({
-					phoneNumber: '15122423833' //仅为示例
-				});
-			},
-			
+
+
+
+			submit() {
+				uni.makePhoneCall({
+					phoneNumber: '15122423833' //仅为示例
+				});
+			},
+
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},
@@ -126,10 +121,12 @@
 		height: 88rpx;
 		background: #EFF4FF;
 		line-height: 88rpx;
+
 		.time {
 			color: #333
 		}
 	}
+
 	.info-tit {
 		color: #4074E7;
 		line-height: 90rpx;