sync

api/common.js

@@ -1,6 +1,14 @@
 import request from '@/utils/request'
 
 
+// 新增（提交）市政工程
+export function submitMunicipalData(param) {
+	return request({
+		'url': '/zdsz/engineeringIndustry',
+		'method': 'post',
+		'data': param
+	})
+}
 // 获取房间工程历史
 export function getRoomProjectList(id,type) {
 

components/bottomSheet/bottomSheet.vue

@@ -77,7 +77,7 @@
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									腐蚀等级:{{value.zEngineeringMaterialBo[0].corrosionLevel}}</view>
 							</view> -->
-							<view v-else-if="title=='放线'||title=='挖沟'||title=='焊接'||title=='下沟'">
+							<view v-else-if="title=='放线'||title=='挖沟'||title=='焊接'||title=='下沟'||title=='除锈'||title=='刷油'||title=='打磨'||title=='焊接'">
 								<view class="uni-media-list-text-top"
 									style="font-size: 13px;color: #000;margin-top: 5px;">
 									施工时间:{{value.constructTime}}</view>

config.js

@@ -1,7 +1,8 @@
 // 应用全局配置
 module.exports = {
   
-   baseUrl: 'http://192.168.4.20:8080',
+  // baseUrl: 'http://192.168.4.20:8080',
+   baseUrl: 'http://192.168.4.11:8080',
   // 应用信息
   appInfo: {
     // 应用名称

pages.json

@@ -108,10 +108,16 @@
 				"navigationBarTitleText": "架空"
 			}
 		}, {
-			"path": "pages/statistics/index",
+			"path": "pages/statistics/statistics",
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path" : "pages/municipal/municipal",
+			"style": {
+				"navigationBarTitleText": "市政工程"
+			}
 		}
 
 	],
