版本修改

api/common.js

@@ -194,7 +194,7 @@ export default {
 		return utils.requestEn(`/mobile/user/getWorker`)
 	},
 	getSearch(data) {
-		return utils.requestEn(`/mobile/sysInfo/search`,data)
+		return utils.requestEn(`/mobile/sysInfo/search`,data,'POST')
 	},
 	//庭院网管控制器
 	getcourtyardNetworkManagement(data) {
@@ -222,4 +222,8 @@ export default {
 	getAdministrativeOffice(data) {
 		return utils.requestEn(`/mobile/regulatorBox/getAdministrativeOffice`, data)
 	},
+	getregulatorBoxList(data) {
+		return utils.requestEn(`/mobile/regulatorBoxList/list`, data)
+	},
+	
 }

common/http.js

@@ -3,5 +3,5 @@ export default {
 	// webUrl: 'http://127.0.0.1:8080',
 	// webUrl: 'https://www.cczdsz.cn/prod-api/',
 	// webUrl: 'http://124.221.101.24:8082',
-	webUrl: 'http://192.168.4.20:8080',
+	webUrl: 'http://192.168.4.20:8081',
 }

pages.json

@@ -16,6 +16,14 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/noLogin/regulatorBoxList",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		
 		// {
 		//     "path" : "pages/noLogin/PressureRegulatingBox/PressureRegulatingBox",
 		//     "style" :                                                                                    
@@ -85,7 +93,8 @@
 			"path": "pages/noLogin/listProject",
 			"style": {
 				"navigationBarTitleText": "历史记录",
-				"enablePullDownRefresh": true //开启下拉刷新
+				"enablePullDownRefresh": true ,//开启下拉刷新
+				"onReachBottomDistance":126 //距离底部多远时触发 单位px
 			}
 		}, {
 			//修改

pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.vue

@@ -30,7 +30,7 @@
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>巡检照片</view>
-			<u-input v-model="WarningColumnInformation" placeholder="请上传巡检照片"></u-input>
+			<u-input v-model="WarningColumnInformation" disabled placeholder="请上传巡检照片"></u-input>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="/static/icon/chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
@@ -92,7 +92,8 @@ data() {
 		unitList: [],
 		type: 2,
 		id: null,
-		community: null
+		community: null,
+		createBy:null
 	}
 },
 onLoad(e) {
@@ -115,8 +116,15 @@ onLoad(e) {
 	if (this.type != 1) {
 		this.getBuildingList()
 	}
+	this.getUserName()
 },
 methods: {
+	getUserName(){
+		service.getUserName().then(res=>{
+			this.userId=res.id
+			thuis.createBy=res.name
+		})
+	},
 	showPhoto(index) {
 		uni.previewImage({
 			current: index,
@@ -176,6 +184,8 @@ methods: {
 		}
 		this.form.buildingId = this.building
 		this.form.communityId=this.community
+		this.form.userId=this.userId
+		this.form.createBy=this.userId
 		service.setcourtyardNetworkManagement(this.form).then(res => {
 			console.log(res)
 			_this.$UTILS.showPrompt('上报成功！')

pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue

@@ -19,7 +19,7 @@
 					<u-col>
 						<u-form-item label="管理所" borderBottom ref="item1" labelWidth="140">
 							<u-input v-model="AdministrativeOfficeLabel" placeholder="请输入管理所名称"
-								disabled @click="showadministrativeOffice= true&&type!=1" borderBottom></u-input>
+								disabled  borderBottom @click="showadministrativeOffice= true&&type!=1"></u-input>
 								<u-select v-model="showadministrativeOffice" :list="AdministrativeOfficeList" label-name="name"
 									value-name="value" @confirm="AdministrativeOffice()"> </u-select>
 								<u-icon slot="right" name="arrow-right"></u-icon>
@@ -27,7 +27,7 @@
 					</u-col>
 					<u-col>
 						<u-form-item label="编号" borderBottom ref="item1" labelWidth="140">
-							<u-input v-model="form.number" placeholder="请输入编号" :disabled="type==1"></u-input>
+							<u-input :disabled="type==1" v-model="form.number" placeholder="请输入编号" ></u-input>
 						</u-form-item>
 					</u-col>
 					<u-col>
@@ -578,12 +578,17 @@
 				dictlist: ['appearance', 'square_brick', 'guardrail', 'foundation', 'pressure_gage', 'valve',
 					'voltage_regulator', 'xtv', 'disconnector_test_status', 'filter',
 					'special_case_of_pressure_regulating_facilities', 'overdue_inspection_days',
-					'reason_for_overdue_inspection', 'valve_well_condition', 'find_problem', 'xtv'
+					'reason_for_overdue_inspection', 'valve_well_condition', 'find_problem', 'xtv','administrative_office'
 				],
 				type: 2,
 				id: null,
 				AdministrativeOfficeList:[],
-				AdministrativeOfficeLabel:null
+				AdministrativeOfficeLabel:null,
+				userId:null,createBy:null,
+				administrativeOffice:null,
+				code:null,
+				name:null
+				
 			}
 		},
 		// onReady() {
@@ -625,13 +630,22 @@
 			this.form.areaId = e.community
 			this.communityId=e.community
 			this.communityName = e.communityName
+			// this.form.number=e.code
+			// this.administrativeOffice=e.administrativeOffice
+			// this.form.administrativeOffice=this.administrativeOffice
+			this.name=e.name
+			this.code=e.code
 			this.getdictsysinfo()
 			this.getUserName()
 		},
 		methods: {
+			
 			getUserName(){
 				service.getUserName().then(res=>{
+					this.userId=res.id
+					this.createBy=res.name
 					this.getAdministrativeOffice(res.id)
+					console.log(this.communityName)
 				})
 			},
 			getAdministrativeOffice(userId){
@@ -671,6 +685,13 @@
 									_this.valveWellConditioLabel = item.dictLabel
 								}
 							})
+							let list3 = []
+							list3 = _this.typelist.administrative_office
+							list3.forEach((item) => {
+								if (item.dictValue == res.administrativeOffice) {
+									_this.AdministrativeOfficeLabel = item.dictLabel
+								}
+							})
 							this.form = res
 						})
 						console.log(res)
@@ -750,6 +771,7 @@
 				this.valveWellConditioLabel = e[0].label
 				console.log(this.$refs.form.valveWellCondition)
 			},
