版本修改

api/common.js

@@ -169,6 +169,10 @@ export default {
 	setregulatorBox(data) {
 		return utils.requestEn(`/mobile/regulatorBox`, data, 'POST')
 	},
+	updateregulatorBox(data)
+	{
+		return utils.requestEn(`/mobile/regulatorBox`, data, 'PUT')
+	},
 	setwarningPile(data) {
 		return utils.requestEn(`/mobile/warningPile`, data, 'Put')
 	},
@@ -181,9 +185,15 @@ export default {
 	setcourtyardNetworkManagement(data) {
 		return utils.requestEn(`/mobile/courtyardNetworkManagement`, data, 'POST')
 	},
+	updatecourtyardNetworkManagement(data) {
+		return utils.requestEn(`/mobile/courtyardNetworkManagement`, data, 'PUT')
+	},
 	setemergencyRepair(data) {
 		return utils.requestEn(`/mobile/emergencyRepair`, data, 'POST')
 	},
+	updateemergencyRepair(data) {
+		return utils.requestEn(`/mobile/emergencyRepair`, data, 'PUT')
+	},
 	getOne() {
 		return utils.requestEn(`/mobile/explain/getOne`)
 	},
@@ -200,6 +210,9 @@ export default {
 	saveroadSectionInspection(data) {
 		return utils.requestEn(`/mobile/roadSectionInspection`,data,'POST')
 	},
+	updateroadSectionInspection(data) {
+		return utils.requestEn(`/mobile/roadSectionInspection`,data,'PUT')
+	},
 	getroadSectionInspection(data) {
 		return utils.requestEn(`/mobile/roadSectionInspection/${data}`)
 	},
@@ -211,7 +224,7 @@ export default {
 		return utils.requestEn(`/mobile/emergencyRepair/${data}`)
 	},
 	//调压箱管理控制器
-	getregulatorBox(data) {
+	getregulatorBox2(data) {
 		return utils.requestEn(`/mobile/regulatorBox/${data}`)
 	},
 	//警示桩控制器
@@ -231,7 +244,7 @@ export default {
 	getregulatorBoxList(data) {
 		return utils.requestLo(`/mobile/pressureRegulatingBox/list`, data)
 	},
-	getregulatorBox(data) {
+	getpressureRegulatingBox(data) {
 		return utils.requestEn(`/mobile/pressureRegulatingBox/${data}`)
 	},
 	getvalveWellPositionlist(data)
@@ -242,13 +255,21 @@ export default {
 	{
 		return utils.requestEn(`/mobile/valveWellInspection`, data,'POST')
 	},
+	updatevalveWellPosition(data)
+	{
+		return utils.requestEn(`/mobile/valveWellInspection`, data,'PUT')
+	},
+	getvalveWellPositionId(data)
+	{
+		return utils.requestEn(`/mobile/valveWellPosition/${data}`)
+	},
 	getvalveWellPosition(data)
 	{
 		return utils.requestEn(`/mobile/valveWellInspection/${data}`)
 	},
-	getvalveWellPositionList()
+	getvalveWellPositionList(data)
 	{
-		return utils.requestEn(`/mobile/valveWellInspection/list`)
+		return utils.requestEn(`/mobile/valveWellInspection/list`,data)
 	},
 	getFileList(data)
 	{
@@ -258,6 +279,10 @@ export default {
 	{
 		return utils.requestEn(`/mobile/transmissionStation/`,data,'POST')
 	},
+	updatetransmissionStation(data)
+	{
+		return utils.requestEn(`/mobile/transmissionStation/`,data,'PUT')
+	},
 	gettransmissionStation(data)
 	{
 		return utils.requestEn(`/mobile/transmissionStation/${data}`)
@@ -265,6 +290,57 @@ export default {
 	gettransmissionStationList(data)
 	{
 		return utils.requestLo(`/mobile/transmissionStation/list`)
+	},
+	patrolTeam(data)
+	{
+		return utils.requestEn(`/mobile/patrolTeam`,data,'POST')
+	},
+	updatepatrolTeam(data)
+	{
+		return utils.requestEn(`/mobile/patrolTeam`,data,'PUT')
+	},
+	getpatrolTeam(data)
+	{
+		return utils.requestEn(`/mobile/patrolTeam/${data}`)
+	},
+	getpatrolTeamList(data)
+	{
+		return utils.requestLo(`/mobile/patrolTeam/list`,data)
+	},
+	setregulatingBoxMaintenance(data)
+	{
+		return utils.requestEn(`/mobile/regulatingBoxMaintenance`,data,'POST')
+	},
+	updateregulatingBoxMaintenance(data)
+	{
+		return utils.requestEn(`/mobile/regulatingBoxMaintenance`,data,'PUT')
+	},
+	getregulatingBoxMaintenance(data)
+	{
+		return utils.requestEn(`/mobile/regulatingBoxMaintenance/${data}`)
+	},
+	getregulatingBoxMaintenanceList(data)
+	{
+		return utils.requestLo(`/mobile/regulatingBoxMaintenance/list`,data)
+	}
+	,
+	setpipelineGasUser(data)
+	{
+		return utils.requestEn(`/mobile/pipelineGasUser`,data,'POST')
+	},
+	updatepipelineGasUser(data)
+	{
+		return utils.requestEn(`/mobile/pipelineGasUser`,data,'PUT')
+	},
+	getpipelineGasUser(data)
+	{
+		return utils.requestEn(`/mobile/pipelineGasUser/${data}`)
+	},
+	getpipelineGasUserList(data)
+	{
+		return utils.requestLo(`/mobile/pipelineGasUser/list`,data)
 	}
 	
+	
+	
 }

common/http.js

@@ -1,7 +1,7 @@
 // 配置信息
 export default {
 	// webUrl: 'http://127.0.0.1:8080',
-	 webUrl: 'https://www.cczdsz.cn/prod-api/',
+	// webUrl: 'https://www.cczdsz.cn/prod-api/',
 	// webUrl: 'http://124.221.101.24:8082',
-	//  webUrl: 'http://192.168.4.11:8080',
+	  webUrl: 'http://192.168.4.11:8080',
 }

pages.json

@@ -210,6 +210,33 @@
 		    }
 		    
 		}
+        ,{
+            "path" : "pages/noLogin/patrolFleet/patrolFleet",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/noLogin/GRegulatingBoxMaintenance/GRegulatingBoxMaintenance",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/noLogin/PipelineGasUser/PipelineGasUser",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.vue

@@ -11,14 +11,14 @@
 			<u-icon slot="right" name="arrow-right"></u-icon>
 		</u-form-item>
 		<!-- <u-form-item label="单元" labelWidth="140" borderBottom ref="item1">
-			<u-input v-model="unitName" disabled borderBottom @click=" showunit= true&&type!=1"
+			<u-input v-model="unitName" disabled borderBottom @click=" showunit= true  "
 				placeholder="请选择单元"></u-input>
 			<u-select v-model="showunit" :list="unitList" label-name="name" value-name="id"
 				@confirm="unitconfirm()"> </u-select>
 			<u-icon slot="right" name="arrow-right"></u-icon>
 		</u-form-item> -->
 		<u-form-item label="发现问题" labelWidth="140" borderBottom ref="item1">
-			<u-radio-group v-model="form.findProblem" :disabled="type==1">
+			<u-radio-group v-model="form.findProblem"   >
 				<u-radio @change="confirm"
 					v-for="(item, index) in typelist.find_problem"
 					:key="index" :name="item.dictValue">
@@ -28,14 +28,14 @@
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remarks" type="textarea" placeholder="请输入备注" :disabled="type==1"></u-input>
+			<u-input v-model="form.remarks" type="textarea" placeholder="请输入备注"   ></u-input>
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>巡检照片</view>
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传巡检照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="https://cczdsz.cn/app/images/chooseimg.png" mode=""
-					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
+					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"  >
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
 					<view v-if="item.type == 'image'">
@@ -48,14 +48,16 @@
 					</view>
 					<view @click="remove(index)"
 						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+						<u-icon name="close" color="#FFFFFF" size="35"  ></u-icon>
 					</view>
 				</view>
 			</view>
 		</u-form-item>
 	</u-form>
-	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()" v-if="type!=1"
+	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()" v-if="type!=1" 
 		type='primary'>确认上传</u-button>
+		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"
+			type='primary'>确认修改</u-button>
 </view>
 </view>
 </template>
@@ -165,6 +167,47 @@ methods: {
 			_this.unitList = res
 		})
 	},
+	update()
+	{
+		let _this = this
+		this.form.photoList = this.imgArr
+		this.form.pressureStatus = null
+		this.building=this.form.buildingId
+		if(this.building==null)
+		{
+			uni.showToast({
+				title: '请选择楼栋',
+				icon: 'none'
+			})
+			return
+		}
+		if(this.imgArr.length==0)
+		{
+			uni.showToast({
+				title: '请上传图片或视频！',
+				icon: 'none'
+			})
+			return
+		}
+		this.form.buildingId = this.building
+		this.form.communityId=this.community
+		this.form.userId=this.userId
+		this.form.createBy=this.userId
+		service.updatecourtyardNetworkManagement(this.form).then(res => {
+			console.log(res)
+			_this.$UTILS.showPrompt('修改成功！')
+			// setTimeout(() => {
+			// 	console.log('跳')
+			// 	uni.switchTab({
+			// 		url: '/pages/index/index'
+			// 	})
+			// }, 2000)
+			// this.form={findProblem:1}
+			// this.buildingName=''
+			// this.imgArr=[]
+			// this.imgymxs=[]
+		})
+	},
 	save() {
 		let _this = this
 		this.form.photoList = this.imgArr
@@ -228,6 +271,7 @@ methods: {
 							url.url = item
 							url.type = 'image'
 							this.imgymxs.push(url)
+							this.imgArr.push(item)
 						})
 					}
 					this.form = res

pages/noLogin/LNGStation/LNGStation.vue

@@ -5,7 +5,7 @@
 	<u-form :model="form" :rules="rules" ref="form">
 		<view class="small-title">输配站</view>
 		<u-form-item borderBottom  label="名称"ref="item1">
-			<u-input v-model="form.name" :disabled="type==1"></u-input>
+			<u-input v-model="form.name"  ></u-input>
 			</u-form-item>
 	<view class="small-title">储存罐</view>
 		<u-form-item borderBottom ref="item1">
@@ -13,7 +13,7 @@
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传压力表照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="https://cczdsz.cn/app/images//chooseimg.png" mode=""
-					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="pressureGaugechoose()" v-if="type!=1">
+					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="pressureGaugechoose()"  >
 				</image>
 				<view v-for="(item,index) in pressureGaugeimgymxs" :key="index" style="position: relative;">
 					<view v-if="item.type == 'image'">
@@ -26,7 +26,7 @@
 					</view>
 					<view @click="pressureGaugeremove(index)"
 						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+						<u-icon name="close" color="#FFFFFF" size="35"  ></u-icon>
 					</view>
 				</view>
 			</view>
@@ -36,7 +36,7 @@
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传液位计照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="https://cczdsz.cn/app/images//chooseimg.png" mode=""
-					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="LevelGaugechoose()" v-if="type!=1">
+					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="LevelGaugechoose()"  >
 				</image>
 				<view v-for="(item,index) in LevelGaugeimgymxs" :key="index" style="position: relative;">
 					<view v-if="item.type == 'image'">
@@ -49,7 +49,7 @@
 					</view>
 					<view @click="LevelGaugeremove(index)"
 						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+						<u-icon name="close" color="#FFFFFF" size="35"  ></u-icon>
 					</view>
 				</view>
 			</view>
@@ -59,7 +59,7 @@
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传流量计照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="https://cczdsz.cn/app/images//chooseimg.png" mode=""
-					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
+					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"  >
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
 					<view v-if="item.type == 'image'">
@@ -72,22 +72,22 @@
 					</view>
 					<view @click="remove(index)"
 						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+						<u-icon name="close" color="#FFFFFF" size="35"  ></u-icon>
 					</view>
 				</view>
 			</view>
 		</u-form-item>
 		<!-- <u-form-item label="路段名称" borderBottom ref="item1" labelWidth="140">
-			<u-input v-model="form.sectionName" :disabled="type==1" borderBottom @click="showbuilding= true&&type!=1"
+			<u-input v-model="form.sectionName"   borderBottom @click="showbuilding= true&&type!=1"
 				placeholder="请输入路段名称"></u-input>
 		</u-form-item>
 		<u-form-item label="抽检米数" labelWidth="140" borderBottom ref="item1">
-			<u-input v-model="form.samplingMeterCount" :disabled="type==1" borderBottom @click="showbuilding= true&&type!=1"
+			<u-input v-model="form.samplingMeterCount"   borderBottom @click="showbuilding= true&&type!=1"
 				placeholder="请输入抽检米数" @input="checksamplingMeterCount()"></u-input>
 		</u-form-item> -->
 		<view class="small-title">输送管道</view>
 		<u-form-item label=" " labelWidth="0" borderBottom ref="item1">
-			<u-radio-group v-model="form.pipeline" :disabled="type==1">
+			<u-radio-group v-model="form.pipeline"  >
 				<u-radio @change="confirm"
 					v-for="(item, index) in typelist.Pipeline"
 					:key="index" :name="item.dictValue">
@@ -97,45 +97,45 @@
 		</u-form-item>
 		<view class="small-title">气化器</view>
 		<u-form-item label="维护" labelWidth="140" borderBottom ref="item1">
-			<u-radio-group v-model="form.maintain" :disabled="type==1">
+			<u-radio-group v-model="form.maintain"  >
 				<u-radio @change="maintainconfirm"
 					v-for="(item, index) in typelist.maintain"
 					:key="index" :name="item.dictValue">
 					{{item.dictLabel}}
 				</u-radio>
 			</u-radio-group>
-			<u-input v-model="maintain"  v-show="form.maintain==2" placeholder="请输入其他" @blur='maintainblur' :disabled="type==1"></u-input>
+			<u-input v-model="maintain"  v-show="form.maintain==2" placeholder="请输入其他" @blur='maintainblur'  ></u-input>
 		</u-form-item>
 		<view class="small-title">安全设施</view>
 		<u-form-item label="报警器" labelWidth="140" borderBottom ref="item1">
-			<u-radio-group v-model="form.alarm" :disabled="type==1">
+			<u-radio-group v-model="form.alarm"  >
 				<u-radio @change="Alarmconfirm"
 					v-for="(item, index) in typelist.safety_facilities"
 					:key="index" :name="item.dictValue">
 					{{item.dictLabel}}
 				</u-radio>
 			</u-radio-group>
-			<u-input v-model="Alarm"  v-show="showAlarm" placeholder="请输入其他" @blur='Alarmblur' :disabled="type==1"></u-input>
+			<u-input v-model="Alarm"  v-show="showAlarm" placeholder="请输入其他" @blur='Alarmblur'  ></u-input>
 		</u-form-item>
 		<u-form-item label="紧急切断阀" labelWidth="140" borderBottom ref="item1">
-			<u-radio-group v-model="form.emergency" :disabled="type==1">
+			<u-radio-group v-model="form.emergency"  >
 				<u-radio @change="emergencyconfirm"
 					v-for="(item, index) in typelist.safety_facilities"
 					:key="index" :name="item.dictValue">
 					{{item.dictLabel}}
 				</u-radio>
 			</u-radio-group>
-			<u-input v-model="emergency"  v-show="showemergency" placeholder="请输入其他" @blur='emergencyblur' :disabled="type==1"></u-input>
+			<u-input v-model="emergency"  v-show="showemergency" placeholder="请输入其他" @blur='emergencyblur'  ></u-input>
 		</u-form-item>
 		<u-form-item label="消防器材" labelWidth="140" borderBottom ref="item1">
-			<u-radio-group v-model="form.fireEquipment" :disabled="type==1">
+			<u-radio-group v-model="form.fireEquipment"  >
 				<u-radio @change="fireEquipmentconfirm"
 					v-for="(item, index) in typelist.safety_facilities"
 					:key="index" :name="item.dictValue">
 					{{item.dictLabel}}
 				</u-radio>
 			</u-radio-group>
-			<u-input v-model="fireEquipment"  v-show="showfireEquipment" placeholder="请输入其他" @blur='fireEquipmentblur' :disabled="type==1"></u-input>
+			<u-input v-model="fireEquipment"  v-show="showfireEquipment" placeholder="请输入其他" @blur='fireEquipmentblur'  ></u-input>
 		</u-form-item>
 		<!-- <u-form-item label="发现时间" labelWidth="140" borderBottom ref="item1">
 				<u-input v-model="form.findTime" borderBottom placeholder="请选择接警时间" disabled
@@ -147,7 +147,7 @@
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传巡检照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="https://cczdsz.cn/app/images//chooseimg.png" mode=""
-					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
+					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"  >
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
 					<view v-if="item.type == 'image'">
@@ -160,18 +160,20 @@
 					</view>
 					<view @click="remove(index)"
 						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+						<u-icon name="close" color="#FFFFFF" size="35"  ></u-icon>
 					</view>
 				</view>
 			</view>
 		</u-form-item> -->
 <!-- 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="type==1"></u-input>
+			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注"  ></u-input>
 		</u-form-item> -->
 	</u-form>
-	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;margin-top: 20px;" @click="save()" v-if="type!=1"
-		type='primary'>确认上传</u-button>
+	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;margin-top: 20px;" @click="save()"  
+		type='primary' v-if="type!=1">确认上传</u-button>
+		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;margin-top: 20px;" @click="update()"
+			type='primary' v-else>确认修改</u-button>
 </view>
 </view>
 </template>
@@ -345,6 +347,60 @@ methods: {
 	// 		_this.unitList = res
 	// 	})
 	// },
+	update()
+	{
+		let _this = this
+		this.form.pressureStatus = null
+		this.form.flowMeter = this.imgArr
+		this.form.levelGauge=this.LevelGaugeimgArr
+		this.form.pressureGauge=this.pressureGaugeimgArr
+		// if(this.building==null)
+		// {
+		// 	uni.showToast({
+		// 		title: '请选择楼栋',
+		// 		icon: 'none'
+		// 	})
+		// 	return
+		// }
+		if(this.imgArr.length==0)
+		{
+			uni.showToast({
+				title: '请上传图片或视频！',
+				icon: 'none'
+			})
+			return
+		}
+		// this.form.buildingId = this.building
+		// this.form.communityId=this.community
+		this.form.userId=this.userId
+		this.form.createBy=this.userId
+		service.updatetransmissionStation(this.form).then(res => {
+			console.log(res)
+			_this.$UTILS.showPrompt('修改成功！')
+			// setTimeout(() => {
+			// 	console.log('跳')
+			// 	uni.switchTab({
+			// 		url: '/pages/index/index'
+			// 	})
+			// }, 2000)
+			// this.form={pipeline:0,maintain:0,alarm:0,fireEquipment:0,emergency:0}
+			// // this.buildingName=''
+			// this.imgArr=[]
+			// this.imgymxs=[]
+			// this.LevelGaugeimgArr=[]
+			// this.pressureGaugeimgArr=[]
+			// this.LevelGaugeimgymxs=[]
+			// this.pressureGaugeimgymxs=[]
+			// this.maintain=null
+			// this.Alarm=null
+			// this.fireEquipment=null
+			// this.emergency=null
+			// this.showAlarm=false
+			// this.showemergency=false
+			// this.showfireEquipment=false
+			// this.showmaintain=false
+		})
+	},
 	save() {
 		let _this = this
 		this.form.flowMeter = this.imgArr
@@ -422,6 +478,7 @@ methods: {
 							url.url = item
 							url.type = 'image'
 							this.imgymxs.push(url)
+							this.imgArr.push(item)
 						})
 					}
 					if (null != res.levelGauge) {
@@ -430,6 +487,7 @@ methods: {
 							url.url = item
 							url.type = 'image'
 							this.LevelGaugeimgymxs.push(url)
+							this.LevelGaugeimgArr.push(item)
 						})
 					}
 					if (null != res.pressureGauge) {
@@ -438,6 +496,7 @@ methods: {
 							url.url = item
 							url.type = 'image'
 							this.pressureGaugeimgymxs.push(url)
+							this.pressureGaugeimgArr.push(item)
 						})
 					}
 					this.form = res

pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue

@@ -14,12 +14,15 @@
 							placeholder=" "></u-input>
 					</u-form-item>
 				</view>
-				<view class="small-title">调压箱部分</view>
+				<view style="flex-flow: row;display: flex; justify-content: flex-end;">
+				<view class="small-title">调压箱部分 </view> 
+				<view class="small-title" style="margin-left: auto;" @click="BoxDetails()">详情<u-icon name="arrow-right"></u-icon></view>
+				</view>
 				<u-row gutter="12">
 					<u-col>
 						<u-form-item label="管理所" borderBottom ref="item1" labelWidth="140">
 							<u-input v-model="AdministrativeOfficeLabel" placeholder="请输入管理所名称"
-								disabled  borderBottom @click="showadministrativeOffice= true&&type!=1"></u-input>
+								disabled  borderBottom @click="showadministrativeOffice= true  "></u-input>
 							<!-- 	<u-select v-model="showadministrativeOffice" :list="AdministrativeOfficeList" label-name="name"
 									value-name="value" @confirm="AdministrativeOffice()" disabled> </u-select>
 								<u-icon slot="right" name="arrow-right"></u-icon> -->
@@ -27,12 +30,12 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="编号" borderBottom ref="item1" labelWidth="140">
-							<u-input :disabled="type==1" v-model="form.number" placeholder="请输入编号" ></u-input>
+							<u-input    v-model="form.number" placeholder="请输入编号" disabled></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col>
 						<u-form-item label="商服" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.businessService" :disabled="type==1">
+							<u-radio-group v-model="form.businessService"   >
 								<u-radio @change="businessService" v-for="(item, index) in typelist.business_service" :key="index"
 									:name="item.dictValue">
 									{{item.dictLabel}}
@@ -42,7 +45,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="外观" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.appearance" :disabled="type==1">
+							<u-radio-group v-model="form.appearance"   >
 								<u-radio @change="appearance" v-for="(item, index) in typelist.appearance" :key="index"
 									:name="item.dictValue">
 									{{item.dictLabel}}
@@ -52,7 +55,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="方砖" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.squareBrick" :disabled="type==1">
+							<u-radio-group v-model="form.squareBrick"   >
 								<u-radio @change="squareBrick" v-for="(item, index) in typelist.square_brick"
 									:key="index" :name="item.dictValue">
 									{{item.dictLabel}}
@@ -62,7 +65,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="护栏" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.guardrail" :disabled="type==1">
+							<u-radio-group v-model="form.guardrail"   >
 								<u-radio @change="guardrail" v-for="(item, index) in typelist.guardrail" :key="index"
 									:name="item.dictValue">
 									{{item.dictLabel}}
@@ -72,7 +75,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="基础" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.foundation" :disabled="type==1">
+							<u-radio-group v-model="form.foundation"   >
 								<u-radio @change="foundation" v-for="(item, index) in typelist.foundation" :key="index"
 									:name="item.dictValue">
 									{{item.dictLabel}}
@@ -82,7 +85,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="压力表" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.pressureGage" :disabled="type==1">
+							<u-radio-group v-model="form.pressureGage"   >
 								<u-radio @change="pressureGage" v-for="(item, index) in typelist.pressure_gage"
 									:key="index" :name="item.dictValue">
 									{{item.dictLabel}}
@@ -92,7 +95,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="阀门" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.valve" :disabled="type==1">
+							<u-radio-group v-model="form.valve"   >
 								<u-radio @change="valve" v-for="(item, index) in typelist.valve" :key="index"
 									:name="item.dictValue">
 									{{item.dictLabel}}
@@ -102,7 +105,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="是否泄露" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.isThereALeak" :disabled="type==1">
+							<u-radio-group v-model="form.isThereALeak"   >
 								<u-radio @change="isThereALeak" v-for="(item, index) in typelist.yes_and_no"
 									:key="index" :name="item.dictValue">
 									{{item.dictLabel}}
@@ -112,7 +115,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="调压器" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
-							<u-radio-group v-model="form.voltageRegulator" :disabled="type==1">
+							<u-radio-group v-model="form.voltageRegulator"   >
 								<u-radio @change="voltageRegulator" v-for="(item, index) in typelist.voltage_regulator"
 									:key="index" :name="item.dictValue">
 									{{item.dictLabel}}
@@ -122,7 +125,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="过滤器" borderBottom ref="item1" placeholder="请输入编号" labelWidth="120">
-							<u-radio-group v-model="form.filter" :disabled="type==1">
+							<u-radio-group v-model="form.filter"   >
 								<u-radio @change="filter" v-for="(item, index) in typelist.filter" :key="index"
 									:name="item.dictValue">
 									{{item.dictLabel}}
@@ -135,7 +138,7 @@
 					<u-col span="10">
 						<u-form-item label="入口压力" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
 							<u-input v-model="form.inletPressure" length='20px' placeholder="请输入入口压力"
-								:disabled="type==1" type="digit" :clearable="false" @input="checkinletPressure"></u-input>
+								   type="digit" :clearable="false" @input="checkinletPressure"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2">
@@ -145,7 +148,7 @@
 				<u-row gutter="12">
 					<u-col span="5">
 						<u-form-item label="出口压力 主路" borderBottom ref="item1" placeholder=" " labelWidth="200">
-							<u-input v-model="form.exportPressureMain" placeholder=" " :disabled="type==1" type="digit" :clearable="false" @input="checkexportPressureMain"></u-input>
+							<u-input v-model="form.exportPressureMain" placeholder=" "    type="digit" :clearable="false" @input="checkexportPressureMain"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2">
@@ -154,7 +157,7 @@
 					<u-col span="3">
 						<u-form-item label="副路" borderBottom ref="item1" placeholder=" " labelWidth="80">
 							<u-input v-model="form.exportPressureAccessory" length='20px' trim="false" aceholder=""
-								:disabled="type==1" type="digit" :clearable="false" @input="checkexportPressureAccessory"></u-input>
+								   type="digit" :clearable="false" @input="checkexportPressureAccessory"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="1">
@@ -165,7 +168,7 @@
 					<u-col span="5">
 						<u-form-item label="关闭压力 主路" borderBottom ref="item1" placeholder=" " labelWidth="200">
 							<u-input v-model="form.closingPressureMain" placeholder=" " trim="false"
-								:disabled="type==1" type="digit" :clearable="false" @input="checkclosingPressureMain"></u-input>
+								   type="digit" :clearable="false" @input="checkclosingPressureMain"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2">
@@ -174,7 +177,7 @@
 					<u-col span="3">
 						<u-form-item label="副路" borderBottom ref="item1" placeholder=" " labelWidth="80">
 							<u-input v-model="form.closingPressureAccessory" length='20px' trim="false" placeholder=" "
-								:disabled="type==1" type="digit" :clearable="false" @input="checkclosingPressureAccessory"></u-input>
+								   type="digit" :clearable="false" @input="checkclosingPressureAccessory"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="1">
@@ -184,7 +187,7 @@
 				<u-row>
 					<u-col>
 						<u-form-item label="伴热带" labelWidth="140" borderBottom ref="item1">
-							<u-radio-group v-model="form.xtv" :disabled="type==1">
+							<u-radio-group v-model="form.xtv"   >
 								<u-radio @change="xtv"
 									v-for="(item, index) in typelist.xtv" :key="index"
 									:name="item.dictValue">
@@ -195,7 +198,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="有无温控器" borderBottom ref="item1" placeholder="" labelWidth="180">
-							<u-radio-group v-model="form.thermostat" :disabled="type==1">
+							<u-radio-group v-model="form.thermostat"   >
 								<u-radio @change="thermostat"
 									v-for="(item, index) in typelist.yes_or_no" :key="index"
 									:name="item.dictValue">
@@ -206,7 +209,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="有无防爆开关" borderBottom ref="item1" placeholder="" labelWidth="180">
-							<u-radio-group v-model="form.explosionProofSwitch" :disabled="type==1">
+							<u-radio-group v-model="form.explosionProofSwitch"   >
 								<u-radio @change="explosionProofSwitch"
 									v-for="(item, index) in typelist.yes_or_no" :key="index"
 									:name="item.dictValue">
@@ -220,7 +223,7 @@
 				<u-row>
 					<u-col>
 						<u-form-item label="切断器测试" borderBottom ref="item1" placeholder="" labelWidth="200">
-							<u-radio-group v-model="form.cutterTested" :disabled="type==1">
+							<u-radio-group v-model="form.cutterTested"   >
 								<u-radio @change="cutterTested"
 									v-for="(item, index) in typelist.cutoff_test_certification" :key="index"
 									:name="item.dictValue">
@@ -231,7 +234,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="切断器(放散阀)测试情况" borderBottom ref="item1" placeholder="" labelWidth="320" v-if="form.cutterTested==1">
-							<u-radio-group v-model="form.disconnectorTestStatus" :disabled="type==1">
+							<u-radio-group v-model="form.disconnectorTestStatus"   >
 								<u-radio @change="disconnectorTestStatus"
 									v-for="(item, index) in typelist.disconnector_test_status" :key="index"
 									:name="item.dictValue">
@@ -244,7 +247,7 @@
 				<u-row gutter="12">
 					<u-col span="5">
 						<u-form-item label="切断压力 主路" borderBottom ref="item1" placeholder=" " labelWidth="200" v-if="form.cutterTested==1">
-							<u-input v-model="form.cutOffPressureMain" placeholder=" " :disabled="type==1" type="digit" :clearable="false" @input="checkcutOffPressureMain"></u-input>
+							<u-input v-model="form.cutOffPressureMain" placeholder=" "    type="digit" :clearable="false" @input="checkcutOffPressureMain"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2" v-if="form.cutterTested==1">
@@ -253,7 +256,7 @@
 					<u-col span="3">
 						<u-form-item label="副路" borderBottom ref="item1" placeholder="" labelWidth="80" v-if="form.cutterTested==1">
 							<u-input v-model="form.cutOffPressureAccessory" length='20px' placeholder="请输入副路"
-								:disabled="type==1" type="digit" :clearable="false" @input="checkcutOffPressureAccessory"></u-input>
+								   type="digit" :clearable="false" @input="checkcutOffPressureAccessory"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="1" v-if="form.cutterTested==1">
@@ -264,7 +267,7 @@
 					<u-col span="10">
 						<u-form-item label="放散压力" borderBottom ref="item1" placeholder="请输入放散压力" labelWidth="140" v-if="form.cutterTested==1">
 							<u-input v-model="form.releasePressure" length='20px' placeholder="请输入放散压力"
-								:disabled="type==1" type="digit" :clearable="false" @input="checkreleasePressure"></u-input>
+								   type="digit" :clearable="false" @input="checkreleasePressure"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2" v-if="form.cutterTested==1">
@@ -275,7 +278,7 @@
 				<u-row>
 					<u-col>
 						<u-form-item label="是否交替" borderBottom ref="item1" placeholder="请输入编号" labelWidth="200">
-							<u-radio-group v-model="form.manOfAccessoryAlternating" :disabled="type==1">
+							<u-radio-group v-model="form.manOfAccessoryAlternating"   >
 								<u-radio @change="manOfAccessoryAlternating" v-for="(item, index) in typelist.secondary_roads" :key="index"
 									:name="item.dictValue">
 									{{item.dictLabel}}
@@ -290,7 +293,7 @@
 						<u-form-item label="操作结果主副路已交替完毕，现" borderBottom ref="item1" placeholder="请输入编号"
 							labelWidth="420">
 							<u-input v-model="form.mainRoad" length='20px' placeholder="请输入"
-								:disabled="type==1"></u-input>
+								  ></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="12">
@@ -301,7 +304,7 @@
 				<u-row>
 					<u-col>
 						<u-form-item label="调压设施特例" borderBottom ref="item1" placeholder="请输入编号" labelWidth="200">
-							<u-radio-group v-model="form.specialCaseOfPressureRegulatingFacilities" :disabled="type==1">
+							<u-radio-group v-model="form.specialCaseOfPressureRegulatingFacilities"   >
 								<u-radio @change="specialCaseOfPressureRegulatingFacilities"
 									v-for="(item, index) in typelist.special_case_of_pressure_regulating_facilities"
 									:key="index" :name="item.dictValue">
@@ -312,7 +315,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="超期巡检天数" borderBottom ref="item1" placeholder="请输入编号" labelWidth="200">
-							<u-radio-group v-model="form.overdueInspectionDays" :disabled="type==1">
+							<u-radio-group v-model="form.overdueInspectionDays"   >
 								<u-radio @change="overdueInspectionDays"
 									v-for="(item, index) in typelist.overdue_inspection_days" :key="index"
 									:name="item.dictValue">
@@ -323,7 +326,7 @@
 					</u-col>
 					<!-- <u-col>
 						<u-form-item label="超期巡检原因" borderBottom ref="item1" placeholder="请输入编号" labelWidth="200">
-							<u-radio-group v-model="form.reasonForOverdueInspection" :disabled="type==1">
+							<u-radio-group v-model="form.reasonForOverdueInspection"   >
 								<u-radio @change="reasonForOverdueInspection"
 									v-for="(item, index) in typelist.reason_for_overdue_inspection" :key="index"
 									:name="item.dictValue">
@@ -335,7 +338,7 @@
 					<u-col>
 						<u-form-item label="超期巡检原因" borderBottom ref="item1" labelWidth="200" v-if="form.overdueInspectionDays!=undefined&&form.overdueInspectionDays!=3">
 							<u-input v-model="form.reasonForOverdueInspection" placeholder="请输入超期巡检原因"
-								:disabled="type==1"></u-input>
+								  ></u-input>
 						</u-form-item>
 					</u-col>
 				</u-row>
@@ -343,7 +346,7 @@
 				<u-row>
 					<u-col>
 						<u-form-item label="未测试" borderBottom ref="item1" placeholder="请输入编号" labelWidth="120">
-							<u-switch v-model="form.valveWellTesting" :disabled="type==1"></u-switch>
+							<u-switch v-model="form.valveWellTesting"   ></u-switch>
 						</u-form-item>
 					</u-col>
 					<u-col>
@@ -363,7 +366,7 @@
 					<u-col>
 						<u-form-item label=" " labelWidth="0" borderBottom ref="item1">
 							<u-input v-model="form.remarks" type="textarea" borderBottom placeholder="请填写备注信息内容"
-								:disabled="type==1"></u-input>
+								  ></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col>
@@ -372,7 +375,7 @@
 							<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 								<image src="https://cczdsz.cn/app/images/chooseimg.png" mode=""
 									style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"
-									v-if="type!=1"></image>
+									  ></image>
 								<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
 									<view v-if="item.type == 'image'">
 										<image :src="item.url" mode=""
@@ -384,9 +387,9 @@
 										<video :src="item"
 											style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 									</view>
-									<view @click="remove(index)" v-if="type!=1"
+									<view @click="remove(index)"   
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-										<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+										<u-icon name="close" color="#FFFFFF" size="35"   ></u-icon>
 									</view>
 								</view>
 							</view>
@@ -395,10 +398,112 @@
 				</u-row>
 			</u-form>
 
-			<u-button class="from-but" style="margin: 40rpx 0;" @click="save()" v-if="type!=1"
+			<u-button class="from-but" style="margin: 40rpx 0;" @click="save() " v-if="type!=1"   
 				type='primary'>确认上传</u-button>
+				<u-button class="from-but" style="margin: 40rpx 0;" @click="update()"   
+					type='primary' v-else>确认修改</u-button>
 		</view>
 		</u-form>
+		<view>
+			<u-popup v-model="showBoxDetails" height= "400px" border-radius="14" mode=bottom closeable=true   close-icon-color="#000000">
+				<image src="https://cczdsz.cn/app/images/background.png" class="background"></image>
+				<view>
+					<u-form :model="boxform" ref="boxform">
+						<view style="text-align:center; font-size: 40rpx;">调压箱详情</view>
+						<view class="project-content" style="margin-top: 20px;">
+	                    <u-form-item label="管理所" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+		                 <u-input v-model="AdministrativeOfficeLabel" disabled></u-input>
+	                    </u-form-item>
+						<u-form-item label="编号" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.number" placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="名称" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.name" placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="性质" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.nature"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="类型" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.type"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="路数" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.numberOfRoutes"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="性质" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.nature"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="总户数" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.totalNumberOfHousehold"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="调压箱位置" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.positionOfPressureRegulatingBox"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="控制范围" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.controlRange"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="接收时间" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.receivingTime"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="阀井位置" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.valveWellPosition"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="阀井钥匙形状" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.valveWellKeyShape"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="厂家" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.manufacturer"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="流量" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.flow"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="进口管径" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.importPipeDiameter"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="出口管径" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.outletPipeDiameter"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="旁通管径" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.bypassPipeDiameter"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="调压器" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.voltageRegulator"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="设施规格型号" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.facilitySpecificationsAndModels"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="入口压力" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.inletPressure"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="出口压力" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.outletPressure"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="切断压力" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.cutOffPressure"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="放散压力" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.releasePressure"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="出厂编号" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.factoryNumber"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="出厂日期" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.factoryDate"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="主电源位置" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="pressureRegulatingBoxDetailsBo.mainPowerSupplyPosition"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="备注" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="inspectionFrequency"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label=" " labelWidth="0" borderBottom ref="item1">
+							<u-input v-model="boxform.remark" type="textarea" borderBottom placeholder="请填写备注信息内容"
+								  ></u-input>
+						</u-form-item>
+							</view>
+							</u-form>
+				</view>
+			</u-popup>
+		</view>
 	</view>
 	</view>
 </template>
@@ -407,6 +512,7 @@
 	export default {
 		data() {
 			return {
+				
 				action: this.$HTTP.webUrl + `/obs`,
 				headers: {
 					MAuthorization: "wxBearer " + uni.getStorageSync('token')
@@ -646,7 +752,11 @@
 				userId:null,createBy:null,
 				administrativeOffice:null,
 				code:null,
-				name:null
+				name:null,
+				showBoxDetails:false,
+				managementOfficeId:null,
+				boxform:{},
+				pressureRegulatingBoxDetailsBo:{}
 
 			}
 		},
@@ -686,6 +796,7 @@
 			var Min = time1.getMinutes(); //分
 			this.type = e.type
 			this.id = e.id
+			this.managementOfficeId=e.managementOfficeId
 			this.time = year + "/" + month + "/" + date + "-" + hours + ":" + Min
 			this.getdictsysinfo()
 			this.getUserName()
@@ -702,6 +813,15 @@
 
 		},
 		methods: {
+			BoxDetails()
+			{
+				service.getpressureRegulatingBox(this.managementOfficeId).then(res=>{
+					this.boxform=res
+					this.pressureRegulatingBoxDetailsBo = res.pressureRegulatingBoxDetailsVo[0];
+					this.showBoxDetails=true
+				})
+				
+			},
 			checkinletPressure(e) {
 				console.log(e)
 							//正则表达试
@@ -798,7 +918,7 @@
 				}).then(res => {
 					_this.typelist = res
 					if (this.type == 1) {
-						service.getregulatorBox(this.id).then(res => {
+						service.getregulatorBox2(this.id).then(res => {
 							this.communityName = res.name
 							this.time = res.createTime
 							if (null != res.photoList) {
@@ -807,6 +927,7 @@
 									url.url = item
 									url.type = 'image'
 									this.imgymxs.push(url)
+									this.imgArr.push(item)
 								})
 							}
 							let list = []
@@ -831,6 +952,7 @@
 								}
 							})
 							this.form = res
+							this.managementOfficeId=this.form.parentId
 						})
 						console.log(res)
 					}
@@ -940,6 +1062,67 @@
 				this.valveWellConditioLabel = e[0].label
 				console.log(this.$refs.form.valveWellCondition)
 			},
+			update()
+			{
+				let _this = this
+				if(this.imgArr.length==0)
+				{
+					this.$UTILS.showPrompt('请上传照片或视频！')
+					return
+				}
+				this.form.pressureStatus = null
+				this.form.photoList = this.imgArr
+				this.form.unitId = this.unit
+				this.form.areaId =  this.id
+				 this.form.userId=this.userId
+				 this.form.createBy=this.userId
+				 this.form.name=this.name
+				 // this.form.administrativeOffice=this.administrativeOffice
+				 // this.form.code=this.code
+				 // this.form.name=this.name
+				 // this.form.number=this.code
+				service.updateregulatorBox(this.form).then(res => {
+					console.log(res)
+					_this.$UTILS.showPrompt('修改成功！')
+					// setTimeout(() => {
+					// 	console.log('跳')
+					// 	uni.switchTab({
+					// 		url: '/pages/index/index'
+					// 	})
+					// }, 2000)
+				// 	this.form={businessService:0,
+				// 	administrativeOffice:0,
+				
+				// 	businessService:0,
+				// 	isNotXtv:0,
+				// 	appearance:0,
+				// 	squareBrick:0,
+				// 	foundation:0,
+				// 	pressureGage:0,
+				// 	valve:0,
+				// 	isThereALeak:0,
+				// 	voltageRegulator:0,
+				// 	xtv:0,
+				// 	thermostat:0,
+				// 	explosionProofSwitch:0,
+				// 	cutterTested:0,
+				// 	manOfAccessoryAlternating:0,
+				// 	filter:0,
+				// 	specialCaseOfPressureRegulatingFacilities:0,
+				// 	overdueInspectionDays:3,
+				// 	valveWellTesting:true,
+				// 	guardrail:0}
+				// 	this.AdministrativeOfficeLabel=this.AdministrativeOfficeList.filter(item=>item.value==this.administrativeOffice)[0].name
+				// 	this.valveWellConditioLabel=''
+				// 	this.xtvLabel=''
+				// 	this.valveWellConditioLabel=''
+				// 	//this.AdministrativeOfficeLabel=''
+				// 	this.form.administrativeOffice=this.administrativeOffice
+				// 	 this.form.number=this.code
+				// 	this.imgArr=[]
+				// 	this.imgymxs=[]
+				})
+			},
 
 			save() {
 				let _this = this
@@ -953,6 +1136,7 @@
 				this.form.areaId =  this.id
 			     this.form.userId=this.userId
 				 this.form.createBy=this.userId
+				 this.form.parentId=this.managementOfficeId
 				 this.form.name=this.name
 				 // this.form.administrativeOffice=this.administrativeOffice
 				 // this.form.code=this.code
@@ -995,6 +1179,7 @@
 					this.valveWellConditioLabel=''
 					//this.AdministrativeOfficeLabel=''
 					this.form.administrativeOffice=this.administrativeOffice
+					 this.form.parentId=this.managementOfficeId
 					 this.form.number=this.code
 					this.imgArr=[]
 					this.imgymxs=[]

pages/noLogin/WarningPileList.vue

@@ -84,7 +84,7 @@
 			gotoindex(item) {
 				console.log(item)
 				uni.navigateTo({
-					url:`/pages/noLogin/valveWellInspection/valveWellInspection?valveWellName=${item.valveWellName}&position=${item.position}&id=${item.id}&type=2`
+					url:`/pages/noLogin/valveWellInspection/valveWellInspection?valveWellName=${item.valveWellName}&position=${item.position}&id=${item.id}&managementOfficeId=${item.id}&type=2`
 				})
 			},
 			topage(url) {

pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.vue

@@ -4,26 +4,26 @@
 		<view class="project-content">
 			<u-form labelPosition="left" :model="form" :rules="rules" ref="form">
 				<u-form-item label="工程名称" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.enginName" borderBottom placeholder="请输入工程名称" :disabled="type==1"></u-input>
+					<u-input v-model="form.enginName" borderBottom placeholder="请输入工程名称"   ></u-input>
 				</u-form-item>
 				<u-form-item label="涉及户数" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.houseHolds" borderBottom placeholder="请输入涉及户数" :disabled="type==1"></u-input>
+					<u-input v-model="form.houseHolds" borderBottom placeholder="请输入涉及户数"   ></u-input>
 				</u-form-item>
 				<u-form-item label="接警时间" borderBottom ref="item1" labelWidth="150">
 					<u-input v-model="form.repairTime" borderBottom placeholder="请选择接警时间" disabled
-						@click="showtime=true&&type!=1"></u-input>
+						@click="showtime=true  "></u-input>
 					<u-picker v-model="showtime" mode="time" :params="params" @confirm="time()"></u-picker>
 				</u-form-item>
 				<u-form-item label="报修人名称" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.repairName" borderBottom placeholder="请输入报修人名称" :disabled="type==1"></u-input>
+					<u-input v-model="form.repairName" borderBottom placeholder="请输入报修人名称"   ></u-input>
 				</u-form-item>
 				<u-form-item label="联系电话" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.repairPhone" borderBottom placeholder="请输入联系电话"
-						:disabled="type==1"></u-input>
+						  ></u-input>
 				</u-form-item>
 				<u-form-item label="报修类型" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="repairTypeLabel" disabled @click=" showrepairType= true;" borderBottom
-						disabledColor="#ffffff" placeholder="请选择报修类型" v-if="type!=1"></u-input>
+						disabledColor="#ffffff" placeholder="请选择报修类型"   ></u-input>
 					<u-input v-model="labelList.repair_type" disabled borderBottom disabledColor="#ffffff"
 						placeholder="请选择报修类型" v-if="type==1"></u-input>
 					<u-select v-model="showrepairType" :list="typelist.repair_type" label-name="dictLabel"
@@ -33,15 +33,15 @@
 				<u-form-item borderBottom ref="item1">
 					<view>报修内容</view>
 					<u-input v-model="form.repairContent" type="textarea" showWordLimit='255' borderBottom
-						:disabled="type==1" placeholder="请输入报修内容"></u-input>
+						   placeholder="请输入报修内容"></u-input>
 				</u-form-item>
 				<u-form-item label="到达时间" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.arrivalTime" borderBottom disabled
-						@click="showtime4=true&&type!=1"></u-input>
+						@click="showtime4=true  "></u-input>
 					<u-picker v-model="showtime4" mode="time" :params="params" @confirm="time4()"></u-picker>
 				</u-form-item>
 				<u-form-item label="损坏原因" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="causesOfFamageLabel" disabled @click=" causesOfFamageType = true;" v-if="type!=1"
+					<u-input v-model="causesOfFamageLabel" disabled @click=" causesOfFamageType = true;"   
 						borderBottom placeholder="请选择损坏原因"></u-input>
 					<u-input v-model="labelList.causes_of_damage" disabled v-if="type==1" borderBottom
 						placeholder="请选择损坏原因"></u-input>
@@ -50,29 +50,29 @@
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="施工管径" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.constructionPipeDiameter" borderBottom :disabled="type==1"
+					<u-input v-model="form.constructionPipeDiameter" borderBottom   
 						placeholder="请输入施工管径"></u-input>
 				</u-form-item>
 
 				<u-form-item label="管线压力" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="pipelinePressureLabel" disabled @click=" pipelinePressureType= true;"
-						v-if="type!=1" placeholder="请输入管线压力" borderBottom></u-input>
+						   placeholder="请输入管线压力" borderBottom></u-input>
 					<u-input v-model="labelList.pipeline_pressure" disabled borderBottom v-if="type==1"></u-input>
 					<u-select v-model="pipelinePressureType" :list="typelist.pipeline_pressure" label-name="dictLabel"
 						value-name="dictValue" @confirm="pipelinePressure()" :value="form.pipelinePressure"></u-select>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="停气方式" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.stopGasMethod" borderBottom :disabled="type==1"
+					<u-input v-model="form.stopGasMethod" borderBottom   
 						placeholder="请输入停气方式"></u-input>
 				</u-form-item>
 				<u-form-item label="使用材料" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.usingMaterials" borderBottom :disabled="type==1"
+					<u-input v-model="form.usingMaterials" borderBottom   
 						placeholder="请输入使用材料" ></u-input>
 				</u-form-item>
 				<u-form-item label="维修人" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.maintenanceName" borderBottom disabled
-						placeholder="请输入维修人" @click="workerModel=true&&type!=1"></u-input>
+						placeholder="请输入维修人" @click="workerModel=true  "></u-input>
 					<!-- 	<u-select v-model="workerModel" :list="workerList" label-name="name"
 							value-name="id" @confirm="Worker()" :value="form.maintenanceName"></u-select> -->
 							<u-popup v-model="workerModel" style= "height: 200px ;padding: 40rpx 36rpx;"mode="bottom">
@@ -101,22 +101,22 @@
 				</u-form-item>
 				<u-form-item label="施工时间" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.constructionTime" borderBottom disabled
-						@click="showtime3=true&&type!=1"></u-input>
+						@click="showtime3=true  "></u-input>
 					<u-picker v-model="showtime3" mode="time" :params="params" @confirm="time3()"></u-picker>
 				</u-form-item>
 
 				<u-form-item label="现场领导" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.onSiteLeadership" borderBottom placeholder="请输入现场领导" :disabled="type==1"></u-input>
+					<u-input v-model="form.onSiteLeadership" borderBottom placeholder="请输入现场领导"   ></u-input>
 				</u-form-item>
 				<u-form-item label="完成时间" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.maintenanceTime" borderBottom disabled
-						@click="showtime2=true&&type!=1"></u-input>
+						@click="showtime2=true  "></u-input>
 					<u-picker v-model="showtime2" mode="time" :params="params" @confirm="time2()"></u-picker>
 				</u-form-item>
 				<u-form-item label="维修照片" labelWidth="150" borderBottom ref="item1">
 					<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 						<image src="https://cczdsz.cn/app/images//chooseimg.png" mode=""
-							style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
+							style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"   >
 						</image>
 						<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
 							<view v-if="item.type == 'image'">
@@ -129,17 +129,18 @@
 							</view>
 							<view @click="remove(index)"
 								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-								<u-icon name="close" color="#FFFFFF" size="25" v-if="type!=1"></u-icon>
+								<u-icon name="close" color="#FFFFFF" size="25"   ></u-icon>
 							</view>
 						</view>
 					</view>
 				</u-form-item>
 				<u-form-item borderBottom ref="item1">
 					<view>备注</view>
-					<u-input v-model="form.remarks" borderBottom type="textarea" :disabled="type==1"></u-input>
+					<u-input v-model="form.remarks" borderBottom type="textarea"   ></u-input>
 				</u-form-item>
 			</u-form>
-			<u-button @click="save()" v-if="type!=1" type='primary'>确认上传</u-button>
+			<u-button @click="save()"    type='primary' v-if="type!=1">确认上传</u-button>
+			<u-button @click="update()"    type='primary' v-else>确认修改</u-button>
 		</view>
 	</view>
 </template>
@@ -273,6 +274,7 @@
 									url.url = item
 									url.type = 'image'
 									this.imgymxs.push(url)
+									this.imgArr.push(item)
 								})
 							}
 							this.form = res
@@ -337,6 +339,43 @@
 				console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)
 				this.form.arrivalTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
 			},
