优化页面

apis/pagejs/pagesInspection.js

@@ -4,7 +4,9 @@ import request from '@/apis/utils/request'
 
 
 export function stationList(data) {
-	var url='/mobile/inspectionRecord/stationList';
+	//var url='/mobile/inspectionRecord/stationList';
+	//var url='/mobile/inspectionUser/teamUserStationUpdateList';
+	var url='/mobile/inspectionUser/teamUserStation';
 	return request({
 		method: 'post',
 		data: data,

pages/index/index.vue

@@ -255,10 +255,10 @@ import {
 			};
 		},
 		onLoad() {
-			this.roleList=this.jphelp.getPersonInfoPlus().roleList
+		//	this.roleList=
 		},
 		onShow() {
-			this.roleList=this.jphelp.getPersonInfoPlus().roleList
+		//	this.roleList=this.jphelp.getPersonInfoPlus().roleList
 			if(this.isReadyfloorStatus){
 				this.getfloorStatus()
 			}
@@ -269,15 +269,11 @@ import {
 		},
 		computed:{
 				isAdmin(){
-					if(this.roleList){
-						var i =this.roleList.findIndex(item=>{
-							return item.name=='XJADMIN'
-						})
-						if(i!=-1){
-								return true
-						}
+					console.log(this.jphelp.getPersonInfo().role)
+					if(this.jphelp.getPersonInfo().role=='1'){
+							return true
 					}
-					return true
+					return false
 				}
 		},
 		onReady() {

pages/inspection/selectStation.vue

@@ -92,7 +92,7 @@
 					title: "加载中",
 					mask: true,
 				})
-				//this.listForm.id = this.jphelp.getPersonInfo().id
+				this.listForm.id = this.jphelp.getPersonInfo().id
 				this.listForm.queryContent=this.queryName
 				
 			

pages/station/stationInfo.vue

@@ -105,7 +105,7 @@
 						
 					</view>
 				</view>
-				<u-divider :isnone="errList.length==0"
+				<u-divider :isnone="errList.length==0"  v-if="errListTotal==0|errListTotal>5"
 				 nonetext="没有找到相关内容" border-color="#CFD2D5">{{errListTotal>5?'最多显示5条':'已经到底了'}}</u-divider>
 				
 				 
@@ -145,7 +145,7 @@
 					<u-icon name="arrow-right" color="#D4D4D4" ></u-icon>
 					
 				</view>
-				<u-divider :isnone="recordList.length==0" 
+				<u-divider :isnone="recordList.length==0"  v-if="recordListTotal==0|recordListTotal>5"
 				 nonetext="没有找到相关内容" border-color="#CFD2D5">{{recordListTotal>5?'最多显示5条':'已经到底了'}}</u-divider>
 				
 				
@@ -451,7 +451,7 @@
 			.na-img {
 				display: flex;
 				justify-content: center;
-		
+				margin-bottom: 8rpx;
 				.img {
 					width: 56rpx;
 					height: 56rpx;
@@ -495,9 +495,11 @@
 				color: rgba(255,61,0,1);
 				font-size: 24rpx;
 				height: 40rpx;
+				line-height: 40rpx;
 				padding: 0 4rpx;
 				border-radius: 8rpx;
 				border: 2rpx solid rgba(255,61,0,1);
+				display: flex;
 			}
 			.tag0{
 				color: rgba(255,61,0,1);

pages/task/listTask.vue

@@ -81,7 +81,7 @@
 						
 					</view>
 					
-					<view class="line3">
+					<view class="line3" v-if="0">
 						
 						<u-button  type="info" v-if="item.status==1"  size="mini">查看</u-button>
 						

pages/task/maintenanceTaks.vue

@@ -202,7 +202,7 @@
 						<template v-slot:content>
 							<view>
 								<view class="u-order-title">设备故障</view>
-								<view class="u-order-title">故障类型：{{errorRecord.typeN}}</view>
+								<view class="u-order-title">故障类型：{{errorRecord.errorCodeText}}</view>
 								
 								<view class="u-order-time">{{errorRecord.errorReportTime}}</view>
 							</view>

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

@@ -47,13 +47,7 @@
 					<text class="u-line-1"  >{{item.text}}</text>
 				</view>
 			</view>
-			<view v-if="midButton" class="u-tabbar__content__circle__border" :class="{
-				'u-border': borderTop,
-			}" :style="{
-				
-				left: midButtonLeft
-			}">
-			</view>
+			
 		</view>
 		<!-- 这里加上一个48rpx的高度,是为了增高有凸起按钮时的防塌陷高度(也即按钮凸出来部分的高度) -->
 		<view class="u-fixed-placeholder safe-area-inset-bottom" :style="{