123123

api/common.js

@@ -192,8 +192,24 @@ export default {
 	},
 	getWorker() {
 		return utils.requestEn(`/mobile/user/getWorker`)
-	}
-	
-
-
+	},
+	getSearch(data) {
+		return utils.requestEn(`/mobile/sysInfo/search`,data)
+	},
+	//庭院网管控制器
+	getcourtyardNetworkManagement(data) {
+		return utils.requestEn(`/mobile/courtyardNetworkManagement/${data}`)
+	},
+	//抢险维修控制器
+	getemergencyRepair(data) {
+		return utils.requestEn(`/mobile/emergencyRepair/${data}`)
+	},
+	//调压箱管理控制器
+	getregulatorBox(data) {
+		return utils.requestEn(`/mobile/regulatorBox/${data}`)
+	},
+	//警示桩控制器
+	getwarningPile(data) {
+		return utils.requestEn(`/mobile/warningPile/${data}`)
+	},
 }

common/http.js

@@ -2,7 +2,7 @@
 export default {
 	// webUrl: 'http://127.0.0.1:8080',
 	//webUrl: 'https://cczdsz.com/prod-api/',
-	// webUrl: 'http://192.168.0.129:8080',
-	webUrl: 'http://192.168.4.20:8080',
+	 webUrl: 'https://44550f5n36.goho.co',
+	//webUrl: 'http://192.168.4.20:8080',
 	
 }

pages/noLogin/WarningPileForm/WarningPileForm.vue

@@ -29,7 +29,7 @@
 				</view>
 			</u-form-item>
 			</u-form>
-			<u-button style="margin: 500rpx 155rpx 0;" @click="save()">确认上传</u-button>
+			<u-button style="margin: 500rpx 155rpx 0;" @click="save()" v-if="type!=1">确认上传</u-button>
 			</view>
 			</view>
 </template>
@@ -49,13 +49,36 @@ import service from '@/api/index.js'
 									progress: 0 ,//图片或视频上传百分比
 				form:{},
 				value:null,