+			update()
+			{
+				let _this = this
+				// this.form.unitId=this.unit
+				if(this.imgArr.length==0)
+				{
+					_this.$UTILS.showPrompt('请上传照片！')
+					return
+				}
+				this.form.pressureStatus = null
+				this.form.photoList = this.imgArr
+				this.form.userId=this.userId
+				this.form.createBy=this.userId
+				service.updateemergencyRepair(this.form).then(res => {
+					console.log(res)
+					_this.$UTILS.showPrompt('修改成功！')
+					// setTimeout(() => {
+					// 	console.log('跳')
+					// 	uni.switchTab({
+					// 		url: '/pages/index/index'
+					// 	})
+					// }, 2000)
+					// this.form={}
+					// this.maintenanceName=''
+					// this.labelList.repair_type=''
+					// this.repairTypeLabel=''
+					// this.labelList.causes_of_damage=''
+					// this.causesOfFamageLabel=''
+					// this.causesOfFamageType=''
+					// this.labelList.pipeline_pressure=''
+					// this.pipelinePressureLabel=''
+					// this.pipelinePressureType=''
+					// this.showtime2=''
+					// this.imgArr=[]
+					// this.imgymxs=[]
+				})
+			},
 			save() {
 				let _this = this
 				// this.form.unitId=this.unit

pages/noLogin/regulatorBoxList.vue

@@ -55,13 +55,14 @@
 				code:'',administrativeOffice:'',
 				ReachBottom:false,
 				page:1,
-				total:0
+				total:0,
+				pagetype:null
 			}
 
 		},
