sync

api/common.js

@@ -66,15 +66,15 @@ export function SubmitMouth(type, param) {
 }
 
 // 碰口工程获取项目名称列表
-export function getProjectName(modeOperation, pageSize) {
-	const data = {
-		modeOperation,
-		pageSize
-	}
+export function getProjectName() {
+	// const data = {
+	// 	modeOperation,
+	// 	pageSize
+	// }
 	return request({
 		'url': '/zdsz/touchOperationEngineering/list',
 		'method': 'get',
-		'data': data
+		// 'data': data
 	})
 }
 
@@ -608,3 +608,63 @@ export function getCollisionProjectScheduleDetails(id, type) {
 		'method': 'get',
 	})
 }
+
+//工业工程列表
+export function getEnginProjectList() {
+	return request({
+		'url': '/zdsz/engineeringGY/queryGYforApp',
+		'method': 'get',
+	})
+}
+
+// 工业工程   详情  根据name enginName enginType 查询
+export function getEnginProjectDetailsByParams(enginName,enginType,enginTitle) {
+	return request({
+		'url': '/zdsz/engineeringGY/getInfoforApp/' + enginName+'/'+enginType+'/'+enginTitle,
+		'method': 'get',
+	})
+}
+//市政工程列表
+export function getMunicipalProjectList() {
+	return request({
+		'url': '/zdsz/engineeringIndustry/querySZforApp',
+		'method': 'get',
+	})
+}
+
+// 市政工程   详情  根据name enginName enginType 查询
+export function getMunicipalProjectDetailsByParams(enginName,enginType) {
+	return request({
+		'url': '/zdsz/engineeringIndustry/getInfoforApp/' + enginName+'/'+enginType,
+		'method': 'get',
+	})
+}
+
+//顶管工程列表
+export function getTopPipeProjectList() {
+	return request({
+		'url': '/zdsz/engineeringPipeJacking/queryDGforApp',
+		'method': 'get',
+	})
+}
+
+//碰口工程列表
+export function getCollisionProjectList() {
+	return request({
+		'url': '/zdsz/touchOperationEngineering/queryPKforApp',
+		'method': 'get',
+	})
+}
+
+//统计页 查询小区 整体施工状态
+export function getAreaCompletionInformationList(areaId,enginCycle) {
+	const data = {
+		areaId,
+		enginCycle
+	}
+	return request({
+		'url': '/zdsz/engineeringCivil/getAreaCompletionInformationList/',
+		'method': 'get',
+		'data': data
+	})
+}

pages/TopPipeWork/TopPipeWork.vue

@@ -7,14 +7,14 @@
 					<view>
 						工程名称
 					</view>
-					<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
+				<!-- 	<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 						@click="pickerShow('gcmc',0)">
 						<span style="color: darkgray;">请选择工程名称</span>
 						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-					</view>
-					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
-						<span style="color: black;">{{projectName.name}}</span>
-						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view> -->
+					<view class="uni-list-cell-db" style="margin-top: 10;" >
+						<span style="color: black;">{{projectName}}</span>
+						<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
 					</view>
 				</view>
 
@@ -293,6 +293,7 @@
 				sgjdValue: '', //施工进度
 				materialList: '', //材质list
 				enginId: '', //其他工程id
+				enginValue:'',
 				id: '', //工程id
 				fileUrl: '', //点击的文件地址
 				fileName: '', //点击的文件名称
@@ -321,9 +322,34 @@
 		onLoad(options) {
 			if ('params' in options) {
 				this.objValue = JSON.parse(decodeURIComponent(options.params));
+				this.enginId = this.objValue.id;
+				this.enginValue = this.objValue.value;
 			}
-
-
+			
+			this.fileImageArr = [];
+			uni.showLoading({
+				title: '加载中'
+			})
+			getTopPipeWorkDetails(this.enginId).then(res => {
+				uni.hideLoading();
+				this.projectName=res.data.enginName;
+				this.gcddValue = res.data.enginAddre; //工程地点
+				this.gcbmValue = res.data.enginCode; //工程编码
+				this.sgdwValue = res.data.constructUnit; //施工单位
+				this.gcgmValue = res.data.enginScale; //工程规模
+				this.sgzlValue = res.data.constructQuality; //施工质量
+				this.sgjdValue = res.data.constructSchedule; //施工进度
+				this.fileArr = res.data.pics;
+				this.enginId = res.data.enginId;
+				this.id = res.data.id;
+				this.fileArr.forEach((list, index) => {
+					if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
+						.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
+							.picUrl.length - 4) == 'jpeg') {
+						this.fileImageArr.push(list.picUrl)
+					}
+				});
+			})
 		},
 		methods: {
 			//判断是否选择
@@ -606,11 +632,11 @@
 				this.SelectIndex = index;
 				this.type = e; //赋值类型
 				if (e == 'gcmc') {
-					this.open = true;
-					getTopPipeNameList().then(response => {
-						this.selectList = response.data;
+					// this.open = true;
+					// getTopPipeNameList().then(response => {
+					// 	this.selectList = response.data;
 
-					});
+					// });
 
 				} else if (e == 'cz') { //材质
 					this.open = true;
@@ -637,35 +663,35 @@
 				this.open = false;
 
 				if (this.type == 'gcmc') {
-					this.projectName = item;
-					this.fileImageArr = [];
-					uni.showLoading({
-						title: '加载中'
-					})
-					getTopPipeWorkDetails(item.id).then(res => {
-						uni.hideLoading();
-						this.gcddValue = res.data.enginAddre; //工程地点
-						this.gcbmValue = res.data.enginCode; //工程编码
-						this.sgdwValue = res.data.constructUnit; //施工单位
-						this.gcgmValue = res.data.enginScale; //工程规模
-						this.sgzlValue = res.data.constructQuality; //施工质量
-						this.sgjdValue = res.data.constructSchedule; //施工进度
-						this.fileArr = res.data.pics;
-						this.enginId = res.data.enginId;
-						this.id = res.data.id;
-						this.fileArr.forEach((list, index) => {
-							if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
-								.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
-									.picUrl.length - 4) == 'jpeg') {
-								this.fileImageArr.push(list.picUrl)
-							}
-
-
-						});
-
-
-
-					})
+					// this.projectName = item;
+					// this.fileImageArr = [];
+					// uni.showLoading({
+					// 	title: '加载中'
+					// })
+					// getTopPipeWorkDetails(item.id).then(res => {
+					// 	uni.hideLoading();
+					// 	this.gcddValue = res.data.enginAddre; //工程地点
+					// 	this.gcbmValue = res.data.enginCode; //工程编码
+					// 	this.sgdwValue = res.data.constructUnit; //施工单位
+					// 	this.gcgmValue = res.data.enginScale; //工程规模
+					// 	this.sgzlValue = res.data.constructQuality; //施工质量
+					// 	this.sgjdValue = res.data.constructSchedule; //施工进度
+					// 	this.fileArr = res.data.pics;
+					// 	this.enginId = res.data.enginId;
+					// 	this.id = res.data.id;
+					// 	this.fileArr.forEach((list, index) => {
+					// 		if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
+					// 			.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
+					// 				.picUrl.length - 4) == 'jpeg') {
+					// 			this.fileImageArr.push(list.picUrl)
+					// 		}
+
+
+					// 	});
+
+
+
+					// })
 
 				}
 				//  else if (this.type == 'cz') {
