首页调整

config/.env.dev.js

@@ -6,7 +6,7 @@ const UNI_APP = {
 	BASE_URL: 'https://youdian-test.hbjp.com.cn/floorlock-server/',
 	//##https://youdian-test.hbjp.com.cn/floorlock-portal/#/home
 	
-	//BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",
+	BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",
 	//BASE_URL: 'https://dgj.jzrccs.com/electric-manager-api/',
 	
 	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz

pages/index/index.vue

@@ -136,18 +136,11 @@
 				</view>
 			</view>
 		</view>
-		<view class="main_list1 panel">
-			<view class="top-main">
-				<view class="title-main">
-					故障记录
-
-
-				</view>
-				<view class="goto-main" @click="gotoUrl('/pages/task/listTask')" >
-					查看详情
-					<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
-				</view>
-			</view>
+		<view class="main_list1 ">
+			
+			<u-tabs :list="tabslist"
+			 style="   width: 50%;"
+			 :current="current" @change="change"></u-tabs>
 			 
 			<view class="list"  >
 				<view class="item" 
@@ -191,16 +184,23 @@
 					<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 				</view>
 				
-				<u-divider color="#F44336"  v-if="dataerrRecordsTotal>5"
-				 @click="gotoUrl('/pages/task/listTask')"  >故障记录{{dataerrRecordsTotal}}条，点击查看更多</u-divider>
-				<u-divider v-if="dataerrRecordsTotal==0" :isnone="dataerrRecordsTotal==0" nonetext="暂无数据" border-color="#CFD2D5"></u-divider>
+				<u-divider color="#F44336" 
+				 :isnone="dataerrRecordsTotal==0" nonetext="暂无数据"
+				 v-if="dataerrRecordsTotal>5&&current==0"
+				 @click="gotoUrl('/pages/task/listTask?status='+tabslist[current].code)"  >故障记录{{dataerrRecordsTotal}}条，点击查看更多</u-divider>
+				 <u-divider color="#CFD2D5"  v-else
+				 
+				 :isnone="dataerrRecordsTotal==0" nonetext="暂无数据"
+				  @click="gotoUrl('/pages/task/listTask?status='+tabslist[current].code)"  >查看详情</u-divider>
+				  
+				
 			</view>
 
 		</view>
 
 
 
-		<u-divider border-color="#CFD2D5">已经到底了</u-divider>
+		 
 		
 		<tabbar :current="0"></tabbar>
 		
@@ -230,7 +230,18 @@ import {
 				roleList:[],
 				isReadyerrList:false,
 				dataerrList:[],
-				dataerrRecordsTotal:0,
+				dataerrRecordsTotal:0,
+				tabslist:[
+					{
+						name: '待处理',
+						code:"geterrList0"
+						
+					}, {
+						name: '已处理',
+						code:"geterrList1"
+					}
+				],
+				current:0,
 			};
 		},
 		onLoad() {
@@ -266,6 +277,14 @@ import {
 			this.query()
 		},
 		methods: {
+			change(e){
+				this.current=e
+				
+				this.dataerrList =[]
+				
+				this.geterrList()
+			},
+			
 			isToday(dateStr) {
 			    // 将传入的日期字符串转换为Date对象
 			    const targetDate = newDate(dateStr);
@@ -311,11 +330,18 @@ import {
 				})
 			},
 			geterrList(){
-				
+				var status=0
+				var code=this.tabslist[this.current].code
+				if(code=="geterrList0"){
+					status=0
+				}
+				if(code=="geterrList1"){
+					status=1
+				}
 				API.errList({
 					pageIndex:1,
 					pageSize:5,
-					status:0,
+					status:status,
 				}).then((response) => {
 					this.dataerrList=response.data.data
 					this.dataerrRecordsTotal=response.data.recordsTotal
@@ -413,7 +439,7 @@ import {
 </script>
 <style>
 	page{
-	/* 	background-color: #FFFFFF; */
+		background-color: #FFFFFF;
 	}
 </style>
 <style lang="scss">
@@ -594,7 +620,7 @@ import {
 	.main_list1 {
 		margin-top: 24rpx;
 		padding: 24rpx;
-		
+		padding-bottom: 36rpx;
 		.list-body{
 			padding: 24rpx 0;
 			.item {

pages/task/listTask.vue

@@ -89,6 +89,17 @@
 			};
 		},
 		onLoad(op) {
+			if(op.status){
+				if('geterrList0'==op.status){
+					this.current=0
+					this.listForm.status=0
+				}
+				if('geterrList1'==op.status){
+					this.current=1
+					this.listForm.status=1
+				}
+			}
+			
 			if(op.lockId){
 				this.lockId=op.lockId
 				this.lockName=op.lockName

uni_modules/uview-ui/components/u-divider/u-divider.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view  class="carNone"  v-if="isnone" >
+		<view   @tap="click"
+		 class="carNone"  v-if="isnone" >
 			<!-- <img src="@/assets/img/暂无数据-缺省页.png" alt=""> -->
 			<view :style=" 'margin-top: '+nonetop+'px; margin-bottom: 40px;'">
 				<u-empty  :text="nonetext" mode="search"></u-empty>