-		onLoad() {
+		onLoad(e) {
 			this.getUserName();
-
+            this.pagetype=e.value
 			this.getWorker();
 			uni.setNavigationBarColor({
 			    frontColor: '#ffffff',
@@ -119,8 +120,14 @@
 			},
 			gotoindex(item) {
 				console.log(item)
+				if(this.pagetype=='10')
+				{
+					uni.navigateTo({
+						url:`/pages/noLogin/GRegulatingBoxMaintenance/GRegulatingBoxMaintenance?number=${item.number}&name=${item.name}&managementOffice=${item.managementOffice}&id=${item.id}&managementOfficeId=${item.id}&type=2`
+					})
+				}
 				uni.navigateTo({
-					url:`/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?number=${item.number}&name=${item.name}&managementOffice=${item.managementOffice}&id=${item.id}&type=2`
+					url:`/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?number=${item.number}&name=${item.name}&managementOffice=${item.managementOffice}&id=${item.id}&managementOfficeId=${item.id}&type=2`
 				})
 			},
 			topage(url) {

pages/noLogin/roadSection/roadSection.vue

@@ -4,15 +4,15 @@
 <view class="project-content">
 	<u-form :model="form" :rules="rules" ref="form">
 		<u-form-item label="路段名称" borderBottom ref="item1" labelWidth="140">
-			<u-input v-model="form.sectionName" :disabled="type==1" borderBottom @click="showbuilding= true&&type!=1"
+			<u-input v-model="form.sectionName"   borderBottom @click="showbuilding= true "
 				placeholder="请输入路段名称"></u-input>
 		</u-form-item>
 		<u-form-item label="抽检米数" labelWidth="140" borderBottom ref="item1">
-			<u-input v-model="form.samplingMeterCount" :disabled="type==1" borderBottom @click="showbuilding= true&&type!=1"
+			<u-input v-model="form.samplingMeterCount"   borderBottom @click="showbuilding= true "
 				placeholder="请输入抽检米数" @input="checksamplingMeterCount()"></u-input>
 		</u-form-item>
 		<u-form-item label="发现问题" labelWidth="140" borderBottom ref="item1">
-			<u-radio-group v-model="form.findProblem" :disabled="type==1">
+			<u-radio-group v-model="form.findProblem"  >
 				<u-radio @change="confirm"
 					v-for="(item, index) in typelist.find_problem"
 					:key="index" :name="item.dictValue">
@@ -22,7 +22,7 @@
 		</u-form-item>
 		<u-form-item label="发现时间" labelWidth="140" borderBottom ref="item1">
 				<u-input v-model="form.findTime" borderBottom placeholder="请选择接警时间" disabled
-					@click="showtime=true&&type!=1"></u-input>
+					@click="showtime=true "></u-input>
 				<u-picker v-model="showtime" mode="time" :params="params" @confirm="time()"></u-picker>
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
@@ -30,7 +30,7 @@
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传巡检照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="https://cczdsz.cn/app/images/chooseimg.png" mode=""
-					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
+					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"  >
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
 					<view v-if="item.type == 'image'">
@@ -43,18 +43,20 @@
 					</view>
 					<view @click="remove(index)"
 						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+						<u-icon name="close" color="#FFFFFF" size="35"  ></u-icon>
 					</view>
 				</view>
 			</view>
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="type==1"></u-input>
+			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注"  ></u-input>
 		</u-form-item>
 	</u-form>
-	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()" v-if="type!=1"
-		type='primary'>确认上传</u-button>
+	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()"  
+		type='primary' v-if="type!=1">确认上传</u-button>
+		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"
+			type='primary ' v-else>确认修改</u-button>
 </view>
 </view>
 </template>
@@ -226,6 +228,45 @@ methods: {
 			this.imgymxs=[]
 		})
 	},
+	update() {
+		let _this = this
+		this.form.pressureStatus = null
+		this.form.photoList = this.imgArr
+		// if(this.building==null)
+		// {
+		// 	uni.showToast({
+		// 		title: '请选择楼栋',
+		// 		icon: 'none'
+		// 	})
+		// 	return
+		// }
+		if(this.imgArr.length==0)
+		{
+			uni.showToast({
+				title: '请上传图片或视频！',
+				icon: 'none'
+			})
+			return
+		}
+		// this.form.buildingId = this.building
+		// this.form.communityId=this.community
+		this.form.userId=this.userId
+		this.form.createBy=this.userId
+		service.updateroadSectionInspection(this.form).then(res => {
+			console.log(res)
+			_this.$UTILS.showPrompt('修改成功！')
+			// setTimeout(() => {
+			// 	console.log('跳')
+			// 	uni.switchTab({
+			// 		url: '/pages/index/index'
+			// 	})
+			// }, 2000)
+			//this.form={findProblem:1}
+			// this.buildingName=''
+			// this.imgArr=[]
+			// this.imgymxs=[]
+		})
+	},
 	getdictsysinfo() {
 		let _this = this
 		service.getDictInfoList({
@@ -251,6 +292,7 @@ methods: {
 							url.url = item
 							url.type = 'image'
 							this.imgymxs.push(url)
+							this.imgArr.push(item)
 						})
 					}
 					this.form = res

pages/noLogin/typeList.vue

@@ -137,7 +137,7 @@
 				if (url.dictValue == '1') {
 					this.list1 = []
 					this.list.forEach(item => {
-						if (item.dictValue == '1'||item.dictValue == '0'||item.dictValue == '6'||item.dictValue == '8') {
+						if (item.dictValue == '1'||item.dictValue == '0'||item.dictValue == '6'||item.dictValue == '8'||item.dictValue == '11') {
 							item.visable = false
 						} else {
 							item.visable = true
@@ -166,7 +166,7 @@
 					{
 						this.list1 = []
 						this.list.forEach(item => {
-							if (item.dictValue == '1'||item.dictValue == '0'||item.dictValue == '8') {
+							if (item.dictValue == '1'||item.dictValue == '0'||item.dictValue == '8'||item.dictValue == '11') {
 								item.visable = true
 							} else {
 								item.visable = false
@@ -199,7 +199,25 @@
 							url: `/pages/noLogin/regulatorBoxList?value=${url.dictValue}`
 						})
 					}
-					else
+					else if(url.dictValue=='9')
+					{
+						uni.navigateTo({
+							url: `/pages/noLogin/patrolFleet/patrolFleet?type=2`
+						})
+					}
+					else if(url.dictValue=='10')
+					{
+						uni.navigateTo({
+							url: `/pages/noLogin/regulatorBoxList?value=${url.dictValue}`
+						})
+					}
+					else if(url.dictValue=='11')
+					{
+						uni.navigateTo({
+							url: `/pages/noLogin/PipelineGasUser/PipelineGasUser?value=${url.dictValue}`
+						})
+					}
+					else 
 					{
 
 						uni.navigateTo({
@@ -212,6 +230,7 @@
 			},
 			backview()
 			{
+				uni.removeStorageSync('type')
 				this.getProjectType()
 				this.visable=false
 				uni.showTabBar()
@@ -226,7 +245,7 @@
 				this.visable = false
 				this.list1 = []
 				this.list.forEach(item => {
-					if (item.dictValue == '1' || item.dictValue == '2'||item.dictValue == '7' || item.dictValue == '8') {
+					if (item.dictValue == '1' || item.dictValue == '2'||item.dictValue == '7' || item.dictValue == '8' || item.dictValue == '9') {
 						item.visable = true
 					} else {
 						item.visable = false
@@ -258,7 +277,7 @@
 						{
 							item.image='https://cczdsz.cn/app/images/kggs.png'
 						}
-						else if (item.dictValue==6 || item.dictValue == 8){
+						else if (item.dictValue == 8){
 							item.image='https://cczdsz.cn/app/images/kggs.png'
 							item.visable = false
 						}
@@ -294,6 +313,24 @@
 						visable: false,
 						image:'https://cczdsz.cn/app/images/spzxc.png'
 					})
+					this.list1.push({
+						dictLabel: '巡检车队',
+						dictValue: '9',
+						visable: false,
+						image:'https://cczdsz.cn/app/images/xjcd.png'
+					})
+					this.list1.push({
+						dictLabel: '调压箱维护',
+						dictValue: '10',
+						visable: false,
+						image:'https://cczdsz.cn/app/images/xxdy.png'
+					})
+					this.list1.push({
+						dictLabel: '非居民用户',
+						dictValue: '11',
+						visable: false,
+						image:'https://cczdsz.cn/app/images/fjm.png'
+					})
 					this.list = this.list1
 					console.log(this.list)
 				})
@@ -301,7 +338,8 @@
 			getUserName() {
 				service.getUserName().then(res => {
 					this.name = res.name;
-					this.power = res.power + '2,3,4,7,8';
+					this.power = res.power + ',2,3,4,7,8,9,10,11';
+					this.power=this.power.split(',')
 				})
 			},
 		},

pages/noLogin/valveWellInspection/valveWellInspection.vue

@@ -3,6 +3,10 @@
 <image src="https://cczdsz.cn/app/images/background-from.png" class="background"></image>
 <view class="project-content">
 	<u-form :model="form" :rules="rules" ref="form">
+		<view style="flex-flow: row;display: flex; justify-content: flex-end;">
+		<view class="small-title">阀井 </view> 
+		<view class="small-title" style="margin-left: auto;" @click="BoxDetails()">详情<u-icon name="arrow-right"></u-icon></view>
+		</view>
 		<u-form-item label="阀井名称" borderBottom ref="item1" labelWidth="140">
 			<u-input v-model="form.valveWellName" disabled borderBottom
 				placeholder="请输入阀井名称"></u-input>
@@ -15,7 +19,7 @@
 		<u-icon slot="right" name="arrow-right"></u-icon> -->
 		</u-form-item>
 		<u-form-item label="发现问题" labelWidth="140" borderBottom ref="item1">
-			<u-radio-group v-model="form.discoverProblems" :disabled="type==1">
+			<u-radio-group v-model="form.discoverProblems"   >
 				<u-radio @change="confirm"
 					v-for="(item, index) in typelist.find_problem"
 					:key="index" :name="item.dictValue">
@@ -33,7 +37,7 @@
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传巡检照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="https://cczdsz.cn/app/images/chooseimg.png" mode=""
-					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
+					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" >
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
 					<view v-if="item.type == 'image'">
@@ -46,19 +50,49 @@
 					</view>
 					<view @click="remove(index)"
 						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" v-if="type!=1"></u-icon>
+						<u-icon name="close" color="#FFFFFF" size="35" ></u-icon>
 					</view>
 				</view>
 			</view>
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="type==1"></u-input>
+			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" ></u-input>
 		</u-form-item>
 	</u-form>
 	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()" v-if="type!=1"
 		type='primary'>确认上传</u-button>
+		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()" 
+			type='primary' v-else>确认修改</u-button>
 </view>
+	<view>
+			<u-popup v-model="showBoxDetails" height= "400px" border-radius="14" mode=bottom closeable=true   close-icon-color="#000000">
+				<image src="https://cczdsz.cn/app/images/background.png" class="background"></image>
+				<view>
+					<u-form :model="boxform" ref="boxform">
+						<view style="text-align:center; font-size: 40rpx;">阀井详情</view>
+						<view class="project-content" style="margin-top: 20px;">
+	                    <u-form-item label="阀井名称" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+		                 <u-input v-model="boxform.valveWellName" disabled></u-input>
+	                    </u-form-item>
+						<u-form-item label="位置" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.position" placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="经度" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.longitude"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="纬度" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.latitude"  placeholder=" " disabled></u-input>
+						</u-form-item>
+						<u-form-item label="控制区域" borderBottom ref="item1" placeholder=" " labelWidth="200" >
+						 <u-input v-model="boxform.remark"  placeholder=" " disabled></u-input>
+						</u-form-item>
+							</view>
+							</u-form>
+				</view>
+			</u-popup>
+		</view>
+	</view>
 </view>
 </template>
 <script>
@@ -109,7 +143,11 @@ data() {
 		community: null,
 		createBy:null,
 		valveWellName:null,
-		position:null
+		position:null,
+		showBoxDetails:false,
+		boxform:{},
+		managementOfficeId:null,
+		
 	}
 },
 onLoad(e) {
@@ -119,7 +157,7 @@ onLoad(e) {
 	// this.unitName = e.unitName
 	// this.unit = e.unit
 	this.id = e.id
-
+  this.managementOfficeId=e.managementOfficeId
 	this.type = e.type
 
 	console.log(e)
@@ -141,6 +179,14 @@ onLoad(e) {
 	this.getUserName()
 },
 methods: {
+	BoxDetails()
+	{
+		service.getvalveWellPositionId(this.managementOfficeId).then(res=>{
+			this.boxform=res
+			this.showBoxDetails=true
+		})
+		
+	},
 	time(e) {
 		console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)
 		this.form.discoverTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
@@ -198,6 +244,49 @@ methods: {
 	// 		_this.unitList = res
 	// 	})
 	// },
+	update()
+	{
+		let _this = this
+		this.form.photoList = this.imgArr
+		// if(this.building==null)
+		// {
+		// 	uni.showToast({
+		// 		title: '请选择楼栋',
+		// 		icon: 'none'
+		// 	})
+		// 	return
+		// }
+		if(this.imgArr.length==0)
+		{
+			uni.showToast({
+				title: '请上传图片或视频！',
+				icon: 'none'
+			})
+			return
+		}
+		// this.form.buildingId = this.building
+		// this.form.communityId=this.community
+		this.form.userId=this.userId
+		this.form.pressureStatus = null
+		this.form.createBy=this.userId
+		this.form.positionId=this.id
+		service.updatevalveWellPosition(this.form).then(res => {
+			console.log(res)
+			_this.$UTILS.showPrompt('修改成功！')
+			// setTimeout(() => {
+			// 	console.log('跳')
+			// 	uni.switchTab({
+			// 		url: '/pages/index/index'
+			// 	})
+			// }, 2000)
+			// this.form={discoverProblems:1}
+			// this.form.valveWellName=this.valveWellName
+			// this.form.position=this.position
+			// // this.buildingName=''
+			// this.imgArr=[]
+			// this.imgymxs=[]
+		})
+	},
 	save() {
 		let _this = this
 		this.form.photoList = this.imgArr
@@ -255,12 +344,14 @@ methods: {
 							url.url = item
 							url.type = 'image'
 							this.imgymxs.push(url)
+							this.imgArr.push(item)
 						})
 					}
 					this.form = res
 					res.valveWellName=res.position.valveWellName
 					//this.form.valveWellName=res.position.valveWellName
 					this.form.position=res.position.position
+					this.managementOfficeId=res.positionId
 					console.log('123123',res)
 				})
 			}
@@ -453,4 +544,9 @@ width: 100%;
 height: 100%;
 background-size: 100% 100%;
 }
+.small-title {
+font-size: 38rpx;
+color: #2d95f4;
+margin: 20rpx 0;
+}
 </style>

unpackage/dist/dev/mp-weixin/app.json

@@ -22,7 +22,10 @@
     "pages/noLogin/valveWellInspection/valveWellInspection",
     "pages/mapindex/mapindex",
     "pages/noLogin/LNGStation/LNGStation",
-    "pages/noLogin/fileList/fileList"
+    "pages/noLogin/fileList/fileList",
+    "pages/noLogin/patrolFleet/patrolFleet",
+    "pages/noLogin/GRegulatingBoxMaintenance/GRegulatingBoxMaintenance",
+    "pages/noLogin/PipelineGasUser/PipelineGasUser"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/common/main.js

@@ -17,7 +17,7 @@ var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
 var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 27));
 var _index = _interopRequireDefault(__webpack_require__(/*! ./api/index.js */ 33));
 var _utils = _interopRequireDefault(__webpack_require__(/*! ./common/utils.js */ 38));
-var _http = _interopRequireDefault(__webpack_require__(/*! ./common/http.js */ 36));
+var _http = _interopRequireDefault(__webpack_require__(/*! ./common/http.js */ 37));
 var _lodashMin = _interopRequireDefault(__webpack_require__(/*! ./common/lodash.min.js */ 39));
 var _uviewUi = _interopRequireDefault(__webpack_require__(/*! uview-ui */ 42));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -29,7 +29,7 @@ _vue.default.config.productionTip = false;
 //返回上一页按钮
 var back = function back() {
   __webpack_require__.e(/*! require.ensure | components/back */ "components/back").then((function () {
-    return resolve(__webpack_require__(/*! @/components/back.vue */ 251));
+    return resolve(__webpack_require__(/*! @/components/back.vue */ 275));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component('back', back);
@@ -37,7 +37,7 @@ _vue.default.component('back', back);
 //弹窗
 var mingPop = function mingPop() {
   __webpack_require__.e(/*! require.ensure | components/ming-pop/ming-pop */ "components/ming-pop/ming-pop").then((function () {
-    return resolve(__webpack_require__(/*! @/components/ming-pop/ming-pop.vue */ 258));
+    return resolve(__webpack_require__(/*! @/components/ming-pop/ming-pop.vue */ 282));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component("ming-pop", mingPop);

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -95,7 +95,7 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 var mpHtml = function mpHtml() {
   Promise.all(/*! require.ensure | components/mp-html/mp-html */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/mp-html/mp-html")]).then((function () {
-    return resolve(__webpack_require__(/*! @/components/mp-html/mp-html.vue */ 363));
+    return resolve(__webpack_require__(/*! @/components/mp-html/mp-html.vue */ 394));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -315,10 +315,10 @@ var components
 try {
   components = {
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
     uParse: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-parse/u-parse */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-parse/u-parse")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-parse/u-parse.vue */ 353))
+      return Promise.all(/*! import() | uview-ui/components/u-parse/u-parse */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-parse/u-parse")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-parse/u-parse.vue */ 384))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 265))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 289))
     },
     uCheckbox: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-checkbox/u-checkbox */ "uview-ui/components/u-checkbox/u-checkbox").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 273))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-checkbox/u-checkbox */ "uview-ui/components/u-checkbox/u-checkbox").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 297))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uForm: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 280))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 304))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 294))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 318))
     },
     uInput: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 304))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 328))
     },
     uSelect: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-select/u-select */ "uview-ui/components/u-select/u-select").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-select/u-select.vue */ 395))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-select/u-select */ "uview-ui/components/u-select/u-select").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-select/u-select.vue */ 426))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
     uRadioGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 325))
