Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue

pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue

@@ -15,7 +15,7 @@
 					</u-form-item>
 				</view>
 				<view style="flex-flow: row;display: flex; justify-content: flex-end;">
-				<view class="small-title">调压箱部分 </view> 
+				<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">
@@ -136,7 +136,7 @@
 				</u-row>
 				<u-row class="un-row" gutter="12" style="text-align:left;">
 					<u-col span="10">
-						<u-form-item label="入口压力" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
+						<u-form-item label="入口压力" borderBottom ref="item1" placeholder="请输入入口压力" labelWidth="140">
 							<u-input v-model="form.inletPressure" length='20px' placeholder="请输入入口压力"
 								   type="digit" :clearable="false" @input="checkinletPressure"></u-input>
 						</u-form-item>
@@ -148,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=" "    type="digit" :clearable="false" @input="checkexportPressureMain"></u-input>
+							<u-input v-model="form.exportPressureMain" placeholder="请输入" :disabled="type==1" type="digit" :clearable="false" @input="checkexportPressureMain"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2">
@@ -156,8 +156,8 @@
 					</u-col>
 					<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=""
-								   type="digit" :clearable="false" @input="checkexportPressureAccessory"></u-input>
+							<u-input v-model="form.exportPressureAccessory" length='20px' trim="false" aceholder="" placeholder="请输入"
+								:disabled="type==1" type="digit" :clearable="false" @input="checkexportPressureAccessory"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="1">
@@ -167,8 +167,8 @@
 				<u-row gutter="12">
 					<u-col span="5">
 						<u-form-item label="关闭压力 主路" borderBottom ref="item1" placeholder=" " labelWidth="200">
-							<u-input v-model="form.closingPressureMain" placeholder=" " trim="false"
-								   type="digit" :clearable="false" @input="checkclosingPressureMain"></u-input>
+							<u-input v-model="form.closingPressureMain" trim="false" placeholder="请输入"
+								:disabled="type==1" type="digit" :clearable="false" @input="checkclosingPressureMain"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="2">
@@ -176,8 +176,8 @@
 					</u-col>
 					<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=" "
-								   type="digit" :clearable="false" @input="checkclosingPressureAccessory"></u-input>
+							<u-input v-model="form.closingPressureAccessory" length='20px' trim="false" placeholder="请输入"
+								:disabled="type==1" type="digit" :clearable="false" @input="checkclosingPressureAccessory"></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col span="1">
@@ -186,6 +186,17 @@
 				</u-row>
 				<u-row>
 					<u-col>
+						<u-form-item label="是否开启伴热带" labelWidth="140" borderBottom ref="item1">
+							<u-radio-group v-model="form.isNotXtv" :disabled="type==1">
+								<u-radio @change="isNotXtv"
+									v-for="(item, index) in typelist.on_off" :key="index"
+									:name="item.dictValue">
+									{{item.dictLabel}}
+								</u-radio>
+							</u-radio-group>
+						</u-form-item>
+					</u-col>
+					<u-col>
 						<u-form-item label="伴热带" labelWidth="140" borderBottom ref="item1">
 							<u-radio-group v-model="form.xtv"   >
 								<u-radio @change="xtv"
@@ -219,7 +230,7 @@
 						</u-form-item>
 					</u-col>
 				</u-row>
-				<view class="small-title">切断器测证部分</view>
+				<view class="small-title">切断器测试部分</view>
 				<u-row>
 					<u-col>
 						<u-form-item label="切断器测试" borderBottom ref="item1" placeholder="" labelWidth="200">
@@ -271,7 +282,7 @@
 						</u-form-item>
 					</u-col>
 					<u-col span="2" v-if="form.cutterTested==1">
-						<viwe class="danwei" >Mpa</viwe>
+						<viwe class="danwei" >Kpa</viwe>
 					</u-col>
 				</u-row>
 				<view class="small-title">主副路交替部分</view>
@@ -387,7 +398,7 @@
 										<video :src="item"
 											style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 									</view>
-									<view @click="remove(index)"   
+									<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"   ></u-icon>
 									</view>
@@ -398,9 +409,9 @@
 				</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()"   
+				<u-button class="from-but" style="margin: 40rpx 0;" @click="update()"
 					type='primary' v-else>确认修改</u-button>
 		</view>
 		</u-form>