+			
 			save() {
 				let _this = this
 				if(this.imgArr.length==0)
@@ -760,6 +782,12 @@
 				this.form.photoList = this.imgArr
 				this.form.unitId = this.unit
 				this.form.areaId =  this.communityId
+			     this.form.userId=this.userId
+				 this.form.createBy=this.userId
+				 // this.form.administrativeOffice=this.administrativeOffice
+				 // this.form.code=this.code
+				 // this.form.name=this.name
+				 // this.form.number=this.code
 				service.setregulatorBox(this.form).then(res => {
 					console.log(res)
 					_this.$UTILS.showPrompt('上报成功！')
@@ -774,6 +802,8 @@
 					this.xtvLabel=''
 					this.valveWellConditioLabel=''
 					this.AdministrativeOfficeLabel=''
+					this.form.administrativeOffice=this.administrativeOffice
+					 this.form.number=this.code
 					this.imgArr=[]
 					this.imgymxs=[]
 				})

pages/noLogin/WarningPileForm/WarningPileForm.vue

@@ -53,7 +53,8 @@
 				imgArr: [],
 				type: 2,
 				id: null,
-				userId: null
+				userId: null,
+				createBy:null
 			}
 		},
 		onLoad(e) {
@@ -120,6 +121,7 @@
 			getUsreName() {
 				service.getUserName().then(res => {
 					this.userId = res.id;
+					this.createBy=res.name
 				})
 			},
 			save() {
@@ -132,6 +134,7 @@
 				this.form.photoList = this.imgArr
 				this.form.warningPileId = this.id
 				this.form.userId = this.userId
+				this.form.createBy=this.userId
 				service.patrolRecord(this.form).then(res => {
 					console.log(res)
 					_this.$UTILS.showPrompt('上报成功')

pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.vue

@@ -3,6 +3,9 @@
 		<image src="/static/icon/background-from.png" mode="" class="background"></image>
 		<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-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>
@@ -29,6 +32,11 @@
 					<u-input v-model="form.repairContent" type="textarea" showWordLimit='255' borderBottom
 						:disabled="type==1" 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>
+					<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"
 						borderBottom placeholder="请选择损坏原因"></u-input>
@@ -38,6 +46,11 @@
 						value-name="dictValue" @confirm="causesOfFamage()" :value="form.causesOfFamage"></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.constructionPipeDiameter" borderBottom :disabled="type==1"
+						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>
@@ -55,8 +68,39 @@
 						placeholder="请输入使用材料"></u-input>
 				</u-form-item>
 				<u-form-item label="维修人" labelWidth="150" borderBottom ref="item1">
-					<u-input v-model="form.maintenanceName" borderBottom :disabled="type==1"
-						placeholder="请输入维修人"></u-input>
+					<u-input v-model="form.maintenanceName" borderBottom disabled
+						placeholder="请输入维修人" @click="workerModel=true&&type!=1"></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: 50% "mode="bottom">
+										<view>
+											<u-checkbox-group width="200px"  @change="checkboxGroupChange">
+			<u-checkbox :customStyle="{marginBottom: '8px'}"
+				@change="checkboxChange" 
+				v-model="item.checked" 
+				v-for="(item, index) in workerList" :key="item.id" 
+				:name="item.name"
+				:label="item.name"
+			>{{item.name}}
+			</u-checkbox>
+		</u-checkbox-group>
+		<view style="display: flex;flex-direction: column;">
+		<u-button @click="workerCancel()">取消</u-button>
+		<u-button@click="workerButton()">确认</u-button>
+		</view>
+		</view>
+									</u-popup>
+						<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.constructionTime" borderBottom disabled
+						@click="showtime3=true&&type!=1"></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-form-item>
 				<u-form-item label="完成时间" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.maintenanceTime" borderBottom disabled
@@ -114,6 +158,8 @@
 				causesOfFamageLabel: null,
 				pipelinePressureLabel: null,
 				showtime2: false,
+				showtime3: false,
+				showtime4: false,
 				headers: {
 					MAuthorization: "wxBearer " + uni.getStorageSync('token')
 				},
@@ -133,7 +179,15 @@
 				typelist2: {},
 				labelList: {},
 				type: 2,
-				id: null
+				id: null,
+				createBy:null,
+				workerList:[],
+				workerModel:false,
+				WorkerList:[],
+				WorkerName:null,
+				userIdList:[],
+				maintenanceName:null
+				
 			};
 		},
 		onLoad(e) {
@@ -147,9 +201,33 @@
 				frontColor: '#ffffff',
 				backgroundColor: '#2d95f4',
 			})
+			this.getUserName()
+			this.getWorker()
 		},
 		onShow() {},
 		methods: {
+			checkboxGroupChange(val)
+			{
+			this.WorkerList=val
+				// this.maintenanceName=this.WorkerList.join(",")
+				// console.log(111,this.maintenanceName)
+			},
+			workerCancel()
+			{
+				this.WorkerList=[]
+				this.workerModel=false
+			},
+			workerButton()
+			{
+				this.form.maintenanceName=this.WorkerList.join(",")
+				console.log(111,this.form.maintenanceName)
+				this.workerModel=false
+			},
+			checkboxChange(val)
+			{
+				console.log(222,val)
+			},
+			
 			getdictsysinfo() {
 				let _this = this
 				service.getDictInfoList({
@@ -224,6 +302,18 @@
 					})
 				})
 			},