@@ -131,7 +137,7 @@
 			"selectedIconPath": "static/images/tabbar/work_.png",
 			"text": "首页"
 		}, {
-			"pagePath": "pages/statistics/index",
+			"pagePath": "pages/statistics/statistics",
 			"iconPath": "static/images/tabbar/mine.png",
 			"selectedIconPath": "static/images/tabbar/mine_.png",
 			"text": "统计"

pages/oldrenovation/overhead/overhead.vue

@@ -220,8 +220,6 @@
 	<script>
 		import SelectPicker from '../../../components/selectPicker/select_picker.vue'
 		import bottomSheet from '../../../components/bottomSheet/bottomSheet.vue'
-
-		import uniIcons from '../../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
 		import {
 			getDicts
 		} from "@/api/system/dict/data";
@@ -245,7 +243,6 @@
 		export default {
 			components: {
 				SelectPicker,
-				uniIcons,
 				bottomSheet,
 			},
 			data() {
@@ -722,10 +719,9 @@
 					if (this.isEmpty(this.XQValue.id)) {
 						this.$modal.msg("请选择小区")
 						return
-					}
-					else if (this.isEmpty(this.LDValue.id)) {
+					} else if (this.isEmpty(this.LDValue.id)) {
 						this.$modal.msg("请选择楼栋")
-					} 
+					}
 
 
 					if (this.objValue.enginClassValue == '回填' && this.isEmpty(this.BackfillingTime)) {
@@ -763,7 +759,7 @@
 
 
 				onsubmit() {
-
+					this.$modal.loading('提交中')
 					let unitId = '';
 					let houseId = '';
 					let buildingId = '';
@@ -804,7 +800,6 @@
 						}
 
 					}
-
 					addTearOldPipe(param).then(res => {
 						if (res.code == '200') {
 							uni.showToast({
@@ -818,6 +813,8 @@
 							}, 1000)
 
 						}
+
+						this.$modal.closeLoading()
 					})
 
 				},
@@ -838,7 +835,7 @@
 					// 	this.$modal.msg("请选择房间")
 					// } 
 					else {
-						
+
 						let unitId = '';
 						let houseId = '';
 						if (this.isEmpty(this.DYValue.id)) {
@@ -846,13 +843,13 @@
 						} else {
 							unitId = this.DYValue.id
 						}
-						
+
 						let param = {
 							areaId: this.XQValue.id, // 小区id
 							buildingId: this.LDValue.id, // 楼宇id
 							unitId: unitId, // 单元id
 							houseId: houseId, // 房间id
-							enginCycle: this.projectValue.dictValue ,// 工程周期
+							enginCycle: this.projectValue.dictValue, // 工程周期
 							enginType: this.objValue.enginType, //写死 上一页面传过来的  新建/旧改
 							enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						}

pages/statistics/index.vue

@@ -1,363 +0,0 @@
-<template>
-	<view>
-		<view class="view-bg">
-			<text class="title-txt">工程用料统计</text>
-			<view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left">
-						小区
-					</view>
-					<view class="uni-list-cell-db">
-						<picker @change="bindPickerVillageChange" :value="villageIndex" :range="villageList"
-							range-key="name">
-							<view class="uni-input">{{villageList[villageIndex].name}}</view>
-						</picker>
-					</view>
-				</view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left">
-						规格
-					</view>
-					<view class="uni-list-cell-db">
-						<picker @change="bindPickerSpecificationChange" :value="specificationIndex"
-							:range="specificationList" range-key="name">
-							<view class="uni-input">{{specificationList[specificationIndex].name}}</view>
-						</picker>
-					</view>
-				</view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left">
-						材料
-					</view>
-					<view class="uni-list-cell-db">
-						<picker @change="bindPickerMaterialChange" :value="materialIndex" :range="materialList"
-							range-key="name">
-							<view class="uni-input">{{materialList[materialIndex].name}}</view>
-						</picker>
-					</view>
-				</view>
-			</view>
-			<uni-divider></uni-divider>
-			<uni-table ref="table">
-				<uni-tr>
-					<uni-th width="20" align="center"></uni-th>
-					<uni-th width="20" align="center">预计用量</uni-th>
-					<uni-th width="20" align="center">实际用量</uni-th>
-				</uni-tr>
-				<uni-tr v-for="(item, index) in materialUsageList" :key="index">
-					<uni-td>{{ item.name }}</uni-td>
-					<uni-td>{{ item.estimatedUsage }}</uni-td>
-					<uni-td>{{ item.actualUsage }}</uni-td>
-				</uni-tr>
-			</uni-table>
-		</view>
-
-		<view class="view-bg">
-			<text class="title-txt">工程进度统计</text>
-			<view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left">
-						小区
-					</view>
-					<view class="uni-list-cell-db">
-						<picker @change="bindPickerVillageChange2" :value="villageIndex2" :range="villageList"
-							range-key="name">
-							<view class="uni-input">{{villageList[villageIndex2].name}}</view>
-						</picker>
-					</view>
-				</view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left">
-						楼栋
-					</view>
-					<view class="uni-list-cell-db">
-						<picker @change="bindPickerBuildChange" :value="buildIndex" :range="buildList" range-key="name">
-							<view class="uni-input">{{buildList[buildIndex].name}}</view>
-						</picker>
-					</view>
-				</view>
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left">
-						单元
-					</view>
-					<view class="uni-list-cell-db">
-						<picker @change="bindPickerUnitChange" :value="unitIndex" :range="unitList" range-key="name">
-							<view class="uni-input">{{unitList[unitIndex].name}}</view>
-						</picker>
-					</view>
-				</view>
-			</view>
-			<uni-divider></uni-divider>
-			<view class="view_bg_build">
-				<uni-grid :column="roomCount" :highlight="true" @change="change">
-					<uni-grid-item v-for="(item, index) in roomList" :index="index" :key="index">
-						<view class="centered" style="background-color: #fff;">
-							<!-- <uni-icons type="image" :size="30" color="#777" /> -->
-							<text>{{item.roomNumber}}</text>
-						</view>
-					</uni-grid-item>
-				</uni-grid>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {getAreaList,getBuildingList,getUnitList,getHousesList} from '@/api/common'
-
-	export default {
-		data() {
-			return {
-				villageIndex: 0,
-				specificationIndex: 0,
-				materialIndex: 0,
-				villageIndex2: 0,
-				buildIndex: 0,
-				unitIndex: 0,
-				villageList: [{
-					name: '小区001'
-				}, {
-					name: '小区002'
-				}, {
-					name: '小区003'
-				}, {
-					name: '小区004'
-				}],
-				specificationList: [{
-					name: '规格001'
-				}, {
-					name: '规格002'
-				}, {
-					name: '规格003'
-				}, {
-					name: '规格004'
-				}],
-				materialList: [{
-					name: '材料001'
-				}, {
-					name: '材料002'
-				}, {
-					name: '材料003'
-				}, {
-					name: '材料004'
-				}],
-				buildList: [{
-					name: '楼栋001'
-				}, {
-					name: '楼栋002'
-				}, {
-					name: '楼栋003'
-				}, {
-					name: '楼栋004'
-				}],
-				unitList: [{
-					name: '单元001'
-				}, {
-					name: '单元002'
-				}, {
-					name: '单元003'
-				}, {
-					name: '单元004'
-				}],
-
-				materialUsageList: [{
-					name: '0.5cm钢',
-					estimatedUsage: 1210,
-					actualUsage: 6852
-				}, {
-					name: '1.0cm钢',
-					estimatedUsage: 1680,
-					actualUsage: 6852
-				}, {
-					name: '1.5cm钢',
-					estimatedUsage: 1503,
-					actualUsage: 6852
-				}],
-				roomList: [{
-					roomNumber: '601',
-					status: '0'
-				}, {
-					roomNumber: '602',
-					status: '0'
-				}, {
-					roomNumber: '603',
-					status: '0'
-				}, {
-					roomNumber: '604',
-					status: '0'
-				}, {
-					roomNumber: '501',
-					status: '0'
-				}, {
-					roomNumber: '502',
-					status: '0'
-				}, {
-					roomNumber: '503',
-					status: '0'
-				}, {
-					roomNumber: '504',
-					status: '0'
-				}, {
-					roomNumber: '401',
-					status: '0'
-				}, {
-					roomNumber: '402',
-					status: '0'
-				}, {
-					roomNumber: '403',
-					status: '0'
-				}, {
-					roomNumber: '404',
-					status: '0'
-				}, {
-					roomNumber: '301',
-					status: '0'
-				}, {
-					roomNumber: '302',
-					status: '0'
-				}, {
-					roomNumber: '303',
-					status: '0'
-				}, {
-					roomNumber: '304',
-					status: '0'
-				}, {
-					roomNumber: '201',
-					status: '0'
-				}, {
-					roomNumber: '202',
-					status: '0'
-				}, {
-					roomNumber: '203',
-					status: '0'
-				}, {
-					roomNumber: '204',
-					status: '0'
-				}, {
-					roomNumber: '101',
-					status: '0'
-				}, {
-					roomNumber: '102',
-					status: '0'
-				}, {
-					roomNumber: '103',
-					status: '0'
-				}, {
-					roomNumber: '104',
-					status: '0'
-				}],
-				roomCount: 4
-			}
-		},
-		created() {
-			// this.chooseVillage()
-			// this.getDicts("district").then(response =>{
-			// 	// this.xxx=response.data
-			// })
-			getAreaList().then(res => {
-				villageList=res;
-				
-			})
-			// getBuildingList('100').then(res => {
-			// 	debugger
-			// 	console.log(res)
-			// })
-			
-			// getUnitList('1098').then(res => {
-			// 	debugger
-			// 	console.log(res)
-			// })
-			// getHousesList('13631').then(res => {
-			// 	debugger
-			// 	console.log(res)
-			// })
-		},
-		methods: {
-			bindPickerVillageChange: function(e) {
-				debugger
-				this.villageIndex = e.detail.value
-			},
-			bindPickerSpecificationChange: function(e) {
-				this.specificationIndex = e.detail.value
-			},
-			bindPickerMaterialChange: function(e) {
-				this.materialIndex = e.detail.value
-			},
-			bindPickerVillageChange2: function(e) {
-				this.villageIndex2 = e.detail.value
-			},
-			bindPickerBuildChange: function(e) {
-				this.buildIndex = e.detail.value
-			},
-			bindPickerUnitChange: function(e) {
-				this.unitIndex = e.detail.value
-			},
-		}
-	}
-</script>
-
-<style>
-	.marginLeft5 {
-		margin-left: 5px;
-	}
-
-	.title-txt {
-		font-size: 15px;
-		font-weight: bold;
-		color: black;
-	}
-
-	.content-txt {
-		font-size: 10px;
-		font-weight: bold;
-		color: black;
-	}
-
-	.view-bg {
-		margin-left: 8px;
-		margin-right: 8px;
-		margin-top: 8px;
-		padding: 10px;
-		background-color: #fff;
-		border-radius: 5px;
-	}
-
-	.uni-list {
-		background-color: #FFFFFF;
-		position: relative;
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.uni-list-cell-db,
-	.uni-list-cell {
-		position: relative;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.uni-list-cell-left {
-		white-space: nowrap;
-		font-size: 28rpx;
-	}
-
-	.centered {
-		text-align: center;
-		background-color: #e2f4ff;
-
-	}
-
-	.text {
-		background-color: #e2f4ff;
-		height: 20rpx;
-	}
-
-	.view_bg_build {
-		background-color: #e2f4ff;
-		padding: 10rpx;
-		margin: 20rpx;
-	}
-</style>

pages/work/index.vue

@@ -25,13 +25,13 @@
 
 
 				<uni-grid-item>
-					<view class="grid-item-box">
+					<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">
+					<view class="grid-item-box" @click="municipalProjectClick">
 						<uni-icons type="color" size="30"></uni-icons>
 						<text class="text">市政工程</text>
 					</view>
@@ -170,6 +170,12 @@
 				this.showPopup = !this.showPopup;
 
 			},
+			//市政工程-首页-点击事件
+			municipalProjectClick(){
+				uni.navigateTo({
+					url: '/pages/municipal/municipal'
+				});
+			},
 
 			NewProject(e) {
 				this.enginType = 'new_built'; //写死