zhanghongrui il y a 1 an
Parent
commit
789307a88e
2 fichiers modifiés avec 87 ajouts et 4 suppressions
  1. 2 2
      config.js
  2. 85 2
      pages/statistics/statistics.vue

+ 2 - 2
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/',
 	// 应用信息

+ 85 - 2
pages/statistics/statistics.vue

@@ -474,6 +474,18 @@
 								{{item.state == 0 ? '审核不通过': (item.state == 1?'审核通过':'未审核')}}
 							</view>
 						</view>
+						<view
+							v-if="EngineeringValue=='顶管工程'||EngineeringValue=='基建工程'||EngineeringValue=='危险工程'||EngineeringValue=='市政工程'||EngineeringValue=='工业工程'">
+							<view class="font-forty">
+								工程名称:{{item.enginName}}
+							</view>
+							<view class="font-twenty-eight gray" v-for="(state,stateIndex) in item.status"
+								:key="stateIndex">
+								<view v-if="EngineeringValue=='工业工程'">{{state.reviewStatus}}</view>
+
+								<view v-else>{{state.type}}-{{state.reviewStatus}}</view>
+							</view>
+						</view>
 
 						<view class="font-twenty-eight gray">
 							{{item.createTime}}
@@ -543,6 +555,7 @@
 		getObtainRoomcCompletionInformationList,
 		getRoomProjectId,
 		getRoomProjectList,
+		getHistoryByUserList,
 	} from '@/api/common'
 
 	export default {
@@ -1331,8 +1344,78 @@
 
 					})
 				} else if (this.EngineeringValue == '顶管工程' || this.EngineeringValue == '基建工程' || this.EngineeringValue ==
-					'危险工程' || this.EngineeringValue == '市政工程' || this.EngineeringValue == '工业工程') {
-					//type 1 = 顶管, 2=基建 3=危险 4= 市政 5= 工业
+					'危险作业工程' || this.EngineeringValue == '市政工程' || this.EngineeringValue == '工业工程'||this.EngineeringValue=='带气封堵施工') {
+					//type 1 = 顶管, 2=基建 3=危险 4= 市政 5= 工业 type=6   是带气封堵
+					let chooseType = '';
+					switch (this.EngineeringValue) {
+						case '顶管工程':
+							chooseType = '1';
+							break
+						case '基建工程':
+							chooseType = '2';
+							break
+						case '危险作业工程':
+							chooseType = '3';
+							break
+						case '市政工程':
+							chooseType = '4';
+							break
+						case '工业工程':
+							chooseType = '5';
+							break
+							case '带气封堵施工':
+								chooseType = '6';
+								break
+					}
+
+					let param = {
+						type: chooseType,
+						district: this.XZQValue3.dictValue == undefined ? '' : this.XZQValue3.dictValue,
+						areaId: this.XQValue3.id == undefined ? '' : this.XQValue3.id,
+						buildingId: this.LDValue3.id == undefined ? '' : this.LDValue3.id,
+						unitId: this.DYValue3.id == undefined ? '' : this.DYValue3.id,
+						houseId: this.FJValue3.id == undefined ? '' : this.FJValue3.id,
+						completionStatus: this.ReviewStatus.dictValue == undefined ? '' : this.ReviewStatus.dictValue,
+						createBy: user.state.name,
+						pageNum: this.pageNum,
+						pageSize: this.pageSize
+
+					}
+					getHistoryByUserList(param).then(res => {
+
+						this.totalNum = res.data.total
+
+						if (res.code == '200') {
+							uni.hideLoading()
+							if (res.data.rows.length !== 0) {
+
+								if (this.pageNum == 1) {
+									this.list = [];
+									this.list = res.data.rows
+								} else {
+									this.list = this.list.concat(res.data.rows)
+								}
+
+
+								if (this.pageNum * 10 >= this.totalNum) {
+									this.$refs.pullScroll.finish();
+
+								} else {
+
+
+									this.$refs.pullScroll.success();
+								}
+
+							} else {
+								this.list = [];
+								this.$refs.pullScroll.empty();
+							}
+						} else {
+							this.$modal.msg(res.msg + "")
+							this.$refs.pullScroll.error();
+						}
+
+					})
 
 				}
 			},