+      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 349))
     },
     uRadio: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 332))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 356))
     },
     uButton: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 339))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 363))
     },
   }
 } catch (e) {
@@ -253,6 +253,8 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -361,6 +363,44 @@ var _default = {
         _this.unitList = res;
       });
     },
+    update: function update() {
+      var _this = this;
+      this.form.photoList = this.imgArr;
+      this.form.pressureStatus = null;
+      this.building = this.form.buildingId;
+      if (this.building == null) {
+        uni.showToast({
+          title: '请选择楼栋',
+          icon: 'none'
+        });
+        return;
+      }
+      if (this.imgArr.length == 0) {
+        uni.showToast({
+          title: '请上传图片或视频！',
+          icon: 'none'
+        });
+        return;
+      }
+      this.form.buildingId = this.building;
+      this.form.communityId = this.community;
+      this.form.userId = this.userId;
+      this.form.createBy = this.userId;
+      _index.default.updatecourtyardNetworkManagement(this.form).then(function (res) {
+        console.log(res);
+        _this.$UTILS.showPrompt('修改成功！');
+        // setTimeout(() => {
+        // 	console.log('跳')
+        // 	uni.switchTab({
+        // 		url: '/pages/index/index'
+        // 	})
+        // }, 2000)
+        // this.form={findProblem:1}
+        // this.buildingName=''
+        // this.imgArr=[]
+        // this.imgymxs=[]
+      });
+    },
     save: function save() {
       var _this3 = this;
       var _this = this;
@@ -426,6 +466,7 @@ var _default = {
                 url.url = item;
                 url.type = 'image';
                 _this4.imgymxs.push(url);
+                _this4.imgArr.push(item);
               });
             }
             _this4.form = res;

