up

pages.json

@@ -17,16 +17,14 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "巡查养护",
-				"app-plus": {  //uni-app项目对应节点名称为"app-plus"
-					 "titleNView": {  
-						 "autoBackButton":false,
-						 "buttons": [
-						 	{
-								"float": "left",
-								"type": "home"
-							}
-						 ]
-					 }	
+				"app-plus": { //uni-app项目对应节点名称为"app-plus"
+					"titleNView": {
+						"autoBackButton": false,
+						"buttons": [{
+							"float": "left",
+							"type": "home"
+						}]
+					}
 				}
 			}
 		}, {
@@ -36,18 +34,16 @@
 				"enablePullDownRefresh": false
 			}
 
-		}
-	    ,{
-            "path" : "road/road/road",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择道路",
-                "enablePullDownRefresh": false
-            }
+		}, {
+			"path": "road/road/road",
+			"style": {
+				"navigationBarTitleText": "选择道路",
+				"enablePullDownRefresh": false
+			}
 
-        }
+		}
 
-    ],
+	],
 	"subPackages": [{
 		"root": "packageA/pages",
 		"pages": [{
@@ -82,13 +78,13 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "dailyList/dailyList",
 			"style": {
 				"navigationBarTitleText": "日常监管巡查",
 				"enablePullDownRefresh": true
 			}
-		},{
+		}, {
 			"path": "dailyInfo/dailyInfo",
 			"style": {
 				"navigationBarTitleText": "日常监管巡查",
@@ -96,55 +92,69 @@
 
 			}
 		}]
-	},{
-			"root": "rainmaintain",
-			"pages": [{
-				"path": "rainmaintain/rainmaintain",
-				"style": {
-					"navigationBarTitleText": "雨管养护",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "rainmaintainlist/rainmaintainList",
-				"style": {
-					"navigationBarTitleText": "雨管养护",
-					"enablePullDownRefresh": true,
-					"disableScroll": true
-				}
-			}, {
-				"path": "rainmaintaininfo/rainmaintainInfo",
-				"style": {
-					"navigationBarTitleText": "雨管养护",
-					"enablePullDownRefresh": false,
-					"disableScroll": true
+	}, {
+		"root": "rainmaintain",
+		"pages": [{
+			"path": "rainmaintain/rainmaintain",
+			"style": {
+				"navigationBarTitleText": "雨管养护",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "rainmaintainlist/rainmaintainList",
+			"style": {
+				"navigationBarTitleText": "雨管养护",
+				"enablePullDownRefresh": true,
+				"disableScroll": true
+			}
+		}, {
+			"path": "rainmaintaininfo/rainmaintainInfo",
+			"style": {
+				"navigationBarTitleText": "雨管养护",
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 
-				}
-			}]
-		},{
-			"root": "raininspection",
-			"pages": [{
-				"path": "raininspection/raininspection",
-				"style": {
-					"navigationBarTitleText": "雨管巡查",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "raininspectionlist/raininspectionList",
-				"style": {
-					"navigationBarTitleText": "雨管巡查",
-					"enablePullDownRefresh": true,
-					"disableScroll": true
-				}
-			}, {
-				"path": "raininspectioninfo/raininspectionInfo",
-				"style": {
-					"navigationBarTitleText": "雨管巡查",
-					"enablePullDownRefresh": false,
-					"disableScroll": true
+			}
+		}, {
+			"path": "plan/plan",
+			"style": {
+				"navigationBarTitleText": "养护计划",
+				"enablePullDownRefresh": false
+			}
 
-				}
-			}]
+		}]
+	}, {
+		"root": "raininspection",
+		"pages": [{
+			"path": "raininspection/raininspection",
+			"style": {
+				"navigationBarTitleText": "雨管巡查",
+				"enablePullDownRefresh": false
+			}
 		}, {
+			"path": "raininspectionlist/raininspectionList",
+			"style": {
+				"navigationBarTitleText": "雨管巡查",
+				"enablePullDownRefresh": true,
+				"disableScroll": true
+			}
+		}, {
+			"path": "raininspectioninfo/raininspectionInfo",
+			"style": {
+				"navigationBarTitleText": "雨管巡查",
+				"enablePullDownRefresh": false,
+				"disableScroll": true
+
+			}
+		}, {
+			"path": "plan/plan",
+			"style": {
+				"navigationBarTitleText": "巡查计划",
+				"enablePullDownRefresh": false
+			}
+
+		}]
+	}, {
 		"root": "order/order",
 		"pages": [{
 			"path": "order/order",
@@ -153,19 +163,19 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "orderList/orderList",
 			"style": {
 				"navigationBarTitleText": "我的工单",
 				"enablePullDownRefresh": true,
 				"disableScroll": true
 			}
-		},{
+		}, {
 			"path": "orderInfo/orderInfo",
 			"style": {
 				"navigationBarTitleText": "我的工单",
 				"enablePullDownRefresh": false,
-				 "disableScroll": true
+				"disableScroll": true
 
 			}
 		}]

pages/index/index.vue

@@ -8,12 +8,24 @@
 		</u-row>
 		<u-row gutter="16">
 
+			<u-col span="6" v-if="isshowxc">
+				<view class="demo-layout bg-purple-light" @click="toviewplan(1)">
+					<text class="iconfont icon-zuzhijiagouguanli"></text>
+					<text class="navtxt">巡查计划</text>
+				</view>
+			</u-col>
 			<u-col span="6" v-if="isshowxc">
 				<view class="demo-layout bg-purple-light" @click="toview(5)">
 					<text class="iconfont icon-guanxianxuncha"></text>
 					<text class="navtxt">雨管巡查</text>
 				</view>
 			</u-col>
+			<u-col span="6" v-if="isshowyh">
+				<view class="demo-layout bg-purple" @click="toviewplan(2)">
+					<text class="iconfont icon-zuzhijiagouguanli"></text>
+					<text class="navtxt">养护计划</text>
+				</view>
+			</u-col>
 			<u-col span="6" v-if="isshowyh">
 				<view class="demo-layout bg-purple" @click="toview(4)">
 					<text class="iconfont icon-guanxianyanghu"></text>
@@ -123,6 +135,18 @@
 					}
 				});
 			},
+
+			toviewplan(type) {
+				var url = '/raininspection/plan/plan';
+				if (type == 2) {
+					url = "/rainmaintain/plan/plan"
+				}
+				uni.navigateTo({
+					url: url
+				})
+
+
+			},
 			toview(type) {
 				let url = "/packageA/pages/generalPatrol/generalPatrol";
 				// let url = "/road/road/road?type=general"

raininspection/plan/plan.vue

@@ -0,0 +1,246 @@
+<template>
+	<view class="boxContent">
+
+		<view :class="mask?'list listfixed':'list'" style="padding-top: 20rpx;">
+			
+			<block v-for="(item, index) in dataList">
+				<u-card :title="item.created_at" padding="20" margin="20rpx" :border="true"
+					:sub-title="item.statusName" :thumb="thumb" thumb-width="36">
+					<view class="" slot="body" @click="todetail(item.id)">
+						<u-row gutter="16">
+							<u-col span="12">
+								<view class="demo-layout bg-purple">地址/排放点：</view>
+							</u-col>
+							<u-col span="12">
+								<view class="demo-layout bg-purple-light">{{item.address}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="4">
+								<view class="demo-layout bg-purple">巡查类型：</view>
+							</u-col>
+							<u-col span="8">
+								<view class="demo-layout bg-purple-light">{{item.typeName}}</view>
+							</u-col>
+							<u-col span="4">
+								<view class="demo-layout bg-purple">所属片区：</view>
+							</u-col>
+							<u-col span="8">
+								<view class="demo-layout bg-purple-light">{{item.area_info?item.area_info.name:''}}</view>
+							</u-col>
+							<u-col span="4">
+								<view class="demo-layout bg-purple">所属道路：</view>
+							</u-col>
+							<u-col span="8">
+								<view class="demo-layout bg-purple-light">{{item.road_name}}</view>
+							</u-col>
+						</u-row>
+						<!-- <u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">描述：</view>
+							</u-col>
+							<u-col span="12">
+								<view class="demo-layout bg-purple-light">{{item.content}}</view>
+							</u-col>
+						</u-row> -->
+					</view>
+				</u-card>
+
+			</block>
+			<u-loadmore class="loadmore" :status="loadStatus" :load-text="loadText"/>
+			<u-empty text="暂无数据" margin-top="200" v-if="dataList.length==0" mode="list"></u-empty>
+		</view>
+	</view>
+
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				serachEntity: {
+					keyword: "",
+					status: "",
+					type: ""
+				},
+				background: {
+					backgroundColor: '#0385e5'
+				},
+				mask: false,
+				loadStatus:"loadmore",
+				loadText:{
+					loadmore:"加载更多",
+					nomore:"已经到底了"
+				},
+				dataList: [],
+				thumb: "/static/img/location.png",
+				currentPage: 0,
+				lastPage:0,
+				
+			}
+		},
+		onReachBottom: function(e) {
+			if(this.currentPage>=this.lastPage){
+				this.loadStatus = "nomore"
+				return;
+			}
+			this.loadPage(this.currentPage + 1);
+		},
+		onPullDownRefresh: function(e) {
+			this.loadPage(1);
+		},
+		onShow: function() {
+			var that = this;
+		},
+		onLoad(options) {
+			this.loadPage(1);
+		},
+		methods: {
+			openmask(){
+				this.mask=true
+				// this.isPullDown(false);
+			},
+			closemask(){
+				this.mask=false
+				// this.isPullDown(true);
+			},
+			tosearch() {
+				this.loadPage(1)
+				this.$refs.uDropdown.close();
+			},
+			
+			loadPage: function(page) {
+				uni.hideKeyboard()
+				var that = this;
+				this.util.request({
+					bindThis: that,
+					api: '/api/mobile/plan/index',
+					customLoading: false,
+					data: {
+						page: page,
+						page_size: 4,
+						...that.serachEntity
+					},
+					utilSuccess: function(r) {
+						var res = r.data;
+						that.lastPage = r.last_page;
+						uni.stopPullDownRefresh(); // 服务器总条数 < 每页条数, 会将第一页的条数重新返回
+						if(r.total<5){
+							that.loadStatus = "nomore";
+						}
+						var hasNoMore = that.dataList.length < 4 && page > 1;
+						if (hasNoMore || res.length == 0 && page > 1) {
+							// 已加载到最后一页
+							that.loadStatus = "nomore";
+							uni.showToast({
+								title: '已加载到最后一页',
+								icon: 'none'
+							});
+							return;
+						}
+						var dataList = that.dataList;
+
+
+						if (page == 1) {
+							dataList = res;
+						} else {
+							dataList.push(...res);
+						}
+						that.currentPage = page;
+						that.dataList = dataList;
+					},
+					utilFail: function(res) {
+						uni.stopPullDownRefresh();
+
+						if (page == 1) {
+
+							that.currentPage = page;
+						}
+
+						this.util.alert(res);
+					}
+				});
+			}
+		}
+
+	}
+</script>
+<style>
+	.boxContent {
+		background: #f3f4f6;
+		min-height: 100vh;
+	}
+
+	.footer {
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.box-header {
+
+		position: fixed;
+		/* top: 0; */
+		width: 100%;
+		z-index: 99;
+	}
+
+
+	.u-row {
+		margin: 10rpx 0;
+		font-size: 28rpx;
+	}
+	.u-card{
+		z-index: 1;
+	}
+</style>
+
+
+<style scoped lang="scss">
+	.search-wrap {
+		background: #0385e5;
+		padding: 20rpx;
+	}
+	.overflowmask{
+		overflow: hidden;
+	}
+	.loadmore{
+		padding:24rpx!important
+	}
+	.listfixed{
+		position: fixed;
+		width:100%;
+	}
+	.u-config-wrap {
+		padding: 30rpx;
+	}
+
+	.bg-purple {
+		font-weight: bold;
+	}
+
+	.slot-content {
+		background-color: #FFFFFF;
+		padding: 24rpx;
+
+		.item-box {
+			margin-bottom: 50rpx;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.item {
+				border: 1px solid $u-type-primary;
+				color: $u-type-primary;
+				padding: 8rpx 40rpx;
+				border-radius: 100rpx;
+				margin-top: 30rpx;
+			}
+
+			.active {
+				color: #FFFFFF;
+				background-color: $u-type-primary;
+			}
+		}
+	}
+</style>

rainmaintain/plan/plan.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

utils/util.js

@@ -1,7 +1,7 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	//'development': 'http://192.168.60.100:9001',
-	'development': 'http://patrol.115.langye.net',
+	'development': 'http://192.168.60.100:9001',
+	//'development': 'http://patrol.115.langye.net',
 	'production': 'http://192.168.60.100:9001'
 }; // 审核状态