+			Worker(val)
+			{
+				console.log(val)
+				
+			},
+			getWorker()
+			{
+				service.getWorker().then(res=>{
+					console.log(res)
+					this.workerList=res
+				})
+			},
 			time(e) {
 				console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)
 				this.form.repairTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
@@ -232,6 +322,14 @@
 				console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)
 				this.form.maintenanceTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
 			},
+			time3(e) {
+				console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)
+				this.form.constructionTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+			},
+			time4(e) {
+				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}`
+			},
 			save() {
 				let _this = this
 				// this.form.unitId=this.unit
@@ -241,6 +339,8 @@
 					return
 				}
 				this.form.photoList = this.imgArr
+				this.form.userId=this.userId
+				this.form.createBy=this.userId
 				service.setemergencyRepair(this.form).then(res => {
 					console.log(res)
 					_this.$UTILS.showPrompt('上报成功！')
@@ -251,6 +351,7 @@
 					// 	})
 					// }, 2000)
 					this.form={}
+					this.maintenanceName=''
 					this.labelList.repair_type=''
 					this.repairTypeLabel=''
 					this.labelList.causes_of_damage=''
@@ -264,6 +365,12 @@
 					this.imgymxs=[]
 				})
 			},
+			getUserName(){
+				service.getUserName().then(res=>{
+					this.userId=res.id
+					this.createBy=res.name
+				})
+			},
 			repairType(e) {
 				console.log(e[0])
 				this.form.repairType = e[0].value
@@ -299,7 +406,7 @@
 				console.log('图片')
 				let _this = this;
 				uni.chooseImage({
-					sourceType: ['camera'],
+					sourceType: ['camera','album'],
 					success(resp) {
 						console.log('res--uni.chooseMedia', resp);
 						resp.tempFiles.forEach((item, index) => {

pages/noLogin/listProject.vue

@@ -4,18 +4,24 @@
 		<view class="" style="padding-top: 0rpx;">
 			<!-- <back></back> -->
 		</view>
-		<view style="padding-top: 40rpx;">
-			<view style="margin: 20rpx;">
-				<u-search placeholder="请输入搜索内容" v-model="nameValue"   :show-action="false" :action-style="{'font-size':'40rpx'}" @search="getProjectList()"></u-search>
-			</view>
+		<view >
+			<u-grid :col="4">
+					<u-grid-item @click="getProjectList(index1)" v-for="(item, index1) in viewList" :bg-color="index1==index ? '#6aabff':''" :index="index1">
+						<image :src="item.src" mode="" style="height: 100rpx;width: 100rpx;"></image>
+						<view class="grid-text">{{item.name}}</view>
+					</u-grid-item>
+				</u-grid>
+				<view>
+					<u-search placeholder="请输入搜索内容" v-model="value1"  shape="square" :show-action="false" :action-style="{'font-size':'40rpx'}" @search="gethosList()"></u-search>
+				</view>
 			<view v-for="(item,index) in list" :key="index" >
 				<view class="project-content"  @click="gotoindex(item)">
 					<view>
 						<view class="font-forty-eight blue">
-							项目类型：{{item.typeValue}}
+							项目名称：{{item.name}}
 						</view>
 						<view class="font-forty-eight blue">
-							项目名称：{{item.name}}
+							项目时间：{{item.time}}
 						</view>
 					</view>
 				</view>
@@ -31,14 +37,20 @@
 			return {
 				list:[],
 				value:'',
+				value1:'',
 				nameValue:'',
-				civilPower:''
+				civilPower:'',
+				userId:'',
+				index:-1,
+				ReachBottom:true,
+				page:1,
+				viewList:[{name:'抢险维修',src:'../../static/icon/qxwx.png'},{name:'调压箱管理',src:'../../static/icon/xxdy.png'},{name:'庭院网管',src:'../../static/icon/tywg.png'},{name:'警示桩管理',src:'../../static/icon/jsz.png'}]
 			}
 		},
 		onLoad(e) {
 			console.log(e)
 			this.nameValue = e.nameValue
-			this.getProjectList();
+			//this.getProjectList();
 			this.getUserName();
 			uni.setNavigationBarTitle({
 					title: '历史记录',
@@ -48,26 +60,47 @@
 			    backgroundColor: '#2d95f4',
 			})
 		},
+		onReachBottom(){
+			console.log('触底')
+			this.getReachBottom()
+		},
+		onPullDownRefresh()
+		{
+			console.log('下拉刷新')
+		},
 		methods: {
+			getReachBottom()
+			{
+				if (this.ReachBottom) {
+					
+					this.page+=1
+					this.getvalueproject()
+					}else
+					{
+						this.page=1
+						this.ReachBottom=false
+					}
+			
+			},
 			gotoindex(item){
 				console.log(item)
-				if(item.type==1)
+				if(this.index==1)
 				{//调压箱
 				console.log(item)
 					uni.navigateTo({
 						url: `/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?type=1&id=${item.id}`
 					})
-				}else if(item.type==2)
+				}else if(this.index==2)
 				{//庭院管理
 					uni.navigateTo({
 						url: `/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement?type=1&id=${item.id}`
 					})
-				}else if(item.type==3)
+				}else if(this.index==0)
 				{//抢险维修
 					uni.navigateTo({
 						url: `/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder?type=1&id=${item.id}`
 					})
-				}else if(item.type==4)
+				}else if(this.index==3)
 				{//警示桩
 				console.log(item)
 				let url1= `/pages/noLogin/WarningPileForm/WarningPileForm?type=1&id=${item.id}`
@@ -84,9 +117,56 @@
 					url
 				})
 			},
-			getProjectList() {
+			getvalueproject()
+			{
+				service.getSearch({type:this.index,userId:this.userId,page:this.page,size:10,value:this.value1}).then(res=>{
+					console.log('getProjectType', res)
+					if(null==res){
+						//this.$UTILS.showPrompt('暂无历史记录!')
+						return
+					}
+					let list1=[]
+					list1=res
+					this.list.push(...list1)
+	// 				list1.forEach(item=>{
+	
+	// 					this.list.push(item)
+	// 				})
+						
+					//this.list = res;
+				})
+			},
+			gethosList()
+			{
+				service.getSearch({type:this.index,userId:this.userId,page:this.page,size:10,value:this.value1}).then(res=>{
+								console.log('getProjectType', res)
+								if(res.length == 0){
+									this.list=[]
+									this.$UTILS.showPrompt('暂无历史记录!')
+									return
+								}
+								let list1=[]
+								list1=res
+								list1.forEach(item=>{
+									this.list.push(item)
+								})
+									
+								this.list = res;
+							})
+			},
+			getProjectList(val) {
+				this.page=1
+				this.value1=''
+				this.ReachBottom=true
+				console.log(val,'11111111')
+				if(val==this.index)
+				{
+					this.index=-1
+					return
+				}
+				this.index=val
 				this.list=[]
-				service.getSearch({value:this.nameValue}).then(res=>{
+				service.getSearch({type:val,userId:this.userId,page:this.page,size:10,value:this.value1}).then(res=>{
 					console.log('getProjectType', res)
 					if(res.length == 0){
 						this.$UTILS.showPrompt('暂无历史记录!')
@@ -117,6 +197,7 @@
 			},
 			getUserName(){
 				service.getUserName().then(res=>{
+					this.userId=res.id
 					this.civilPower = res.civilPower;
 				})
 			},

pages/noLogin/typeList.vue

@@ -3,8 +3,8 @@
 		<image src="/static/icon/backgroundgz.png" mode="" class="background"></image>
 		<image src="https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/0e1e285e104144caa274659b3429284c.png" mode="" class="gongzuobj"></image>
 		<view class="justify-content" v-if="visable">
-			
 			<view class="align-items" style="position: absolute; top: 110rpx; left: 50rpx;">
+				<u-icon name="arrow-left" @click="backview()"></u-icon>
 				<image src="/static/icon/sgglpt.png" mode="" class="header-title" style="width: 300rpx;height: 36rpx;"></image>
 			</view>
 			<view class="align-items" style="position: absolute;top: 100px;left: 150px;font-size: 36rpx;color: #fff;">
@@ -12,8 +12,10 @@
 			</view>
 		</view>
 		<view style="padding-top: 170rpx;" v-if="!visable">
-			<view style="margin: 20rpx;">
-				<u-search placeholder="请输入搜索内容" v-model="nameValue"  :show-action="false" :action-style="{'font-size':'40rpx'}" @search="getProjectList()"></u-search>
+			<view style="display: flex;align-items: flex-end;width: 100%;text-align:right;position: fixed;">
+				<!-- <u-search placeholder="请输入搜索内容" v-model="nameValue"  :show-action="false" :action-style="{'font-size':'40rpx'}" @search="getProjectList()"></u-search> -->
+				<view style="width: 100%;" @click="getProjectList()">历史</view>
+				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
 		<view style="padding-top: 300rpx;">
@@ -71,10 +73,10 @@
 		},
 		methods: {
 			getProjectList() {
-				if ('' == this.nameValue) {
-					this.$UTILS.showPrompt('请输入搜索内容!')
-					return
-				}
+				// if ('' == this.nameValue) {
+				// 	this.$UTILS.showPrompt('请输入搜索内容!')
+				// 	return
+				// }
 				uni.navigateTo({
 					url: `/pages/noLogin/listProject?nameValue=${this.nameValue}`
 				})
@@ -92,12 +94,11 @@
 				if (url.dictValue == '1') {
 					this.list1 = []
 					this.list.forEach(item => {
-						if (item.dictValue == '1'||item.dictValue == '0') {
+						if (item.dictValue == '1'||item.dictValue == '0'||item.dictValue == '6') {
 							item.visable = false
 						} else {
 							item.visable = true
 						}
-
 						this.list1.push(item)
 					})
 					this.list = this.list1
@@ -116,7 +117,24 @@
 						})
 						
 					}
-					else
+					else if(url.dictValue=='6')
+					{
+						this.list1 = []
+						this.list.forEach(item => {
+							if (item.dictValue == '1'||item.dictValue == '0') {
+								item.visable = true
+							} else {
+								item.visable = false
+							}
+						
+							this.list1.push(item)
+						})
+						this.list = this.list1
+						console.log(this.list)
+						this.visable = true
+						uni.hideTabBar()
+					}
+					else 
 					{
 						
 						uni.navigateTo({
@@ -127,6 +145,11 @@
 
 				}
 			},
+			backview()
+			{
+				this.getProjectType()
+				this.visable=false
+			},
 			back(url) {
 				this.visable = false
 				this.list1 = []
@@ -169,11 +192,13 @@
 					this.list1.push({
 						dictLabel: '庭院网管',
 						dictValue: '3',
+						visable: false,
 						image:'../../static/icon/tywg.png'
 					})
 					this.list1.push({
 						dictLabel: '警示桩管理',
 						dictValue: '4',
+						visable: false,
 						image:'../../static/icon/jsz.png'
 					})
 					this.list = this.list1

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

@@ -2,6 +2,7 @@
   "pages": [
     "pages/login/login",
     "pages/noLogin/PressureRegulatingBox/PressureRegulatingBox",
+    "pages/noLogin/regulatorBoxList",
     "pages/index/index",
     "pages/noLogin/uploadProject",
     "pages/noLogin/typeList",

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

@@ -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 */ 339));
+    return resolve(__webpack_require__(/*! @/components/back.vue */ 347));
   }).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 */ 346));
+    return resolve(__webpack_require__(/*! @/components/ming-pop/ming-pop.vue */ 354));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component("ming-pop", mingPop);

unpackage/dist/dev/mp-weixin/components/back.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/components/ming-pop/ming-pop.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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 */ 353))
+      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 */ 361))
     },
     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 */ 361))
+      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 */ 369))
     },
   }
 } catch (e) {