同步数据

components/selectPicker/select_picker.vue

@@ -0,0 +1,292 @@
+<template>
+	<view class="content">
+		<view class="liy-select-fixed">
+			<view class="liy-search-warp">
+
+				<view class="liy-search-input">
+					<view @click="closeOverlay">
+						取消
+					</view>
+					<view class="lsi-warp">
+						<image src="../../static/images/search.png" mode="widthFix" class="lsi-icon"></image>
+						<input class="lsi-input" v-model="keyword" placeholder="请输入搜索内容" @input="getParamsList" />
+
+					</view>
+					<view @click="confirm">
+						确定
+					</view>
+				</view>
+				<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="lower">
+					<view class="liy-search-list" v-if="outPutList.length > 0">
+						<view class="liy-search-li" v-for="(item,index) in outPutList" :key="index"
+							@click="mapSelectMenu(item,index)">
+							<view class="liy-search-left">
+								<view class="liy-search-title" v-if="titleKey">{{item[titleKey]}}
+								</view>
+								<view class="liy-search-title" v-else>未选择标题
+								</view>
+								<view class="liy-search-desc" v-if="subtitleKey">{{item[subtitleKey]}}</view>
+							</view>
+							<view class="liy-search-icon" v-if="mapSelectIndex == index">
+								<image class="lsi-icon" src="../../static/images/check_mark.png" mode="widthFix">
+								</image>
+							</view>
+						</view>
+						<!-- <view class="liy-loading">
+							<image class="liy-loading-img" src="../../static/images/complete.png" mode="widthFix">
+							</image>
+							<view class="liy-loading-text">加载完成</view>
+						</view> -->
+					</view>
+					<view v-else class="liy-void">
+						<image class="liy-void-img" src="../../static/images/void.png" mode="widthFix"></image>
+						<view class="liy-void-text">未查询到内容</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<view class="liy-overlay" @click="closeOverlay"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'select_picker',
+		props: {
+			list: {
+				type: Array,
+				default: []
+			},
+			titleKey: {
+				type: [String, null],
+				default: null
+			},
+			subtitleKey: {
+				type: [String, null],
+				default: null
+			},
+		},
+		data() {
+			return {
+				mapSelectIndex: null,
+				keyword: "",
+				outPutList: [],
+				openClass: false
+			}
+		},
+		watch: {
+			list(newList, oldList) {
+				this.getParamsList();
+			},
+		},
+		created() {
+			this.getParamsList();
+		},
+		methods: {
+			mapSelectMenu(item, index) {
+				this.mapSelectIndex = index;
+				this.$emit("change", item, index)
+				// this.$parent.open=false;
+			},
+			getParamsList() {
+				var selectList = this.list;
+				this.mapSelectIndex = null;
+				if (!this.keyword) {
+					this.outPutList = selectList;
+
+					return false;
+				}
+				var arr = [];
+				for (var i = 0; i < selectList.length; i++) {
+					let item = selectList[i];
+					if (item[this.titleKey].indexOf(this.keyword) > -1) {
+						arr.push(item);
+					} else {
+
+					}
+				}
+				this.outPutList = arr;
+			},
+			lower() {
+
+			},
+			closeOverlay() {
+				this.$emit("close");
+			},
+			confirm(){
+				// console.log(this.mapSelectIndex)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.liy-overlay {
+		transition-duration: 300ms;
+		transition-timing-function: ease-out;
+		position: fixed;
+		inset: 0px;
+		z-index: 100;
+		background-color: rgba(0, 0, 0, 0.5);
+	}
+
+	.liy-select-fixed {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		z-index: 150;
+		transition: transform .5s ease-in-out;
+		transform: translateY(calc(100% + 40rpx));
+
+		animation: showHandler 0.3s forwards;
+
+		.liy-search-warp {
+			background: #fff;
+			border-radius: 10rpx 10rpx 0 0;
+
+			.liy-search-input {
+				padding: 30rpx 40rpx;
+				font-size: 28rpx;
+
+				.lsi-warp {
+					display: flex;
+					align-items: center;
+					border: 2rpx solid #e3e3e3;
+					padding: 16rpx 20rpx;
+					border-radius: 50rpx;
+
+					.lsi-icon {
+						width: 30rpx;
+						height: 30rpx;
+					}
+
+					.lsi-input {
+						width: 90%;
+						padding-left: 16rpx;
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.liy-search-list {
+				.liy-search-li {
+					padding: 20rpx 30rpx;
+					display: flex;
+					align-items: center;
+					border-bottom: 1rpx solid #f7f7f7;
+					min-height: 50rpx;
+
+					.liy-search-left {
+						width: 90%;
+
+						.liy-search-title {
+							font-size: 28rpx;
+							line-height: 36rpx;
+							color: #333;
+						}
+
+						.liy-search-desc {
+							padding-top: 10rpx;
+							font-size: 24rpx;
+							line-height: 36rpx;
+							color: #999;
+						}
+					}
+
+					.liy-search-icon {
+						.lsi-icon {
+							width: 40rpx;
+							height: 40rpx;
+						}
+					}
+
+				}
+			}
+
+		}
+
+	}
+
+	.scroll-Y {
+		height: 500rpx;
+	}
+
+	.liy-loading {
+		color: #333;
+		font-size: 26rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 20rpx 0;
+
+		.liy-loading-img {
+			width: 32rpx;
+			height: 32rpx;
+			// animation: turn 3s linear infinite;
+		}
+
+		.liy-loading-text {
+			padding-left: 12rpx;
+			padding-right: 32rpx;
+		}
+	}
+
+	@keyframes turn {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		25% {
+			transform: rotate(90deg);
+		}
+
+		50% {
+			transform: rotate(180deg);
+		}
+
+		75% {
+			transform: rotate(270deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes showHandler {
+		0% {
+			transform: translateY(calc(100% + 40rpx));
+		}
+
+		100% {
+			transform: translateY(0);
+		}
+	}
+
+	@keyframes hideHandler {
+		0% {
+			transform: translateY(0);
+		}
+
+
+		100% {
+			transform: translateY(calc(100% + 40rpx));
+		}
+	}
+
+	.liy-void {
+		text-align: center;
+		padding-top: 60rpx;
+
+		.liy-void-img {
+			width: 40%;
+		}
+
+		.liy-void-text {
+			padding-top: 30rpx;
+			font-size: 26rpx;
+			color: #909090;
+		}
+	}
+</style>

pages.json

@@ -1,121 +1,156 @@
 {
-  "pages": [{
-    "path": "pages/login",
-    "style": {
-      "navigationBarTitleText": "登录"
-    }
-  }, {
-    "path": "pages/register",
-    "style": {
-      "navigationBarTitleText": "注册"
-    }
-  }, {
-    "path": "pages/index",
-    "style": {
-      "navigationBarTitleText": "若依移动端框架",
-      "navigationStyle": "custom"
-    }
-  }, {
-    "path": "pages/work/index",
-    "style": {
-      "navigationBarTitleText": "工作台"
-    }
-  }, {
-    "path": "pages/mine/index",
-    "style": {
-      "navigationBarTitleText": "我的"
-    }
-  }, {
-    "path": "pages/mine/avatar/index",
-    "style": {
-      "navigationBarTitleText": "修改头像"
-    }
-  }, {
-    "path": "pages/mine/info/index",
-    "style": {
-      "navigationBarTitleText": "个人信息"
-    }
-  }, {
-    "path": "pages/mine/info/edit",
-    "style": {
-      "navigationBarTitleText": "编辑资料"
-    }
-  }, {
-    "path": "pages/mine/pwd/index",
-    "style": {
-      "navigationBarTitleText": "修改密码"
-    }
-  }, {
-    "path": "pages/mine/setting/index",
-    "style": {
-      "navigationBarTitleText": "应用设置"
-    }
-  }, {
-    "path": "pages/mine/help/index",
-    "style": {
-      "navigationBarTitleText": "常见问题"
-    }
-  }, {
-    "path": "pages/mine/about/index",
-    "style": {
-      "navigationBarTitleText": "关于我们"
-    }
-  }, {
-    "path": "pages/common/webview/index",
-    "style": {
-      "navigationBarTitleText": "浏览网页"
-    }
-  }, {
-    "path": "pages/common/textview/index",
-    "style": {
-      "navigationBarTitleText": "浏览文本"
-    }
-  },
-  {
-  	"path" : "pages/statistics/index",
-  	"style" : 
-  	{
-  		"navigationBarTitleText" : ""
-  	}
-  },
-  {
-  	"path" : "pages/statistics/sss",
-  	"style" : 
-  	{
-  		"navigationBarTitleText" : "sticky-list"
-  	}
-  }],
-  "tabBar": {
-    "color": "#000000",
-    "selectedColor": "#000000",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/images/tabbar/home_.png",
-        "text": "首页"
-      }, {
-        "pagePath": "pages/work/index",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
-        "text": "工作台"
-      }, {
-        "pagePath": "pages/statistics/index",
-        "iconPath": "static/images/tabbar/mine.png",
-        "selectedIconPath": "static/images/tabbar/mine_.png",
-        "text": "统计"
-      }/* , {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/images/tabbar/mine.png",
-        "selectedIconPath": "static/images/tabbar/mine_.png",
-        "text": "我的"
-      } */
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "RuoYi",
-    "navigationBarBackgroundColor": "#FFFFFF"
-  }
+	"pages": [{
+			"path": "pages/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		}, {
+			"path": "pages/register",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
+		}, {
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "若依移动端框架",
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/work/index",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
+		}, {
+			"path": "pages/mine/index",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		}, {
+			"path": "pages/mine/avatar/index",
+			"style": {
+				"navigationBarTitleText": "修改头像"
+			}
+		}, {
+			"path": "pages/mine/info/index",
+			"style": {
+				"navigationBarTitleText": "个人信息"
+			}
+		}, {
+			"path": "pages/mine/info/edit",
+			"style": {
+				"navigationBarTitleText": "编辑资料"
+			}
+		}, {
+			"path": "pages/mine/pwd/index",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		}, {
+			"path": "pages/mine/setting/index",
+			"style": {
+				"navigationBarTitleText": "应用设置"
+			}
+		}, {
+			"path": "pages/mine/help/index",
+			"style": {
+				"navigationBarTitleText": "常见问题"
+			}
+		}, {
+			"path": "pages/mine/about/index",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		}, {
+			"path": "pages/common/webview/index",
+			"style": {
+				"navigationBarTitleText": "浏览网页"
+			}
+		}, {
+			"path": "pages/common/textview/index",
+			"style": {
+				"navigationBarTitleText": "浏览文本"
+			}
+		},
+		{
+			"path": "pages/oldrenovation/indoor/tearOldPipe",
+			"style": {
+				"navigationBarTitleText": "拆旧管"
+			}
+		},
+		{
+			"path": "pages/oldrenovation/indoor/verticalBar",
+			"style": {
+				"navigationBarTitleText": "立杠"
+			}
+		},
+		{
+			"path": "pages/oldrenovation/indoor/putUpWatch",
+			"style": {
+				"navigationBarTitleText": "挂表"
+			}
+		},
+		{
+			"path": "pages/oldrenovation/indoor/watchAfterPipe",
+			"style": {
+				"navigationBarTitleText": "表后管"
+			}
+		},
+		{
+			"path": "pages/oldrenovation/indoor/valveTube",
+			"style": {
+				"navigationBarTitleText": "阀管"
+			}
+		},
+		{
+			"path": "pages/newbuilt/newIndoor",
+			"style": {
+				"navigationBarTitleText": "室内"
+			}
+		},
+		{
+			"path": "pages/newbuilt/newCourtyard",
+			"style": {
+				"navigationBarTitleText": "庭院"
+			}
+		},
+		{
+			"path": "pages/newbuilt/newOverhead",
+			"style": {
+				"navigationBarTitleText": "架空"
+			}
+		}, {
+			"path": "pages/statistics/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}
+	],
+	"tabBar": {
+		"color": "#000000",
+		"selectedColor": "#000000",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index",
+			"iconPath": "static/images/tabbar/home.png",
+			"selectedIconPath": "static/images/tabbar/home_.png",
+			"text": "公告"
+		}, {
+			"pagePath": "pages/work/index",
+			"iconPath": "static/images/tabbar/work.png",
+			"selectedIconPath": "static/images/tabbar/work_.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/mine/index",
+			"iconPath": "static/images/tabbar/mine.png",
+			"selectedIconPath": "static/images/tabbar/mine_.png",
+			"text": "统计"
+		}]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "RuoYi",
+		"navigationBarBackgroundColor": "#FFFFFF"
+	}
 }
+

pages/newbuilt/newCourtyard.vue

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

pages/newbuilt/newIndoor.vue

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

pages/newbuilt/newOverhead.vue

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

pages/oldrenovation/indoor/putUpWatch.vue

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

pages/oldrenovation/indoor/tearOldPipe.vue

@@ -0,0 +1,315 @@
+	<template>
+		<view class="background">
+			<view class="uni-list">
+				<view class="container">
+					<view>
+						小区
+					</view>
+					<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
+						<span>{{attributeXQ}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="uni-list">
+				<view class="container">
+					<view class="uni-list-cell-left">
+						楼栋
+					</view>
+					<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
+						<span>{{attributeLD}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="uni-list" style="margin-top: 10;">
+				<view class="container">
+					<view class="uni-list-cell-left">
+						单元
+					</view>
+					<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
+						<span>{{attributeDY}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="uni-list">
+				<view class="container">
+					<view class="uni-list-cell-left">
+						房间
+					</view>
+					<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj')">
+						<span>{{attributeFJ}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="container">
+
+				<view class="title">是否按照施工图纸施工</view>
+				<switch checked @change="switch2Change" />
+
+			</view>
+			<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="communityName"
+				subtitleKey="address" v-model="communityName"></SelectPicker>
+		</view>
+	</template>
+
+
+
+	<script>
+		import SelectPicker from '../../../components/selectPicker/select_picker.vue'
+
+		export default {
+			components: {
+				SelectPicker
+			},
+			data() {
+
+				return {
+
+					type: '',
+					open: false,
+					selectList: [],
+
+					XQValue: {},
+					LDValue: {},
+					DYValue: {},
+					FJValue: {},
+					XQList: [{
+						"communityName": "乐彩花园",
+						"address": "乐彩花园(新华路东100米)",
+						"id": "00"
+					}, {
+						"communityName": "进行蓉城",
+						"address": "运河城万佳广场(兴隆桥北街)",
+						"id": "01"
+					}, {
+						"communityName": "万达华府1、2号院",
+						"address": "万达华府",
+						"id": "02"
+					}, {
+						"communityName": "万达华府8--10号楼",
+						"address": "万达华府",
+						"id": "03"
+					}, {
+						"communityName": "万达华府2--8号楼",
+						"address": "万达华府",
+						"id": "04"
+					}, {
+						"communityName": "万达华府1--3号楼",
+						"address": "万达华府",
+						"id": "05"
+					}],
+					index: 0,
+					address: null,
+					title: 'picker',
+					transformerValue: '请选择楼栋',
+
+					LDList: [{
+						"communityName": "1栋",
+						"address": "乐彩花园(新华路东100米)",
+						"id": "000"
+					}, {
+						"communityName": "2栋",
+						"address": "运河城万佳广场(兴隆桥北街)",
+						"id": "001"
+					}, {
+						"communityName": "3栋",
+						"address": "万达华府",
+						"id": "002"
+					}, {
+						"communityName": "4栋",
+						"address": "万达华府",
+						"id": "003"
+					}, {
+						"communityName": "5栋",
+						"address": "万达华府",
+						"id": "004"
+					}, {
+						"communityName": "6栋",
+						"address": "万达华府",
+						"id": "005"
+					}],
+					DYList: [{
+						"communityName": "一单元",
+						"address": "乐彩花园(新华路东100米)",
+						"id": "011"
+					}, {
+						"communityName": "二单元",
+						"address": "运河城万佳广场(兴隆桥北街)",
+						"id": "012"
+					}, {
+						"communityName": "三单元",
+						"address": "万达华府",
+						"id": "013"
+					}, {
+						"communityName": "四单元",
+						"address": "万达华府",
+						"id": "014"
+					}, {
+						"communityName": "五单元",
+						"address": "万达华府",
+						"id": "015"
+					}, {
+						"communityName": "六单元",
+						"address": "万达华府",
+						"id": "016"
+					}],
+					FJList: [{
+						"communityName": "101",
+						"address": "乐彩花园(新华路东100米)",
+						"id": "021"
+					}, {
+						"communityName": "201",
+						"address": "运河城万佳广场(兴隆桥北街)",
+						"id": "022"
+					}, {
+						"communityName": "301",
+						"address": "万达华府",
+						"id": "023"
+					}, {
+						"communityName": "401",
+						"address": "万达华府",
+						"id": "024"
+					}, {
+						"communityName": "501",
+						"address": "万达华府",
+						"id": "025"
+					}, {
+						"communityName": "601",
+						"address": "万达华府",
+						"id": "026"
+					}],
+
+
+				}
+			},
+			onLoad() {
+				uni.setNavigationBarTitle({
+					title: '旧改工程-室内'
+				})
+			},
+			computed: {
+				attributeXQ() {
+					return this.XQValue.communityName ? this.XQValue.communityName : "请选择小区"
+
+				},
+				attributeLD() {
+					return this.LDValue.communityName ? this.LDValue.communityName : "请选择楼栋"
+				},
+				attributeDY() {
+					return this.DYValue.communityName ? this.DYValue.communityName : "请选择单元"
+				},
+				attributeFJ() {
+					return this.FJValue.communityName ? this.FJValue.communityName : "请选择房间"
+				}
+			},
+			methods: {
+				//判断是否选择
+				isEmpty(str) {
+
+					return (!str || 0 === str.length);
+
+				},
+				pickerShow(e) {
+
+
+					this.type = e; //赋值类型
+					if (e == 'xq') {
+						this.open = true;
+						this.selectList = this.XQList;
+					} else if (e == 'ld') {
+
+						if (this.isEmpty(this.XQValue.id)) {
+							uni.showToast({
+								title: '请选择小区',
+								icon: 'error',
+								duration: 1000
+							});
+
+						} else {
+							this.open = true;
+							this.selectList = this.LDList;
+						}
+
+					} else if (e == 'dy') {
+						if (this.isEmpty(this.LDValue.id)) {
+							uni.showToast({
+								title: '请选择楼栋',
+								icon: 'error',
+								duration: 1000
+
+							});
+						} else {
+							this.open = true;
+							this.selectList = this.DYList;
+						}
+					} else if (e == 'fj') {
+						if (this.isEmpty(this.DYValue.id)) {
+							uni.showToast({
+								title: '请选择单元',
+								icon: 'error',
+								duration: 1000
+
+							});
+						} else {
+							this.open = true;
+							this.selectList = this.FJList;
+						}
+					}
+
+				},
+				bindPickerChange(e) {
+					console.log('picker发送选择改变，携带值为', e.detail.value)
+					this.index = e.detail.value
+				},
+				bindDateChange(e) {
+					this.date = e.detail.value
+				},
+				switch2Change(e) {
+					console.log('switch2 发生 change 事件，携带值为', e.detail.value)
+				},
+				changeSelect(item, index) {
+					this.index = index;
+					this.address = item.communityName;
+					this.open = false;
+					if (this.type == 'xq') {
+						this.XQValue = item;
+					} else if (this.type == 'ld') {
+						this.LDValue = item;
+					} else if (this.type == 'dy') {
+						this.DYValue = item;
+					} else if (this.type == 'fj') {
+						this.FJValue = item;
+					}
+
+				},
+				//关闭弹窗
+				close(e) {
+					this.open = false
+				}
+			}
+		}
+	</script>
+
+	<style>
+		.container {
+			display: flex;
+			margin-left: 10px;
+			margin-top: 10px;
+			margin-right: 10px;
+			align-items: flex-start;
+			justify-content: space-between;
+		}
+
+		.text {
+			font-size: 16px;
+			color: #333;
+		}
+
+		.background {
+			border: 15px solid hsla(0, 0%, 100%, .5);
+			background: white;
+			background-clip: padding-box;
+			/*从padding开始往外面裁剪背景*/
+
+
+		}
+	</style>

pages/oldrenovation/indoor/valveTube.vue

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

pages/oldrenovation/indoor/verticalBar.vue

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

pages/oldrenovation/indoor/watchAfterPipe.vue

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

pages/oldrenovation/oldCourtyard.vue

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

pages/oldrenovation/oldIndoor.vue

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

pages/oldrenovation/oldOverhead.vue

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

pages/statistics/index.vue

@@ -114,7 +114,7 @@
 				villageIndex2: 0,
 				buildIndex: 0,
 				unitIndex: 0,
-				villageList: /* [{
+				villageList: [{
 					name: '小区001'
 				}, {
 					name: '小区002'
@@ -122,7 +122,7 @@
 					name: '小区003'
 				}, {
 					name: '小区004'
-				}] */,
+				}],
 				specificationList: [{
 					name: '规格001'
 				}, {

pages/work/index.vue

@@ -1,183 +1,344 @@
 <template>
-  <view class="work-container">
-    <!-- 轮播图 -->
-    <uni-swiper-dot class="uni-swiper-dot-box" :info="data" :current="current" field="content">
-      <swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
-        <swiper-item v-for="(item, index) in data" :key="index">
-          <view class="swiper-item" @click="clickBannerItem(item)">
-            <image :src="item.image" mode="aspectFill" :draggable="false" />
-          </view>
-        </swiper-item>
-      </swiper>
-    </uni-swiper-dot>
-
-    <!-- 宫格组件 -->
-    <uni-section title="系统管理" type="line"></uni-section>
-    <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false" @change="changeGrid">
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="person-filled" size="30"></uni-icons>
-            <text class="text">用户管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="staff-filled" size="30"></uni-icons>
-            <text class="text">角色管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="color" size="30"></uni-icons>
-            <text class="text">菜单管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="settings-filled" size="30"></uni-icons>
-            <text class="text">部门管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="heart-filled" size="30"></uni-icons>
-            <text class="text">岗位管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="bars" size="30"></uni-icons>
-            <text class="text">字典管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="gear-filled" size="30"></uni-icons>
-            <text class="text">参数设置</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="chat-filled" size="30"></uni-icons>
-            <text class="text">通知公告</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="wallet-filled" size="30"></uni-icons>
-            <text class="text">日志管理</text>
-          </view>
-        </uni-grid-item>
-      </uni-grid>
-    </view>
-  </view>
+	<view class="work-container">
+		<!-- 轮播图 -->
+		<uni-swiper-dot class="uni-swiper-dot-box" :info="data" :current="current" field="content">
+			<swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
+				<swiper-item v-for="(item, index) in data" :key="index">
+					<view class="swiper-item" @click="clickBannerItem(item)">
+						<image :src="item.image" mode="aspectFill" :draggable="false" />
+					</view>
+				</swiper-item>
+			</swiper>
+		</uni-swiper-dot>
+
+		<!-- 宫格组件 -->
+		<!-- <uni-section title="系统管理" type="line"></uni-section> -->
+		<view class="grid-body">
+			<uni-grid :column="2" :showBorder="false">
+				<uni-grid-item>
+					<view class="grid-item-box" @click="showMinYong">
+						<uni-icons type="person-filled" size="30"></uni-icons>
+						<text class="text">民用工程</text>
+					</view>
+				</uni-grid-item>
+
+
+
+				<uni-grid-item>
+					<view class="grid-item-box">
+						<uni-icons type="staff-filled" size="30"></uni-icons>
+						<text class="text">工业工程</text>
+					</view>
+				</uni-grid-item>
+				<uni-grid-item>
+					<view class="grid-item-box">
+						<uni-icons type="color" size="30"></uni-icons>
+						<text class="text">市政工程</text>
+					</view>
+				</uni-grid-item>
+				<uni-grid-item>
+					<view class="grid-item-box">
+						<uni-icons type="settings-filled" size="30"></uni-icons>
+						<text class="text">危险作业工程</text>
+					</view>
+				</uni-grid-item>
+				<uni-grid-item>
+					<view class="grid-item-box">
+						<uni-icons type="heart-filled" size="30"></uni-icons>
+						<text class="text">预警工程</text>
+					</view>
+				</uni-grid-item>
+				<uni-grid-item>
+					<view class="grid-item-box">
+						<uni-icons type="bars" size="30"></uni-icons>
+						<text class="text">基建工程</text>
+					</view>
+				</uni-grid-item>
+
+
+			</uni-grid>
+			<view v-if="showPopup" class="popup">
+				<view class="content">
+					<view class="line1">
+						<view>旧改工程</view>
+					</view>
+					<view class="line2">
+						<view @click="Indoor(0)">室内</view>
+						<view @click="Courtyard(0)">庭院</view>
+						<view @click="Overhead(0)">架空</view>
+
+					</view>
+					<view class="line1">
+						<view>新建工程</view>
+					</view>
+					<view class="line2">
+						<view @click="Indoor(1)">室内</view>
+						<view @click="Courtyard(1)">庭院</view>
+						<view @click="Overhead(1)">架空</view>
+					</view>
+				</view>
+
+				<view class="btn-group">
+					<view class="btn_position">
+						<view class="cancel" @click="showMinYong">取消</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="showPopup" class="mask" @click="showMinYong"></view>
+		</view>
+	</view>
+	</view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        current: 0,
-        swiperDotIndex: 0,
-        data: [{
-            image: '/static/images/banner/banner01.jpg'
-          },
-          {
-            image: '/static/images/banner/banner02.jpg'
-          },
-          {
-            image: '/static/images/banner/banner03.jpg'
-          }
-        ]
-      }
-    },
-    methods: {
-      clickBannerItem(item) {
-        console.info(item)
-      },
-      changeSwiper(e) {
-        this.current = e.detail.current
-      },
-      changeGrid(e) {
-        this.$modal.showToast('模块建设中~')
-      }
-    }
-  }
+	export default {
+		data() {
+			return {
+				showPopup: false,
+
+				current: 0,
+				swiperDotIndex: 0,
+				data: [{
+						image: '/static/images/banner/banner01.jpg'
+					},
+					{
+						image: '/static/images/banner/banner02.jpg'
+					},
+					{
+						image: '/static/images/banner/banner03.jpg'
+					}
+				]
+			}
+		},
+		methods: {
+			clickBannerItem(item) {
+				console.info(item)
+			},
+			changeSwiper(e) {
+				this.current = e.detail.current
+			},
+			changeGrid(e) {
+				this.$modal.showToast('模块建设中~')
+			},
+			showMinYong() {
+				this.showPopup = !this.showPopup;
+
+			},
+			//室内
+			Indoor(e) {
+				if (e == 0) {
+					//旧改
+					this.showTypeSheet(0);
+				} else if (e == 1) {
+					//新建
+					this.showTypeSheet(1);
+				}
+			},
+			//庭院
+			Courtyard(e) {
+				if (e === 0) {
+
+					this.showTypeSheet(0);
+					//旧改
+				} else if (e == 1) {
+					//新建
+					this.showTypeSheet(1);
+				}
+			},
+			//架空
+			Overhead(e) {
+				if (e == 0) {
+					//旧改
+					this.showTypeSheet(0);
+				} else if (e == 1) {
+					//新建
+					this.showTypeSheet(1);
+				}
+
+			},
+			//二次弹窗 选择类型
+			showTypeSheet(e) {
+				uni.showActionSheet({
+					itemList: ['拆旧管', '立杠', '挂表', '表后管', '阀管'],
+					success: (res) => {
+						console.log('选择了第' + (res.tapIndex + 1) + '个选项');
+						if (e == 0 && res.tapIndex == 0) {
+							uni.navigateTo({
+								url: '/pages/oldrenovation/indoor/tearOldPipe'
+							})
+						}
+						if (e == 0 && res.tapIndex == 1) {
+							uni.navigateTo({
+								url: '/pages/oldrenovation/indoor/verticalBar'
+							})
+						}
+						if (e == 0 && res.tapIndex == 2) {
+							uni.navigateTo({
+								url: '/pages/oldrenovation/indoor/putUpWatch'
+							})
+						}
+						if (e == 0 && res.tapIndex == 3) {
+							uni.navigateTo({
+								url: '/pages/oldrenovation/indoor/watchAfterPipe'
+							})
+						}
+						if (e == 0 && res.tapIndex == 4) {
+							uni.navigateTo({
+								url: '/pages/oldrenovation/indoor/valveTube'
+							})
+						}
+
+					},
+					fail: (err) => {
+						console.log('弹窗取消');
+					}
+				});
+
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-  /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #fff;
-    min-height: 100%;
-    height: auto;
-  }
-
-  view {
-    font-size: 14px;
-    line-height: inherit;
-  }
-
-  /* #endif */
-
-  .text {
-    text-align: center;
-    font-size: 26rpx;
-    margin-top: 10rpx;
-  }
-
-  .grid-item-box {
-    flex: 1;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 15px 0;
-  }
-
-  .uni-margin-wrap {
-    width: 690rpx;
-    width: 100%;
-    ;
-  }
-
-  .swiper {
-    height: 300rpx;
-  }
-
-  .swiper-box {
-    height: 150px;
-  }
-
-  .swiper-item {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #fff;
-    height: 300rpx;
-    line-height: 300rpx;
-  }
-
-  @media screen and (min-width: 500px) {
-    .uni-swiper-dot-box {
-      width: 400px;
-      /* #ifndef APP-NVUE */
-      margin: 0 auto;
-      /* #endif */
-      margin-top: 8px;
-    }
-
-    .image {
-      width: 100%;
-    }
-  }
-</style>
+	/* #ifndef APP-NVUE */
+	page {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #fff;
+		min-height: 100%;
+		height: auto;
+	}
+
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	/* #endif */
+
+	.text {
+		text-align: center;
+		font-size: 26rpx;
+		margin-top: 10rpx;
+	}
+
+	.grid-item-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.uni-margin-wrap {
+		width: 690rpx;
+		width: 100%;
+		;
+	}
+
+	.swiper {
+		height: 300rpx;
+	}
+
+	.swiper-box {
+		height: 150px;
+	}
+
+	.swiper-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #fff;
+		height: 300rpx;
+		line-height: 300rpx;
+	}
+
+	@media screen and (min-width: 500px) {
+		.uni-swiper-dot-box {
+			width: 400px;
+			/* #ifndef APP-NVUE */
+			margin: 0 auto;
+			/* #endif */
+			margin-top: 8px;
+		}
+
+		.image {
+			width: 100%;
+		}
+	}
+
+	// 弹窗效果
+	.popup {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		background-color: #fff;
+		// padding: 20rpx;
+		box-sizing: border-box;
+		z-index: 999;
+	}
+
+	// 遮罩层
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 888;
+	}
+
+	// 弹窗内容
+	.content {
+		.line1 {
+			background-color: #6ea8e7;
+			text-align: center;
+			padding: 20rpx;
+		}
+
+		.line2 {
+			padding: 20rpx;
+			// border-bottom: 1px solid black;
+
+			view {
+				margin-bottom: 10rpx;
+			}
+		}
+	}
+
+	// 按钮样式
+	.btn-group {
+		box-shadow: 0px -2px 6px rgba(0, 0, 0, 0.5);
+
+		/* 示例阴影参数，根据需要进行调整 */
+		.btn_position {
+			display: flex;
+			width: 100%;
+
+			.cancel {
+				width: 50%;
+				text-align: center;
+				padding: 20rpx 0;
+				color: #519fe7;
+			}
+
+			.submit {
+				width: 50%;
+				background-color: #519fe7;
+				text-align: center;
+				padding: 20rpx 0;
+				color: #fff;
+			}
+		}
+
+	}
+</style>