sync 统计功能完善 新增功能

api/common.js

@@ -573,10 +573,31 @@ export function getProjectStatisticsData(id, type) {
 		'method': 'get',
 	})
 }
-//工程进度详情
-export function getProjectScheduleDetails(id, type) {
+//工业工程进度详情
+export function getIndustryProjectScheduleDetails(id, type) {
 	return request({
 		'url': '/zdsz/engineeringGY/' + id + '/' + type,
 		'method': 'get',
 	})
 }
+//市政工程进度详情
+export function getMunicipalProjectScheduleDetails(id, type) {
+	return request({
+		'url': '/zdsz/engineeringIndustry/' + id + '/' + type,
+		'method': 'get',
+	})
+}
+//顶管工程进度详情
+export function getTopTubeProjectScheduleDetails(id, type) {
+	return request({
+		'url': '/zdsz/engineeringPipeJacking/' + id + '/' + type,
+		'method': 'get',
+	})
+}
+//碰口工程进度详情
+export function getCollisionProjectScheduleDetails(id, type) {
+	return request({
+		'url': '/zdsz/touchOperationEngineering/query/' + id + '/' + type,
+		'method': 'get',
+	})
+}

config.js

@@ -2,9 +2,9 @@
 module.exports = {
 
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
-	baseUrl: 'http://192.168.4.88:8080',
+	// 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.20:8080',
 	// baseUrl: 'http://192.168.4.6:8080',
 
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

pages/statistics/statistics.vue

@@ -321,7 +321,7 @@
 						</view>
 						<view class="felx-row" v-for="(item, index) in projectBody02.nodeCheck" :key="index">
 							<view class="h-td" style="flex: 1">{{ item.name }}</view>
-							<view class="h-td" style="flex: 1">{{ item.value }}</view>
+							<view class="h-td" style="flex: 1" @click="municipalItemClick(item)">{{ item.value }}</view>
 						</view>
 					</view>
 				</view>
@@ -377,7 +377,7 @@
 						</view>
 						<view class="felx-row" v-for="(item, index) in projectBody03.nodeCheck" :key="index">
 							<view class="h-td" style="flex: 1">{{ item.name }}</view>
-							<view class="h-td" style="flex: 1">{{ item.value }}</view>
+							<view class="h-td" style="flex: 1" @click="topTubeItemClick(item)">{{ item.value }}</view>
 						</view>
 					</view>
 				</view>
@@ -409,7 +409,7 @@
 						</view>
 						<view class="felx-row" v-for="(item, index) in projectBody04.nodeCheck" :key="index">
 							<view class="h-td" style="flex: 1">{{ item.name }}</view>
-							<view class="h-td" style="flex: 1">{{ item.value }}</view>
+							<view class="h-td" style="flex: 1" @click="collisionItemClick(item)">{{ item.value }}</view>
 						</view>
 					</view>
 				</view>
@@ -696,9 +696,9 @@
 			</view>
 		</view>
 
-		<bottomSheet> ref="refShare" :data="historyList"></bottomSheet>
-		<BottomSheetNew> ref="refShareNew" :data="historyListNew"></BottomSheetNew>
-		<bottomSheetMore> ref="refShareMore" :data="historyListMore"></bottomSheetMore>
+		<bottomSheet ref="refShare" :data="historyList"></bottomSheet>
+		<BottomSheetNew ref="refShareNew" :data="historyListNew" :TitleType="bottomSheetTitle"></BottomSheetNew>
+		<bottomSheetMore ref="refShareMore" :data="historyListMore" :TitleType="bottomSheetTitle"></bottomSheetMore>
 		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
 			subtitleKey="id" v-model="name"></SelectPicker>
 
@@ -748,7 +748,10 @@
 		getengineeringNameList,
 		getTopPipeNameList,
 		getProjectName,
-		getProjectScheduleDetails
+		getIndustryProjectScheduleDetails,
+		getMunicipalProjectScheduleDetails,
+		getTopTubeProjectScheduleDetails,
+		getCollisionProjectScheduleDetails
 	} from '@/api/common'
 
 	export default {
@@ -761,6 +764,7 @@
 		},
 		data() {
 			return {
+				bottomSheetTitle: "",
 				historyList: {}, //历史数据
 				historyListNew: {}, //历史数据
 				historyListMore: {}, //历史数据
@@ -895,30 +899,55 @@
 			if (this.isLeader == 'app_user') {
 				this.changeTab();
 			}
-
-
-
 		},
 
 		// 上拉加载
 		onReachBottom() {
-
-
 			if (this.pageNum * 10 >= this.totalNum) {
-
 			} else {
-
 				this.$refs.pullScroll.showUpLoading();
 				this.pageNum++;
 				this.requestData();
-
 			}
-
 		},
 		methods: {
 			industryItemClick(item) {
-				getProjectScheduleDetails(this.projectObj01.id, item.name).then(res => {
-					this.historyListNew=res.data;
+				if ("未上传" == item.value) {
+					return;
+				}
+				getIndustryProjectScheduleDetails(this.projectObj01.id, item.name).then(res => {
+					this.historyListNew = res.data;
+					this.bottomSheetTitle = res.data.zEngineeringNodeBo.type;
+					this.showHistoryNewList();
+				})
+			},
+			municipalItemClick(item) {
+				if ("未上传" == item.value) {
+					return;
+				}
+				getMunicipalProjectScheduleDetails(this.projectObj02.id, item.name).then(res => {
+					this.historyListNew = res.data;
+					this.bottomSheetTitle = res.data.zEngineeringNodeBo.type;
+					this.showHistoryNewList();
+				})
+			},
+			topTubeItemClick(item) {
+				if ("未上传" == item.value) {
+					return;
+				}
+				getTopTubeProjectScheduleDetails(this.projectObj03.id, item.name).then(res => {
+					this.historyListMore = res.data;
+					this.bottomSheetTitle = res.data.zEngineeringNodeBo.type;
+					this.showHistoryMoreList();
+				})
+			},
+			collisionItemClick(item) {
+				if ("未上传" == item.value) {
+					return;
+				}
+				getCollisionProjectScheduleDetails(this.projectObj04.id, item.name).then(res => {
+					this.historyListNew = res.data;
+					this.bottomSheetTitle = res.data.zEngineeringNodeBo.type;
 					this.showHistoryNewList();
 				})
 			},