liwei2496 1 anno fa
parent
commit
7860a12d05

+ 2 - 2
components/t-table/t-td.vue

@@ -64,8 +64,8 @@
 		border-top: 1px #d0dee5 solid;
 		border-left: 1px #d0dee5 solid;
 		text-align: center;
-		color: #555c60;
-		font-size: 28upx;
+		color: #697081;
+		font-size: 24upx;
 
 	}
 </style>

+ 2 - 2
components/t-table/t-th.vue

@@ -60,10 +60,10 @@
 		flex: 1;
 		display: flex;
 		align-items: center;
-		font-size: 30upx;
+		font-size: 25upx;
 		font-weight: bold;
 		text-align: center;
-		color: #3b4246;
+		color: #9DA0AC;
 		border-left: 1px #d0dee5 solid;
 		border-top: 1px #d0dee5 solid;
 		padding: 15upx;

+ 4 - 3
pages/Workorder/Remotecontrol/Remotecontrol.vue

@@ -11,9 +11,10 @@
 			</picker>
 		</view> -->
 		
-		<u-cell-group>
-			<u-cell :title="mytitle" value="修改" :isLink="true" @click="floorchange">
-				<u-icon slot="icon" size="40" name="map"></u-icon>
+		<u-cell-group class="toptemplate">
+			<u-cell :title="mytitle"  @click="floorchange">
+				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>				
+					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
 			</u-cell>
 		</u-cell-group>
 		

+ 6 - 5
pages/Workorder/Tenantbill/Tenantbill.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="billall">
-		<u-cell-group>
-			<u-cell :title="mytitle" value="修改" :isLink="true" @click="floorchange">
-				<u-icon slot="icon" size="40" name="map"></u-icon>
-			</u-cell>
-		</u-cell-group>
+	<u-cell-group class="toptemplate">
+		<u-cell :title="mytitle"  @click="floorchange">
+			<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>				
+				<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
+		</u-cell>
+	</u-cell-group>
 		<view class="topbill">
 			<view class="topbilledit">
 				<view class="changetime1">

+ 45 - 42
pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="billall">
-		<u-cell-group>
-			<u-cell :title="mytitle" value="修改" :isLink="true" @click="floorchange">
-				<u-icon slot="icon" size="40" name="map"></u-icon>
+		<u-cell-group class="toptemplate">
+			<u-cell :title="mytitle"  @click="floorchange">
+				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>				
+					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
 			</u-cell>
 		</u-cell-group>
 		<view class="topbill">
@@ -45,9 +46,9 @@
 		</t-table> -->
 
 		<view class="u-listdata">
-<view style="padding:10rpx 0 0 30rpx">
-	共有 <span style="color: red">{{totalnumber}}</span>条记录
-</view>
+			<view style="padding:10rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>
 
 			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
 				<u-list-item v-for="(item, index) in indexList" :key="index">
@@ -82,7 +83,7 @@
 		</view>
 
 
-		<u-picker :show="showtypexunjian" :columns="columnstypexunjian" keyName="label" @confirm="confirmxunjian"
+		<u-picker :show="showtypexunjian" :columns="columnstypexunjian" keyName="dictLabel" @confirm="confirmxunjian"
 			@cancel='cancelxunjian'>
 		</u-picker>
 