@@ -701,10 +727,6 @@
 			},
 			//历史
 			history() {
-				if (this.isEmpty(this.projectName.id)) {
-					this.$modal.msg('请选择工程名称')
-					return
-				}
 				getTopPipeHistoryList(this.id, this.objValue.value).then(response => {
 
 					this.historyList = response.data

pages/collision/collisionMouth.vue

@@ -7,24 +7,17 @@
 						<view>
 							工程名称
 						</view>
-						<view v-if="this.isEmpty(this.projectName)" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
+						<!-- <view v-if="this.isEmpty(this.projectName)" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 							<span style="color: darkgray;">请选择工程名称</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
+						</view> -->
+						<view  class="uni-list-cell-db" style="margin-top: 10;">
 							<span style="color: black;">{{projectName}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
 						</view>
 					</view>
-
 				</view>
-
-
-
-
-
-
-
+				
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
@@ -33,15 +26,10 @@
 							style="margin-left: 10px;text-align: right;"></input>
 					</view>
 				</view>
-
-
-
-
-
+				
 				<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
 					subtitleKey="id" v-model="name"></SelectPicker>
 
-
 				<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
 					titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
 			</view>
@@ -141,7 +129,6 @@
 		} from "@/api/system/dict/data";
 		import {
 			SubmitMouth,
-			getProjectName,
 			getHistoryMouthDetails,
 		} from '@/api/common'
 		import {
@@ -153,10 +140,7 @@
 				SelectPicker,
 				bottomSheet,
 			},
-
 			data() {
-
-
 				return {
 					historyList: {}, //历史数据
 					show_loding: false,
@@ -198,12 +182,11 @@
 					updateInfoTime: '',
 					id: '',
 					modeOperation: '',
-					enginName: '',
 					locations: '',
 					remark: '',
-
-
-
+					
+					enginTitle: '',
+					enginValue: '',
 				}
 			},
 
@@ -215,25 +198,21 @@
 				if ('params' in options) {
 					this.objValue = JSON.parse(decodeURIComponent(options.params));
 					this.placeholder = '请输入' + this.objValue.value;
+					this.id=this.objValue.id;
+					this.projectName=this.objValue.name;
+					this.enginTitle=this.objValue.title;
+					this.enginValue=this.objValue.value;
+					this.locations=this.objValue.address;
 				}
-
-
 			},
 			methods: {
 				//判断是否选择
-
 				isEmpty(str) {
-
 					return (!str || 0 === str.length);
-
 				},
-
 				handleSubmit(e) {
-
 					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
-
 				},
-
 				//获取当前时间
 				traversalTime(timestamp) {
 					//timestamp(时间戳)是整数，否则要parseInt转换
@@ -246,8 +225,6 @@
 					let s = time.getSeconds();
 					return y + '-' + this.addTimes(m) + '-' + this.addTimes(d) + ' ' + this.addTimes(h) + ':' + this.addTimes(
 						mm) + ':' + this.addTimes(s);
-
-
 				},
 				addTimes(m) {
 					return m < 10 ? '0' + m : m
@@ -265,28 +242,22 @@
 					this.SelectIndex = index;
 					this.type = e; //赋值类型
 					if (e == 'gcmc') { //工程名称
-
-						this.open = true;
-						//请求
-						getProjectName(this.objValue.title, "1", '999999').then(response => {
-							let result = JSON.parse(JSON.stringify(response.rows).replace(/enginName/g, 'name'));
-							this.selectList = result;
-						});
-
+						// this.open = true;
+						// //请求
+						// getProjectName(this.objValue.title, "1", '999999').then(response => {
+						// 	let result = JSON.parse(JSON.stringify(response.rows).replace(/enginName/g, 'name'));
+						// 	this.selectList = result;
+						// });
 
 					}
 
-
-
 				},
 
 				showPhotoFile(index) {
-
 					uni.previewImage({
 						current: index,
 						urls: this.fileImageArr,
 					})
-
 				},
 
 				showPhoto(index, e) {
@@ -449,25 +420,23 @@
 					this.openDict = false;
 					// this.projectName = ''; //重置工程名称
 					// this.createTime = '';
-
-
 				},
 				changeSelect(item, index) {
-					this.open = false;
-
-					if (this.type == 'gcmc') {
-						this.projectName = item.name;
-						this.createBy = item.createBy;
-						this.createTime = item.createTime;
-						this.updateBy = item.updateBy;
-						this.updateTime = item.updateTime;
-						this.updateInfoTime = item.updateInfoTime;
-						this.id = item.id;
-						this.modeOperation = item.modeOperation;
-						this.enginName = item.name;
-						this.locations = item.locations;
-						this.remark = item.remark;
-					}
+					// this.open = false;
+
+					// if (this.type == 'gcmc') {
+					// 	this.projectName = item.name;
+					// 	this.createBy = item.createBy;
+					// 	this.createTime = item.createTime;
+					// 	this.updateBy = item.updateBy;
+					// 	this.updateTime = item.updateTime;
+					// 	this.updateInfoTime = item.updateInfoTime;
+					// 	this.id = item.id;
+					// 	this.modeOperation = item.modeOperation;
+					// 	this.enginName = item.name;
+					// 	this.locations = item.locations;
+					// 	this.remark = item.remark;
+					// }
 				},
 				//关闭弹窗
 				close(e) {
@@ -480,13 +449,7 @@
 
 				//历史
 				history() {
-
-					if (this.isEmpty(this.projectName)) {
-						this.$modal.msg('请选择工程名称')
-						return
-					}
 					getHistoryMouthDetails(this.id, this.objValue.value).then(response => {
-
 						this.historyList = response.data
 						if (response.data.zEngineeringNodeBo != null) {
 							this.$refs.refShare.handleShowShare();
@@ -494,24 +457,17 @@
 							this.$modal.msg("暂无历史信息")
 						}
 					});
-
 				},
 
 				submit() {
-
-
-
 					if (this.isEmpty(this.projectName)) {
 						this.$modal.msg('请选择工程名称')
 						return
 					}
-
 					if (this.objValue.value == '原有管线压力' || this.objValue.value == '管道压力') {
-
 						if (this.isEmpty(this.pipePressure)) {
 							this.$modal.msg(this.placeholder)
 							return
-
 						}
 					}
 					if (this.imgArr.length <= 0) {
@@ -542,12 +498,8 @@
 								remark: this.projectContent,
 								constructAccordingDrawings: this.pipePressure,
 								constructAddre: this.pipePressure,
-
-
 							}
-
 						}]
-
 					}
 					uni.showLoading()
 					SubmitMouth('new', param).then(res => {
@@ -562,13 +514,9 @@
 							setTimeout(function() {
 								uni.navigateBack();
 							}, 1000)
-
 						}
 					})
-
 				}