unpackage/dist/dev/mp-weixin/pages/noLogin/LNGStation/LNGStation.js

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uForm: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 280))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 304))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 294))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 318))
     },
     uInput: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 304))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 328))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
     uRadioGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 325))
+      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 349))
     },
     uRadio: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 332))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 356))
     },
     uButton: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 339))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 363))
     },
   }
 } catch (e) {
@@ -361,6 +361,8 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -532,6 +534,58 @@ var _default = {
     // 		_this.unitList = res
     // 	})
     // },
+    update: function update() {
+      var _this = this;
+      this.form.pressureStatus = null;
+      this.form.flowMeter = this.imgArr;
+      this.form.levelGauge = this.LevelGaugeimgArr;
+      this.form.pressureGauge = this.pressureGaugeimgArr;
+      // if(this.building==null)
+      // {
+      // 	uni.showToast({
+      // 		title: '请选择楼栋',
+      // 		icon: 'none'
+      // 	})
+      // 	return
+      // }
+      if (this.imgArr.length == 0) {
+        uni.showToast({
+          title: '请上传图片或视频！',
+          icon: 'none'
+        });
+        return;
+      }
+      // this.form.buildingId = this.building
+      // this.form.communityId=this.community
+      this.form.userId = this.userId;
+      this.form.createBy = this.userId;
+      _index.default.updatetransmissionStation(this.form).then(function (res) {
+        console.log(res);
+        _this.$UTILS.showPrompt('修改成功！');
+        // setTimeout(() => {
+        // 	console.log('跳')
+        // 	uni.switchTab({
+        // 		url: '/pages/index/index'
+        // 	})
+        // }, 2000)
+        // this.form={pipeline:0,maintain:0,alarm:0,fireEquipment:0,emergency:0}
+        // // this.buildingName=''
+        // this.imgArr=[]
+        // this.imgymxs=[]
+        // this.LevelGaugeimgArr=[]
+        // this.pressureGaugeimgArr=[]
+        // this.LevelGaugeimgymxs=[]
+        // this.pressureGaugeimgymxs=[]
+        // this.maintain=null
+        // this.Alarm=null
+        // this.fireEquipment=null
+        // this.emergency=null
+        // this.showAlarm=false
+        // this.showemergency=false
+        // this.showfireEquipment=false
+        // this.showmaintain=false
+      });
+    },
     save: function save() {
       var _this4 = this;
       var _this = this;
@@ -616,6 +670,7 @@ var _default = {
                 url.url = item;
                 url.type = 'image';
                 _this5.imgymxs.push(url);
+                _this5.imgArr.push(item);
               });
             }
             if (null != res.levelGauge) {
@@ -624,6 +679,7 @@ var _default = {
                 url.url = item;
                 url.type = 'image';
                 _this5.LevelGaugeimgymxs.push(url);
+                _this5.LevelGaugeimgArr.push(item);
               });
             }
             if (null != res.pressureGauge) {
@@ -632,6 +688,7 @@ var _default = {
                 url.url = item;
                 url.type = 'image';
                 _this5.pressureGaugeimgymxs.push(url);
+                _this5.pressureGaugeimgArr.push(item);
               });
             }
             _this5.form = res;

