历史底部弹窗

config.js

@@ -2,8 +2,8 @@
 module.exports = {
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	//baseUrl: 'http://192.168.4.88:8080',
-	//baseUrl: 'http://192.168.4.23:8080',
-	 baseUrl: 'http://192.168.4.20:8080',
+	baseUrl: 'http://192.168.4.23:8080',
+	 //baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

pages/dangerous/dangerous.vue

@@ -325,7 +325,6 @@
 				<view class="align-items" style="margin-bottom: 20px;">
 					<view class="container" style="color: #b2b2b2;">*请上传文件</view>
 					<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-						<!--  -->
 						<image :src="loadImgSrc('updateimg.png')" mode=""
 							style="width: 200rpx; height: 150rpx; margin: 0 12rpx; " @click="chooseFile()"></image>
 						<view v-for="(item,index) in fileArr" :key="index" style="position: relative;">

pages/statistics/statistics.vue

@@ -224,21 +224,7 @@
 
 
 
-			<!-- 		<view class="grid-body">
-				<view class="Grid">
-					<view class="Grid-Item" v-for="item in List" :key="item.id" @click="changeTab(item.id)"
-						hover-class="click-hover" hover-start-time="50" hover-stay-time="50"
-						v-if="userRole.includes(item.title)">
-						<button class="icon-item" v-if="item.title == '民用工程'">民用工程</button>
-						<button class="icon-item" v-if="item.title == '工业工程'">工业工程</button>
-						<button class="icon-item" v-if="item.title == '市政工程'">市政工程</button>
-						<button class="icon-item" v-if="item.title == '危险作业工程'">危险作业工程</button>
-						<button class="icon-item" v-if="item.title == '顶管工程'">顶管工程</button>
-						<button class="icon-item" v-if="item.title == '基建工程'">基建工程</button>
-						<button class="icon-item" v-if="item.title == '开栓'">开栓</button>
-					</view>
-				</view>
-			</view> -->
+
 
 			<view class="background">
 
@@ -475,7 +461,7 @@
 							</view>
 						</view>
 						<view
-							v-if="EngineeringValue=='顶管工程'||EngineeringValue=='基建工程'||EngineeringValue=='危险工程'||EngineeringValue=='市政工程'||EngineeringValue=='工业工程'">
+							v-if="EngineeringValue=='顶管工程'||EngineeringValue=='基建工程'||EngineeringValue=='危险工程'||EngineeringValue=='市政工程'||EngineeringValue=='工业工程'||EngineeringValue=='带气封堵施工'">
 							<view class="font-forty">
 								工程名称：{{item.enginName}}
 							</view>
@@ -734,6 +720,12 @@
 							.stringify(
 								obj))
 					})
+				} else if (this.EngineeringValue == '市政工程' || this.EngineeringValue == '基建工程' || this.EngineeringValue ==
+					'顶管工程') {
+					this.nodeId = item.id;
+					let result = JSON.parse(JSON.stringify(item.status).replace(/type/g, 'Type'));
+					this.typeList = result;
+					this.handleShowSheet();
 				}
 			},
 			showHistoryList() {
@@ -780,31 +772,33 @@
 
 
 				} else {
-					let obj = {
-						id: this.nodeId,
-						type: item.Type,
-						roomId: this.roomId,
-					};
-					this.handleHiddenShare();
-
-					if (this.nodeType == 'indoor_engin') { //室内
-						uni.navigateTo({
-							url: '/pages/statistics/historyDetails?params=' + encodeURIComponent(JSON
-								.stringify(
-									obj))
-						})
-					} else if (this.nodeType == 'overhead') { //架空
-						uni.navigateTo({
-							url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
-								.stringify(
-									obj))
-						})
-					} else if (this.nodeType == 'courtyard') { //庭院
-						uni.navigateTo({
-							url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
-								.stringify(
-									obj))
-						})
+					if (this.EngineeringValue == '民用工程') {
+						let obj = {
+							id: this.nodeId,
+							type: item.Type,
+							roomId: this.roomId,
+						};
+						this.handleHiddenShare();
+
+						if (this.nodeType == 'indoor_engin') { //室内
+							uni.navigateTo({
+								url: '/pages/statistics/historyDetails?params=' + encodeURIComponent(JSON
+									.stringify(
+										obj))
+							})
+						} else if (this.nodeType == 'overhead') { //架空
+							uni.navigateTo({
+								url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
+									.stringify(
+										obj))
+							})
+						} else if (this.nodeType == 'courtyard') { //庭院
+							uni.navigateTo({
+								url: '/pages/statistics/historyDetailsCourtyard?params=' + encodeURIComponent(JSON
+									.stringify(
+										obj))
+							})
+						}
 					}
 				}
 			},
@@ -1344,7 +1338,8 @@
 
 					})
 				} else if (this.EngineeringValue == '顶管工程' || this.EngineeringValue == '基建工程' || this.EngineeringValue ==
-					'危险作业工程' || this.EngineeringValue == '市政工程' || this.EngineeringValue == '工业工程'||this.EngineeringValue=='带气封堵施工') {
+					'危险作业工程' || this.EngineeringValue == '市政工程' || this.EngineeringValue == '工业工程' || this
+					.EngineeringValue == '带气封堵施工') {
 					//type 1 = 顶管， 2=基建 3=危险 4= 市政 5= 工业 type=6   是带气封堵
 					let chooseType = '';
 					switch (this.EngineeringValue) {
@@ -1363,9 +1358,9 @@
 						case '工业工程':
 							chooseType = '5';
 							break
-							case '带气封堵施工':
-								chooseType = '6';
-								break
+						case '带气封堵施工':
+							chooseType = '6';
+							break
 					}
 
 					let param = {