-
-
 			}
 		}
 	</script>

pages/enginproject/enginproject.vue

@@ -4,35 +4,34 @@
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
-							工程类型
-						</view>
-						<view v-if="this.isEmpty(this.projectType.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('gclx',0)">
-							<span style="color: darkgray;">请选择工程类型</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							工程名称
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gclx',0)">
-							<span style="color: black;">{{projectType.dictLabel}}</span>
+						<!-- <view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
+							@click="pickerShow('gcmc',0)">
+							<span style="color: darkgray;">请选择工程名称</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view> -->
+						<view class="uni-list-cell-db" style="margin-top: 10;">
+							<span style="color: black;">{{enginName}}</span>
+							<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
 						</view>
 					</view>
+
 				</view>
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
-							工程名称
-						</view>
-						<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
-							@click="pickerShow('gcmc',0)">
-							<span style="color: darkgray;">请选择工程名称</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							工程类型
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
-							<span style="color: black;">{{projectName.name}}</span>
+						<!-- 	<view v-if="this.isEmpty(this.projectType.dictValue)" style="margin-top: 10;">
+							<span style="color: darkgray;">请选择工程类型</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view> -->
+						<view class="uni-list-cell-db" style="margin-top: 10;">
+							<span style="color: black;">{{enginType}}</span>
+							<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
 						</view>
 					</view>
-
 				</view>
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -508,6 +507,7 @@
 			getengineeringNameListNew,
 			getEngineeringDetailsNew,
 			getEngineeringHistoryListNew,
+			getEnginProjectDetailsByParams
 		} from '@/api/common'
 		import {
 			getToken
@@ -596,7 +596,10 @@
 					imgDtljArr: [],
 					imgHldmyhArr: [],
 
-
+					enginName: '',
+					enginType: '',
+					enginTitle: '',
+					enginValue: '',
 				}
 			},
 