unpackage/dist/dev/mp-weixin/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.json

@@ -10,6 +10,7 @@
     "u-col": "/uview-ui/components/u-col/u-col",
     "u-radio-group": "/uview-ui/components/u-radio-group/u-radio-group",
     "u-radio": "/uview-ui/components/u-radio/u-radio",
-    "u-button": "/uview-ui/components/u-button/u-button"
+    "u-button": "/uview-ui/components/u-button/u-button",
+    "u-popup": "/uview-ui/components/u-popup/u-popup"
   }
 }

unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileForm/WarningPileForm.js

@@ -101,19 +101,19 @@ var components
 try {
   components = {
     uForm: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 280))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 304))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 294))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 318))
     },
     uInput: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 304))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 328))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
     uButton: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 339))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 363))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/noLogin/WarningPileList.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
   }
 } catch (e) {
@@ -260,7 +260,7 @@ var _default = {
     gotoindex: function gotoindex(item) {
       console.log(item);
       uni.navigateTo({
-        url: "/pages/noLogin/valveWellInspection/valveWellInspection?valveWellName=".concat(item.valveWellName, "&position=").concat(item.position, "&id=").concat(item.id, "&type=2")
+        url: "/pages/noLogin/valveWellInspection/valveWellInspection?valveWellName=".concat(item.valveWellName, "&position=").concat(item.position, "&id=").concat(item.id, "&managementOfficeId=").concat(item.id, "&type=2")
       });
     },
     topage: function topage(url) {

unpackage/dist/dev/mp-weixin/pages/noLogin/buildinglist.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/noLogin/communitylist.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.js

@@ -101,37 +101,37 @@ var components
 try {
   components = {
     uForm: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 280))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 304))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 294))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 318))
     },
     uInput: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 304))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 328))
     },
     uPicker: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 385))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 416))
     },
     uSelect: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-select/u-select */ "uview-ui/components/u-select/u-select").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-select/u-select.vue */ 395))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-select/u-select */ "uview-ui/components/u-select/u-select").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-select/u-select.vue */ 426))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
     uPopup: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 402))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 370))
     },
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
     uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 265))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 289))
     },
     uCheckbox: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-checkbox/u-checkbox */ "uview-ui/components/u-checkbox/u-checkbox").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 273))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-checkbox/u-checkbox */ "uview-ui/components/u-checkbox/u-checkbox").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 297))
     },
     uButton: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 339))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 363))
     },
   }
 } catch (e) {
@@ -160,13 +160,13 @@ var render = function () {
   }
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
-      _vm.showtime =  true && _vm.type != 1
+      _vm.showtime = true
     }
     _vm.e1 = function ($event) {
       _vm.showrepairType = true
     }
     _vm.e2 = function ($event) {
-      _vm.showtime4 =  true && _vm.type != 1
+      _vm.showtime4 = true
     }
     _vm.e3 = function ($event) {
       _vm.causesOfFamageType = true
@@ -175,13 +175,13 @@ var render = function () {
       _vm.pipelinePressureType = true
     }
     _vm.e5 = function ($event) {
-      _vm.workerModel =  true && _vm.type != 1
+      _vm.workerModel = true
     }
     _vm.e6 = function ($event) {
-      _vm.showtime3 =  true && _vm.type != 1
+      _vm.showtime3 = true
     }
     _vm.e7 = function ($event) {
-      _vm.showtime2 =  true && _vm.type != 1
+      _vm.showtime2 = true
     }
   }
   _vm.$mp.data = Object.assign(
@@ -378,6 +378,7 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
@@ -502,6 +503,7 @@ var _default = {
                 url.url = item;
                 url.type = 'image';
                 _this2.imgymxs.push(url);
+                _this2.imgArr.push(item);
               });
             }
             _this2.form = res;