@@ -112,7 +113,7 @@
 				format: 'yyyy-mm'
 			})
 			return {
-				totalnumber:0,
+				totalnumber: 0,
 				showtypexunjian: false,
 				setyesno: true,
 				// tableList: [{
@@ -150,21 +151,12 @@
 				loading: false,
 				columns: [],
 				columnData: [],
+				pd: true,
 				myday: '',
 				xjry: '巡检人员',
 				showPicker: false,
 				myday: currentDate,
-				columnstypexunjian: [
-					[{
-							label: '安保',
-							id: ''
-						}, {
-							label: '保洁',
-							id: 0
-						},
-
-					]
-				],
+				columnstypexunjian: [],
 
 				columnstype: [
 					[{
@@ -187,6 +179,15 @@
 		},
 		//监听页面加载,其参数为上个页面传递的数据,参数类型为 Object(用于页面传参
 		onLoad() {
+			let getDictDataList = uni.getStorageSync('getDictDataList');
+
+			for (let i = 0; i < getDictDataList.length; i++) {
+				if (getDictDataList[i].dictType == 'ReviewType') {
+					this.columnstypexunjian = [getDictDataList[i].dataList]
+				}
+			}
+
+
 			this.getfloor();
 			//	this.loadmore();
 		},
@@ -215,24 +216,11 @@
 
 			},
 			scrolltolower() {
-				// this.loadmore()
-				this.dataForm.page = this.dataForm.page + 1;
-				console.log('111111111111111111', this.dataForm.page)
-				this.$api.get('/billinfo/paypage', this.dataForm)
-					.then(res => {
-							
-						if (res.data.data.list.length != 0) {
-							this.indexList.push(...res.data.data.list);
-						} else {
-							uni.showToast({
-								title: '暂无更多数据了',
-								icon: 'none',
-								duration: 1500
-							})
-						}
-
-						console.log('111111111111111111', this.indexList)
-					})
+				if(this.pd){
+					this.getalldata();
+				}else{
+					 return
+				}
 			},
 			loadmore() {
 				// for (let i = 0; i < 30; i++) {
@@ -249,7 +237,7 @@
 			},
 			confirmxunjian(e) {
 
-				this.xjlx = e.value[0].label;
+				this.xjlx = e.value[0].dictLabel;
 				// this.dataForm.cycle = e.value[0].id;
 				// this.dataForm.page = 1;
 				// this.getalldata();
@@ -258,11 +246,26 @@
 			},
 
 			getalldata() {
-				this.$api.get('/billinfo/paypage', this.dataForm)
+				this.$api.get('/circuitrecord/page', this.dataForm)
 					.then(res => {
-						this.totalnumber=res.data.data.total;
-						this.indexList = [];
-						this.indexList = res.data.data.list;
+						
+						this.totalnumber = res.data.data.total;
+						//  console.log('111111111111111111',res.data.data.list)
+						if (res.data.data.list.length != 0) {
+							this.indexList.push(...res.data.data.list);
+							this.dataForm.page = this.dataForm.page + 1;
+							this.pd = true;
+							
+						} else {
+							uni.showToast({
+								title: '暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd = false;
+							//this.jfnodata=true
+						}
+
 
 					})
 			},

+ 99 - 103
pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="billall">
-		<u-cell-group>
-			<u-cell :title="mytitle" value="修改" :isLink="true" @click="floorchange">
-				<u-icon slot="icon" size="40" name="map"></u-icon>
+		<u-cell-group class="toptemplate">
+			<u-cell :title="mytitle"  @click="floorchange">
+				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>				
+					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
 			</u-cell>
 		</u-cell-group>
 		<view class="topbill">
@@ -25,70 +26,71 @@
 				</view>
 			</view>
 		</view>
-		
-<view class="u-listdata">
-	
-	<view style="padding:10rpx 0 0 30rpx">
-		共有 <span style="color: red">{{totalnumber}}</span>条记录
-	</view>
-	<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
-		<u-list-item v-for="(item, index) in indexList" :key="index">
-		
-			<view class="companylist" @click="seedetail(item)">
-				<!-- <view class="settled" v-if="item.status==1">
+
+		<view class="u-listdata">
+
+			<view style="padding:10rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+				<u-list-item v-for="(item, index) in indexList" :key="index">
+
+					<view class="companylist" @click="seedetail(item)">
+						<!-- <view class="settled" v-if="item.status==1">
 					已结清
 				</view> -->
-			<!-- 	<view class="outstanding" v-if="item.status==0">
+						<!-- 	<view class="outstanding" v-if="item.status==0">
 					未结清
 				</view> -->
-				<view class="outstanding">
-						预存
+						<view class="outstanding">
+							预存
+						</view>
+						<h3>{{item.tenantInfo.name}}</h3>
+						<view class="Currentamount">
+							扣缴金额: <span>¥{{item.surplus}}</span>
+						</view>
+						<view class="Currentamount">
+							租户电话: {{item.tenantInfo.tel}}
+						</view>
+						<view class="Currentamount">
+							操作人:{{item.createName}}
+						</view>
+						<view class="Currentamount">
+							扣缴时间: {{item.createDate}}
+						</view>
+
 					</view>
-				<h3>{{item.tenantInfo.name}}</h3>
-				<view class="Currentamount">
-					扣缴金额: <span>¥{{item.surplus}}</span>
-				</view>
-				<view class="Currentamount">
-					租户电话: {{item.tenantInfo.tel}}
-				</view>
-				<view class="Currentamount">
-					操作人:{{item.createName}}
-				</view>
-				<view class="Currentamount">
-					扣缴时间: {{item.createDate}}
-				</view>
-				
-			</view>
-	
-		</u-list-item>
-	</u-list>
-	
-</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
 
 
 
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'></u-picker>
-	
-		
+		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
+			@cancel='canceltype'></u-picker>
+
+
 		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
-			
-			
+
+
 		<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
 	</view>
 </template>
 
 <script>
-//import { isEmpty, getDictDataList } from "@/utils/index";
+	//import { isEmpty, getDictDataList } from "@/utils/index";
 	export default {
 		components: {
-		
+
 		},
 		data() {
-			
+
 			return {
-				totalnumber:0,
+				totalnumber: 0,
 				setyesno: true,
 				indexList: [],
 				dataList: [],
@@ -101,7 +103,7 @@
 					page: 1,
 					limit: 10,
 				},
-
+				pd: true,
 				showtype: false,
 				showdct: false,
 				mytitle: '',
@@ -115,7 +117,7 @@
 				showPicker: false,
 				//myday: currentDate,
 				columnstype: [
-					
+
 				],
 
 
@@ -125,16 +127,16 @@
 		//监听页面加载,其参数为上个页面传递的数据,参数类型为 Object(用于页面传参
 		onLoad() {
 
-			let getDictDataList=uni.getStorageSync('getDictDataList');
- // console.log('111111111111111111', getDictDataList)
+			let getDictDataList = uni.getStorageSync('getDictDataList');
+			// console.log('111111111111111111', getDictDataList)
 
-			for(let i=0;i<getDictDataList.length;i++){
-				if(getDictDataList[i].dictType=='PayType'){
-					this.columnstype=[getDictDataList[i].dataList]
+			for (let i = 0; i < getDictDataList.length; i++) {
+				if (getDictDataList[i].dictType == 'PayType') {
+					this.columnstype = [getDictDataList[i].dataList]
 				}
 			}
 
-			
+
 			this.getfloor();
 			//	this.loadmore();
 		},
@@ -155,72 +157,64 @@
 
 
 		methods: {
-			seedetail(e){
-				  console.log('222',e)
+			seedetail(e) {
+				console.log('222', e)
 			},
-			
+
 			scrolltolower() {
-				// this.loadmore()				 
-				this.dataForm.page = this.dataForm.page + 1;
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
 			
-				this.$api.get('/billinfo/paypage', this.dataForm)
+			getalldata() {
+				this.$api.get('/payrecord/page', this.dataForm)
 					.then(res => {
+						// this.totalnumber=res.data.data.total;
+						// this.indexList = [];
+						// this.indexList = res.data.data.list;
+						this.totalnumber = res.data.data.total;
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
+							this.dataForm.page = this.dataForm.page + 1;
+							this.pd = true;
 						} else {
 							uni.showToast({
-								title:'暂无更多数据了',
+								title: '暂无更多数据了',
 								icon: 'none',
 								duration: 1500
 							})
+							this.pd = false;
 						}
-
-						console.log('111111111111111111', this.indexList)
 					})
 			},
-			loadmore() {
-				// for (let i = 0; i < 30; i++) {
-				// 	this.indexList.push({
-				// 		url: this.urls[uni.$u.random(0, this.urls.length - 1)]
-				// 	})
-				// }
-			},
-
 
-			getalldata() {
-				this.$api.get('/payrecord/page', this.dataForm)
-					.then(res => {
-						this.totalnumber=res.data.data.total;
-						this.indexList = [];
-						this.indexList = res.data.data.list;
-
-					})
-			},
-			
 			canceltype() {
 				this.showtype = false;
 			},
 			confirmtype(e) {
 				console.log('111111111111111111', e.value[0])
 				this.showtype = false;
-				if( e.value[0].dictValue=='all'){
+				if (e.value[0].dictValue == 'all') {
 					this.mytype = e.value[0].dictLabel;
-					this.dataForm.type ='';
-					this.dataForm.page=1;
+					this.dataForm.type = '';
+					this.dataForm.page = 1;
 					this.getalldata();
-				}else{
+				} else {
 					this.mytype = e.value[0].dictLabel;
 					this.dataForm.type = e.value[0].dictValue;
-					this.dataForm.page=1;
+					this.dataForm.page = 1;
 					this.getalldata();
 				}
-				
+
 			},
 			typechange() {
 				this.showtype = true;
 			},
-			
-			
+
+
 			getfloor() {
 				this.$api.get('/control/getOrgStructureTree/', {})
 					.then(res => {
@@ -241,7 +235,7 @@
 							}
 							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
-							this.dataForm.page=1;
+							this.dataForm.page = 1;
 							this.getalldata();
 						} else {
 							this.showdct = true
@@ -295,19 +289,21 @@
 			padding-left: 9rpx;
 		}
 	}
-.Callfee{
-	width: 100rpx;
-	height: 45rpx;
-	text-align: center;
-	line-height:45rpx;
-	color: #5C8FFF;
-	border: 1px solid #5C8FFF;
-	font-size: 22rpx;
-	position: absolute;
-	bottom: 10rpx;
-	right: 10px;
-	font-weight: bold;
-}
+
+	.Callfee {
+		width: 100rpx;
+		height: 45rpx;
+		text-align: center;
+		line-height: 45rpx;
+		color: #5C8FFF;
+		border: 1px solid #5C8FFF;
+		font-size: 22rpx;
+		position: absolute;
+		bottom: 10rpx;
+		right: 10px;
+		font-weight: bold;
+	}
+
 	.companylist {
 		margin: 20rpx 30rpx;
 		background: #fff;

+ 3 - 0
pages/index/Workordertodone/Workordertodone.vue

@@ -258,6 +258,9 @@
 </script>
 
 <style lang="scss">
+	
+	
+	
 	.nodata{
 		text-align: center;
 		padding-top: 400rpx;

+ 27 - 25
pages/index/index.vue

@@ -8,21 +8,21 @@
 							<!-- <img :src="srcxianshang1" alt="" style="margin-left: 5rpx;"> -->
 							<u--image mode="widthFix" :src="srcxianshang1" width="80rpx" height="80rpx"></u--image>
 						</view>
-						<view style="font-size: 30rpx;">线上报修</view>
+						<view style="font-size: 28rpx;color: #697081;">线上报修</view>
 					</view>
 					<view class="online" @click="Inspectionrecord">
 						<view>
 							<u--image mode="widthFix" :src="srcxianshang2" width="80rpx" height="80rpx"></u--image>
 
 						</view>
-						<view style="font-size: 30rpx;">巡检记录</view>
+						<view style="font-size: 28rpx;color: #697081;">巡检记录</view>
 					</view>
 					<view class="online" @click="Withholdingrecord">
 						<view>
 
 							<u--image mode="widthFix" :src="srcxianshang3" width="80rpx" height="80rpx"></u--image>
 						</view>
-						<view style="font-size: 30rpx;">扣缴记录</view>
+						<view style="font-size: 28rpx;color: #697081;">扣缴记录</view>
 					</view>
 				</view>
 			</view>
@@ -31,7 +31,7 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;">工单待办</span>
+						<span style="font-size: 30rpx;font-weight: bold;">工单待办</span>
 					</view>
 					<view class="processing">
 						<view class="immediately" @click="Workordertodone">
@@ -43,16 +43,16 @@
 				</view>
 				<view class="wait">
 					<view>
-						<view style="font-size: 30rpx;">待指派</view>
-						<view style="text-align: center;">{{workList[1]}}</view>
+						<view style="font-size: 26rpx;color: #697081;">待指派</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{workList[1]}}</view>
 					</view>
 					<view>
-						<view style="font-size: 30rpx;">待维修</view>
-						<view style="text-align: center;">{{workList[2]}}</view>
+						<view style="font-size: 26rpx;color: #697081;">待维修</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{workList[2]}}</view>
 					</view>
 					<view>
-						<view style="font-size: 30rpx;">已维修</view>
-						<view style="text-align: center;">{{workList[3]}}</view>
+						<view style="font-size: 26rpx;color: #697081;">已维修</view>
+						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">{{workList[3]}}</view>
 					</view>
 				</view>
 			</view>
@@ -61,7 +61,7 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;">设备异常</span>
+						<span style="font-size: 30rpx;font-weight: bold;">设备异常</span>
 					</view>
 					<view class="processing">
 						<view class="immediately">
@@ -73,20 +73,20 @@
 				</view>
 				<view class="wait">
 					<view>
-						<view style="font-size: 30rpx;">异常总数</view>
-						<view style="text-align: center;">{{deviceArr.AirConditioner}}</view>
+						<view  style="font-size: 26rpx;color: #697081;">异常总数</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.AirConditioner}}</view>
 					</view>
 					<view>
-						<view style="font-size: 30rpx;">空调异常</view>
-						<view style="text-align: center;">{{deviceArr.Ammeter}}</view>
+						<view  style="font-size: 26rpx;color: #697081;">空调异常</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.Ammeter}}</view>
 					</view>
 					<view>
-						<view style="font-size: 30rpx;">水表异常</view>
-						<view style="text-align: center;">{{deviceArr.WaterMeter}}</view>
+						<view  style="font-size: 26rpx;color: #697081;">水表异常</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.WaterMeter}}</view>
 					</view>
 					<view>
-						<view style="font-size: 30rpx;">电表异常</view>
-						<view style="text-align: center;">{{deviceArr.Relay}}</view>
+						<view  style="font-size: 26rpx;color: #697081;">电表异常</view>
+						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">{{deviceArr.Relay}}</view>
 					</view>
 				</view>
 			</view>
@@ -95,7 +95,7 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;">欠费待收</span>
+						<span style="font-size: 30rpx;font-weight: bold;">欠费待收</span>
 					</view>
 					<view class="processing">
 						<view class="immediately" @click="Immediatecollection">
@@ -244,7 +244,7 @@
 	}
 
 	.Homepage_suspension {
-		width: 650rpx;
+		width: 690rpx;
 		height: 200rpx;
 		background-color: #fff;
 		display: flex;
@@ -252,10 +252,11 @@
 		justify-content: space-between;
 		position: absolute;
 		top: 100rpx;
+		border-radius: 10rpx;
 	}
 
 	.Suspension {
-		width: 650rpx;
+		width: 690rpx;
 		// height: 200rpx;
 		display: flex;
 		align-items: center;
@@ -274,7 +275,7 @@
 	}
 
 	.pending_middle {
-		width: 650rpx;
+		width: 690rpx;
 		// height: 100px;
 		// background-color: #fff;
 	}
@@ -292,15 +293,16 @@
 	}
 
 	.wait {
-		width: 650rpx;
+		width: 690rpx;
 		display: flex;
 		align-items: center;
 		background-color: #fff;
 		justify-content: space-around;
 		padding-top: 30rpx;
 		text-align: center;
-		line-height: 60rpx;
+		height: 140rpx;
 		margin-top: 10rpx;
+		border-radius: 10rpx;
 	}
 
 	.immediately {

+ 15 - 0
uni.scss

@@ -22,6 +22,21 @@
 .u-subsection--button{
 	height: 80rpx;
 }
+.companylist {
+		h3 {
+			font-size: 32rpx;
+			color: #0C1935;
+		}
+	}
+.toptemplate{
+	background-color: #5C8FFF;
+}
+::v-deep .toptemplate {
+	.u-cell__title-text {
+		color: #ffffff;
+	}
+} 
+
 
 
 /* 颜色变量 */