@@ -607,26 +610,52 @@
 			onLoad(options) {
 				if ('params' in options) {
 					this.objValue = JSON.parse(decodeURIComponent(options.params));
-
+					this.enginName = this.objValue.name;
+					this.enginType = this.objValue.enginType;
+					this.enginTitle = this.objValue.title;
+					this.enginValue = this.objValue.value;
 				}
 
+				// this.projectName = item
+				// 获取工程信息
+				uni.showLoading({
+					title: '加载中'
+				})
+				getEnginProjectDetailsByParams(this.enginName, this.enginType, this.enginTitle).then(
+					response => {
+						uni.hideLoading();
+						//	this.enginList = response.data
+						this.jlPhoneValue = response.data.supervisionPhone; //监理电话
+						this.jlfzrValue = response.data.supervisionHead; //监理负责人
+						this.jldwValue = response.data.supervisionUnit; //监理单位
+						this.sjPhoneValue = response.data.designPhone; //设计电话
+						this.sjfzrValue = response.data.designHead; //设计负责人
+						this.sjdwValue = response.data.designUnit; //设计单位
+						this.xcfzrValue = response.data.sceneHead; //现场负责人
+						this.xmfzrValue = response.data.projectHead; //项目负责人
+						this.jsdwValue = response.data.constructUnit; //建设单位
+						this.enginId = response.data.id; //工程id
+						this.fileArr = response.data.pics
+						this.createTime = response.data.createTime;
+						this.fileArr.forEach((list, index) => {
+							if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
+								.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
+									.picUrl.length - 4) == 'jpeg') {
+								this.fileImageArr.push(list.picUrl)
+							}
+						});
+					});
+
 
 			},
 			methods: {
 				//判断是否选择
-
 				isEmpty(str) {
-
 					return (!str || 0 === str.length);
-
 				},
-
 				handleSubmit(e) {
-
 					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
-
 				},
-
 				//获取当前时间
 				traversalTime(timestamp) {
 					//timestamp(时间戳)是整数，否则要parseInt转换
@@ -679,17 +708,17 @@
 							this.dictOptions = response.data;
 						});
 					} else if (e == 'gcmc') { //工程名称
-						if (this.isEmpty(this.projectType.dictValue)) {
+						// if (this.isEmpty(this.projectType.dictValue)) {
 
-							this.$modal.msg('请选择工程类型')
-							return
-						}
-						this.open = true;
-						//请求
-						getengineeringNameListNew(this.projectType.dictValue, this.objValue.title).then(response => {
+						// 	this.$modal.msg('请选择工程类型')
+						// 	return
+						// }
+						// this.open = true;
+						// //请求
+						// getengineeringNameListNew(this.projectType.dictValue, this.objValue.title).then(response => {
 
-							this.selectList = response.data;
-						});
+						// 	this.selectList = response.data;
+						// });
 
 
 					}