@@ -567,6 +569,41 @@ var _default = {
       console.log("".concat(e.year, "-").concat(e.month, "-").concat(e.day, " ").concat(e.hour, ":").concat(e.minute));
       this.form.arrivalTime = "".concat(e.year, "-").concat(e.month, "-").concat(e.day, " ").concat(e.hour, ":").concat(e.minute);
     },
+    update: function update() {
+      var _this = this;
+      // this.form.unitId=this.unit
+      if (this.imgArr.length == 0) {
+        _this.$UTILS.showPrompt('请上传照片！');
+        return;
+      }
+      this.form.pressureStatus = null;
+      this.form.photoList = this.imgArr;
+      this.form.userId = this.userId;
+      this.form.createBy = this.userId;
+      _index.default.updateemergencyRepair(this.form).then(function (res) {
+        console.log(res);
+        _this.$UTILS.showPrompt('修改成功！');
+        // setTimeout(() => {
+        // 	console.log('跳')
+        // 	uni.switchTab({
+        // 		url: '/pages/index/index'
+        // 	})
+        // }, 2000)
+        // this.form={}
+        // this.maintenanceName=''
+        // this.labelList.repair_type=''
+        // this.repairTypeLabel=''
+        // this.labelList.causes_of_damage=''
+        // this.causesOfFamageLabel=''
+        // this.causesOfFamageType=''
+        // this.labelList.pipeline_pressure=''
+        // this.pipelinePressureLabel=''
+        // this.pipelinePressureType=''
+        // this.showtime2=''
+        // this.imgArr=[]
+        // this.imgymxs=[]
+      });
+    },
     save: function save() {
       var _this5 = this;
       var _this = this;

unpackage/dist/dev/mp-weixin/pages/noLogin/fileList/fileList.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
     uMask: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-mask/u-mask */ "uview-ui/components/u-mask/u-mask").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-mask/u-mask.vue */ 409))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-mask/u-mask */ "uview-ui/components/u-mask/u-mask").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-mask/u-mask.vue */ 433))
     },
     uImage: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 416))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 440))
     },
   }
 } catch (e) {
@@ -223,7 +223,7 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 var mypopup = function mypopup() {
   __webpack_require__.e(/*! require.ensure | components/mypopup */ "components/mypopup").then((function () {
-    return resolve(__webpack_require__(/*! ../../../components/mypopup.vue */ 423));
+    return resolve(__webpack_require__(/*! ../../../components/mypopup.vue */ 447));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pages/noLogin/listProject.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uGrid: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-grid/u-grid */ "uview-ui/components/u-grid/u-grid").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-grid/u-grid.vue */ 371))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-grid/u-grid */ "uview-ui/components/u-grid/u-grid").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-grid/u-grid.vue */ 402))
     },
     uGridItem: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-grid-item/u-grid-item */ "uview-ui/components/u-grid-item/u-grid-item").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-grid-item/u-grid-item.vue */ 378))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-grid-item/u-grid-item */ "uview-ui/components/u-grid-item/u-grid-item").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-grid-item/u-grid-item.vue */ 409))
     },
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
   }
 } catch (e) {
@@ -216,6 +216,9 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 //
 //
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -246,6 +249,15 @@ var _default = {
       }, {
         name: '输配站',
         src: 'https://cczdsz.cn/app/images/spzxc.png'
+      }, {
+        name: '巡检车队',
+        src: 'https://cczdsz.cn/app/images/xjcd.png'
+      }, {
+        name: '调压箱维护',
+        src: 'https://cczdsz.cn/app/images/xxdy.png'
+      }, {
+        name: '非居民巡查',
+        src: 'https://cczdsz.cn/app/images/fjm.png'
       }]
     };
   },
@@ -317,12 +329,33 @@ var _default = {
           url: _url
         });
       } else if (this.index == 5) {
-        //警示桩
+        //输配
         console.log(item);
         var _url2 = "/pages/noLogin/LNGStation/LNGStation?type=1&id=".concat(item.id);
         uni.navigateTo({
           url: _url2
         });
+      } else if (this.index == 6) {
+        //输配
+        console.log(item);
+        var _url3 = "/pages/noLogin/patrolFleet/patrolFleet?type=1&id=".concat(item.id, "&name=").concat(item.name);
+        uni.navigateTo({
+          url: _url3
+        });
+      } else if (this.index == 7) {
+        //输配
+        console.log(item);
+        var _url4 = "/pages/noLogin/GRegulatingBoxMaintenance/GRegulatingBoxMaintenance?type=1&id=".concat(item.id);
+        uni.navigateTo({
+          url: _url4
+        });
+      } else if (this.index == 8) {
+        //非居民
+        console.log(item);
+        var _url5 = "/pages/noLogin/PipelineGasUser/PipelineGasUser?type=1&id=".concat(item.id);
+        uni.navigateTo({
+          url: _url5
+        });
       }
       // uni.switchTab({
       // 	url:'/pages/index/index'
@@ -418,7 +451,9 @@ var _default = {
         _index.default.getvalveWellPositionList({
           discoverProblems: this.value1,
           userId: this.userId,
-          createBy: this.userId
+          createBy: this.userId,
+          pageNum: this.page,
+          pageSize: 10
         }).then(function (res) {
           console.log('getProjectType', res);
           if (res.length == 0) {
@@ -429,8 +464,8 @@ var _default = {
           list1 = res;
           list1.forEach(function (item) {
             item.type = 4;
-            item.name = item.position.valveWellName;
-            item.time = item.discoverTime;
+            item.name = item.valveWellName;
+            item.time = item.createTime;
             _this3.list.push(item);
           });
         });
@@ -454,6 +489,74 @@ var _default = {
             _this3.list.push(item);
           });
         });
+      } else if (val == 6) {
+        _index.default.getpatrolTeamList({
+          name: this.value1,
+          userId: this.userId,
+          createBy: this.userId
+        }).then(function (res) {
+          console.log('getProjectType', res);
+          if (res.length == 0) {
+            _this3.$UTILS.showPrompt('暂无历史记录!');
+            return;
+          }
+          var list1 = [];
+          list1 = res.rows;
+          _index.default.getDictInfoList({
+            type: ['team']
+          }).then(function (res2) {
+            var teamName = [];
+            teamName = res2.team;
+            list1.forEach(function (item) {
+              item.type = 6;
+              item.name = teamName.filter(function (item2) {
+                return item2.dictValue == item.team;
+              })[0].dictLabel;
+              item.time = item.createTime;
+              _this3.list.push(item);
+            });
+          });
+        });
+      } else if (val == 7) {
+        _index.default.getregulatingBoxMaintenanceList({
+          name: this.value1,
+          userId: this.userId,
+          createBy: this.userId
+        }).then(function (res) {
+          console.log('getProjectType', res);
+          if (res.length == 0) {
+            _this3.$UTILS.showPrompt('暂无历史记录!');
+            return;
+          }
+          var list1 = [];
+          list1 = res.rows;
+          list1.forEach(function (item) {
+            item.type = 7;
+            item.name = item.name;
+            item.time = item.createTime;
+            _this3.list.push(item);
+          });
+        });
+      } else if (val == 8) {
+        _index.default.getpipelineGasUserList({
+          name: this.value1,
+          userId: this.userId,
+          createBy: this.userId
+        }).then(function (res) {
+          console.log('getProjectType', res);
+          if (res.length == 0) {
+            _this3.$UTILS.showPrompt('暂无历史记录!');
+            return;
+          }
+          var list1 = [];
+          list1 = res.rows;
+          list1.forEach(function (item) {
+            item.type = 8;
+            item.name = item.userName;
+            item.time = item.securityCheckTime;
+            _this3.list.push(item);
+          });
+        });
       } else {
         _index.default.getSearch({
           type: val,

unpackage/dist/dev/mp-weixin/pages/noLogin/regulatorBoxList.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
   }
 } catch (e) {
@@ -241,11 +241,13 @@ var _default = {
       administrativeOffice: '',
       ReachBottom: false,
       page: 1,
-      total: 0
+      total: 0,
+      pagetype: null
     };
   },
-  onLoad: function onLoad() {
+  onLoad: function onLoad(e) {
     this.getUserName();
+    this.pagetype = e.value;
     this.getWorker();
     uni.setNavigationBarColor({
       frontColor: '#ffffff',
@@ -294,8 +296,13 @@ var _default = {
     },
     gotoindex: function gotoindex(item) {
       console.log(item);
+      if (this.pagetype == '10') {
+        uni.navigateTo({
+          url: "/pages/noLogin/GRegulatingBoxMaintenance/GRegulatingBoxMaintenance?number=".concat(item.number, "&name=").concat(item.name, "&managementOffice=").concat(item.managementOffice, "&id=").concat(item.id, "&managementOfficeId=").concat(item.id, "&type=2")
+        });
+      }
       uni.navigateTo({
-        url: "/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?number=".concat(item.number, "&name=").concat(item.name, "&managementOffice=").concat(item.managementOffice, "&id=").concat(item.id, "&type=2")
+        url: "/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?number=".concat(item.number, "&name=").concat(item.name, "&managementOffice=").concat(item.managementOffice, "&id=").concat(item.id, "&managementOfficeId=").concat(item.id, "&type=2")
       });
     },
     topage: function topage(url) {

unpackage/dist/dev/mp-weixin/pages/noLogin/roadSection/roadSection.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uForm: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 280))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 304))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 294))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 318))
     },
     uInput: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 304))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 328))
     },
     uRadioGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 325))
+      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 349))
     },
     uRadio: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 332))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 356))
     },
     uPicker: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 385))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 416))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
     uButton: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 339))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 363))
     },
   }
 } catch (e) {
@@ -148,13 +148,13 @@ var render = function () {
   var _c = _vm._self._c || _h
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
-      _vm.showbuilding =  true && _vm.type != 1
+      _vm.showbuilding = true
     }
     _vm.e1 = function ($event) {
-      _vm.showbuilding =  true && _vm.type != 1
+      _vm.showbuilding = true
     }
     _vm.e2 = function ($event) {
-      _vm.showtime =  true && _vm.type != 1
+      _vm.showtime = true
     }
   }
 }
@@ -258,6 +258,8 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -429,6 +431,44 @@ var _default = {
         _this4.imgymxs = [];
       });
     },
+    update: function update() {
+      var _this = this;
+      this.form.pressureStatus = null;
+      this.form.photoList = this.imgArr;
+      // if(this.building==null)
+      // {
+      // 	uni.showToast({
+      // 		title: '请选择楼栋',
+      // 		icon: 'none'
+      // 	})
+      // 	return
+      // }
+      if (this.imgArr.length == 0) {
+        uni.showToast({
+          title: '请上传图片或视频！',
+          icon: 'none'
+        });
+        return;
+      }
+      // this.form.buildingId = this.building
+      // this.form.communityId=this.community
+      this.form.userId = this.userId;
+      this.form.createBy = this.userId;
+      _index.default.updateroadSectionInspection(this.form).then(function (res) {
+        console.log(res);
+        _this.$UTILS.showPrompt('修改成功！');
+        // setTimeout(() => {
+        // 	console.log('跳')
+        // 	uni.switchTab({
+        // 		url: '/pages/index/index'
+        // 	})
+        // }, 2000)
+        //this.form={findProblem:1}
+        // this.buildingName=''
+        // this.imgArr=[]
+        // this.imgymxs=[]
+      });
+    },
     getdictsysinfo: function getdictsysinfo() {
       var _this5 = this;
       var _this = this;
@@ -455,6 +495,7 @@ var _default = {
                 url.url = item;
                 url.type = 'image';
                 _this5.imgymxs.push(url);
+                _this5.imgArr.push(item);
               });
             }
             _this5.form = res;