@@ -512,7 +523,7 @@
 	export default {
 		data() {
 			return {
-				
+
 				action: this.$HTTP.webUrl + `/obs`,
 				headers: {
 					MAuthorization: "wxBearer " + uni.getStorageSync('token')
@@ -533,7 +544,7 @@
 					businessService:0,
 					administrativeOffice:0,
 					businessService:0,
-					isNotXtv:0,
+					isNotXtv:null,
 					appearance:0,
 					squareBrick:0,
 					foundation:0,
@@ -657,6 +668,11 @@
 						message: "伴热带不能为空",
 						trigger: "change"
 					}],
+					isNotXtv: [{
+						required: true,
+						message: "是否开启伴热带不能为空",
+						trigger: "change"
+					}],
 					thermostat: [{
 						required: true,
 						message: "有无控温器不能为空",
@@ -743,7 +759,7 @@
 				dictlist: ['appearance', 'square_brick', 'guardrail', 'foundation', 'pressure_gage', 'valve',
 					'voltage_regulator', 'xtv', 'disconnector_test_status', 'filter','cutoff_test_certification','secondary_roads',
 					'special_case_of_pressure_regulating_facilities', 'overdue_inspection_days',
-					'reason_for_overdue_inspection', 'valve_well_condition', 'find_problem', 'xtv','administrative_office','yes_and_no','business_service','yes_or_no'
+					'reason_for_overdue_inspection', 'valve_well_condition', 'find_problem', 'on_off','administrative_office','yes_and_no','business_service','yes_or_no'
 				],
 				type: 2,
 				id: null,
@@ -820,7 +836,7 @@
 					this.pressureRegulatingBoxDetailsBo = res.pressureRegulatingBoxDetailsVo[0];
 					this.showBoxDetails=true
 				})
-				
+
 			},
 			checkinletPressure(e) {
 				console.log(e)
@@ -1045,11 +1061,11 @@
 				this.$refs.form.reasonForOverdueInspection = e
 				console.log(e)
 			},
+			isNotXtv(e) {
+				this.$refs.form.isNotXtv = e
+			},
 			xtv(e) {
 				this.$refs.form.xtv = e
-				// this.form.xtv = e[0].value
-				// this.xtvLabel = e[0].label
-				// console.log(this.xtvLabel)
 			},
 			AdministrativeOffice(e)
 			{
@@ -1092,7 +1108,7 @@
 					// }, 2000)
 				// 	this.form={businessService:0,
 				// 	administrativeOffice:0,
-				
+
 				// 	businessService:0,
 				// 	isNotXtv:0,
 				// 	appearance:0,
@@ -1126,11 +1142,34 @@
 
 			save() {
 				let _this = this
-				if(this.imgArr.length==0)
-				{
+				if(this.imgArr.length==0){
 					this.$UTILS.showPrompt('请上传照片或视频！')
 					return
 				}
+				if(this.form.isNotXtv==null){
+					this.$UTILS.showPrompt('请选择是否开启伴热带！')
+					return
+				}
+				if(this.form.inletPressure==null){
+					this.$UTILS.showPrompt('请输入入口压力！')
+					return
+				}
+				if(this.form.exportPressureMain==null){
+					this.$UTILS.showPrompt('请输入出口压力主路！')
+					return
+				}
+				if(this.form.exportPressureAccessory==null){
+					this.$UTILS.showPrompt('请输入出口压力副路！')
+					return
+				}
+				if(this.form.closingPressureMain==null){
+					this.$UTILS.showPrompt('请输入关闭压力主路！')
+					return
+				}
+				if(this.form.closingPressureAccessory==null){
+					this.$UTILS.showPrompt('请输入管理压力副路！')
+					return
+				}
 				this.form.photoList = this.imgArr
 				this.form.unitId = this.unit
 				this.form.areaId =  this.id
@@ -1155,7 +1194,7 @@
 					administrativeOffice:0,
 
 					businessService:0,
-					isNotXtv:0,
+					isNotXtv:null,
 					appearance:0,
 					squareBrick:0,
 					foundation:0,

pages/noLogin/regulatorBoxList.vue

@@ -3,12 +3,12 @@
 		<image src="https://cczdsz.cn/app/images//background-from.png" mode="" class="background"></image>
 		<view>
 			<view class="sousuo">
-				<u-search  placeholder="调压箱名称" @search="getProjectList()" v-model="name"  :show-action="false"></u-search>
+				<u-search  placeholder="调压箱名称" @search="getProjectList(true)" v-model="name"  :show-action="false"></u-search>
 				<!-- <u-select v-model="showName" :list="workList"  label-name="name" value-name="id" @confirm="worker()" @cancel="cancelWorker()"></u-select> -->
 					<u-search placeholder="调压箱编号" v-model="code"  :show-action="false" :action-style="{'font-size':'40rpx'}"
-						@search="getProjectList()"></u-search>
+						@search="getProjectList(true)"></u-search>
 						<u-search placeholder="管理所编号" v-model="administrativeOffice"  :show-action="false" :action-style="{'font-size':'40rpx'}"
-							@search="getProjectList()"></u-search>
+							@search="getProjectList(true)"></u-search>
 			</view>
 
 			<view v-for="(item,index) in list" :key="index">
@@ -135,9 +135,11 @@
 					url
 				})
 			},
-			getProjectList() {
-				//this.list=[]
-				service.getregulatorBoxList({inspector:this.userId,name:this.name,code:this.code,managementOffice:this.administrativeOffice,pageSize:10,pageNum:this.page}).then(res => {
+			getProjectList(flag) {
+				if(flag){
+					this.list=[];
+				}
+				service.getregulatorBoxList({inspector:this.userId,name:this.name,number:this.code,managementOffice:this.administrativeOffice,pageSize:10,pageNum:this.page}).then(res => {
 					console.log('getregulatorBoxList', res)
 					if (res.rows.length == 0) {
 						this.$UTILS.showPrompt('暂无项目!')

pages/noLogin/roadSection/roadSection.vue

@@ -20,11 +20,11 @@
 				</u-radio>
 			</u-radio-group>
 		</u-form-item>
-		<u-form-item label="发现时间" labelWidth="140" borderBottom ref="item1">
+		<!-- <u-form-item label="发现时间" labelWidth="140" borderBottom ref="item1">
 				<u-input v-model="form.findTime" borderBottom placeholder="请选择接警时间" disabled
 					@click="showtime=true "></u-input>
 				<u-picker v-model="showtime" mode="time" :params="params" @confirm="time()"></u-picker>
-		</u-form-item>
+		</u-form-item> -->
 		<u-form-item borderBottom ref="item1">
 			<view>巡检照片</view>
 			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传巡检照片"></u-input>