@@ -1090,16 +1119,15 @@
 				},
 				//历史
 				history() {
-					if (this.isEmpty(this.projectType.dictValue)) {
-						this.$modal.msg('请选择工程类型')
-						return
-					}
-					if (this.isEmpty(this.projectName.id)) {
-						this.$modal.msg('请选择工程名称')
-						return
-					}
+					// if (this.isEmpty(this.projectType.dictValue)) {
+					// 	this.$modal.msg('请选择工程类型')
+					// 	return
+					// }
+					// if (this.isEmpty(this.projectName.id)) {
+					// 	this.$modal.msg('请选择工程名称')
+					// 	return
+					// }
 					getEngineeringHistoryListNew(this.enginId, this.objValue.value).then(response => {
-
 						this.historyList = response.data
 						if (response.data.zEngineeringNodeBo != null) {
 							this.$refs.refShare.handleShowShare();
@@ -1113,14 +1141,14 @@
 				submit() {
 
 
-					if (this.isEmpty(this.projectType.dictValue)) {
-						this.$modal.msg('请选择工程类型')
-						return
-					}
-					if (this.isEmpty(this.projectName.id)) {
-						this.$modal.msg('请选择工程名称')
-						return
-					}
+					// if (this.isEmpty(this.projectType.dictValue)) {
+					// 	this.$modal.msg('请选择工程类型')
+					// 	return
+					// }
+					// if (this.isEmpty(this.projectName.id)) {
+					// 	this.$modal.msg('请选择工程名称')
+					// 	return
+					// }
 
 					if (this.objValue.value == '焊接、防腐' || this.objValue.value == '架空管线' || this.objValue.value == '下管' || this
 						.objValue.value == '沟下连头' || this.objValue.value == '焊接') {

pages/municipal/municipal.vue

@@ -4,36 +4,37 @@
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
-							工程类型
-						</view>
-						<view v-if="this.isEmpty(this.projectType.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('gclx',0)">
-							<span style="color: darkgray;">请选择工程类型</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							工程名称
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gclx',0)">
-							<span style="color: black;">{{projectType.dictLabel}}</span>
+						<!-- 	<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
+							@click="pickerShow('gcmc',0)">
+							<span style="color: darkgray;">请选择工程名称</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view> -->
+						<view class="uni-list-cell-db" style="margin-top: 10;">
+							<span style="color: black;">{{enginName}}</span>
+							<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
 						</view>
 					</view>
+
 				</view>
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
-							工程名称
-						</view>
-						<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
-							@click="pickerShow('gcmc',0)">
-							<span style="color: darkgray;">请选择工程名称</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							工程类型
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
-							<span style="color: black;">{{projectName.name}}</span>
+						<!-- <view v-if="this.isEmpty(this.projectType.dictValue)" style="margin-top: 10;"
+							@click="pickerShow('gclx',0)">
+							<span style="color: darkgray;">请选择工程类型</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view> -->
+						<view class="uni-list-cell-db" style="margin-top: 10;">
+							<span style="color: black;">{{enginType}}</span>
+							<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
 						</view>
 					</view>
-
 				</view>
+
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
@@ -148,7 +149,7 @@
 					<view class="uni-list">
 						<view
 							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
-							{{objValue.Label}}
+							{{objValue.title}}
 
 							<span
 								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
@@ -452,6 +453,10 @@
 					createTime: '',
 					infonId: '', //info id
 
+					enginName: '',
+					enginType: '',
+					enginTitle: '',
+					enginValue: '',
 				}
 			},
 
@@ -462,27 +467,50 @@
 			onLoad(options) {
 				if ('params' in options) {
 					this.objValue = JSON.parse(decodeURIComponent(options.params));
-
-
+					this.enginId = this.objValue.id;
+					this.enginTitle = this.objValue.title;
+					this.enginValue = this.objValue.value;
 				}
-
-
+				//根据工程id  获取工程信息
+				uni.showLoading({
+					title: '加载中'
+				})
+				getEngineeringDetails(this.enginId).then(
+					response => {
+						uni.hideLoading();
+						this.enginName=response.data.enginName;
+						this.enginType=response.data.enginType;
+						//	this.enginList = response.data
+						this.jlPhoneValue = response.data.supervisionPhone; //监理电话
+						this.jlfzrValue = response.data.supervisionHead; //监理负责人
+						this.jldwValue = response.data.supervisionUnit; //监理单位
+						this.sjPhoneValue = response.data.designPhone; //设计电话
+						this.sjfzrValue = response.data.designHead; //设计负责人
+						this.sjdwValue = response.data.designUnit; //设计单位
+						this.xcfzrValue = response.data.sceneHead; //现场负责人
+						this.xmfzrValue = response.data.projectHead; //项目负责人
+						this.jsdwValue = response.data.constructUnit; //建设单位
+						this.enginId = response.data.id; //工程id
+						this.fileArr = response.data.pics
+						this.createTime = response.data.createTime;
+						//this.infonId = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0].id
+						this.fileArr.forEach((list, index) => {
+							if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
+								.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
+									.picUrl.length - 4) == 'jpeg') {
+								this.fileImageArr.push(list.picUrl)
+							}
+						});
+					});
 			},
 			methods: {
 				//判断是否选择
-
 				isEmpty(str) {
-
 					return (!str || 0 === str.length);
-
 				},
-
 				handleSubmit(e) {
-
 					this.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
-
 				},
-
 				//获取当前时间
 				traversalTime(timestamp) {
 					//timestamp(时间戳)是整数，否则要parseInt转换
@@ -495,8 +523,6 @@
 					let s = time.getSeconds();
 					return y + '-' + this.addTimes(m) + '-' + this.addTimes(d) + ' ' + this.addTimes(h) + ':' + this.addTimes(
 						mm) + ':' + this.addTimes(s);
-
-
 				},
 				addTimes(m) {
 					return m < 10 ? '0' + m : m
@@ -531,22 +557,22 @@
 						}
 
 					} else if (e == 'gclx') { //工程类型
-						this.openDict = true;
-						getDicts("municipal_engineering").then(response => {
-							this.dictOptions = response.data;
-						});
+						// this.openDict = true;
+						// getDicts("municipal_engineering").then(response => {
+						// 	this.dictOptions = response.data;
+						// });
 					} else if (e == 'gcmc') { //工程名称
-						if (this.isEmpty(this.projectType.dictValue)) {
+						// if (this.isEmpty(this.projectType.dictValue)) {
 
-							this.$modal.msg('请选择工程类型')
-							return
-						}
-						this.open = true;
-						//请求
-						getengineeringNameList(this.projectType.dictValue, "2", null).then(response => {
+						// 	this.$modal.msg('请选择工程类型')
+						// 	return
+						// }
+						// this.open = true;
+						// //请求
+						// getengineeringNameList(this.projectType.dictValue, "2", null).then(response => {
 
-							this.selectList = response.data;
-						});
+						// 	this.selectList = response.data;
+						// });
 
 
 					}
@@ -807,37 +833,37 @@
 						this.czggslList[this.SelectIndex].gg.id = this.specificationValue.id
 						this.czggslList[this.SelectIndex].gg.name = this.specificationValue.name
 					} else if (this.type == 'gcmc') {
-						this.projectName = item
-						//根据工程id  获取工程信息
-						uni.showLoading({
-							title: '加载中'
-						})
-						getEngineeringDetails(item.id).then(response => {
-							uni.hideLoading();
-							//	this.enginList = response.data
-							this.jlPhoneValue = response.data.supervisionPhone; //监理电话
-							this.jlfzrValue = response.data.supervisionHead; //监理负责人
-							this.jldwValue = response.data.supervisionUnit; //监理单位
-							this.sjPhoneValue = response.data.designPhone; //设计电话
-							this.sjfzrValue = response.data.designHead; //设计负责人
-							this.sjdwValue = response.data.designUnit; //设计单位
-							this.xcfzrValue = response.data.sceneHead; //现场负责人
-							this.xmfzrValue = response.data.projectHead; //项目负责人
-							this.jsdwValue = response.data.constructUnit; //建设单位
-							this.enginId = response.data.id; //工程id
-							this.fileArr = response.data.pics
-							this.createTime = response.data.createTime;
-							//this.infonId = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0].id
-							this.fileArr.forEach((list, index) => {
-								if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
-									.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
-										.picUrl.length - 4) == 'jpeg') {
-									this.fileImageArr.push(list.picUrl)
-								}
-
-
-							});
-						});
+						// this.projectName = item
+						// //根据工程id  获取工程信息
+						// uni.showLoading({
+						// 	title: '加载中'
+						// })
+						// getEngineeringDetails(item.id).then(response => {
+						// 	uni.hideLoading();
+						// 	//	this.enginList = response.data
+						// 	this.jlPhoneValue = response.data.supervisionPhone; //监理电话
+						// 	this.jlfzrValue = response.data.supervisionHead; //监理负责人
+						// 	this.jldwValue = response.data.supervisionUnit; //监理单位
+						// 	this.sjPhoneValue = response.data.designPhone; //设计电话
+						// 	this.sjfzrValue = response.data.designHead; //设计负责人
+						// 	this.sjdwValue = response.data.designUnit; //设计单位
+						// 	this.xcfzrValue = response.data.sceneHead; //现场负责人
+						// 	this.xmfzrValue = response.data.projectHead; //项目负责人
+						// 	this.jsdwValue = response.data.constructUnit; //建设单位
+						// 	this.enginId = response.data.id; //工程id
+						// 	this.fileArr = response.data.pics
+						// 	this.createTime = response.data.createTime;
+						// 	//this.infonId = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0].id
+						// 	this.fileArr.forEach((list, index) => {
+						// 		if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
+						// 			.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
+						// 				.picUrl.length - 4) == 'jpeg') {
+						// 			this.fileImageArr.push(list.picUrl)
+						// 		}
+
+
+						// 	});
+						// });
 					}
 				},
 				//关闭弹窗
