更改排版，数据对接

common/common.scss

@@ -11,7 +11,9 @@ body {
 //     -ms-user-select: none;
 //     user-select: none;
 // }
-
+.border-gray{
+	border:.5rpx solid #ddd
+}
 radio,checkbox {
 			transform: scale(0.7)
 }
@@ -227,6 +229,29 @@ radio,checkbox {
 	width: 100%;
 	height: calc(100% - 100rpx);
 	overflow-y: scroll;
+	.cu-form-group{
+		padding:0;
+		uni-radio::after, uni-checkbox::after{
+			content: "";
+			    background-color: transparent;
+			    display: block;
+			    position: absolute;
+			    width: 8px;
+			    height: 8px;
+			    z-index: 999;
+			    top: 0px;
+			    left: 0px;
+			    right: 0;
+			    bottom: 0;
+			    margin: auto;
+			    border-radius: 100px;
+			    border: 7px solid #ffffff !important;
+			
+		}
+		uni-radio::before, uni-checkbox::before{
+			display:none;
+		}
+	}
 }
 
 
@@ -435,5 +460,11 @@ radio,checkbox {
 	// 现场档案新增
 	.form-item.extraDis .title{
 		width:65%
+	}
+	
+	
+	.checkPos{
+		position:absolute;
+		left:0
 	}
 	

pages/processList/processList.vue

@@ -5,8 +5,8 @@
 			<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 v-if="TabCur==index" class="cu-tag badge">
-						<block class="cu-tag badge">{{TabCur?alarmUntreatedCount1:alarmUntreatedCount}} </block>
+					<view v-if="TabCur==index&&!TabCur" class="cu-tag badge">
+						<block class="cu-tag badge">{{alarmUntreatedCount}} </block>
 					</view>
 					{{item}}
 				</view>
@@ -15,8 +15,7 @@
 
 		<block v-if="TabCur==0">
 			<view class="processList">
-				
-					<view class="cu-list menu-avatar">
+					<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>
@@ -31,9 +30,8 @@
 								</view>
 								<view class="pro-date ">{{item.soeTime}}</view>
 							</view>
-							<view class="action" style="z-index:99">
-								<view class="unProcess" v-if="type==1" @tap="goUnprocessDetail(item.id)">未处理</view>
-								<view class="unProcess" v-else @tap="goVideoUnprocessDetail(item.id)">未处理</view>
+							<view class="action" style="z-index:99;width:170rpx;text-align:right">
+								<view class="unProcess"  @tap="goUnprocessDetail(item.id)">未处理<text class="icon iconfont margin-left-xs margin-right-xs">&#xe629;</text></view>
 							</view>
 						</view>
 						<view class=" text-center margin-top" v-if="alarmUntreatedCount === 0">暂无数据...</view>
@@ -48,12 +46,50 @@
 		</block>
 		<block v-if="TabCur==1">
 			<view class="processList">
-		
-					<view class="cu-list menu-avatar "  >
+				<!-- 筛选 start -->
+				<view class=" padding-bottom-xs" style="border-bottom:1rpx solid  rgba(221,221,221,.3)">
+					<view class="cu-bar search filter-section">
+						<view class="search-form border-gray round bg-white">
+							<select name="" id="" v-model="handleStatus">
+								<option value="0">全部</option>
+								<option value="1">已处理</option>
+								<option value="2">待确认</option>
+								<option value="3">自动恢复</option>
+								<option value="4">过期失效</option>
+							</select>
+						</view>
+						<view class="action" v-if="this.handleStatus==2">
+							<view>
+								<checkbox-group class="block " @change="allChoose">
+									<view class="cu-form-group">
+										<checkbox value="all"  class='round blue' :class="{'checked':allChecked}"  :checked="allChecked?true:false">
+										</checkbox> 
+										<view class="title">批量处理</view>
+									</view>
+								</checkbox-group>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 筛选end -->
+				
+				
+				<checkbox-group @change="changeCheckbox">
+					<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="cu-form-group checkPos">
+								
+								<!-- <checkbox :value="String(item.owner_code)" :checked="checkedArr.includes(String(item.owner_code))"
+									:class="{'checked':checkedArr.includes(String(item.owner_code))}"></checkbox> -->
+									
+									<checkbox :value="String(item.id)"  class='round blue ' :class="{'checked':checkedArr.includes(String(item.id))}"  :checked="checkedArr.includes(String(item.id))">
+									</checkbox> 
+							</view>
+							
+							<view class="cu-avatar lg" :style="{'left':handleStatus==2 ? '60rpx':'0'}"  style="background-image:url(../../static/processed-icon.png);"></view>
+							<view class="content" :style="{'left':handleStatus==2 ? '180rpx':'120rpx'}">
 								<view class="pro-title">
 									<view class="cut">{{item.measName}}</view>
 								</view>
@@ -64,13 +100,26 @@
 								</view>
 								<view class="pro-date ">{{item.soeTime}}</view>
 							</view>
-							<view class="action" style="z-index:99">
-								<view class="processed" v-if="type==1" @tap="goProcessedDetail(item.id)">已处理</view>
-								<view class="processed" v-else @tap="goVideoProcessedDetail(item.id)">已处理</view>
+							<view class="action" style="z-index:99;width:180rpx;text-align:right">
+								<view class="processed" v-if="item.handling_status==1" @tap="goProcessedDetail(item.id)">
+									已处理
+									<text class="icon iconfont margin-left-xs  margin-right-xs">&#xe629;</text>
+								</view>
+								<view style="color:#FF8125" v-if="item.handling_status==2" @tap="goProcessedDetail(item.id)">待确认
+								<text class="icon iconfont margin-left-xs margin-right-xs">&#xe629;</text>
+								</view>
+								<view style="color:#4274E7" v-if="item.handling_status==3" @tap="goProcessedDetail(item.id)">自动回复
+								<text class="icon iconfont margin-left-xs margin-right-xs">&#xe629;</text>
+								</view>
+								<view style="color:#999999" v-if="item.handling_status==4" @tap="goProcessedDetail(item.id)">过期失效
+								<text class="icon iconfont margin-left-xs margin-right-xs">&#xe629;</text>
+								</view>
+								
 							</view>
 						</view>
 						<view class="text-center margin-top" v-if="alarmUntreatedCount1 === 0">暂无数据...</view>
 					</view>
+					</checkbox-group>
 
 				
 					
@@ -78,6 +127,7 @@
 
 
 			</view>
+			
 		</block>
 
 	</view>
@@ -88,6 +138,21 @@
 	export default {
 		data() {
 			return {
+				allChecked:false,
+				
+				checkbox: [{
+					value: 'A',
+					checked: true
+				}, {
+					value: 'B',
+					checked: true
+				}, {
+					value: 'C',
+					checked: false
+				}],
+				handleStatus:0,
+				checkedArr:[],
+				
 				// unporcessList: json.unprocessList,
 				unporcessList: [],
 				porcessedList: [],
@@ -101,10 +166,28 @@
 				companyCode: '',
 				alarmUntreatedCount: '',
 				alarmUntreatedCount1: '',
-				processingStatus: '',
+				processingStatus: '',
+				
+				
 		
 			};
 		},
+		watch:{
+			handleStatus(val){
+				// this.porcessedList={};
+				this.getProcessData({
+					"companyCode": this.companyCode,
+					"type": this.type,
+					"processingStatus": val
+				}, 0);
+				
+			}
+			
+		},
+		computed: {
+		
+		},
+		
 		onLoad: function(option) {
 
 			console.log(option.type);
@@ -130,12 +213,38 @@
 			this.type = option.type;
 		},
 		methods: {
-
-
-
-
+			
+			// 全选事件
+			allChoose(e) {
+				let chooseItem = e.detail.value;
+				// 全选
+				if (chooseItem[0] == 'all') {
+					this.allChecked = true;
+					for (let item of this.porcessedList) {
+						let itemVal = String(item.id);
+						if (!this.checkedArr.includes(itemVal)) {
+							this.checkedArr.push(itemVal);
+						}
+					}
+				} else {
+					// 取消全选
+					this.allChecked = false;
+					this.checkedArr = [];
+				}
+			},
+			
+			changeCheckbox(e){
+				this.checkedArr = e.detail.value;
+				// 如果选择的数组中有值，并且长度等于列表的长度，就是全选
+				if (this.checkedArr.length > 0 && this.checkedArr.length == this.porcessedList.length) {
+					this.allChecked = true;
+				} else {
+					this.allChecked = false;
+				}
+			},
 
 			async getProcessData(ming = {}, whichTab) {
+				
 				const res = await this.$myRequest({
 					url: 'IntegratedAlarm/getElectricAlarmUntreated',
 					data: ming,
@@ -147,7 +256,9 @@
 					this.unporcessList = res.data.data;
 					this.alarmUntreatedCount = parseInt(res.data.alarmUntreatedCount)
 				} else {
+				
 					this.porcessedList = res.data.data;
+					console.log(this.porcessedList)
 					this.alarmUntreatedCount1 = parseInt(res.data.alarmUntreatedCount)
 
 				}
@@ -157,7 +268,6 @@
 			},
 
 			tabSelect(e) {
-
 				console.log(e.currentTarget);
 				this.TabCur = e.currentTarget.dataset.id;
 				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
@@ -165,7 +275,7 @@
 				this.getProcessData({
 					"companyCode": this.companyCode,
 					"type": this.type,
-					"processingStatus": e.currentTarget.dataset.id
+					"processingStatus": !e.currentTarget.dataset.id?e.currentTarget.dataset.id:'1,2,3,4'
 				}, this.TabCur);
 
 
@@ -209,7 +319,14 @@
 					fail: () => {},
 					complete: () => {}
 				});
-			}
+			},
+			
+			InputFocus(e) {
+				this.InputBottom = e.detail.height
+			},
+			InputBlur(e) {
+				this.InputBottom = 0
+			},
 		}
 	}
 </script>

util/api.js

@@ -1,5 +1,5 @@
-const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
-// const BASE_URL = 'https://wx.ewoogi.com/wx/USKYOF/USKYOF.php/Home/' //(正式域名新)  
+// const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
+const BASE_URL = 'https://wx.ewoogi.com/wx/USKYOF/USKYOF.php/Home/' //(正式域名新)  
 // const websiteUrl = 'https://wx.ewoogi.com'
 
 // const BASE_URL='http://https://qhome.usky.cn/USKYOF/USKYOF.php/Home/'