-				imgArr: []
+				imgArr: [],
+				type:2,
+				id:null
 				
 			}
 		},
 		onLoad(e)
 		{
-			this.getwarningPileInfo(e.value)
+			console.log(e)
+			this.id=e.id
+			if(e.type==1)
+			{
+				this.type=e.type
+				console.log(this.id)
+				service.getwarningPile(this.id).then(res => {
+					this.form=res
+					//this.imgymxs=res.photoList
+					if(null!=res.photoList)
+					{
+						res.photoList.forEach(item=>{
+							let url={}
+							url.url=item
+							url.type='image'
+							this.imgymxs.push(url)
+						})
+					}
+				})
+			}else{
+				this.getwarningPileInfo(e.value)
+			}
 			uni.setNavigationBarTitle({
 					title: '抢险维修单'
 			});

pages/noLogin/listProject.vue

@@ -9,63 +9,16 @@
 				<u-search placeholder="请输入搜索内容" v-model="nameValue" :action-style="{'font-size':'40rpx'}" @custom="getProjectList()"></u-search>
 			</view>
 			<view v-for="(item,index) in list" :key="index" >
-				<view class="project-content" v-if="item.name == '灶管阀改造' && civilPower.includes('pu1')" @click="gotoindex()">
+				<view class="project-content"  @click="gotoindex(item)">
 					<view>
 						<view class="font-forty-eight blue">
-							项目名称：{{item.name}}
-						</view>
-						<view class="font-forty-eight blue">
-							项目地址：{{item.address}}
-						</view>
-					</view>
-				</view>
-				<view class="project-content" v-else-if="item.name == '安检' && civilPower.includes('pu2')" @click="topage(`/pages/noLogin/data?id=${item.id}&name=${item.name}&address=${item.address}`)">
-					<view >
-						<view class="font-forty-eight blue">
-							项目名称：{{item.name}}
-						</view>
-						<view class="font-forty-eight blue">
-							项目地址：{{item.address}}
-						</view>
-					</view>
-				</view>
-				<view class="project-content" v-else-if="item.name == '维修' && civilPower.includes('pu3')" @click="topage(`/pages/noLogin/data?id=${item.id}&name=${item.name}&address=${item.address}`)">
-					<view >
-						<view class="font-forty-eight blue">
-							项目名称：{{item.name}}
+							项目类型：{{item.typeValue}}
 						</view>
 						<view class="font-forty-eight blue">
-							项目地址：{{item.address}}
-						</view>
-					</view>
-				</view>
-				<view class="project-content" v-else-if="item.name == '开栓' && civilPower.includes('pu4')" @click="topage(`/pages/noLogin/data?id=${item.id}&name=${item.name}&address=${item.address}`)">
-					<view >
-						<view class="font-forty-eight blue">
 							项目名称：{{item.name}}
 						</view>
-						<view class="font-forty-eight blue">
-							项目地址：{{item.address}}
-						</view>
 					</view>
 				</view>
-				<view class="project-content" v-else-if="
-						item.name != '灶管阀改造' && 
-						item.name != '安检' && 
-						item.name != '维修' && 
-						item.name != '开栓' && 
-						civilPower.includes('pu5')"
-					@click="topage(`/pages/noLogin/uploadProject?id=${item.id}&name=${item.name}&address=${item.address}`)">
-					<view>
-						<view class="font-forty-eight blue">
-							项目名称：{{item.name}}
-						</view>
-						<view class="font-forty-eight blue">
-							项目地址：{{item.address}}
-						</view>
-					</view>
-				</view>
-				<view v-else></view>
 			</view>
 		</view>
 	</view>
@@ -84,15 +37,40 @@
 		},
 		onLoad(e) {
 			console.log(e)
-			this.value = e.value
+			this.nameValue = e.nameValue
 			this.getProjectList();
 			this.getUserName();
 		},
 		methods: {
-			gotoindex(){
-				uni.switchTab({
-					url:'/pages/index/index'
-				})
+			gotoindex(item){
+				console.log(item)
+				if(item.type==1)
+				{//调压箱
+				console.log(item)
+					uni.navigateTo({
+						url: `/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?type=1&id=${item.id}`
+					})
+				}else if(item.type==2)
+				{//庭院管理
+					uni.navigateTo({
+						url: `/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement?type=1&id=${item.id}`
+					})
+				}else if(item.type==3)
+				{//抢险维修
+					uni.navigateTo({
+						url: `/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder?type=1&id=${item.id}`
+					})
+				}else if(item.type==4)
+				{//警示桩
+				console.log(item)
+				let url1= `/pages/noLogin/WarningPileForm/WarningPileForm?type=1&id=${item.id}`
+					uni.navigateTo({
+						url: url1
+					})
+				}
+				// uni.switchTab({
+				// 	url:'/pages/index/index'
+				// })
 			},
 			topage(url){
 				uni.navigateTo({
@@ -100,12 +78,33 @@
 				})
 			},
 			getProjectList() {
-				service.getProjectList({engineType:this.value,name:this.nameValue}).then(res=>{
+				service.getSearch({value:this.nameValue}).then(res=>{
 					console.log('getProjectType', res)
 					if(res.length == 0){
-						this.$UTILS.showPrompt('暂无项目!')
+						this.$UTILS.showPrompt('暂无历史记录!')
+						return
 					}
-					this.list = res;
+					let list1=[]
+					list1=res
+					list1.forEach(item=>{
+						 if(item.type==1)
+						{
+							item.typeValue='调压箱'
+						}else if(item.type==2)
+						{
+							item.typeValue='庭院管网'
+						}
+						else if(item.type==3)
+						{
+							item.typeValue='抢险维修'
+						}else if(item.type==4)
+						{
+							item.typeValue='警示桩'
+						}
+						this.list.push(item)
+					})
+		
+					//this.list = res;
 				})
 			},
 			getUserName(){

pages/noLogin/typeList.vue

@@ -13,8 +13,7 @@
 		</view>
 		<view style="padding-top: 150rpx;" v-if="!visable">
 			<view style="margin: 20rpx;">
-				<u-search placeholder="请输入搜索内容" v-model="nameValue" :action-style="{'font-size':'40rpx'}"
-					@custom="getProjectList()"></u-search>
+				<u-search placeholder="请输入搜索内容" v-model="nameValue" :action-style="{'font-size':'40rpx'}" @custom="getProjectList()"></u-search>
 			</view>
 		</view>
 		<view style="padding-top: 300rpx;">
@@ -76,7 +75,7 @@
 					return
 				}
 				uni.navigateTo({
-					url: '/pages/noLogin/listProject'
+					url: `/pages/noLogin/listProject?nameValue=${this.nameValue}`
 				})