@@ -930,16 +956,19 @@
 				},
 				//历史
 				history() {
-					if (this.isEmpty(this.projectType.dictValue)) {
-						this.$modal.msg('请选择工程类型')
-						return
-					}
-					if (this.isEmpty(this.projectName.id)) {
-						this.$modal.msg('请选择工程名称')
+					// if (this.isEmpty(this.projectType.dictValue)) {
+					// 	this.$modal.msg('请选择工程类型')
+					// 	return
+					// }
+					// if (this.isEmpty(this.projectName.id)) {
+					// 	this.$modal.msg('请选择工程名称')
+					// 	return
+					// }
+					if (this.isEmpty(this.enginId)) {
+						this.$modal.msg('暂无工程信息')
 						return
 					}
 					getEngineeringHistoryList(this.enginId, this.objValue.value).then(response => {
-
 						this.historyList = response.data
 						if (response.data.zEngineeringNodeBo != null && response.data.zEngineeringNodeBo
 							.zEngineeringInfoBoList != '') {
@@ -952,19 +981,15 @@
 				},
 
 				submit() {
-
-
-					if (this.isEmpty(this.projectType.dictValue)) {
-						this.$modal.msg('请选择工程类型')
-						return
-					}
-					if (this.isEmpty(this.projectName.id)) {
-						this.$modal.msg('请选择工程名称')
-						return
-					}
-
-
-					if (this.objValue.Label == '焊接、防腐' || this.objValue.Label == '下管' || this.objValue.Label == ' 沟下连头') {
+					// if (this.isEmpty(this.projectType.dictValue)) {
+					// 	this.$modal.msg('请选择工程类型')
+					// 	return
+					// }
+					// if (this.isEmpty(this.projectName.id)) {
+					// 	this.$modal.msg('请选择工程名称')
+					// 	return
+					// }
+					if (this.objValue.title == '焊接、防腐' || this.objValue.title == '下管' || this.objValue.title == ' 沟下连头') {
 						try {
 							this.czggslList.forEach((list) => {
 								if (this.isEmpty(list.cz.id)) {
@@ -977,16 +1002,13 @@
 								if (this.isEmpty(list.gg.id)) {
 									this.$modal.msg('规格不能为空')
 									throw new Error('End Loop')
-
 								}
 
-
 								if (this.isEmpty(list.sl.inputIntegerNumberValue)) {
 									this.$modal.msg("请输入米数")
 									throw new Error('End Loop')
 								}
 
-
 							})
 						} catch (e) {
 							if (e.message === 'End Loop') throw e
@@ -1005,8 +1027,7 @@
 
 					}
 
-
-					if (this.objValue.Label == '回填、撤场') {
+					if (this.objValue.title == '回填、撤场') {
 						if (this.imgHtqArr.length <= 0 && this.imgJspsArr.length <= 0 && this.imgHthArr.length <= 0) {
 							this.$modal.msg('请上传照片')
 							return

pages/statistics/statistics.vue

@@ -183,7 +183,19 @@
     left: -5px;
     z-index: 1;
 "></image> -->
-					<scroll-view :scroll-x="true" class="view_bg_build" v-if="roomList.length > 0">
+					<view class="felx-row" v-if="!isEmpty(XQValue2.id)" style="margin-top: 10px;">
+						<view class="h-td" style="flex: 1;">规模(户)</view>
+						<view class="h-td" style="flex: 1;">未施工(户)</view>
+						<view class="h-td" style="flex: 1;">施工中(户)</view>
+						<view class="h-td" style="flex: 1;">竣工(户)</view>
+					</view>
+					<view class="felx-row" v-for="(item, index) in areaData" :key="index" v-if="!isEmpty(XQValue2.id)">
+						<view class="h-td" style="flex: 1">{{ item.scale }}</view>
+						<view class="h-td" style="flex: 1">{{ item.notstart }}</view>
+						<view class="h-td" style="flex: 1">{{ item.willDone }}</view>
+						<view class="h-td" style="flex: 1">{{ item.done }}</view>
+					</view>
+					<scroll-view :scroll-x="true" class="view_bg_build" v-if="roomList.length > 0" style="margin-top: 10px;">
 						<view class="HuaDongBiao">
 							<view class="NeiRong" v-for="(item,index) in roomList" :key="index">
 								<view class="Fang" v-for="(item2, index2) in roomList[index]" :key="index2">
@@ -223,7 +235,7 @@
 					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
 						<view class="uni-list-cell-left">工程名称</view>
 						<view class="uni-list-cell-db">
-							<view v-if="isEmpty(projectObj01.id)" style="margin-top: 10;"
+							<view v-if="isEmpty(projectObj01.name)" style="margin-top: 10;"
 								@click="getProjectTypeList('engineeringIndustry')">
 								<span style="color: darkgray;">请选择工程</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
@@ -235,8 +247,9 @@
 						</view>
 
 					</view>
-					<view v-if="!isEmpty(projectObj01.id)">
-						<view class="table">
+					<view v-if="!isEmpty(projectObj01.name)">
+						<!-- v-if="!isEmpty(projectObj01.id)" -->
+						<!-- 	<view class="table">
 							<view class="felx-row">
 								<view class="h-tr" style="flex: 1">名称</view>
 								<view class="h-tr" style="flex: 1">实际用料</view>
@@ -268,6 +281,18 @@
 						<view class="felx-row" v-for="(item, index) in projectBody01.nodeCheck" :key="index">
 							<view class="h-td" style="flex: 1">{{ item.name }}</view>
 							<view class="h-td" style="flex: 1" @click="industryItemClick(item)">{{ item.value }}</view>
+						</view> -->
+						<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+							<view class="uni-list-cell-left">工程进度</view>
+							<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;"></view>
+						</view>
+						<view class="felx-row">
+							<view class="h-td" style="flex: 1;">名称</view>
+							<view class="h-td" style="flex: 1;">占比</view>
+						</view>
+						<view class="felx-row" v-for="(item, index) in projectBody01.nodeCheck" :key="index">
+							<view class="h-td" style="flex: 1">{{ item.enginClassification }}</view>
+							<view class="h-td" style="flex: 1">{{ item.percentage }}</view>
 						</view>
 					</view>
 				</view>
@@ -744,14 +769,15 @@
 		getRoomProjectList,
 		getHistoryByUserList,
 		getByUserListAndDicts,
-		getengineeringNameListNew,
+		getEnginProjectList,
 		getengineeringNameList,
 		getTopPipeNameList,
 		getProjectName,
 		getIndustryProjectScheduleDetails,
 		getMunicipalProjectScheduleDetails,
 		getTopTubeProjectScheduleDetails,
-		getCollisionProjectScheduleDetails
+		getCollisionProjectScheduleDetails,
+		getAreaCompletionInformationList
 	} from '@/api/common'
 
 	export default {
@@ -836,18 +862,7 @@
 				roomItem: {},
 				roomId: '',
 				projectList: [],
-				projectBody01: {
-					'materialPercentagePE': {
-						'actuality': '',
-						'anticipation': '',
-						'percentage': ''
-					},
-					'materialPercentageIron': {
-						'actuality': '',
-						'anticipation': '',
-						'percentage': ''
-					}
-				},
+				projectBody01: {},
 				projectBody02: {
 					'materialPercentagePE': {
 						'actuality': '',
@@ -889,7 +904,8 @@
 				projectObj03: {},
 				projectObj04: {},
 				openP: false,
-				currentProjectType: ''
+				currentProjectType: '',
+				areaData: [],
 			}
 		},
 		created() {},
@@ -955,20 +971,23 @@
 				let type = this.currentProjectType;
 				if (type == 'engineeringIndustry') { // 工业工程
 					this.projectObj01 = item;
+					this.getProjectData(item.name, type);
 				} else if (type == 'engineeringMunicipal') { // 市政工程
 					this.projectObj02 = item;
+					this.getProjectData(item.id, type);
 				} else if (type == 'engineeringPipeJacking') { // 顶管工程
 					this.projectObj03 = item;
+					this.getProjectData(item.id, type);
 				} else if (type == 'touchOperationEngineering') { // 碰口作业
 					this.projectObj04 = item;
+					this.getProjectData(item.id, type);
 				}
-				this.getProjectData(item.id, type);
 			},
 			getProjectTypeList(type) {
 				this.currentProjectType = type;
 				if (type == 'engineeringIndustry') {
 					this.projectList = null;
-					getengineeringNameListNew("", "").then(res => {
+					getEnginProjectList().then(res => {
 						this.projectList = res.data;
 						this.openP = true;
 					})
@@ -1637,6 +1656,9 @@
 					getBuildingList(item.id).then(res => {
 						this.LDList2 = res.data
 					})
+					getAreaCompletionInformationList(item.id, 0).then(res => {
+						this.areaData = res.rows;
+					})
 				} else if (this.type == 'xq3') {
 					this.XZQValue3 = {
 						dictValue: item.district,

pages/work/index.vue

@@ -113,11 +113,16 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				</view>
 			</view>
 		</view>
+
+
+		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="title"
+			subtitleKey="id" v-model="name"></SelectPicker>
 	</view>
 	</view>
 </template>
 
 <script>
+	import SelectPicker from '../../components/selectPicker/select_picker.vue'
 	import {
 		getDicts
 	} from "@/api/system/dict/data";
@@ -125,7 +130,16 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 		getUserRole
 	} from '@/utils/auth';
 	import user from '@/store/modules/user'
+	import {
+		getEnginProjectList,
+		getMunicipalProjectList,
+		getCollisionProjectList,
+		getTopPipeNameList,
+	} from '@/api/common';
 	export default {
+		components: {
+			SelectPicker,
+		},
 
 		data() {
 			return {
@@ -184,13 +198,59 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						img: '/static/logo.png',
 						title: '带气封堵施工'
 					},
-				]
-
-
+				],
+				selectList: [],
+				open: false,
+				id: '',
+				enginName: '',
+				enginType: '',
+				address: '',
 			}
 		},
 
-		methods: {
+		methods: { //关闭弹窗
+			close(e) {
+				this.open = false
+			},
+			changeSelect(item, index) {
+				this.open = false;
+				this.typeList = [];
+				if (this.projectType == 'GongYe') {
+					this.enginName = item.name;
+					this.enginType = item.enginType;
+					// //工业工程
+					getDicts("engin_classification").then(response => {
+						this.typeList = response.data;
+					});
+					this.handleShowSheet();
+				} else if (this.projectType == 'ShiZheng') {
+					this.id = item.id;
+					this.enginName = item.name;
+					this.enginType = item.enginType;
+					getDicts("municipal_node_types").then(response => {
+						this.typeList = response.data;
+					});
+					this.handleShowSheet();
+				} else if (this.projectType == 'DingGuan') {
+					this.id = item.id;
+					this.enginName = item.name;
+					this.enginType = item.enginType;
+					getDicts("pipe_jack").then(response => {
+						this.typeList = response.data;
+					});
+					this.handleShowSheet();
+				} else if (this.projectType == 'PengKou') {
+					this.id = item.id;
+					this.enginName = item.name;
+					this.enginType = item.enginType;
+					this.address = item.locations;
+					getDicts(item.modeOperation).then(response => {
+						this.typeList = response.data;
+					});
+					this.handleShowSheet();
+				}
+
+			},
 			navClick(newId) {
 				if (newId == 1) {
 					this.showMinYong()
@@ -233,12 +293,21 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 			},
 			//市政工程-首页-点击事件
 			municipalProjectClick() {
-
 				this.projectType = 'ShiZheng';
-				getDicts("municipal_node_types").then(response => {
-					this.typeList = response.data;
-				});
-				this.handleShowSheet();
+				this.open = true;
+				getMunicipalProjectList().then(res => {
+					let list = res.data;
+					let mList = [];
+					list.forEach((item, index) => {
+						mList.push({
+							id: item.id,
+							name: item.name,
+							enginType: item.enginType,
+							title: item.name + " - " + item.enginType
+						})
+					})
+					this.selectList = mList;
+				})
 			},
 
 			NewProject(e) {
@@ -463,13 +532,13 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					// }
 				} else if (this.projectType == 'ShiZheng') {
 					let obj = {
-						Label: item.dictLabel,
-						value: item.dictValue
+						id: this.id,
+						value: item.dictValue,
+						title: item.dictLabel
 					};
 					uni.navigateTo({
 						url: '/pages/municipal/municipal?params=' + encodeURIComponent(JSON
 							.stringify(obj))
-
 					});
 				} else if (this.projectType == 'GongYe') {
 
@@ -499,12 +568,16 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						if (item.dictLabel == '调压柜') {
 							obj = {
 								value: item.dictValue,
-								title: item.dictLabel
+								title: item.dictLabel,
+								name: this.enginName,
+								enginType: this.enginType,
 							};
 						} else {
 							obj = {
 								value: item.dictValue,
-								title: this.title_lebel
+								title: this.title_lebel,
+								name: this.enginName,
+								enginType: this.enginType,
 							};
 						}
 
@@ -518,52 +591,24 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 
 				} else if (this.projectType == 'PengKou') {
-					if (item.dictLabel == '地埋扳孔' || item.dictLabel == '架空扳孔' || item.dictLabel == '停气作业' || item
-						.dictLabel == 'PE 封堵' || item.dictLabel == '钢管带气封堵') {
-						let label = '';
-						switch (item.dictLabel) {
-							case '地埋扳孔':
-								label = 'bury_the_wrench_hole '
-								break
-							case '架空扳孔':
-								label = 'aerial_wrench_hole'
-								break
-							case '停气作业':
-								label = 'shutdown_operation'
-								break
-							case 'PE 封堵':
-								label = 'pe_plugging'
-								break
-							case '钢管带气封堵':
-								label = 'the_steel_pipe_sealed_with_gas'
-								break
-
-						}
-						this.handleHiddenShare();
-						this.title_lebel = item.dictValue;
-						getDicts(label).then(response => {
-
-							this.typeList = response.data;
-						});
-
-						this.handleShowSheet();
-
-					} else {
-						let obj = {
-							value: item.dictValue,
-							label: item.dictLabel,
-							title: this.title_lebel,
-						};
-						uni.navigateTo({
-							url: '/pages/collision/collisionMouth?params=' + encodeURIComponent(JSON
-								.stringify(
-									obj))
-						})
-					}
+					let obj = {
+						id: this.id,
+						value: item.dictValue,
+						title: item.dictLabel,
+						name: this.enginName,
+						address: this.address
+					};
+					uni.navigateTo({
+						url: '/pages/collision/collisionMouth?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
 
 				} else if (this.projectType == 'JiJian') {
 					let obj = {
-						value: item.dictValue
+						value: item.dictValue,
+						name: this.enginName,
+						enginType: this.enginType,
 					};
 					//this.handleHiddenShare();
 					uni.navigateTo({
@@ -573,6 +618,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					})
 				} else if (this.projectType == 'DingGuan') {
 					let obj = {
+						id: this.id,
 						value: item.dictValue
 					};
 					//this.handleHiddenShare();
@@ -596,19 +642,41 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 			},
 			showGongYe() {
 				this.projectType = 'GongYe';
-				//工业工程
-				getDicts("engin_classification").then(response => {
-					this.typeList = response.data;
-
-				});
-				this.handleShowSheet();
+				// //工业工程
+				// getDicts("engin_classification").then(response => {
+				// 	this.typeList = response.data;
+
+				// });
+				// this.handleShowSheet();
+				this.open = true;
+				getEnginProjectList().then(res => {
+					let list = res.data;
+					let mList = [];
+					list.forEach((item, index) => {
+						mList.push({
+							name: item.name,
+							enginType: item.enginType,
+							title: item.name + " - " + item.enginType
+						})
+					})
+					this.selectList = mList;
+				})
 			},
 			showTopPipe() {
 				this.projectType = 'DingGuan';
-				getDicts("pipe_jack").then(response => {
-					this.typeList = response.data;
+				this.open = true;
+				getTopPipeNameList().then(response => {
+					let list = response.data;
+					let mList = [];
+					list.forEach((item, index) => {
+						mList.push({
+							id: item.id,
+							name: item.name,
+							title: item.name
+						})
+					})
+					this.selectList = mList;
 				});
-				this.handleShowSheet();
 			},
 			showInfrastructureDialog() {
 				this.projectType = 'JiJian';
@@ -619,15 +687,23 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				this.handleShowSheet();
 			},
 			showDangerous() {
-				// uni.navigateTo({
-				// 	url: '/pages/dangerous/dangerous'
-				// })
 				this.projectType = 'PengKou';
-				getDicts("tapping_operation").then(response => {
-					this.typeList = response.data;
+				this.open = true;
+				//请求
+				getCollisionProjectList().then(response => {
+					let list = response.data;
+					let mList = [];
+					list.forEach((item, index) => {
+						mList.push({
+							id: item.id,
+							name: item.name,
+							title: item.name,
+							locations: item.locations,
+							modeOperation: item.modeOperation
+						})
+					})
+					this.selectList = mList;
 				});
-				this.handleShowSheet();
-
 			},
 			showOpenBolt() {
 				let obj = {