unpackage/dist/dev/mp-weixin/pages/noLogin/typeList.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
   }
 } catch (e) {
@@ -312,7 +312,7 @@ var _default = {
       if (url.dictValue == '1') {
         this.list1 = [];
         this.list.forEach(function (item) {
-          if (item.dictValue == '1' || item.dictValue == '0' || item.dictValue == '6' || item.dictValue == '8') {
+          if (item.dictValue == '1' || item.dictValue == '0' || item.dictValue == '6' || item.dictValue == '8' || item.dictValue == '11') {
             item.visable = false;
           } else {
             item.visable = true;
@@ -336,7 +336,7 @@ var _default = {
       } else if (url.dictValue == '6') {
         this.list1 = [];
         this.list.forEach(function (item) {
-          if (item.dictValue == '1' || item.dictValue == '0' || item.dictValue == '8') {
+          if (item.dictValue == '1' || item.dictValue == '0' || item.dictValue == '8' || item.dictValue == '11') {
             item.visable = true;
           } else {
             item.visable = false;
@@ -360,6 +360,18 @@ var _default = {
         uni.navigateTo({
           url: "/pages/noLogin/regulatorBoxList?value=".concat(url.dictValue)
         });
+      } else if (url.dictValue == '9') {
+        uni.navigateTo({
+          url: "/pages/noLogin/patrolFleet/patrolFleet?type=2"
+        });
+      } else if (url.dictValue == '10') {
+        uni.navigateTo({
+          url: "/pages/noLogin/regulatorBoxList?value=".concat(url.dictValue)
+        });
+      } else if (url.dictValue == '11') {
+        uni.navigateTo({
+          url: "/pages/noLogin/PipelineGasUser/PipelineGasUser?value=".concat(url.dictValue)
+        });
       } else {
         uni.navigateTo({
           url: "/pages/noLogin/communitylist?value=".concat(url.dictValue)
@@ -367,6 +379,7 @@ var _default = {
       }
     },
     backview: function backview() {
+      uni.removeStorageSync('type');
       this.getProjectType();
       this.visable = false;
       uni.showTabBar();
@@ -381,7 +394,7 @@ var _default = {
       this.visable = false;
       this.list1 = [];
       this.list.forEach(function (item) {
-        if (item.dictValue == '1' || item.dictValue == '2' || item.dictValue == '7' || item.dictValue == '8') {
+        if (item.dictValue == '1' || item.dictValue == '2' || item.dictValue == '7' || item.dictValue == '8' || item.dictValue == '9') {
           item.visable = true;
         } else {
           item.visable = false;
@@ -410,7 +423,7 @@ var _default = {
             item.image = 'https://cczdsz.cn/app/images/xxdy.png';
           } else if (item.dictValue == 6) {
             item.image = 'https://cczdsz.cn/app/images/kggs.png';
-          } else if (item.dictValue == 6 || item.dictValue == 8) {
+          } else if (item.dictValue == 8) {
             item.image = 'https://cczdsz.cn/app/images/kggs.png';
             item.visable = false;
           }
@@ -446,6 +459,24 @@ var _default = {
           visable: false,
           image: 'https://cczdsz.cn/app/images/spzxc.png'
         });
+        _this3.list1.push({
+          dictLabel: '巡检车队',
+          dictValue: '9',
+          visable: false,
+          image: 'https://cczdsz.cn/app/images/xjcd.png'
+        });
+        _this3.list1.push({
+          dictLabel: '调压箱维护',
+          dictValue: '10',
+          visable: false,
+          image: 'https://cczdsz.cn/app/images/xxdy.png'
+        });
+        _this3.list1.push({
+          dictLabel: '非居民用户',
+          dictValue: '11',
+          visable: false,
+          image: 'https://cczdsz.cn/app/images/fjm.png'
+        });
         _this3.list = _this3.list1;
         console.log(_this3.list);
       });
@@ -454,7 +485,8 @@ var _default = {
       var _this4 = this;
       _index.default.getUserName().then(function (res) {
         _this4.name = res.name;
-        _this4.power = res.power + '2,3,4,7,8';
+        _this4.power = res.power + ',2,3,4,7,8,9,10,11';
+        _this4.power = _this4.power.split(',');
       });
     }
   }

unpackage/dist/dev/mp-weixin/pages/noLogin/unitlist.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uSearch: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 346))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 377))
     },
     uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/noLogin/valveWellInspection/valveWellInspection.js

@@ -101,25 +101,28 @@ var components
 try {
   components = {
     uForm: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 280))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 304))
+    },
+    uIcon: function () {
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 311))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 294))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 318))
     },
     uInput: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 304))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 328))
     },
     uRadioGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 325))
+      return Promise.all(/*! import() | uview-ui/components/u-radio-group/u-radio-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-radio-group/u-radio-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 349))
     },
     uRadio: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 332))
-    },
-    uIcon: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 287))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-radio/u-radio */ "uview-ui/components/u-radio/u-radio").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-radio/u-radio.vue */ 356))
     },
     uButton: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 339))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 363))
+    },
+    uPopup: function () {
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 370))
     },
   }
 } catch (e) {
@@ -247,6 +250,40 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/api/index.js */ 33
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -296,7 +333,10 @@ var _default = {
       community: null,
       createBy: null,
       valveWellName: null,
-      position: null
+      position: null,
+      showBoxDetails: false,
+      boxform: {},
+      managementOfficeId: null
     };
   },
   onLoad: function onLoad(e) {
@@ -306,6 +346,7 @@ var _default = {
     // this.unitName = e.unitName
     // this.unit = e.unit
     this.id = e.id;
+    this.managementOfficeId = e.managementOfficeId;
     this.type = e.type;
     console.log(e);
     this.getdictsysinfo();
@@ -326,25 +367,32 @@ var _default = {
     this.getUserName();
   },
   methods: {
+    BoxDetails: function BoxDetails() {
+      var _this2 = this;
+      _index.default.getvalveWellPositionId(this.managementOfficeId).then(function (res) {
+        _this2.boxform = res;
+        _this2.showBoxDetails = true;
+      });
+    },
     time: function time(e) {
       console.log("".concat(e.year, "-").concat(e.month, "-").concat(e.day, " ").concat(e.hour, ":").concat(e.minute));
       this.form.discoverTime = "".concat(e.year, "-").concat(e.month, "-").concat(e.day, " ").concat(e.hour, ":").concat(e.minute);
     },
     checksamplingMeterCount: function checksamplingMeterCount(e) {
-      var _this2 = this;
+      var _this3 = this;
       console.log(e);
       //正则表达试
       e = e.match(/^\d*(\.?\d{0,10})/g)[0] || null;
       //重新赋值给input
       this.$nextTick(function () {
-        _this2.form.samplingMeterCount = e;
+        _this3.form.samplingMeterCount = e;
       });
     },
     getUserName: function getUserName() {
-      var _this3 = this;
+      var _this4 = this;
       _index.default.getUserName().then(function (res) {
-        _this3.userId = res.id;
-        _this3.createBy = res.name;
+        _this4.userId = res.id;
+        _this4.createBy = res.name;
       });
     },
     // showPhoto(index) {
@@ -385,8 +433,49 @@ var _default = {
     // 		_this.unitList = res
     // 	})
     // },
+    update: function update() {
+      var _this = this;
+      this.form.photoList = this.imgArr;
+      // if(this.building==null)
+      // {
+      // 	uni.showToast({
+      // 		title: '请选择楼栋',
+      // 		icon: 'none'
+      // 	})
+      // 	return
+      // }
+      if (this.imgArr.length == 0) {
+        uni.showToast({
+          title: '请上传图片或视频！',
+          icon: 'none'
+        });
+        return;
+      }
+      // this.form.buildingId = this.building
+      // this.form.communityId=this.community
+      this.form.userId = this.userId;
+      this.form.pressureStatus = null;
+      this.form.createBy = this.userId;
+      this.form.positionId = this.id;
+      _index.default.updatevalveWellPosition(this.form).then(function (res) {
+        console.log(res);
+        _this.$UTILS.showPrompt('修改成功！');
+        // setTimeout(() => {
+        // 	console.log('跳')
+        // 	uni.switchTab({
+        // 		url: '/pages/index/index'
+        // 	})
+        // }, 2000)
+        // this.form={discoverProblems:1}
+        // this.form.valveWellName=this.valveWellName
+        // this.form.position=this.position
+        // // this.buildingName=''
+        // this.imgArr=[]
+        // this.imgymxs=[]
+      });
+    },
     save: function save() {
-      var _this4 = this;
+      var _this5 = this;
       var _this = this;
       this.form.photoList = this.imgArr;
       // if(this.building==null)
@@ -418,38 +507,40 @@ var _default = {
         // 		url: '/pages/index/index'
         // 	})
         // }, 2000)
-        _this4.form = {
+        _this5.form = {
           discoverProblems: 1
         };
-        _this4.form.valveWellName = _this4.valveWellName;
-        _this4.form.position = _this4.position;
+        _this5.form.valveWellName = _this5.valveWellName;
+        _this5.form.position = _this5.position;
         // this.buildingName=''
-        _this4.imgArr = [];
-        _this4.imgymxs = [];
+        _this5.imgArr = [];
+        _this5.imgymxs = [];
       });
     },
     getdictsysinfo: function getdictsysinfo() {
-      var _this5 = this;
+      var _this6 = this;
       var _this = this;
       _index.default.getDictInfoList({
         type: this.dictlist
       }).then(function (res) {
-        if (_this5.type == 1) {
-          var _this6 = _this5;
-          console.log(_this5.id);
-          _index.default.getvalveWellPosition(_this5.id).then(function (res) {
+        if (_this6.type == 1) {
+          var _this7 = _this6;
+          console.log(_this6.id);
+          _index.default.getvalveWellPosition(_this6.id).then(function (res) {
             if (null != res.photoList) {
               res.photoList.forEach(function (item) {
                 var url = {};
                 url.url = item;
                 url.type = 'image';
-                _this5.imgymxs.push(url);
+                _this6.imgymxs.push(url);
+                _this6.imgArr.push(item);
               });
             }
-            _this5.form = res;
+            _this6.form = res;
             res.valveWellName = res.position.valveWellName;
             //this.form.valveWellName=res.position.valveWellName
-            _this5.form.position = res.position.position;
+            _this6.form.position = res.position.position;
+            _this6.managementOfficeId = res.positionId;
             console.log('123123', res);
           });
         }
@@ -461,7 +552,7 @@ var _default = {
       this.form.findProblem = e;
     },
     choose: function choose() {
-      var _this7 = this;
+      var _this8 = this;
       var _this = this;
       uni.showActionSheet({
         title: '上传',
@@ -469,9 +560,9 @@ var _default = {
         success: function success(res) {
           // console.log(res)
           if (res.tapIndex == 0) {
-            _this7.chooseimage();
+            _this8.chooseimage();
           } else {
-            _this7.choosevideo();
+            _this8.choosevideo();
           }
         }
       });
@@ -482,7 +573,7 @@ var _default = {
       uni.chooseImage({
         sourceType: ['camera'],
         success: function success(resp) {
-          var _this8 = this;
+          var _this9 = this;
           console.log('res--uni.chooseMedia', resp);
           resp.tempFiles.forEach(function (item, index) {
             var task = uni.uploadFile({
@@ -520,7 +611,7 @@ var _default = {
               },
               fail: function fail(e) {
                 _this.$UTILS.showPrompt('选取失败！');
-                _this8.uploadError(index, e);
+                _this9.uploadError(index, e);
               },
               complete: function complete(res) {
                 _this.uploading = false;
@@ -552,7 +643,7 @@ var _default = {
         sourceType: ['camera'],
         maxDuration: 30,
         success: function success(resp) {
-          var _this9 = this;
+          var _this10 = this;
           var task = uni.uploadFile({
             url: _this.$HTTP.webUrl + "/obs",
             filePath: resp.tempFilePath,
@@ -563,7 +654,7 @@ var _default = {
               // 判断是否json字符串，将其转为json格式
               var data = _this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data;
               if (![200, 201, 204].includes(res.statusCode)) {
-                _this9.uploadError(index, data);
+                _this10.uploadError(index, data);
               } else {
                 // 上传成功
                 // this.lists[index].response = data;
@@ -588,7 +679,7 @@ var _default = {
             },
             fail: function fail(e) {
               _this.$UTILS.showPrompt('选取失败！');
-              _this9.uploadError(index, e);
+              _this10.uploadError(index, e);
             },
             complete: function complete(res) {
               uni.hideLoading();
@@ -614,15 +705,15 @@ var _default = {
       });
     },
     remove: function remove(index) {
-      var _this10 = this;
+      var _this11 = this;
       uni.showModal({
         title: '提示',
         content: '是否删除该图片或视频？',
         success: function success(res) {
           if (res.confirm) {
-            _this10.imgArr.splice(index, 1);
-            _this10.imgymxs.splice(index, 1);
-            console.log('this.imgarr', _this10.imgArr);
+            _this11.imgArr.splice(index, 1);
+            _this11.imgymxs.splice(index, 1);
+            console.log('this.imgarr', _this11.imgArr);
           }
         }
       });

unpackage/dist/dev/mp-weixin/pages/noLogin/valveWellInspection/valveWellInspection.json

@@ -1,11 +1,12 @@
 {
   "usingComponents": {
     "u-form": "/uview-ui/components/u-form/u-form",
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-form-item": "/uview-ui/components/u-form-item/u-form-item",
     "u-input": "/uview-ui/components/u-input/u-input",
     "u-radio-group": "/uview-ui/components/u-radio-group/u-radio-group",
     "u-radio": "/uview-ui/components/u-radio/u-radio",
-    "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-button": "/uview-ui/components/u-button/u-button"
+    "u-button": "/uview-ui/components/u-button/u-button",
+    "u-popup": "/uview-ui/components/u-popup/u-popup"
   }
 }

unpackage/dist/dev/mp-weixin/pages/noLogin/valveWellInspection/valveWellInspection.wxss

@@ -13,4 +13,9 @@ width: 100%;
 height: 100%;
 background-size: 100% 100%;
 }
+.small-title {
+font-size: 38rpx;
+color: #2d95f4;
+margin: 20rpx 0;
+}