提交

api/common.js

@@ -229,7 +229,10 @@ export default {
 		return utils.requestEn(`/mobile/regulatorBox/getAdministrativeOffice`, data)
 	},
 	getregulatorBoxList(data) {
-		return utils.requestEn(`/mobile/regulatorBoxList/list`, data)
+		return utils.requestLo(`/mobile/pressureRegulatingBox/list`, data)
+	},
+	getregulatorBox(data) {
+		return utils.requestEn(`/mobile/pressureRegulatingBox/${data}`)
 	},
 	getvalveWellPositionlist(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.20:8080',
 }

manifest.json

@@ -67,7 +67,8 @@
         },
         "uniStatistics" : {
             "enable" : false
-        }
+        },
+		"lazyCodeLoading":"requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -22,7 +22,8 @@
 			"path": "pages/noLogin/regulatorBoxList",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true ,//开启下拉刷新
+				"onReachBottomDistance":126 //距离底部多远时触发 单位px
 			}
 		},
 
@@ -53,13 +54,7 @@
 		// 		"navigationStyle": "custom"
 		// 	}
 		// },
-		{
-			//上传市政项目
-			"path": "pages/noLogin/uploadProject",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
+		 {
 			//项目类型
 			"path": "pages/noLogin/typeList",
 			"style": {
@@ -84,13 +79,7 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		}, {
-			//历史施工（详情页）
-			"path": "pages/historyConstruction/historyDetail",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
+		},  {
 			//历史施工（详情页）
 			"path": "pages/noLogin/listProject",
 			"style": {
@@ -98,32 +87,15 @@
 				"enablePullDownRefresh": true ,//开启下拉刷新
 				"onReachBottomDistance":126 //距离底部多远时触发 单位px
 			}
-		}, {
-			//修改
-			"path": "pages/historyConstruction/updateInfo",
-			"style": {
-				"navigationBarTitleText": "修改"
-			}
-		}, {
-			//市政项目
-			"path": "pages/noLogin/cityProject",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
-			//安检
-			"path": "pages/noLogin/data",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
-			//安检
-			"path": "pages/noLogin/list",
-			"style": {
-				"navigationBarTitleText": "列表",
-				"enablePullDownRefresh": true //开启下拉刷新
-			}
-		}, {
+		}, 
+		 //{
+		// 	//安检
+		// 	"path": "pages/noLogin/data",
+		// 	"style": {
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
+	  {
 			//公告详情
 			"path": "pages/notice/noticeDetail",
 			"style": {
@@ -136,19 +108,7 @@
 				"navigationBarTitleText": "公告列表",
 				"enablePullDownRefresh": true //开启下拉刷新
 			}
-		}, {
-			//阀管施工
-			"path": "pages/cityConstrution/cityConstrution",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
-			//历史施工
-			"path": "pages/historyConstruction/historyConstruction",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
+		},  {
 			//服务说明
 			"path": "pages/service/service",
 			"style": {
@@ -168,58 +128,7 @@
 		// 		"navigationStyle": "custom"
 		// 	}
 		// },
-		{
-			//统计图页面
-			"path": "pages/chart/chart",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
-			//汇总统计图
-			"path": "pages/chart/chartAll",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
-			//统计图
-			"path": "pages/chart/chartDetail",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
-			//统计图
-			"path": "pages/chart/newchartDetail",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
-			//工程管理
-			"path": "pages/chart/chartList",
-			"style": {
-				"navigationBarTitleText": "工程管理"
-			}
-		}, {
-			//工程管理
-			"path": "pages/chart/details",
-			"style": {
-				"navigationBarTitleText": "详情"
-			}
-		}, { //安检
-			"path": "pages/noLogin/repair",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, { //安检
-			"path": "pages/noLogin/My",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, { //安检(查看照片)
-			"path": "pages/noLogin/Myphoto",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}, {
+		 {
 			"path": "pages/noLogin/home/home",
 			"style": {
 				"navigationBarTitleText": "",
@@ -279,7 +188,7 @@
 			"path" : "pages/mapindex/mapindex",
 			"style" :
 			{
-				"navigationBarTitleText" : "地图",
+				"navigationBarTitleText" : "地图展示",
 				"enablePullDownRefresh" : false
 			}
 		},

pages/chart/chart.vue

@@ -1,106 +0,0 @@
-<template>
-	<view style="margin-top: 80rpx;">
-		<view class="font-senventy-two">
-			基础信息
-		</view>
-		<view class="square" @click="gotochart('/pages/chart/chartList')">
-			<image src="/static/icon/project.png" mode="" class="icon"></image>
-			<view class="font-thirty-six">
-				工程管理
-			</view>
-		</view>
-		<view class="font-senventy-two">
-			统计信息
-		</view>
-		<view class="font-fifty-six SourceHanSansCN choose" @click="gotochart('/pages/chart/chartDetail?type=examineArea')">
-			小区合格率
-		</view>
-		<view class="font-fifty-six SourceHanSansCN choose" @click="gotochart('/pages/chart/chartDetail?type=ExamineWorker')">
-			职工合格率
-		</view>
-		<view class="font-fifty-six SourceHanSansCN choose" @click="gotochart('/pages/chart/chartDetail?type=getExamineServe')">
-			小区服务
-		</view>
-		<view class="font-fifty-six SourceHanSansCN choose" @click="gotochart('/pages/chart/chartDetail?type=getExaminePipeType')">
-			管材类别设计
-		</view>
-		<view class="font-fifty-six SourceHanSansCN choose" @click="gotochart('/pages/chart/chartDetail?type=getExaminePipeLength')">
-			管材长度
-		</view>
-		<view class="font-fifty-six SourceHanSansCN choose" @click="gotochart('/pages/chart/chartDetail?type=getExamineValveType')">
-			自闭阀类别
-		</view>
-		<view class="font-fifty-six SourceHanSansCN choose" @click="gotochart('/pages/chart/chartDetail?type=getAreaSum')">
-			小区汇总
-		</view>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				// chartData: {
-				// 	series: [{
-				// 		data: []
-				// 	}]
-				// },
-			}
-		},
-		onLoad() {
-			// this.getList()
-			// this.getExamineValveType()
-			// this.getwork();
-		},
-		methods: {
-			getList() {
-				service.getList().then(res => {
-					console.log('getList', res)
-				})
-			},
-			gotochart(url) {
-				uni.navigateTo({
-					url,
-				})
-
-			},
-			getExamineValveType() {
-				service.getExamineValveType().then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExamineValveType', res)
-				})
-			},
-			// getOrderListFn() {
-			// 	if (this.itemList.length < this.total) {
-			// 		server.getOrderList(this.orderParams).then(response => {
-			// 			this.orderParams.pageNum = response.current + 1
-			// 			for (var i = 0; i < response.records.length; i++) {
-			// 				this.itemList.push(response.records[i])
-			// 			}
-			// 		})
-			// 	}
-			// },
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-	.square{
-		margin: 25rpx;
-		.icon{
-			margin-left: 22rpx;
-			width: 100rpx;
-			height: 100rpx;
-		}
-	}
-	
-</style>

pages/chart/chartAll.vue

@@ -1,84 +0,0 @@
-<template>
-	<view style="margin-top: 80rpx;">
-		<view class="font-senventy-two">
-			基础信息
-		</view>
-		<view class="square" @click="gotochart('/pages/chart/chartList')">
-			<image src="/static/icon/project.png" mode="" class="icon"></image>
-			<view class="font-thirty-six">
-				工程管理
-			</view>
-		</view>
-		<view class="font-senventy-two">
-			统计信息
-		</view>
-		<view style="background: #fcfcfe; margin-bottom: 15rpx;margin-top: 40rpx;">
-			<view style="padding-top:20rpx;text-align: center;font-size: 50rpx;font-weight: 900;">小区合格率</view><newchartDetail ref='tj1' :allType='examineArea' ></newchartDetail>
-		</view>
-		<view style="background: #fcfcfe; margin-bottom: 15rpx;">
-			<view style="padding-top:20rpx;text-align: center;font-size: 50rpx;font-weight: 900;">职工合格率</view><newchartDetail ref='tj2' :allType='ExamineWorker' ></newchartDetail>
-		</view>
-		<view style="background: #fcfcfe; margin-bottom: 15rpx;">
-			<view style="padding-top:20rpx;text-align: center;font-size: 50rpx;font-weight: 900;">小区服务</view><newchartDetail ref='tj3' :allType='getExamineServe' ></newchartDetail>
-		</view>
-		<view style="background: #fcfcfe; margin-bottom: 15rpx;">
-			<view style="padding-top:20rpx;text-align: center;font-size: 50rpx;font-weight: 900;">管材类别设计</view><newchartDetail ref='tj4' :allType='getExaminePipeType' ></newchartDetail>
-		</view>
-		<view style="background: #fcfcfe; margin-bottom: 15rpx;">
-			<view style="padding-top:20rpx;text-align: center;font-size: 50rpx;font-weight: 900;">管材长度</view><newchartDetail ref='tj5' :allType='getExaminePipeLength' ></newchartDetail>
-		</view>
-		<view style="background: #fcfcfe; margin-bottom: 15rpx;">
-			<view style="padding-top:20rpx;text-align: center;font-size: 50rpx;font-weight: 900;">自闭阀类别</view><newchartDetail ref='tj6' :allType='getExamineValveType' ></newchartDetail>
-		</view>
-		<view style="background: #fcfcfe; margin-bottom: 15rpx;">
-			<view style="padding-top:20rpx;text-align: center;font-size: 50rpx;font-weight: 900;">小区汇总</view><newchartDetail ref='tj7' :allType='getAreaSum' ></newchartDetail>
-		</view>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js';
-	import newchartDetail from './newchartDetail.vue';
-	export default {
-		components: {
-			newchartDetail,
-		},
-		data() {
-			return {
-				examineArea:'examineArea',
-				ExamineWorker:'ExamineWorker',
-				getExamineServe:'getExamineServe',
-				getExaminePipeType:'getExaminePipeType',
-				getExaminePipeLength:'getExaminePipeLength',
-				getExamineValveType:'getExamineValveType',
-				getAreaSum:'getAreaSum',
-			}
-		},
-		methods: {
-			gotochart(url) {
-				uni.navigateTo({
-					url,
-				})
-			},
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-	.square{
-		margin: 25rpx;
-		.icon{
-			margin-left: 22rpx;
-			width: 100rpx;
-			height: 100rpx;
-		}
-	}
-	
-</style>

pages/chart/chartDetail.vue

@@ -1,245 +0,0 @@
-<template>
-	<view>
-		<view class="" style="height: 500rpx; margin-top: 200rpx;">
-			<view class="align-items" style="position: absolute; top: 90rpx; left: 0;" >
-				<back></back>
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse()" v-if="type != 'ExamineWorker'">
-				{{house ? house :'全部小区'}}
-				<u-popup v-model="pop" mode="bottom" height="1000rpx">
-					<view style="margin: 20rpx;">
-						<u-search placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}" @custom="searchinfo()"></u-search>
-					</view>
-					<view>
-						<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-							<view v-for="(item,index) in chooseHouseList" :key="item.value" >
-								<view :class="current === index ? 'active' : '' " style="color: #000000;" @click="active(item,index)">
-									{{item.label}}
-								</view>
-							</view>
-						</scroll-view>
-						<view class="">
-							<button type="default" class="font-fifty-six" @click="search()">确定</button>
-						</view>
-						<view class="">
-							<button type="default" @click="pop = false;"  class="font-fifty-six">取消</button>
-						</view>
-					</view>
-				</u-popup>
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" v-if="type != 'ExamineWorker'" @click="reset()">
-				重置
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openWorker()" v-if="type == 'ExamineWorker'">
-				{{worker ? worker : '全部工人'}}
-				<u-select v-model="workShow" :list="workList" @confirm="workConfirm()"></u-select>
-			</view>
-			<view>
-				<qiun-data-charts type="pie" :chartData="chartData" background="none" canvas2d="true" canvasId="ssssss"/>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data(){
-			return {
-				chartData: {
-					series: [{
-						data: []
-					}]
-				},
-				type:'',
-				house:'',
-				houseId:'',
-				worker:'',
-				workerId:'',
-
-				chooseHouseList:[],
-				workList:[],
-				houseShow:false,
-				workShow:false,
-				keyword:'',
-				pop:false,
-				current:-1
-			}
-		},
-		onLoad(e) {
-			this.type = e.type;
-			if(this.type == 'examineArea'){
-				this.getExamineArea();
-			}else if(this.type == 'ExamineWorker'){
-				this.getwork();
-				this.getExamineWorker()
-			}else if(this.type == 'getExamineServe'){
-				this.getExamineServe()
-			}else if(this.type == 'getExaminePipeType'){
-				this.getExaminePipeType()
-			}else if(this.type == 'getExaminePipeLength'){
-				this.getExaminePipeLength()
-			}else if(this.type == 'getExamineValveType'){
-				this.getExamineValveType()
-			}else if(this.type =='getAreaSum'){
-				this.getAreaSum()
-			}
-		   this.getArea();
-		},
-		methods:{
-			openHouse(){
-				this.pop = !this.pop;
-			},
-			openWorker(){
-				this.workShow = !this.workShow;
-			},
-			workConfirm(e){
-				this.worker = e[0].label;
-				this.workerId = e[0].value;
-				this.getExamineWorker(this.workerId)
-			},
-			reset(){
-				this.houseId = '';
-				this.getArea();
-				if(this.type == 'examineArea'){
-					this.getExamineArea(this.houseId)
-				}else if(this.type == 'getExamineServe'){
-					this.getExamineServe(this.houseId)
-				}else if(this.type == 'getExaminePipeType'){
-					this.getExaminePipeType(this.houseId)
-				}else if(this.type == 'getExaminePipeLength'){
-					this.getExaminePipeLength(this.houseId)
-				}else if(this.type == 'getExamineValveType'){
-					this.getExamineValveType(this.houseId)
-				}else if(this.type =='getAreaSum'){
-					this.getAreaSum(this.houseId)
-				}
-				this.house = null;
-				this.current = -1;
-				this.$UTILS.showPrompt('重置成功！')
-			},
-			search(){
-				this.house = this.housename
-				if(this.type == 'examineArea'){
-				  this.getExamineArea(this.houseId)
-				}else if(this.type == 'getExamineServe'){
-					this.getExamineServe(this.houseId)
-				}else if(this.type == 'getExaminePipeType'){
-					this.getExaminePipeType(this.houseId)
-				}else if(this.type == 'getExaminePipeLength'){
-					this.getExaminePipeLength(this.houseId)
-				}else if(this.type == 'getExamineValveType'){
-					this.getExamineValveType(this.houseId)
-				}else if(this.type =='getAreaSum'){
-					this.getAreaSum(this.houseId)
-				}
-				this.pop = false;
-			},
-			searchinfo(){
-				service.getArea({name:this.keyword}).then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-							selectType:'xiaoqu'
-						})
-					})
-				})	
-				this.keyword = null;
-			},
-			active(item,index){
-				this.current = index;
-				this.housename = item.label;
-				this.houseId = item.value;
-				this.selectType = item.selectType;
-			},
-			getArea(){
-				service.getArea().then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-						})
-					})
-				})
-			},
-			//获取工人列表
-			getwork(){
-				service.getWorker().then(res => {
-					this.workList = [];
-					res.forEach((item, index) => {
-						this.workList.push({
-							value: item.id,
-							label: item.name,
-						})
-					})
-				})
-			},
-			//小区合格率
-			getExamineArea(houseId) {
-				service.getExamineArea({areaId:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('this.chartData', this.chartData)
-				})
-			},
-			//工人合格率
-			getExamineWorker(workerId) {
-				service.getExamineWorker({workerId:this.workerId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExamineWorker', res)
-				})
-			},
-			//小区服务统计
-			getExamineServe(serveId) {
-				service.getExamineServe({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExamineServe', res)
-				})
-			},
-			//管材类别统计
-			getExaminePipeType(pipeTypeId) {
-				service.getExaminePipeType({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExaminePipeType', res)
-				})
-			},
-			//管材长度统计
-			getExaminePipeLength(pipeLengthId) {
-				service.getExaminePipeLength({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExaminePipeLength', res)
-				})
-			},
-			//自闭阀类别统计
-			getExamineValveType(valveTypeId) {
-				service.getExamineValveType({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExamineValveType', res)
-				})
-			},
-			//小区汇总统计
-			getAreaSum(areaSumId) {
-				service.getAreaSum({areaId:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getAreaSum', res)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-	.active{
-	   background-color: #1890FF;
-	}
-</style>

pages/chart/chartList.vue

@@ -1,639 +0,0 @@
-<template>
-	<view class="list_s">
-		<view class="header_s">
-			<u-popup v-model="show" mode="top">
-				<view class="popup">
-					<view style="margin-top: 120rpx;">
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-								{{house ? house :'选择小区'}}
-								<u-popup v-model="pop" mode="bottom" height="1000rpx">
-									<view style="margin: 20rpx;">
-										<u-search placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)"></u-search>
-									</view>
-									<view>
-										<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-											<view v-for="(item,index) in chooseHouseList" :key="item.value" >
-												<view :class="current === index ? 'active' : '' " style="color: #000000;" @click="active(item,index)">
-													{{item.label}}
-												</view>
-											</view>
-										</scroll-view>
-										<view class="">
-											<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
-										</view>
-										<view class="">
-											<button type="default" @click="pop = false;"  class="font-fifty-six">取消</button>
-										</view>
-									</view>
-								</u-popup>
-							</view>
-						</view>
-						
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
-								{{bulid ? bulid : '选择楼宇'}}
-							</view>
-					
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('danyuan')">
-								{{unit ? unit : '选择单元'}}
-							</view>
-					
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('menpai')">
-								{{houseNumber ? houseNumber  : '选择门牌'}}
-							</view>
-						</view>
-						<view>
-						<view class="font-fifty-six SourceHanSansCN choose" @click="openType('shows')">
-							服务类型 <text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
-								{{type ? '----' +  type : ''}}</text>
-							<u-select v-model="shows" :list="mounicipalList" @confirm="confirm"></u-select>
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="showStart = true">
-								{{form.starTime ? form.starTime  : '开始时间'}}
-								<u-picker v-model="showStart" mode="time" @confirm="confirmStart"></u-picker>
-							</view>
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="showEnd = true">
-								{{form.endTime ? form.endTime  : '结束时间'}}
-								<u-picker v-model="showEnd" mode="time" @confirm="confirmEnd"></u-picker>
-							</view>
-						</view>
-						<view style="display: flex;">
-							<view style="height: 100rpx; font-size: 64rpx; width: 180rpx; font-weight: 600;">工号</view>
-							<u-input
-								style="font-size: 64rpx!important; font-weight: 600; width: 400rpx!important;"
-								placeholder="请输入工号"
-								placeholder-style="font-size: 64rpx;"
-								v-model="form.jobNum"
-								maxlength = '4'
-								:type='numberType'
-								:border="border" />
-						</view>
-						<view class="font-fifty-six SourceHanSansCN total background-color1" @click="submit()">
-							提交数据
-						</view>
-					</view>
-					</view>
-				</view>
-			</u-popup>
-			<view style="display: flex;">
-				<view class="btn_s" @click="show = true">查询</view>
-				<view class="btn_s" @click="kong">重置</view>
-			</view>
-		</view>
-		<view class="footer_s" v-if="list.length > 0">
-			<view class="footer-item" v-for="(item, index) in list" @click="goto(item.id)">
-				<view class="item-title">服务类型: {{item.serviceType}}</view>
-				<view class="item-title">地址: {{item.house}}</view>
-				<view class="item-title">职工: {{item.userName}}</view>
-				<view class="item-title">时间: {{item.time}}</view>
-				<view class="main-list-icon"></view>
-			</view>
-		</view>
-		<view class="footer_s" style="padding-top: 100rpx;" v-else>
-			<u-empty text="暂无数据" mode="list"></u-empty>
-		</view>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				numberType: 'number',
-				show: false,
-				list: [],
-				params: {
-					pageNum: 1,
-					pageSize: 10,
-				},
-				keyword:'',
-				selectType:'',
-				pop: false,
-				show: false,
-				border: false,
-				typeValue: '',
-				current:-1,
-				labelPosition: 'left',
-				errorType: ['message'],
-				list: [],
-				chooseHouseList: [],
-				typeList: [],
-				showStart: false,
-				showEnd: false,
-				form: {
-					starTime: '',
-					endTime: '',
-					jobNum: '',
-				},
-				listTypeShow: false,
-				tubeTypeShow: false,
-				tubeLongShow: false,
-				house: '选择小区',
-				bulid: '选择楼宇',
-				unit: '选择单元',
-				houseNumber: '选择门牌',
-				shows: false,
-				mounicipalList: [],
-				tubeTypeLongList: [],
-				tubeTypeList: [],
-				houseid:'',
-				type: '',
-				buildid:'',
-				unitid:'',
-				numberid:'',
-			}
-		},
-		onLoad() {
-			this.getListFn();
-			this.getArea();
-			this.getProjectType();
-			this.getTubeType();
-			this.getTubeLong();
-			this.select();
-		},
-		onReachBottom() {
-			this.getNextListFn()
-		},
-		onPullDownRefresh() {
-			this.getListFn();
-			setTimeout(function () {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		methods:{
-			kong(){
-				this.houseid = '';
-				this.buildid = '';
-				this.unitid = '';
-				this.numberid = '';
-				this.form.starTime = '';
-				this.form.endTime = '';
-				this.form.jobNum = '';
-				this.getListFn();
-			},
-			goto(id){
-				uni.navigateTo({
-					url: './details?id=' + id
-				})
-			},
-			getListFn(){
-				let that = this;
-				let params ={
-					areaId: this.houseid,
-					buildingId: this.buildid,
-					unitId: this.unitid,
-					houseId: this.numberid,
-					starTime: this.form.starTime,
-					endTime: this.form.endTime,
-					jobNum: this.form.jobNum,
-					serviceType: this.typeValue,
-					pageSize: 10,
-					pageNum: 1,
-				}
-				console.log("888", params)
-				service.getOrderList(params).then(res =>{
-					console.log("999", res)
-					that.list = res.records;
-					that.total = res.total || 0;
-					that.params.pageNum = res.current + 1;
-				})
-			},
-			getNextListFn(){
-				let that = this;
-				let params ={
-					areaId: this.houseid,
-					buildingId: this.buildid,
-					unitId: this.unitid,
-					houseId: this.numberid,
-					starTime: this.form.starTime,
-					endTime: this.form.endTime,
-					jobNum: this.form.jobNum,
-					serviceType: this.typeValue,
-					pageSize: this.params.pageSize,
-					pageNum: this.params.pageNum,
-				}
-				console.log("7777", params)
-				if (this.list.length < this.total) {
-					service.getOrderList(params).then(response => {
-						that.params.pageNum = response.current + 1
-						response.records.forEach(item =>{
-							that.list.push(item)
-						})
-					})
-				}
-			},
-			confirmStart(e){
-				console.log(e)
-				this.form.starTime = `${e.year}-${e.month}-${e.day}`
-			},
-			confirmEnd(e){
-				console.log(e)
-				this.form.endTime = `${e.year}-${e.month}-${e.day}`
-			},
-			openUnit() {
-				this.unitShow = !this.unitShow
-			},
-			//选择门牌
-			open() {
-				this.houseNumberShow = !this.houseNumberShow
-			},
-			//选择上门类型
-			confirm(e) {
-				this.type = e[0].label
-				this.typeValue = e[0].value
-			
-				this.imgArr = [];
-				this.tubeType = null;
-				this.tubeLong = null;
-				this.valueType = null;
-			},
-			openType(type) {
-				if (type === 'shows') {
-					this.shows = !this.shows
-				} else if (type === 'tubeType') {
-					this.tubeTypeShow = !this.tubeTypeShow
-				} else {
-					this.tubeLongShow = !this.tubeLongShow
-				}
-			
-			},
-			//选择类型
-			select() {
-				service.getDic({
-					dicType: 'service_type'
-				}).then(res => {
-					res.forEach(item => {
-						this.mounicipalList.push({
-							value: item.value,
-							label: item.name
-						})
-					})
-				})
-			},
-			tubeTypeConfirm(e) {
-				this.tubeType = e[0].label
-			},
-			listType(e) {
-				this.valueType = e[0].label
-			},
-			tubeLongConfirm(e) {
-				this.tubeLong = e[0].label
-			},
-			getTubeType() {
-				service.getPipeType().then(res => {
-					res.forEach(item => {
-						this.tubeTypeList.push({
-							value: item.id,
-							label: item.pipeType
-						})
-					})
-				})
-			},
-			getTubeLong() {
-				service.getPipeLength().then(res => {
-					res.forEach(item => {
-						this.tubeTypeLongList.push({
-							value: item.id,
-							label: item.pipeLength
-						})
-					})
-				})
-			},
-			getProjectType() {
-				service.getProject().then(res => {
-					console.log('getProjectType', res)
-					this.typeList = [];
-					res.forEach(item => {
-						this.typeList.push({
-							value: item.id,
-							label: item.valveType
-						})
-					})
-			
-				})
-			},
-			projectType() {
-				this.listTypeShow = !this.listTypeShow
-			},
-			search(selectType){
-				console.log('this.housename', this.housename)
-				console.log('this.selectType', this.selectType)
-				if(selectType == 'xiaoqu'){
-					this.house = this.housename;	
-					service.getBuilding({areaId: this.houseid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'louyu'
-							})
-						})
-					})
-					this.current = -1;
-					this.bulid = null;
-					this.unit = null;
-					this.houseNumber = null;
-				}else if(selectType == 'louyu'){
-					this.bulid = this.housename;
-					service.getUnit({buildingId: this.buildid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'danyuan'
-							})
-						})
-					})
-					this.unit = null;
-					this.houseNumber = null;
-					this.current = -1;
-				}else if(selectType == 'danyuan'){
-					this.unit = this.housename;
-					service.getAllHouse({unitId: this.unitid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'menpai'
-							})
-						})
-					})
-					this.houseNumber = null;
-					this.current = -1;
-					
-				}else if(selectType == 'menpai'){
-					this.houseNumber = this.housename;
-					this.housedata = this.numberid;
-					this.current = -1;
-				}
-				this.pop = false;
-			},
-			openHouse(selectType) {
-				if(selectType === 'xiaoqu'){
-					//选择小区
-					this.selectType = 'xiaoqu'
-					this.getArea();
-				}else if(selectType === 'louyu'){
-					//选择楼宇
-					this.selectType = 'louyu'
-					this.housename = null;
-					this.buildid = 0;
-					service.getBuilding({areaId: this.houseid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'louyu'
-							})
-						})
-					})
-				}else if(selectType === 'danyuan'){
-					//选择单元
-					this.selectType = 'danyuan'
-					this.housename = null;
-					this.unitid = 0;
-					service.getUnit({buildingId: this.buildid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'danyuan'
-							})
-						})
-					})
-				}else if(selectType === 'menpai'){
-					//选择门牌
-					this.selectType = 'menpai'
-					this.housename = null;
-					this.numberid = null;
-					service.getAllHouse({unitId: this.unitid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'menpai'
-							})
-						})
-					})
-				}
-				this.pop = !this.pop;
-			},
-			searchinfo(selectType){
-				if(selectType == 'xiaoqu'){
-					console.log('ssss',this.selectType)
-					service.getArea({name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'xiaoqu'
-							})
-						})
-					})	
-					this.keyword = '';
-				}else if(selectType == 'louyu'){
-					console.log('ssss',this.selectType)
-					service.getBuilding({areaId: this.houseid,name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'louyu'
-							})
-						})
-					})
-					this.keyword = '';
-				}else if(selectType == 'danyuan'){
-					console.log('ssss',this.selectType)
-					service.getUnit({buildingId: this.buildid,name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'danyuan'
-							})
-						})
-					})
-					this.keyword = '';
-				}else if(selectType == 'menpai'){
-					console.log('ssss',this.selectType)
-					service.getAllHouse({unitId: this.unitid,name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'menpai'
-							})
-						})
-					})
-					this.keyword = '';
-				}
-				
-			},
-			active(item,index){
-				this.current = index;
-				this.housename = item.label;
-				if(item.selectType == 'xiaoqu'){
-					this.houseid = item.value;
-				}else if(item.selectType == 'louyu'){
-					this.buildid = item.value;
-				}else if(item.selectType == 'danyuan'){
-					this.unitid = item.value;
-				}else if(item.selectType == 'menpai'){
-					this.numberid = item.value
-				}
-				this.selectType = item.selectType;
-			},
-			//获取小区
-			getArea() {
-				service.getArea().then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-							selectType:'xiaoqu'
-						})
-					})
-				})
-			},
-			submit() {
-				console.log('submit',this.houseid,this.buildid,this.unitid,this.numberid);
-				this.getListFn();
-				this.show = false;
-			},
-			// 预览图片
-			preAvatar(url) {
-				console.log('url', url)
-				wx.previewImage({
-					current: url, // 当前显示图片的 http 链接
-					urls: [url] ,// 需要预览的图片 http 链接列表
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	/deep/ .u-input__input{
-		font-size: 64rpx!important;
-		color: #303133;
-		width: calc(100% - 200rpx)!important;
-	}
-	/deep/ .u-column-item{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		font-size: 64rpx!important;
-		color: #303133;
-		padding: 8rpx;
-	}
-	/deep/ .u-btn-picker.data-v-70102400 {
-	    padding: 16rpx;
-	    box-sizing: border-box;
-	    text-align: center;
-	    text-decoration: none;
-	    font-size: 64rpx!important;
-	}
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-	.active{
-	   background-color: #1890FF;
-	}
-	.select-type {
-		border: 2rpx solid #3857F3;
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #3857F3;
-		border-radius: 64rpx;
-	}
-	.total {
-		width: 100%;
-		padding: 40rpx 30rpx;
-		text-align: center;
-		color: #FFFFFF;
-	}
-	.list_s{
-		min-height: 100vh;
-		background-color: #F9F9F9;
-	}
-	.header_s{
-		padding: 30rpx 30rpx 0rpx 30rpx;
-		.btn_s{
-			margin: 0 15rpx;
-			width: calc(50% - 15px);
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			background-color: #3857F3;
-			color: #fff;
-			font-size: 64rpx;
-			border-radius: 16rpx;
-		}
-	}
-	.footer_s{
-		padding: 30rpx;
-		.footer-item{
-			background: #FFFFFF;
-			height: auto;
-			border-radius: 8rpx;
-			margin-bottom: 30rpx;
-			padding: 20rpx 0rpx 20rpx 66rpx;
-			position: relative;
-			.item-title{
-				font-size: 48rpx;
-				font-family: PingFangSC-Medium, PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				padding-bottom: 20rpx;
-			}
-			.main-list-icon{
-				position: absolute;
-				top: 43rpx;
-				left: 30rpx;
-				width: 16rpx;
-				height: 16rpx;
-				background: #3857F3;
-				border-radius: 2rpx;
-			}
-			.item-img{
-				display: flex;
-				justify-content: flex-start;
-				flex-wrap: wrap;
-				image{
-					width: calc(50% - 20rpx);
-					height: 200rpx;
-					padding-bottom: 20rpx;
-					padding-right: 20rpx;
-				}
-			}
-		}
-	}
-</style>

pages/chart/details.vue

@@ -1,135 +0,0 @@
-<template>
-	<view class="main_s">
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>服务类型</view>
-			<view>{{list.serviceTypeName ? list.serviceTypeName : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>职工</view>
-			<view>{{list.userName ? list.userName : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>房屋</view>
-			<view>{{list.house ? list.house : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>管子类型</view>
-			<view>{{list.pipeType ? list.pipeType : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>管子长度</view>
-			<view>{{list.pipeLength ? list.pipeLength : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>自闭阀类型</view>
-			<view>{{list.valveType ? list.valveType : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>订单时间</view>
-			<view>{{list.time ? list.time : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>订单状态</view>
-			<view>{{list.orderStatus ? list.orderStatus : ''}}</view>
-		</view>
-		<view class="title_s">
-			<view class="main-list-icon"></view>
-			<view>审核状态</view>
-			<view>{{list.examineStatus ? list.examineStatus : ''}}</view>
-		</view>
-		<view class="title_img">
-			<view>上传</view>
-			<view class="item-img">
-				<!-- <image v-for="img in list.picUrl" :src="img" @tap="preAvatar(img)"></image> -->
-				<view v-for="(item,index) in list.picUrl" :key="index">
-					<view v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ">
-						<image :src="item" mode=""
-							style="margin: 0 12rpx;" @tap="preAvatar(item)">
-						</image>
-					</view>
-					<view v-else>
-						<video :src="item"
-							style="margin: 0 12rpx;"
-							></video>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				id: undefined,
-				list:{}
-			}
-		},
-		onLoad(e) {
-			this.id = e.id;
-			console.log(e.id)
-			this.getFn();
-		},
-		methods:{
-			getFn(){
-				service.getById({id:this.id}).then(res =>{
-					console.log("eee", res)
-					this.list = res;
-				})
-			},
-			// 预览图片
-			preAvatar(url) {
-				console.log('url', url)
-				wx.previewImage({
-					current: url, // 当前显示图片的 http 链接
-					urls: [url] ,// 需要预览的图片 http 链接列表
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main_s{
-		background: #F9F9F9;
-		min-height: 100vh;
-		padding: 30rpx 30rpx 0rpx 30rpx;
-	}
-	.title_s{
-		display: flex;
-		justify-content: space-between;
-		width: 100%;
-		height: 102rpx;
-		line-height: 102rpx;
-		padding: 0rpx 20rpx 0rpx 66rpx;
-		background: #FFFFFF;
-		border-radius: 8px;
-		position: relative;
-		margin-bottom: 30rpx;
-		font-size: 40rpx;
-		font-weight: 600;
-	}
-	.title_img{
-		font-size: 40rpx;
-		font-weight: 600;
-	}
-	.main-list-icon{
-		position: absolute;
-		top: 43rpx;
-		left: 30rpx;
-		width: 16rpx;
-		height: 16rpx;
-		background: #3857F3;
-		border-radius: 2rpx;
-	}
-</style>

pages/chart/newchartDetail.vue

@@ -1,276 +0,0 @@
-<template>
-	<view>
-		<view class="" style="margin-top: 0rpx;padding: 0rpx 0rpx 0rpx 20rpx;">
-			<view class="align-items" style="position: absolute; top: 90rpx; left: 0;" v-if="allType == null">
-				<back></back>
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse()" v-if="type != 'ExamineWorker'">
-				{{house ? house :'全部小区'}}
-				<u-popup v-model="pop" mode="bottom" height="1000rpx">
-					<view style="margin: 20rpx;">
-						<u-search placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}" @custom="searchinfo()"></u-search>
-					</view>
-					<view>
-						<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-							<view v-for="(item,index) in chooseHouseList" :key="item.value" >
-								<view :class="current === index ? 'active' : '' " style="color: #000000;" @click="active(item,index)">
-									{{item.label}}
-								</view>
-							</view>
-						</scroll-view>
-						<view class="">
-							<button type="default" class="font-fifty-six" @click="search()">确定</button>
-						</view>
-						<view class="">
-							<button type="default" @click="pop = false;"  class="font-fifty-six">取消</button>
-						</view>
-					</view>
-				</u-popup>
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openWorker()" v-if="type == 'ExamineWorker'">
-				{{worker ? worker : '全部职工'}}
-				<u-select v-model="workShow" :list="workList" @confirm="workConfirm()"></u-select>
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="reset()">
-				重置
-			</view>
-			<view>
-				<qiun-data-charts type="pie" :chartData="chartData" background="none" canvas2d="false" />
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		name:'chartDetail',
-		props:{
-			allType:null
-		},
-		data(){
-			return {
-				chartData: {
-					series: [{
-						data: []
-					}]
-				},
-				type:'',
-				house:'',
-				houseId:'',
-				worker:'',
-				workerId:'',
-
-				chooseHouseList:[],
-				workList:[],
-				houseShow:false,
-				workShow:false,
-				keyword:'',
-				pop:false,
-				current:-1
-			}
-		},
-		created(){
-			let thet = this;
-			if(this.allType!=null){
-				this.type=this.allType;
-				if(this.type == 'examineArea'){
-					this.getExamineArea();
-				}else if(this.type == 'ExamineWorker'){
-					this.getwork();
-					this.getExamineWorker()
-				}else if(this.type == 'getExamineServe'){
-					this.getExamineServe()
-				}else if(this.type == 'getExaminePipeType'){
-					this.getExaminePipeType()
-				}else if(this.type == 'getExaminePipeLength'){
-					this.getExaminePipeLength()
-				}else if(this.type == 'getExamineValveType'){
-					this.getExamineValveType()
-				}else if(this.type =='getAreaSum'){
-					this.getAreaSum()
-				}
-				this.getArea();
-			}
-		},
-		onLoad(e) {
-			this.type = e.type;
-			if(this.type == 'examineArea'){
-				this.getExamineArea();
-			}else if(this.type == 'ExamineWorker'){
-				this.getwork();
-				this.getExamineWorker()
-			}else if(this.type == 'getExamineServe'){
-				this.getExamineServe()
-			}else if(this.type == 'getExaminePipeType'){
-				this.getExaminePipeType()
-			}else if(this.type == 'getExaminePipeLength'){
-				this.getExaminePipeLength()
-			}else if(this.type == 'getExamineValveType'){
-				this.getExamineValveType()
-			}else if(this.type =='getAreaSum'){
-				this.getAreaSum()
-			}
-		   this.getArea();
-		},
-		methods:{
-			openHouse(){
-				this.pop = !this.pop;
-			},
-			openWorker(){
-				this.workShow = !this.workShow;
-			},
-			workConfirm(e){
-				this.worker = e[0].label;
-				this.workerId = e[0].value;
-				this.getExamineWorker(this.workerId)
-			},
-			reset(){
-				this.houseId = '';
-				this.worker='',
-				this.workerId='',
-				this.getArea();
-				if(this.type == 'examineArea'){
-					this.getExamineArea(this.houseId)
-				}else if(this.type == 'ExamineWorker'){
-					this.getExamineWorker();
-				}else if(this.type == 'getExamineServe'){
-					this.getExamineServe(this.houseId)
-				}else if(this.type == 'getExaminePipeType'){
-					this.getExaminePipeType(this.houseId)
-				}else if(this.type == 'getExaminePipeLength'){
-					this.getExaminePipeLength(this.houseId)
-				}else if(this.type == 'getExamineValveType'){
-					this.getExamineValveType(this.houseId)
-				}else if(this.type =='getAreaSum'){
-					this.getAreaSum(this.houseId)
-				}
-				this.house = null;
-				this.current = -1;
-				this.$UTILS.showPrompt('重置成功！')
-			},
-			search(){
-				this.house = this.housename
-				if(this.type == 'examineArea'){
-				  this.getExamineArea(this.houseId)
-				}else if(this.type == 'getExamineServe'){
-					this.getExamineServe(this.houseId)
-				}else if(this.type == 'getExaminePipeType'){
-					this.getExaminePipeType(this.houseId)
-				}else if(this.type == 'getExaminePipeLength'){
-					this.getExaminePipeLength(this.houseId)
-				}else if(this.type == 'getExamineValveType'){
-					this.getExamineValveType(this.houseId)
-				}else if(this.type =='getAreaSum'){
-					this.getAreaSum(this.houseId)
-				}
-				this.pop = false;
-			},
-			searchinfo(){
-				service.getArea({name:this.keyword}).then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-							selectType:'xiaoqu'
-						})
-					})
-				})	
-				this.keyword = null;
-			},
-			active(item,index){
-				this.current = index;
-				this.housename = item.label;
-				this.houseId = item.value;
-				this.selectType = item.selectType;
-			},
-			getArea(){
-				service.getArea().then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-						})
-					})
-				})
-			},
-			//获取职工列表
-			getwork(){
-				service.getWorker().then(res => {
-					this.workList = [];
-					res.forEach((item, index) => {
-						this.workList.push({
-							value: item.id,
-							label: item.name,
-						})
-					})
-				})
-			},
-			//小区合格率
-			getExamineArea(houseId) {
-				service.getExamineArea({areaId:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('this.chartData', this.chartData)
-				})
-			},
-			//职工合格率
-			getExamineWorker(workerId) {
-				service.getExamineWorker({workerId:this.workerId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExamineWorker', res)
-				})
-			},
-			//小区服务统计
-			getExamineServe(serveId) {
-				service.getExamineServe({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExamineServe', res)
-				})
-			},
-			//管材类别统计
-			getExaminePipeType(pipeTypeId) {
-				service.getExaminePipeType({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExaminePipeType', res)
-				})
-			},
-			//管材长度统计
-			getExaminePipeLength(pipeLengthId) {
-				service.getExaminePipeLength({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExaminePipeLength', res)
-				})
-			},
-			//自闭阀类别统计
-			getExamineValveType(valveTypeId) {
-				service.getExamineValveType({id:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getExamineValveType', res)
-				})
-			},
-			//小区汇总统计
-			getAreaSum(areaSumId) {
-				service.getAreaSum({areaId:this.houseId}).then(res => {
-					this.chartData.series[0].data = res
-					console.log('getAreaSum', res)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-	.active{
-	   background-color: #1890FF;
-	}
-</style>

pages/cityConstrution/cityConstrution.vue

@@ -1,849 +0,0 @@
-<template>
-	<view>
-		<view class="align-items" style="margin-top: 80rpx;">
-			<back></back>
-			<view class="title-text" style="margin-left: 20rpx;">
-				阀管施工
-			</view>
-		</view>
-		<view style="margin-top: 60rpx;">
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('district')">
-					{{districtName ? districtName :'选择行政区'}}
-					<!-- <u-select v-model="houseShow" :list="chooseHouseList" @confirm="chooseHouse"></u-select> -->
-				</view>
-			</view>
-
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-					{{house ? house : '选择小区'}}
-					<!-- <u-select v-model="bulidShow" :list="chooseBuildList" @confirm="chooseBuild"></u-select> -->
-				</view>
-
-			</view>
-
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
-					{{bulid ? bulid : '选择楼宇'}}
-					<!-- <u-select v-model="bulidShow" :list="chooseBuildList" @confirm="chooseBuild"></u-select> -->
-				</view>
-
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('danyuan')">
-					{{unit ? unit : '选择单元'}}
-					<!-- openUnit(), <u-select v-model="unitShow" :list="chooseUnitList" @confirm="chooseUnit"></u-select> -->
-				</view>
-
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('menpai')">
-					{{houseNumber ? houseNumber  : '选择门牌'}}
-					<!-- open(), <u-select v-model="houseNumberShow" :list="chooseNumberList" @confirm="chooseNumber"></u-select> -->
-				</view>
-			</view>
-
-			<view>
-				<view class="font-fifty-six SourceHanSansCN select-type" @click="openType('shows')">
-					上门类型 <text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
-						{{type ? '----' +  type : ''}}</text>
-					<u-select v-model="shows" :list="mounicipalList" @confirm="confirm"></u-select>
-				</view>
-				<view v-if="typeValue">
-					<view v-if=" typeValue === '002' ">
-						<view class="font-fifty-six SourceHanSansCN select-type" @click="projectType()">
-							自闭阀类型 <text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
-								{{valueType ? '----' +  valueType : ''}}</text>
-							<u-select v-model="listTypeShow" :list="typeList" @confirm="listType"></u-select>
-						</view>
-						<view class="font-fifty-six SourceHanSansCN tube" @click="openType('tubeType')">
-							管子类别
-							<text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
-								{{tubeType ?'----' + tubeType:''}}</text>
-							<u-select v-model="tubeTypeShow" :list="tubeTypeList" @confirm="tubeTypeConfirm"></u-select>
-						</view>
-						<view class="font-fifty-six SourceHanSansCN tube" @click="openType('tubeLong')">
-							管子长度
-							<text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
-								{{tubeLong ?'----' + tubeLong  :''}}</text>
-							<u-select v-model="tubeLongShow" :list="tubeTypeLongList" @confirm="tubeLongConfirm">
-							</u-select>
-						</view>
-					</view>
-					<view class="upload align-items">
-						<view class="" style="display: flex; flex-wrap: wrap;">
-							<image src="/static/icon/chooseimg.png" mode=""
-								style="width: 190rpx; height: 190rpx; margin: 0 12rpx;; " @click="choose()"></image>
-							<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ">
-									<image :src="item" mode="" style="width: 190rpx; height: 190rpx; margin: 0 12rpx;"
-										@click="showPhoto(index)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 190rpx; height: 190rpx; margin: 0 12rpx;"></video>
-								</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"></u-icon>
-								</view>
-							</view>
-						</view>
-						<view class="gray font-forty-eight SourceHanSansCN" v-if="photo">
-							此处添加照片或视频
-						</view>
-					</view>
-					<view class="upload">
-						<text class="font-forty SourceHanSansCN">备注：</text>
-						<textarea value="" placeholder="请输入备注" v-model="remark" />
-					</view>
-				</view>
-
-				<view class="font-fifty-six SourceHanSansCN total background-color1" @click="submit()">
-					提交数据
-				</view>
-				<!-- <u-select v-model="shows" :list="mounicipalList" @confirm="confirm"></u-select> -->
-				<!-- <u-select v-model="tubeTypeShow" :list="tubeTypeList" @confirm="tubeTypeConfirm"></u-select> -->
-				<!-- <u-select v-model="tubeLongShow" :list="tubeTypeLongList" @confirm="tubeLongConfirm"></u-select> -->
-			</view>
-		</view>
-		<u-popup v-model="pop" mode="bottom" height="1000rpx">
-			<view style="margin: 20rpx;">
-				<u-search v-show="inputShow" placeholder="请输入搜索内容" v-model="keyword"
-					:action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)"></u-search>
-			</view>
-			<view>
-				<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-					<view v-for="(item,index) in chooseHouseList" :key="item.value">
-						<view :class="current === index ? 'active' : '' " style="color: #000000;font-size: 56rpx;"
-							@click="active(item,index)">
-							{{item.label}}
-						</view>
-					</view>
-				</scroll-view>
-				<view class="">
-					<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
-				</view>
-				<view class="">
-					<button type="default" @click="pop = false;" class="font-fifty-six">取消</button>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		components: {
-
-		},
-		data() {
-			return {
-				keyword: '',
-				selectType: '',
-				pop: false,
-				inputShow: false,
-				housename: '',
-				houseid: 0,
-				buildid: 0,
-				unitid: 0,
-				numberid: 0,
-				houseShow: false,
-				current: -1,
-				chooseHouseList: [],
-				districtId: 0,
-				districtName: '选择行政区',
-				house: '选择小区',
-				bulid: '选择楼宇',
-				unit: '选择单元',
-				houseNumber: '选择门牌',
-				action: this.$HTTP.webUrl + `/obs`,
-				shows: false,
-				tubeTypeShow: false,
-				tubeLongShow: false,
-				mounicipalList: [],
-				tubeTypeList: [],
-				tubeTypeLongList: [],
-				type: '',
-				tubeType: '',
-				tubeLong: '',
-				// url: [],
-				photo: true,
-				typeValue: '',
-				headers: {
-					MAuthorization: "wxBearer " + uni.getStorageSync('token')
-				},
-				housedata: '',
-				typeList: [],
-				listTypeShow: false,
-				valueType: '',
-				uploading: false,
-				imgArr: [],
-				remark: '',
-				show: false,
-				progress: 0, //上传图片进度百分比
-				loading: false
-			}
-		},
-		onLoad() {
-			// this.getArea();
-			this.select();
-			this.getTubeType();
-			this.getTubeLong();
-			this.getProjectType();
-		},
-		methods: {
-			openHouse(selectType) {
-				if (selectType === 'district') {
-					this.inputShow = false
-					//选择行政区
-					this.housename = null;
-					this.selectType = 'district'
-					service.getDistrict().then(res => {
-						// console.log(res);
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.dictValue,
-								label: item.dictLabel,
-								selectType: 'district'
-							})
-						})
-					})
-				} else if (selectType === 'xiaoqu') {
-					this.inputShow = true
-					//选择小区
-					this.selectType = 'xiaoqu'
-					this.housename = null;
-					// this.district = '';
-					service.getArea({
-						district: this.districtId
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-				} else if (selectType === 'louyu') {
-					this.inputShow = true
-					//选择楼宇
-					this.selectType = 'louyu'
-					this.housename = null;
-					service.getBuilding({
-						areaId: this.houseid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-
-				} else if (selectType === 'danyuan') {
-					this.inputShow = true
-					//选择单元
-					this.selectType = 'danyuan';
-					this.housename = null;
-					service.getUnit({
-						buildingId: this.buildid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-
-				} else if (selectType === 'menpai') {
-					this.inputShow = true
-					//选择门牌
-					this.selectType = 'menpai';
-					this.housename = null;
-					service.getHouse({
-						unitId: this.unitid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-				}
-				this.pop = !this.pop;
-			},
-			searchinfo(selectType) {
-				if (selectType == 'xiaoqu') {
-					console.log('ssss', this.selectType)
-					service.getArea({
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'louyu') {
-					console.log('ssss', this.selectType)
-					service.getBuilding({
-						areaId: this.houseid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'danyuan') {
-					console.log('ssss', this.selectType)
-					service.getUnit({
-						buildingId: this.buildid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'menpai') {
-					console.log('ssss', this.selectType)
-					service.getHouse({
-						unitId: this.unitid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-					this.keyword = '';
-				}
-
-			},
-			showPhoto(index) {
-				uni.previewImage({
-					current: index,
-					urls: this.imgArr,
-				})
-				console.log('sss')
-			},
-			openBuild() {
-				this.bulidShow = !this.bulidShow
-			},
-			projectType() {
-				this.listTypeShow = !this.listTypeShow
-			},
-			// 	//获取小区
-			// 	getArea() {
-
-			// 	},
-			getProjectType() {
-				service.getProject().then(res => {
-					console.log('getProjectType', res)
-					this.typeList = [];
-					res.forEach(item => {
-						this.typeList.push({
-							value: item.id,
-							label: item.valveType
-						})
-					})
-
-				})
-			},
-			search(selectType) {
-				if (selectType == 'district') {
-					this.districtName = this.housename;
-					service.getArea({
-						district: this.districtId
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.dictValue,
-								label: item.dictLabel,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-					this.current = -1;
-					this.house = null;
-					this.bulid = null;
-					this.unit = null;
-					this.houseNumber = null;
-
-					this.houseid = 0;
-					this.buildid = 0;
-					this.unitid = 0;
-					this.housedata = 0;
-
-
-				} else if (selectType == 'xiaoqu') {
-					this.house = this.housename;
-					service.getBuilding({
-						areaId: this.houseid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-					this.current = -1;
-					this.bulid = null;
-					this.unit = null;
-					this.houseNumber = null;
-
-					this.buildid = 0;
-					this.unitid = 0;
-					this.housedata = 0;
-				} else if (selectType == 'louyu') {
-					this.bulid = this.housename;
-					service.getUnit({
-						buildingId: this.buildid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-
-					this.unit = null;
-					this.houseNumber = null;
-					this.current = -1;
-
-					this.unitid = 0;
-					this.housedata = 0;
-				} else if (selectType == 'danyuan') {
-					this.unit = this.housename;
-					service.getHouse({
-						unitId: this.unitid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-					this.houseNumber = null;
-					this.current = -1;
-
-					this.housedata = 0;
-
-				} else if (selectType == 'menpai') {
-					this.houseNumber = this.housename;
-					this.housedata = this.numberid;
-					this.current = -1;
-				}
-				this.pop = false;
-			},
-			active(item, index) {
-				this.current = index;
-				if (item.selectType == 'district') { //行政区
-					this.housename = item.label;
-					this.districtId = item.value;
-				} else if (item.selectType == 'xiaoqu') { //小区
-					this.housename = item.label;
-					this.houseid = item.value;
-				} else if (item.selectType == 'louyu') { //楼宇
-					this.housename = item.label;
-					this.buildid = item.value;
-				} else if (item.selectType == 'danyuan') { //单元
-					this.housename = item.label;
-					this.unitid = item.value;
-				} else if (item.selectType == 'menpai') { //门牌
-					this.housename = item.label;
-					this.numberid = item.value
-				}
-				this.selectType = item.selectType;
-				// console.log("xxxxx_type:" + this.selectType + "_" + this.housename)
-
-			},
-
-			openUnit() {
-				this.unitShow = !this.unitShow
-			},
-			//选择门牌
-
-			open() {
-				this.houseNumberShow = !this.houseNumberShow
-			},
-			//选择上门类型
-			confirm(e) {
-				this.type = e[0].label
-				this.typeValue = e[0].value
-
-				this.imgArr = [];
-				this.tubeType = null;
-				this.tubeLong = null;
-				this.valueType = null;
-				this.photo = true;
-			},
-			//选择类型
-			select() {
-				service.getDic({
-					dicType: 'service_type'
-				}).then(res => {
-					res.forEach(item => {
-						this.mounicipalList.push({
-							value: item.value,
-							label: item.name
-						})
-					})
-				})
-			},
-			openType(type) {
-				if (type === 'shows') {
-					this.shows = !this.shows
-				} else if (type === 'tubeType') {
-					this.tubeTypeShow = !this.tubeTypeShow
-				} else {
-					this.tubeLongShow = !this.tubeLongShow
-				}
-
-			},
-			tubeTypeConfirm(e) {
-				this.tubeType = e[0].label
-			},
-			listType(e) {
-				this.valueType = e[0].label
-			},
-			tubeLongConfirm(e) {
-				this.tubeLong = e[0].label
-			},
-			getTubeType() {
-				service.getPipeType().then(res => {
-					res.forEach(item => {
-						this.tubeTypeList.push({
-							value: item.id,
-							label: item.pipeType
-						})
-					})
-				})
-			},
-			getTubeLong() {
-				service.getPipeLength().then(res => {
-					res.forEach(item => {
-						this.tubeTypeLongList.push({
-							value: item.id,
-							label: item.pipeLength
-						})
-					})
-				})
-			},
-			remove(index) {
-				uni.showModal({
-					title: '提示',
-					content: '是否删除该图片或视频？',
-					success: (res) => {
-						if (res.confirm) {
-							this.imgArr.splice(index, 1)
-							console.log('this.imgarr', this.imgArr)
-							if (this.imgArr.length <= 0) {
-								this.photo = true;
-							}
-						}
-					}
-				})
-			},
-			choose() {
-				let _this = this;
-				uni.showActionSheet({
-					title: '上传',
-					itemList: ['图片', '视频'],
-					success: (res) => {
-						console.log(res)
-						if (res.tapIndex == 0) {
-							this.chooseimage()
-						} else {
-							this.choosevideo()
-						}
-					}
-				})
-			},
-			chooseimage() {
-				console.log('图片')
-				let _this = this;
-				uni.chooseImage({
-					sizeType: ['album', 'camera'],
-					success(resp) {
-						console.log('res--uni.chooseMedia', resp);
-						resp.tempFiles.forEach((item, index) => {
-							const task = uni.uploadFile({
-								url: _this.$HTTP.webUrl + `/obs`,
-								filePath: item.path,
-								name: 'file',
-								formData: {},
-								header: _this.headers,
-								success: res => {
-									// 判断是否json字符串，将其转为json格式
-									let data = _this.$u.test.jsonString(res
-										.data) ? JSON.parse(res.data) : res.data;
-									if (![200, 201, 204].includes(res.statusCode)) {
-										// this.uploadError(index, data);
-										_this.$UTILS.showPrompt('上传失败！')
-									} else {
-										if (_this.progress === 100) {
-											console.log('_this.progress', _this.progress)
-											console.log('data----', data)
-											console.log('res--', res)
-											_this.imgArr.push(data.data.url)
-											console.log('imgArr', _this.imgArr)
-											_this.$UTILS.showPrompt('上传成功！')
-											_this.photo = false;
-										}
-									}
-								},
-								fail: e => {
-									_this.$UTILS.showPrompt('上传失败！')
-									this.uploadError(index, e);
-								},
-								complete: res => {
-									uni.hideLoading();
-									_this.uploading = false;
-
-								}
-							});
-							task.onProgressUpdate(res => {
-								_this.progress = res.progress;
-								console.log('onProgressUpdate', res)
-								console.log('task.onProgressUpdate', _this.progress)
-								uni.showLoading({
-									title: '上传中'
-								})
-								if (_this.progress != 100) {
-									_this.loading = false
-									console.log('_this.loading false', _this.loading)
-								} else {
-									_this.loading = true
-									console.log('_this.loading true', _this.loading)
-								}
-							});
-
-						})
-
-					},
-				})
-			},
-			choosevideo() {
-				let _this = this;
-				console.log('视频')
-				uni.chooseVideo({
-					sourceType: ['album', 'camera'],
-					maxDuration: 30,
-					success(resp) {
-						const task = uni.uploadFile({
-							url: _this.$HTTP.webUrl + `/obs`,
-							filePath: resp.tempFilePath,
-							name: 'file',
-							formData: {},
-							header: _this.headers,
-							success: res => {
-								// 判断是否json字符串，将其转为json格式
-								let data = _this.$u.test.jsonString(res
-									.data) ? JSON.parse(res.data) : res.data;
-								if (![200, 201, 204].includes(res.statusCode)) {
-									this.uploadError(index, data);
-								} else {
-									//上传成功
-									if (_this.progress === 100) {
-										console.log('_this.progress', _this.progress)
-										_this.imgArr.push(data.data.url)
-										console.log('imgArr', _this.imgArr)
-										_this.$UTILS.showPrompt('上传成功！')
-										_this.photo = false;
-									}
-								}
-							},
-							fail: e => {
-								_this.$UTILS.showPrompt('上传失败！')
-								this.uploadError(index, e);
-							},
-							complete: res => {
-								uni.hideLoading();
-								_this.uploading = false;
-							}
-						});
-						task.onProgressUpdate(res => {
-							_this.progress = res.progress;
-							console.log('onProgressUpdate', res)
-							uni.showLoading({
-								title: '上传中'
-							})
-							if (_this.progress != 100) {
-								_this.loading = false
-								console.log('_this.loading false', _this.loading)
-							} else {
-								_this.loading = true
-								console.log('_this.loading true', _this.loading)
-							}
-						});
-
-					},
-				})
-			},
-			submit() {
-				if (!this.housedata) {
-					this.$UTILS.showPrompt('请选择门牌号！')
-					return
-				}
-				if (!this.type) {
-					this.$UTILS.showPrompt('请选择上门类型！')
-					return
-				}
-				if (this.typeValue == '002') {
-					if (!this.valueType) {
-						this.$UTILS.showPrompt('请选择自闭阀类别！')
-						return
-					}
-					if (!this.tubeType) {
-						this.$UTILS.showPrompt('请选择管子类型！')
-						return
-					}
-					if (!this.tubeLong) {
-						this.$UTILS.showPrompt('请选择管子长度！')
-						return
-					}
-				}
-
-				if (this.imgArr.length <= 0) {
-					this.$UTILS.showPrompt('请上传照片或视频！')
-					return
-				}
-				if (this.loading == false) {
-					this.$UTILS.showPrompt('照片或视频未上传完毕，无法提交！')
-					return
-				}
-				let param = {
-					serviceType: this.typeValue,
-					pipeType: this.tubeType,
-					pipeLength: this.tubeLong,
-					//小区
-					areaId: this.houseid,
-					areaName: this.house,
-					//楼宇
-					buildingId: this.buildid,
-					buildingName: this.bulid,
-					//单元
-					unitId: this.unitid,
-					unitName: this.unit,
-					//房间
-					houseId: this.housedata,
-					houseName: this.houseNumber,
-
-					valveType: this.valueType,
-					picUrl: this.imgArr,
-					remark: this.remark,
-				}
-				console.log('param-----', param)
-				service.submitOrder(param).then(res => {
-					this.$UTILS.showPrompt('提交成功！')
-					this.houseNumber = null;
-					this.type = null;
-					this.typeValue = null;
-					this.valueType = null;
-					this.tubeType = null;
-					this.tubeLong = null;
-					this.housedata = null;
-					this.typeValue = null;
-					this.remark = null;
-					this.imgArr = [];
-				}).catch(e => {
-					this.$UTILS.showPrompt('提交失败！')
-					console.error(e)
-				})
-
-
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-
-	.active {
-		background-color: #1890FF;
-	}
-
-	.select-type {
-		border: 2rpx solid #3857F3;
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #3857F3;
-		border-radius: 64rpx;
-	}
-
-	.upload {
-		margin: 30rpx;
-		padding: 30rpx 20rpx;
-		border: 2rpx solid #3857F3;
-		border-radius: 48rpx;
-	}
-
-	.tube {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #43CEB1;
-		border: 2rpx solid #43CEB1;
-		border-radius: 64rpx;
-	}
-
-	.total {
-		width: 100%;
-		padding: 40rpx 30rpx;
-		text-align: center;
-		color: #FFFFFF;
-	}
-</style>

pages/historyConstruction/historyConstruction.vue

@@ -1,271 +0,0 @@
-<template>
-	<view>
-		<view class="title-text" style="margin-top: 80rpx;">
-			历史施工
-		</view>
-		
-		<view :class="(kgName == '展开搜索') ? 'hei_vie2':'hei_vie'">
-			<view class="justify-content select">
-				<view class="thirsty gray border" v-for="item in type" :key="item.value"
-					:class="{active: show === item.value}" @click="active(item),getListAll()">
-					{{item.name}}
-				</view>
-			</view>
-			<!-- <u-search placeholder="请输入搜索内容" v-model="nameValue" :action-style="{'font-size':'40rpx'}" @custom="getListAll()"></u-search> -->
-			<view class="inp_vie">
-				<input type="text" value="" placeholder="小区名称搜索" class="search-text" v-model="areaName"/>
-				<input type="text" value="" placeholder="楼栋名称搜索" class="search-text" v-model="buildingName"/>
-				<input type="text" value="" placeholder="单元名称搜索" class="search-text" v-model="unitName"/>
-				<input type="text" value="" placeholder="房间名称搜索" class="search-text" v-model="houseName"/>
-				<button @click="getListAll()" class="btn_vie">搜索</button>
-			</view>
-		</view>
-		<view>
-			<button class="p_zk" @click="p_zk()">{{kgName}}</button>
-		</view>
-		<view class="font-forty total">
-			合计： <text class="font-fifty-six SourceHanSansCN red">{{total}}</text>
-		</view>	
-		<view v-for="(item,index) in list" :key="index">
-			<view @click="gotopage(`/pages/historyConstruction/historyDetail?id=${item.id}`)">
-				<view class="type">
-					<view class="justify-content">
-						<view class="font-forty blue" v-if="item.serviceType != '004'">
-							类别：{{item.serviceType}}
-						</view>
-						<view class="font-forty blue" v-else>
-							类别：安检
-						</view>
-						<view class="font-twenty-eight gray">
-							{{item.time}}
-						</view>
-					</view>
-					<view class="font-thirty-six black" style="margin: 30rpx 0;" v-if="show === '002' || item.serviceType=='正常施工'">
-						状态：{{item.status}}
-					</view>
-					<view class="font-thirty-six black" style="margin: 30rpx 0;" v-if="show === '002' || item.serviceType=='正常施工'">
-						审核意见：
-						<text class="" v-if="item.reason != null || item.reason != undefined">
-							{{item.reason}}
-						</text>
-						<text class="" v-else>
-							无
-						</text>
-					</view>
-					<view class="font-thirty-six black" style="margin: 30rpx 0;">
-						{{item.house}}
-					</view>
-					<button v-if="show === '002' && item.status == '待审核'" style="background-color: #007AFF; color: #FFFFFF;" @click.stop="gotoUpdate(item)">修改</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				show: '001',
-				index: 0,
-				list: [],
-				type: [],
-				
-				areaName: '',
-				buildingName: '',
-				unitName: '',
-				houseName: '',
-				pop: false,
-				kgName: '展开搜索',
-				params: {
-					pageNum: 1,
-					pageSize: 10,
-				},
-				total:0
-			}
-		},
-		onShow() {
-			// this.show = '001';
-			this.getListAll();
-			this.select();
-		},
-		onReachBottom() {
-			this.getNextListFn()
-		},
-		onPullDownRefresh() {
-			this.getListAll();
-			setTimeout(function () {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		methods: {
-			getListAll() {
-				service.getListAll({serviceType: this.show,
-				areaName:this.areaName,
-				buildingName:this.buildingName,
-				unitName:this.unitName,
-				houseName:this.houseName,
-				pageSize: 10,
-				pageNum: 1,
-				}).then(res => {
-					this.list = res.records;
-					this.total = res.total || 0;
-					this.params.pageNum = res.current + 1;
-				})
-			},
-			getNextListFn(){
-				if (this.list.length < this.total) {
-					service.getListAll({serviceType: this.show,
-				areaName:this.areaName,
-				buildingName:this.buildingName,
-				unitName:this.unitName,
-				houseName:this.houseName,
-				pageSize: this.params.pageSize,
-				pageNum: this.params.pageNum,
-				}).then(response => {
-						this.params.pageNum = response.current + 1
-						response.records.forEach(item =>{
-							this.list.push(item)
-						})
-					})
-				}
-			},
-			gotopage(url) {
-				uni.navigateTo({
-					url
-				})
-			},
-			select() {
-				service.getDic({dicType: 'service_type'}).then(res => {
-					// console.log('service_type', res)
-					const shenhe = {};
-					shenhe.value='es002';
-					shenhe.name='不合格';
-					res.push(shenhe);
-					this.type = res;
-				})
-			},
-			active(item) {
-				this.show = item.value;
-			},
-			gotoUpdate(item){
-				uni.navigateTo({
-					url:`/pages/historyConstruction/updateInfo?id=${item.id}&&house=${item.house}`,
-				})				
-			},
-			p_zk(){
-				if(this.kgName == '收起搜索'){
-					this.kgName = '展开搜索';
-				}else{
-					this.kgName = '收起搜索';
-				}
-			}
-		}
-	}
-	
-	
-	
-	
-</script>
-
-<style lang="scss" scoped>
-	.select {
-		margin: 50rpx 20rpx 0;
-		height: 105px;
-		display: block;
-		.border {
-				width: 48%;
-			    text-align: center;
-			    padding: 20rpx 10rpx;
-			    border-radius: 48rpx;
-			    display: block;
-			    float: left;
-			    border: 2rpx solid #9dc9ff;
-			    margin: 1%;
-				background: #f5f7ff;
-		}
-	}
-	.active {
-	    background: #3857F3!important;
-	    color: #FFFFFF;
-	}
-
-	.type {
-		margin: 20rpx;
-		padding: 20rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 8rpx 17rpx 0rpx rgba(0, 0, 0, 0.04);
-		border-radius: 10rpx;
-	}
-
-	.text {
-		border-left: 15rpx solid #3857F3;
-		padding-left: 20rpx;
-	}
-
-	.total {
-		width: 100%;
-		padding: 40rpx 30rpx;
-		border: 1rpx solid #727272;
-		background: #FFFFFF;
-	}
-
-	.active {
-		background: #3857F3;
-		color: #FFFFFF;
-	}
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-	.search-text{
-		float: left;
-	    border-style:solid;
-		border-width: 1rpx;
-		height: 50rpx;
-		width: 90%;
-		border-radius: 24rpx;
-	}
-	.inp_vie{
-		padding: 1% 3.5%;
-	}
-	.inp_vie input{
-		float: none;
-		    width: 98%;
-		    padding-left: 1.5%;
-		    height: 40px;
-		    margin-bottom: 1.5%;
-		    /* border-bottom: 1px solid #ccc!important; */
-		    border: 1px solid #c7c7c7;
-		    border-radius: 5px;
-			
-	}
-	.btn_vie{
-		background: #3857F3;
-		color: #fff;
-	}
-	.btn_vie:active{
-		background: #0925b3;
-	}
-	.p_zk{
-		height: 40px;
-		line-height: 40px;
-		text-align: center;
-		// background: #eee;
-		margin: 1% auto;
-		width: 93%;
-		font-size: 15px;
-	}
-	.hei_vie{
-		height: 350px;
-	}
-	.hei_vie2{
-		height: 130px!important;
-		overflow: hidden;
-	}
-</style>

pages/historyConstruction/historyDetail.vue

@@ -1,53 +0,0 @@
-<template>
-	<view>
-		<view class="" style="margin-top: 100rpx;">
-			<back></back>
-		</view>
-		<view v-for="(item,index) in image" :key="index" class="flex" >
-			<!-- <image :src="item" mode="" class="image" @click="showPhoto(index)"></image> -->
-			<image :src="item" mode="" class="image" @click="showPhoto(index)" v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' "></image>
-			<video :src="item" controls v-else class="image"></video>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default{
-		data(){
-			return{
-				id:0,
-				image:[],
-				index:0,
-			}
-		},
-		onLoad(e) {
-		   this.id = e.id;
-		   this.photo()
-		},
-		methods:{
-			photo(){
-				service.getOrderPhoto({orderId:this.id}).then(res=>{
-					this.image = res;
-				})
-			},
-			showPhoto(index){
-				uni.previewImage({
-					current:index,
-					urls:this.image,
-				})
-				
-			}
-		}
-	}
-
-</script>
-
-<style lang="scss" scoped>
-	.image{
-		margin: 50rpx auto;
-		width: 330rpx;
-		height: 230rpx;
-	}
-</style>

pages/historyConstruction/updateInfo.vue

@@ -1,599 +0,0 @@
-<template>
-	<view>
-		<view style="margin: 30rpx;">
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-				{{house ? house :'选择小区'}}
-			<u-popup v-model="pop" mode="bottom" height="1000rpx">
-				<view style="margin: 20rpx;">
-					<u-search placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)"></u-search>
-				</view>
-				<view>
-					<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-						<view v-for="(item,index) in chooseHouseList" :key="item.value" >
-							<view :class="current === index ? 'active' : '' " style="color: #000000;" @click="active(item,index)">
-								{{item.label}}
-							</view>
-						</view>
-					</scroll-view>
-					<view class="">
-						<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
-					</view>
-					<view class="">
-						<button type="default" @click="pop = false;"  class="font-fifty-six">取消</button>
-					</view>
-				</view>
-			</u-popup>
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
-				{{bulid ? bulid : '选择楼宇'}}
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('danyuan')">
-				{{unit ? unit : '选择单元'}}
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('menpai')">
-				{{houseNumber ? houseNumber  : '选择门牌'}}
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('fuwu')">
-				{{serviceType ? serviceType  : '服务类别'}} 
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('leibie')">
-				{{tubeType ? tubeType  : '管子类别'}}
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('changdu')">
-				{{tubeLong ? tubeLong  : '管子长度'}}
-			</view>
-			<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('zibifa')">
-				{{valueType ? valueType  : '自闭阀类型'}}
-			</view>
-			<view class="upload">
-				<text class="font-forty SourceHanSansCN">备注：</text>
-				<textarea value="" placeholder="请输入备注" v-model="remark"/>
-			</view>
-			<view class="font-forty-eight align-items" style="margin: 30rpx 0;">
-				图片与视频：
-			</view>
-			<view class="" style="display: flex; flex-wrap: wrap;">
-				<image src="/static/icon/chooseimg.png" mode="" style="width: 190rpx; height: 190rpx; margin: 0 12rpx; "
-					@click="choose()"></image>
-				<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
-					<view v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ">
-						<image :src="item" mode=""
-							style="width: 190rpx; height: 190rpx; margin: 0 20rpx;" @click="showPhoto(index)">
-						</image>
-					</view>
-					<view v-else>
-						<video :src="item"
-							style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
-					</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" ></u-icon> 
-					</view>
-				</view>
-			</view>
-		</view>
-		<button type="default" class="btn" @click="updata()">确认更改</button>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				id:0,
-				imgArr:[],
-				progress:0 ,//上传图片进度百分比
-				headers: {
-					MAuthorization: "wxBearer " + uni.getStorageSync('token')
-				},
-				house:'',
-				bulid:'',
-				unit:'',
-				houseNumber:'',
-				tubeType: '',
-				tubeLong: '',
-				typeValue: '',
-				valueType:'',
-				selectType:'',
-				pop:false,
-				housename:'',
-				houseid:0,
-				buildid:0,
-				unitid:0,
-				numberid:0,
-				houseShow: false,
-				current:-1,
-				chooseHouseList: [],
-				serviceType:'',
-				serviceTypeId:'',
-				tubetypeid:'',
-				tubelength:'',
-				valuetypeid:'',
-				shows:false,
-				remark:'',
-				index:0,
-				keyword:'',
-			}
-		},
-		onLoad(e) {
-			this.id = parseInt(e.id);
-			this.photo();
-			this.getById();
-		},
-		methods:{
-			photo(){
-				service.getOrderPhoto({orderId:this.id}).then(res=>{
-					this.imgArr = res;
-				})
-			},
-			showPhoto(index){
-				uni.previewImage({
-					current:index,
-					urls:this.imgArr,
-				})
-				console.log('sss')
-			},
-			getById(){ 
-				service.getById({id:this.id}).then(res=>{
-					this.house = res.areaName;
-					this.bulid = res.buildingName;
-					this.unit = res.unitName; 
-					this.houseNumber = res.houseName;
-					this.serviceType = res.serviceTypeName;
-					this.houseid = res.areaId;
-					this.buildid = res.buildingId;
-					this.unitid = res.unitId;
-					this.numberid = res.houseId;
-					this.remark = res.remark;
-					this.tubeType = res.pipeType;
-					this.tubeLong = res.pipeLength;
-					this.valueType = res.valveType;
-					this.serviceTypeId = res.serviceType;
-				})
-			},
-			//获取小区
-			getArea() {
-				service.getArea().then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-							selectType:'xiaoqu'
-						})
-					})
-				})
-			},
-			searchinfo(selectType){
-				if(selectType == 'xiaoqu'){
-					console.log('ssss',this.selectType)
-					service.getArea({name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'xiaoqu'
-							})
-						})
-					})	
-					this.keyword = '';
-				}else if(selectType == 'louyu'){
-					console.log('ssss',this.selectType)
-					service.getBuilding({areaId: this.houseid,name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'louyu'
-							})
-						})
-					})
-					this.keyword = '';
-				}else if(selectType == 'danyuan'){
-					console.log('ssss',this.selectType)
-					service.getUnit({buildingId: this.buildid,name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'danyuan'
-							})
-						})
-					})
-					this.keyword = '';
-				}else if(selectType == 'menpai'){
-					console.log('ssss',this.selectType)
-					service.getHouse({unitId: this.unitid,name:this.keyword}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'menpai'
-							})
-						})
-					})
-					this.keyword = '';
-				}
-				
-			},
-			//选择服务类型
-			openHouse(selectType) {
-				if(selectType === 'xiaoqu'){
-					//选择小区
-					this.selectType = 'xiaoqu'
-					this.getArea();
-				}else if(selectType === 'louyu'){
-					//选择楼宇
-					service.getBuilding({areaId: this.houseid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'louyu'
-							})
-						})
-					})
-				}else if(selectType === 'danyuan'){
-					//选择单元
-					service.getUnit({buildingId: this.buildid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'danyuan'
-							})
-						})
-					})
-				}else if(selectType === 'menpai'){
-					//选择门牌
-					service.getHouse({unitId: this.unitid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'menpai'
-							})
-						})
-					})
-				}
-				else if(selectType === 'fuwu'){
-					//选择服务类别
-					// console.log('fuwu',this.selectType)
-					this.chooseHouseList = [];
-					service.getDic({dicType: 'service_type'}).then(res => {
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.value,
-								label: item.name,
-								selectType:'fuwu'
-							})
-						})
-					})
-				}else if(selectType === 'leibie'){
-					//选择管子类别
-					this.chooseHouseList = [];
-					service.getPipeType().then(res => {
-						res.forEach(item => {
-							// this.chooseHouseList = [];
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.pipeType,
-								selectType:'leibie'
-							})
-						})
-					})
-				}else if(selectType === 'changdu'){
-					//选择管子长度
-					this.chooseHouseList = [];
-					service.getPipeLength().then(res => {
-						res.forEach(item => {
-							// this.chooseHouseList = [];
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.pipeLength,
-								selectType:'changdu'
-							})
-						})
-					})
-				}else if(selectType === 'zibifa'){
-					//选择自闭阀类别
-					this.chooseHouseList = [];
-					service.getProject().then(res => {
-						// this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.valveType,
-								selectType:'zibifa'
-							})
-						})
-					
-					})
-				}
-				this.pop = !this.pop;
-			},
-			search(selectType){
-				if(selectType == 'xiaoqu'){
-					this.house = this.housename;	
-					service.getBuilding({areaId: this.houseid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'louyu'
-							})
-						})
-					})
-					this.current = -1;
-
-				}else if(selectType == 'louyu'){
-					this.bulid = this.housename;
-					service.getUnit({buildingId: this.buildid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'danyuan'
-							})
-						})
-					})
-					this.current = -1;
-				}else if(selectType == 'danyuan'){
-					this.unit = this.housename;
-					service.getHouse({unitId: this.unitid}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType:'menpai'
-							})
-						})
-					})
-
-					this.current = -1;
-					
-				}else if(selectType == 'menpai'){
-					this.houseNumber = this.housename;
-					this.numberid = this.numberid;
-					this.current = -1;
-				}else if(selectType == 'fuwu'){
-					this.serviceType = this.housename;
-					this.current = -1;
-				}else if(selectType == 'leibie'){
-					this.tubeType = this.housename;
-					this.current = -1;
-				}else if(selectType == 'changdu'){
-					this.tubeLong = this.housename;
-					this.current = -1;
-				}else if(selectType == 'zibifa'){
-					this.valueType = this.housename;
-					this.current = -1;
-				}
-				this.pop = false;
-			},
-			active(item,index){
-				console.log('active')
-				this.current = index;
-				this.housename = item.label;
-				if(item.selectType == 'xiaoqu'){
-					this.houseid = item.value;
-				}else if(item.selectType == 'louyu'){
-					this.buildid = item.value;
-				}else if(item.selectType == 'danyuan'){
-					this.unitid = item.value;
-				}else if(item.selectType == 'menpai'){
-					this.numberid = item.value
-				}else if(item.selectType == 'fuwu'){
-					this.serviceTypeId = item.value
-				}else if(item.selectType == 'leibie'){
-					this.tubetypeid = item.value
-				}else if(item.selectType == 'changdu'){
-					this.tubelength = item.value
-				}else if(item.selectType == 'zibifa'){
-					this.valuetypeid = item.value
-				}
-				this.selectType = item.selectType;
-			},
-			choose() {
-				let _this = this;
-				uni.showActionSheet({
-					title: '上传',
-					itemList: ['图片', '视频'],
-					success: (res) => {
-						if (res.tapIndex == 0) {
-							this.chooseimage()
-						} else {
-							this.choosevideo()
-						}
-					}
-				})
-			},
-			chooseimage() {
-				console.log('图片')
-				let _this = this;
-				uni.chooseImage({
-					sizeType: ['album', 'camera'],
-					success(resp) {
-						console.log('res--uni.chooseMedia', resp);
-						resp.tempFiles.forEach((item, index) => {
-							const task = uni.uploadFile({
-								url: _this.$HTTP.webUrl + `/obs`,
-								filePath: item.path,
-								name: 'file',
-								formData: {},
-								header: _this.headers,
-								success: res => {
-									// 判断是否json字符串，将其转为json格式
-									let data = _this.$u.test.jsonString(res
-										.data) ? JSON.parse(res.data) : res.data;
-									if (![200, 201, 204].includes(res.statusCode)) {
-										// this.uploadError(index, data);
-										_this.$UTILS.showPrompt('上传失败！')
-									} else {
-										if (_this.progress === 100) {
-											console.log('_this.progress', _this.progress)
-											console.log('data----', data)
-											console.log('res--', res)
-											_this.imgArr.push(data.data.url)
-											console.log('imgArr', _this.imgArr)
-											_this.$UTILS.showPrompt('上传成功！')
-											_this.photo = false;
-										} 
-									}
-								},
-								fail: e => {
-									_this.$UTILS.showPrompt('上传失败！')
-									this.uploadError(index, e);
-								},
-								complete: res => {
-									uni.hideLoading();
-									_this.uploading = false;
-								
-								}
-							});
-							task.onProgressUpdate(res => {
-								_this.progress = res.progress;
-								console.log('onProgressUpdate', res)
-								console.log('task.onProgressUpdate', _this.progress)
-								uni.showLoading({
-									title: '上传中'
-								})
-							});
-						})
-					},
-				})
-			},
-			choosevideo() {
-				let _this = this;
-				console.log('视频')
-				uni.chooseVideo({
-					sourceType: ['album','camera'],
-					maxDuration: 30,
-					success(resp) {
-						const task = uni.uploadFile({
-							url: _this.$HTTP.webUrl + `/obs`,
-							filePath: resp.tempFilePath,
-							name: 'file',
-							formData: {},
-							header: _this.headers,
-							success: res => {
-								// 判断是否json字符串，将其转为json格式
-								let data = _this.$u.test.jsonString(res
-									.data) ? JSON.parse(res.data) : res.data;
-								if (![200, 201, 204].includes(res.statusCode)) {
-									this.uploadError(index, data);
-								} else {	
-									//上传成功
-									if (_this.progress === 100) {
-										console.log('_this.progress', _this.progress)
-										_this.imgArr.push(data.data.url)
-										console.log('imgArr', _this.imgArr)
-										_this.$UTILS.showPrompt('上传成功！')
-										_this.photo = false;
-									} 
-								}
-							},
-							fail: e => {
-								_this.$UTILS.showPrompt('上传失败！')
-								this.uploadError(index, e);
-							},
-							complete: res => {
-								uni.hideLoading();
-								_this.uploading = false;
-							}
-						});
-						task.onProgressUpdate(res => {
-							_this.progress = res.progress;
-							console.log('onProgressUpdate', res)
-							uni.showLoading({
-								title: '上传中'
-							})
-						});
-			
-					},
-				})
-			},
-			remove(index) {
-				uni.showModal({
-					title: '提示',
-					content: '是否删除该图片或视频？',
-					success: (res) => {
-						if (res.confirm) {
-							this.imgArr.splice(index, 1)
-							console.log('this.imgarr',this.imgArr)
-						}
-					}
-				})
-			},
-			updata(){
-				let param = {
-					id:this.id,
-					serviceType: this.serviceTypeId,
-					pipeType: this.tubeType,
-					pipeLength: this.tubeLong,
-					houseId: this.numberid,
-					valveType: this.valueType,
-					picUrl: this.imgArr,
-					remark: this.remark,
-				};
-				console.log('param', param)
-				service.getUpdateOrder(param).then(res=>{
-					this.$UTILS.showPrompt('提交成功！')
-					// setTimeout(()=>{
-					// 	uni.switchTab({
-					// 		url:'/pages/historyConstruction/historyConstruction'
-					// 	})
-					// },1000)
-				}).catch(e => {
-					this.$UTILS.showPrompt('提交失败！')
-					console.error(e)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.input {
-		// width: 300rpx;
-		height: 20%;
-		border: 2rpx solid #000000;
-	}
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-	.upload {
-		margin: 30rpx;
-		padding: 30rpx 20rpx;
-		border: 2rpx solid #3857F3;
-		border-radius: 48rpx;
-	}
-	.active{
-	   background-color: #1890FF;
-	}
-	.btn {
-		background-color: #007AFF;
-		color: #FFFFFF;
-		margin: 30rpx;
-	}
-	.image{
-		margin: 50rpx auto;
-		width: 330rpx;
-		height: 230rpx;
-	}
-</style>

pages/index/index.vue

@@ -1,16 +1,18 @@
 <template>
 	<view class="content" style="position: relative;">
-		<view>	
-			<image src="https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/5fde4230055e4eefb4dded5ba3325333.png" mode="" class="header"></image>
+		<view>
+			<image src="https://121.37.40.217/app/images/5fde4230055e4eefb4dded5ba3325333.png" mode="" class="header">
+			</image>
 		</view>
 		<view class="justify-content">
 			<view class="align-items" style="position: absolute; top: 66rpx;left: 40rpx;">
-				<image src="/static/icon/sgglpt.png" mode="" class="header-title"></image>
+				<image src="https://121.37.40.217/app/images/sgglpt.png" mode="" class="header-title"></image>
 			</view>
-		<view class="align-items" style="position: absolute; top: 180rpx; left: 300rpx; font-size: 10pt;font-size: 36rpx; color: #fff;">
-			{{name}} !欢迎你登录本应用
+			<view class="align-items"
+				style="position: absolute; top: 180rpx; left: 300rpx; font-size: 10pt;font-size: 36rpx; color: #fff;">
+				{{name}} !欢迎你登录本应用
 			</view>
-		<!-- <view class="align-items" style="position: absolute; top: 90rpx; left: 0;" @click="gotopage('/pages/noLogin/typeList')">
+			<!-- <view class="align-items" style="position: absolute; top: 90rpx; left: 0;" @click="gotopage('/pages/noLogin/typeList')">
 			<back></back>
 		</view> -->
 		</view>
@@ -23,27 +25,27 @@
 				</swiper-item>
 			</swiper>
 		</view>
-	<!-- 	<view class="distance justify-content">
+		<!-- 	<view class="distance justify-content">
 			<view class="square" @click="gotopage('/pages/cityConstrution/cityConstrution')">
-				<image src="/static/icon/city.png" mode="" class="icon"></image>
+				<image src="https://121.37.40.217/app/images//city.png" mode="" class="icon"></image>
 				<view class="font-thirty-six">
 					阀管施工
 				</view>
 			</view>
 			<view class="square" @click="history()">
-				<image src="/static/icon/construction.png" mode="" class="icon"></image>
+				<image src="https://121.37.40.217/app/images//construction.png" mode="" class="icon"></image>
 				<view class="font-thirty-six">
 					历史施工
 				</view>
 			</view>
 			<view class="square" @click="gotopage('/pages/service/service')">
-				<image src="/static/icon/service.png" mode="" class="icon"></image>
+				<image src="https://121.37.40.217/app/images//service.png" mode="" class="icon"></image>
 				<view class="font-thirty-six">
 					服务说明
 				</view>
 			</view>
 			<view class="square" @click="gotopage('/pages/aboutme/aboutme')">
-				<image src="/static/icon/construction.png" mode="" class="icon"></image>
+				<image src="https://121.37.40.217/app/images//construction.png" mode="" class="icon"></image>
 				<view class="font-thirty-six">
 					关于我们
 				</view>
@@ -53,44 +55,40 @@
 		<view class="tongzhicont">
 			<view class="gonggao">
 				<view class="justify-content">
-					<view class="font-forty-eight text" >
-						公告内容
-					</view>
-					<view class="font-thirty-six darkgray more"  @click="more()"  >
-						更多<u-icon name="arrow-right" ></u-icon>
+					<view class="font-forty-eight text"> 公告内容 </view>
+					<view class="font-thirty-six darkgray more" @click="more()"> 更多<u-icon name="arrow-right"></u-icon>
 					</view>
 				</view>
-				<view   v-for="(item,index) in list" style="margin: 30rpx 0;">
-						<u-parse class="title" :html="item.text"></u-parse>
+				<view v-for="(item,index) in list" style="margin: 30rpx 0;">
+					<u-parse class="title" :html="item.text"></u-parse>
 				</view>
 			</view>
 			<view class="notice" :key="index">
-				<view  style="margin: 30rpx 0;">
+				<view style="margin: 30rpx 0;">
 					<rich-text class="one-title" :nodes="oneManage.title"></rich-text>
 					<rich-text class="one-time" :nodes="oneManage.time"></rich-text>
 					<!-- <view class="font-forty"> -->
-						<mpHtml :content="oneManage.text"></mpHtml>
+					<mpHtml :content="oneManage.text"></mpHtml>
 					<!-- </view> -->
 				</view>
 			</view>
-		<!-- 	</view> -->
+			<!-- 	</view> -->
 		</view>
 	</view>
 </template>
-
 <script>
 	import service from '@/api/index.js'
-	import mpHtml from'@/components/mp-html/mp-html.vue'
+	import mpHtml from '@/components/mp-html/mp-html.vue'
 	export default {
-		components:{
+		components: {
 			mpHtml
 		},
 		data() {
 			return {
-				list:[],
-				oneManage:{},
-				name:'',
-				lunbo:[]
+				list: [],
+				oneManage: {},
+				name: '',
+				lunbo: []
 			}
 		},
 		onLoad() {
@@ -103,14 +101,13 @@
 			this.getnotice()
 			uni.showTabBar();
 		},
-		onTabItemTap(e)
-		{
+		onTabItemTap(e) {
 			console.log(e)
 			uni.removeStorageSync('type')
 		},
 		methods: {
-			getUserName(){
-				service.getUserName().then(res=>{
+			getUserName() {
+				service.getUserName().then(res => {
 					this.name = res.name;
 					this.power = res.power;
 				})
@@ -118,80 +115,80 @@
 			change(e) {
 				this.current = e.detail.current;
 			},
-			gotopage(url){
+			gotopage(url) {
 				uni.navigateTo({
 					url
 				})
 			},
-			getLunBo(){
-				service.getLunBo().then(res=>{
+			getLunBo() {
+				service.getLunBo().then(res => {
 					this.lunbo = res;
 				})
 			},
-			getOne()
-			{
-				service.getOne().then(res=>{
-					this.oneManage= res
+			getOne() {
+				service.getOne().then(res => {
+					this.oneManage = res
 					console.log(this.oneManage)
-					
 				})
 			},
-			getnotice(){
-				service.getNoticeList().then(res=>{
-					let list =[]
-					this.list=[]
-					list=res
-					let i=res.length-1
-					if(res.length!=0)
-					{
+			getnotice() {
+				service.getNoticeList().then(res => {
+					let list = []
+					this.list = []
+					list = res
+					let i = res.length - 1
+					if (res.length != 0) {
 						this.list.push(list[i])
-					}else{
-						this.list=res
+					} else {
+						this.list = res
 					}
-					
 				})
 			},
-			more(){
+			more() {
 				console.log(11111)
 				uni.navigateTo({
-					url:'/pages/notice/noticeList'
+					url: '/pages/notice/noticeList'
 				})
 			},
-			history(){
+			history() {
 				uni.switchTab({
-					url:'/pages/historyConstruction/historyConstruction'
+					url: '/pages/historyConstruction/historyConstruction'
 				})
 			}
 		}
 	}
 </script>
-
 <style lang="scss" scoped>
 	.header {
 		width: 100%;
 		height: 530rpx;
 	}
-	.header-title{
+
+	.header-title {
 		width: 310rpx;
 		height: 40rpx;
 	}
-		 .row-item{
-		    overflow: hidden;
-		    -webkit-line-clamp: 2;
-		    text-overflow: ellipsis;
-		    display: -webkit-box;
-		    -webkit-box-orient: vertical;
-		}
-	.tongzhicont{
+
+	.row-item {
+		overflow: hidden;
+		-webkit-line-clamp: 2;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+	}
+
+	.tongzhicont {
 		position: absolute;
 		top: 396rpx;
 		width: 100%;
 	}
-	.more{
+
+	.more {
 		font-size: 30rpx;
 		color: #666666;
 	}
-	.gonggao{
+
+	.gonggao {
 		width: 90%;
 		margin: 0 auto;
 		border-radius: 30rpx;
@@ -199,33 +196,38 @@
 		box-shadow: 7rpx 1rpx 10rpx #e5f0ff;
 		padding: 20rpx;
 	}
-	.one-title{
+
+	.one-title {
 		font-size: 40rpx;
 		font-weight: bold;
 		color: #666;
 		line-height: 2rem;
 	}
-	.one-time{
+
+	.one-time {
 		color: #999;
 		font-size: 32rpx;
 	}
-	.font-forty{
+
+	.font-forty {
 		font-size: 32rpx;
 		line-height: 2rem;
 		margin: 20rpx 0 0 0;
 	}
-	.title{
-		       overflow: hidden;
-		       		text-overflow: ellipsis;
-		       		width: 100%;
-		       		/*将对象作为弹性伸缩盒子模型显示*/
-		       		display: -webkit-box;
-		       		/*限制文本行数*/
-		       		-webkit-line-clamp: 2;
-		       		/*子元素的排列方式*/
-		       		-webkit-box-orient: vertical;
-		       		/*将对象作为弹性伸缩盒子模型显示*/
+
+	.title {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		width: 100%;
+		/*将对象作为弹性伸缩盒子模型显示*/
+		display: -webkit-box;
+		/*限制文本行数*/
+		-webkit-line-clamp: 2;
+		/*子元素的排列方式*/
+		-webkit-box-orient: vertical;
+		/*将对象作为弹性伸缩盒子模型显示*/
 	}
+
 	.swiper {
 		position: absolute;
 		top: 200rpx;
@@ -233,28 +235,33 @@
 		height: 280rpx;
 		margin: 0 30rpx;
 	}
-	.distance{
+
+	.distance {
 		margin: 250rpx 30rpx 0;
-		.square{
+
+		.square {
 			margin: 15rpx;
 			text-align: center;
-			.icon{
+
+			.icon {
 				width: 100rpx;
 				height: 100rpx;
 			}
 		}
 	}
-	.notice{
+
+	.notice {
 		margin: 20rpx;
 		padding: 20rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx 8rpx 17rpx 0rpx rgba(0, 0, 0, 0.04);
 		border-radius: 10rpx;
 	}
-	.text{
+
+	.text {
 		padding-left: 20rpx;
 		font-size: 44rpx;
 		font-weight: bold;
 		color: #4194fd;
 	}
-</style>
+</style>

pages/login/login.vue

@@ -1,20 +1,20 @@
 <template>
 	<view class="bigback">
-		<image src="https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/42ad4e72a9bb4f08ac613933c04c679a.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images/42ad4e72a9bb4f08ac613933c04c679a.png" mode="" class="background"></image>
 		<view class="title">
-			<image src="https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/41743f2fb9b54c8e87e1168bb094505b.png" mode="" class="logo"></image>
+			<image src="https://121.37.40.217/app/images/41743f2fb9b54c8e87e1168bb094505b.png" mode="" class="logo"></image>
 			<!-- <view class="font-sixty-four">
 				长春贞达市政施工管理平台
 			</view> -->
 		</view>
 		<view>
 			<view class="align-items margin">
-				<image src="/static/icon/zh.png" mode="" class="img"></image>
+				<image src="https://121.37.40.217/app/images//zh.png" mode="" class="img"></image>
 				<input type="text" placeholder="账号" placeholder-class="font-forty-eight"
 					class="input font-forty-eight" v-model="form.number" />
 			</view>
 			<view class="align-items margin">
-				<image src="/static/icon/mm.png" mode="" class="img"></image>
+				<image src="https://121.37.40.217/app/images//mm.png" mode="" class="img"></image>
 				<input type="password" placeholder="密码" placeholder-class="font-forty-eight"
 					class="input font-forty-eight" v-model="form.password" />
 			</view>

pages/mapindex/mapindex.vue

@@ -2,23 +2,23 @@
   <view class="content">
 	 <!-- <button type="primary" @click="location">位置定位</button> -->
     <map id="map" class="map" :show-location="true" :latitude="latitude" :longitude="longitude" :enable-3D="true" @markertap="location":markers="markers">
-		<cover-view class="img-map2">
-<cover-image  style="width: 100rpx;height: 100rpx;" src="https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/ef712ef2a0bf48f48bf56ea655e8359c.png"   @click="clickcontrol"></cover-image>
+		<view class="img-map2">
+<cover-image  style="width: 100rpx;height: 100rpx;" src="https://121.37.40.217/app/images/ef712ef2a0bf48f48bf56ea655e8359c.png"   @click="getregulatorBoxList "></cover-image>
 调压箱
-</cover-view>
-	<cover-view class="img-map3">
-		<cover-image   style="width: 100rpx;height: 100rpx;"  src="https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/6ba09f14edcc49b5bd2ff0f6dee4bdb9.png"  @click="getvalveWellPositionlist"></cover-image>
+</view>
+	<view class="img-map3">
+		<cover-image   style="width: 100rpx;height: 100rpx;"  src="https://121.37.40.217/app/images/6ba09f14edcc49b5bd2ff0f6dee4bdb9.png"  @click="getvalveWellPositionlist"></cover-image>
 		<!-- <u-popup v-model="show"  mode="bottom" height='600rpx'>
 					<view>出淤泥而不染，濯清涟而不妖</view>
 				</u-popup> -->
 				阀井
-	</cover-view>
+	</view>
 	</map>
   </view>
 </template>
 
 <script>
-  const img = 'https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/6ba09f14edcc49b5bd2ff0f6dee4bdb9.png';
+  // const img = 'https://121.37.40.217/app/images/6ba09f14edcc49b5bd2ff0f6dee4bdb9.png';
 import service from '@/api/index.js'
   export default {
     data() {
@@ -28,7 +28,8 @@ import service from '@/api/index.js'
 		_mapContext:null,
 		show:true,
 		positions:[],
-		markers:[]
+		markers:[],
+		type:1
       }
     },
     onReady() {
@@ -90,10 +91,87 @@ import service from '@/api/index.js'
 					this.$UTILS.showPrompt('暂无项目!')
 				}
 				this.positions = res;
-				setTimeout(()=>{this.addMarkers()},1000)
+			let	img='https://121.37.40.217/app/images/6ba09f14edcc49b5bd2ff0f6dee4bdb9.png'
+			
+				setTimeout(()=>{this.addMarkers(img)},1000)
 				})
 		},
-      addMarkers() {
+		getregulatorBoxList()
+		{
+			this.positions=[]
+		service.getregulatorBoxList({}).then(res => {
+			console.log('getwarningPileList', res)
+			if (res.length == 0) {
+				this.$UTILS.showPrompt('暂无项目!')
+			}
+			this.positions = res.rows;
+		 let img='https://121.37.40.217/app/images/ef712ef2a0bf48f48bf56ea655e8359c.png'
+			setTimeout(()=>{this.addMarkers2(img)},1000)
+		
+			})
+			},
+			addMarkers2(img) {
+				this.type=2
+			  const positions = [
+			    {
+			      latitude: 43.771703,
+			      longitude: 125.376804
+			    },{
+			      latitude: "43.780458",
+			      longitude: "125.367899"
+			    }
+			  ]
+					
+			  this.markers = []
+			  this.positions.forEach((p, i) => {
+			    this.markers.push(
+			      Object.assign({},{
+			        id: p.id,
+					type:2,
+			        iconPath: img,
+			        width: 45,
+			        height: 50,
+						  latitude:parseFloat(p.latitude),
+						  longitude:parseFloat(p.longitude),
+			        joinCluster: true, // 指定了该参数才会参与聚合
+			        // label: {
+			        //     width: 50,
+			        //     height: 30,
+			        //     borderWidth: 1,
+			        //     borderRadius: 10,
+			        //     bgColor: '#ffffff',
+			        //     content: p.valveWellName,
+			        //   latitude:p.latitude,
+			        //   longitude:p.longitude
+			        // },
+			        callout:{
+			          borderWidth: 1,
+			          borderRadius: 10,
+			          bgColor: '#ffffff',
+							fontSize:20,
+							padding:3,
+			          content: p.name,
+			          display:'ALWAYS'
+			        }
+			      })
+			    )
+			  })
+			  console.log(this.markers)
+					setTimeout(()=>{
+			  this._mapContext.addMarkers({
+			      markers:this.markers,
+			      clear: true,
+			      complete(res) {
+			        console.log('addMarkers', res)
+			      }
+				 
+			  })
+			  
+					},100)
+				
+			},
+      addMarkers(img) {
+		  this.type=1
         const positions = [
           {
             latitude: 43.771703,
@@ -109,6 +187,7 @@ import service from '@/api/index.js'
           this.markers.push(
             Object.assign({},{
               id: p.id,
+			  type:1,
               iconPath: img,
               width: 45,
               height: 50,
@@ -151,6 +230,9 @@ import service from '@/api/index.js'
 
 	  //位置定位
 	  location(e){
+		  if(this.type==1)
+		  {
+		  console.log(e)
 		  service.getvalveWellPosition(e.markerId).then(res => {
 		  	console.log('getwarningPileList', res)
           console.log(e)
@@ -166,6 +248,25 @@ import service from '@/api/index.js'
 		 })
 		 // this.positions = res;
 		 })
+		 }else{
+			 console.log(e)
+			 service.getregulatorBox(e.markerId).then(res => {
+			  	console.log('getwarningPileList', res)
+			  console.log(e)
+			 uni.openLocation({
+			     latitude: parseFloat( res.latitude),
+			 			   longitude: parseFloat(res.longitude),
+			     success: function (res) {
+			         console.log('打开系统位置地图成功')
+			     },
+			     fail: function (error) {
+			         console.log(error)
+			     }
+			 })
+			 // this.positions = res;
+			 })
+			
+		 }
 	  },
       clickMarker(e)
       {
@@ -217,6 +318,8 @@ import service from '@/api/index.js'
   	bottom: 12vh;
   	right: 2vh;
 	text-align: center;
+	display: flex;
+	  flex-direction: column;
   	background-color: #FFFFFF;
   	border-radius: 5px;
   }
@@ -227,6 +330,8 @@ import service from '@/api/index.js'
   	bottom: 23vh;
   	right: 2vh;
 	text-align: center;
+	display: flex;
+	  flex-direction: column;
   	background-color: #FFFFFF;
   	border-radius: 5px;
   }

pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.vue

@@ -1,6 +1,6 @@
 <template>
 <view>
-<image src="/static/icon/background-from.png" class="background"></image>
+<image src="https://121.37.40.217/app/images/background-from.png" class="background"></image>
 <view class="project-content">
 	<u-form :model="form" :rules="rules" ref="form">
 		<u-form-item label="楼栋" borderBottom ref="item1" labelWidth="140">
@@ -34,7 +34,7 @@
 			<view>巡检照片</view>
 			<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=""
+				<image src="https://121.37.40.217/app/images/chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
@@ -81,7 +81,7 @@ data() {
 		imgArr: [],
 		imgymxs: [],
 		progress: 0, //图片或视频上传百分比
-		form: {},
+		form: {findProblem:1},
 		typelist: [],
 		causesOfFamageLabel: null,
 		dictlist: ['find_problem'],
@@ -197,7 +197,7 @@ methods: {
 			// 		url: '/pages/index/index'
 			// 	})
 			// }, 2000)
-			this.form={}
+			this.form={findProblem:1}
 			this.buildingName=''
 			this.imgArr=[]
 			this.imgymxs=[]

pages/noLogin/LNGStation/LNGStation.vue

@@ -1,6 +1,6 @@
 <template>
 <view>
-<image src="/static/icon/background-from.png" class="background"></image>
+<image src="https://121.37.40.217/app/images//background-from.png" class="background"></image>
 <view class="project-content">
 	<u-form :model="form" :rules="rules" ref="form">
 		<view class="small-title">输配站</view>
@@ -12,7 +12,7 @@
 			<view>压力表</view>
 			<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=""
+				<image src="https://121.37.40.217/app/images//chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="pressureGaugechoose()" v-if="type!=1">
 				</image>
 				<view v-for="(item,index) in pressureGaugeimgymxs" :key="index" style="position: relative;">
@@ -35,7 +35,7 @@
 			<view>液位计</view>
 			<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=""
+				<image src="https://121.37.40.217/app/images//chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="LevelGaugechoose()" v-if="type!=1">
 				</image>
 				<view v-for="(item,index) in LevelGaugeimgymxs" :key="index" style="position: relative;">
@@ -58,7 +58,7 @@
 			<view>流量计</view>
 			<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=""
+				<image src="https://121.37.40.217/app/images//chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
@@ -146,7 +146,7 @@
 			<view>巡检照片</view>
 			<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=""
+				<image src="https://121.37.40.217/app/images//chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
@@ -211,7 +211,7 @@ data() {
 		LevelGaugeimgArr: [],
 		LevelGaugeimgymxs: [],
 		progress: 0, //图片或视频上传百分比
-		form: {},
+		form: {pipeline:0,maintain:0,alarm:0,fireEquipment:0,emergency:0},
 		typelist: [],
 		causesOfFamageLabel: null,
 		dictlist: ['Pipeline','maintain','safety_facilities'],
@@ -379,7 +379,7 @@ methods: {
 			// 		url: '/pages/index/index'
 			// 	})
 			// }, 2000)
-			this.form={}
+			this.form={pipeline:0,maintain:0,alarm:0,fireEquipment:0,emergency:0}
 			// this.buildingName=''
 			this.imgArr=[]
 			this.imgymxs=[]

pages/noLogin/My.vue

@@ -1,113 +0,0 @@
-<template>
-	<view>
-		<view class="align-items" style="margin-top: 80rpx;">
-			<back></back>
-		</view>
-		<view v-for="(item,index) in list" :key="index">
-			<view  @click="gotopage(item)">
-				<view class="type">
-					<view class="justify-content">
-						<view class="font-forty blue" >
-							类别：{{name}}
-						</view>
-						<view class="font-twenty-eight gray">
-							{{item.time}} 
-						</view>
-					</view>
-					<view class="font-thirty-six black" style="margin: 30rpx 0;">
-						{{item.house}}
-					</view>
-					<view class="font-thirty-six black" style="margin: 30rpx 0;">
-						备注：
-						<text v-if="item.remark != null">
-							{{item.remark}}
-						</text>
-						<text v-else>
-							无
-						</text>
-					</view>
-				</view>
-			</view>
-			<view class="main-list-icon"></view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default { 
-		data(){
-			return {
-				list:[],
-				name:'',
-				params: {
-					pageNum: 1,
-					pageSize: 10,
-				},
-			}
-		},
-		onLoad(e) {
-			console.log('e',e)
-			this.id = e.id;
-			this.name = e.name;
-			this.address = e.address;
-			this.getListAll();
-		},
-		onReachBottom() {
-			this.getNextListFn()
-		},
-		onPullDownRefresh() {
-			this.getListAll();
-			setTimeout(function () {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		methods:{
-			getListAll() {
-				let that = this;
-				let params ={
-					serviceType: this.id,
-					pageSize: 10,
-					pageNum: 1,
-				}
-				service.getListAll(params).then(res => {
-					this.list = res.records;
-					that.total = res.total || 0;
-					that.params.pageNum = res.current + 1;
-				})
-			},
-			getNextListFn() {
-				let that = this;
-				let params ={
-					serviceType: this.id,
-					pageSize: this.params.pageSize,
-					pageNum: this.params.pageNum,
-				}
-				if (this.list.length < this.total) {
-					service.getListAll(params).then(response => {
-						that.params.pageNum = response.current + 1
-						response.records.forEach(item =>{
-							that.list.push(item)
-						})
-					})
-				}
-			},
-			gotopage(item){
-				uni.navigateTo({
-					url:`/pages/noLogin/Myphoto?id=${item.id}`,
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.type {
-		margin: 20rpx;
-		padding: 20rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 8rpx 17rpx 0rpx rgba(0, 0, 0, 0.04);
-		border-radius: 10rpx;
-	}
-</style>

pages/noLogin/Myphoto.vue

@@ -1,51 +0,0 @@
-<template>
-	<view class="">
-		<view class="" style="margin-top: 100rpx;">
-			<back></back>
-		</view>
-		<view v-for="(item,index) in image" :key="index" class="flex" >
-			<image :src="item" mode="" class="image" @click="showPhoto(index)" v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' "></image>
-			<video :src="item" controls v-else class="image"></video>
-		</view>
-	</view>
-	
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default{
-		data(){
-			return{
-				id:0,
-				image:[],
-				index:0,
-			}
-		},
-		onLoad(e) {
-		   this.id = e.id;
-		   this.photo()
-		},
-		methods:{
-			photo(){
-				service.getOrderPhoto({orderId:this.id}).then(res=>{
-					this.image = res;
-				})
-			},
-			showPhoto(index){
-				uni.previewImage({
-					current:index,
-					urls:this.image,
-				})
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.image{
-		margin: 50rpx auto;
-		width: 330rpx;
-		height: 230rpx;
-	}
-</style>

pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="/static/icon/background.png" class="background"></image>
+		<image src="https://121.37.40.217/app/images/background.png" class="background"></image>
 		<view class="project-content">
 			<u-form :model="form" ref="form">
 				<view class="top">
@@ -20,9 +20,9 @@
 						<u-form-item label="管理所" borderBottom ref="item1" labelWidth="140">
 							<u-input v-model="AdministrativeOfficeLabel" placeholder="请输入管理所名称"
 								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>
+							<!-- 	<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> -->
 						</u-form-item>
 					</u-col>
 					<u-col>
@@ -370,7 +370,7 @@
 						<u-form-item label=" " labelWidth="0" borderBottom ref="item1">
 							<u-input v-model="form.WarningColumnInformation" disabled placeholder="请上传巡检照片"></u-input>
 							<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
-								<image src="/static/icon/chooseimg.png" mode=""
+								<image src="https://121.37.40.217/app/images/chooseimg.png" mode=""
 									style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"
 									v-if="type!=1"></image>
 								<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
@@ -687,16 +687,19 @@
 			this.type = e.type
 			this.id = e.id
 			this.time = year + "/" + month + "/" + date + "-" + hours + ":" + Min
-			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()
+			this.form.areaId = e.id
+			this.communityId=e.id
+			this.communityName = e.name
+			 this.form.number=e.number
+			 this.administrativeOffice=e.managementOffice
+			 this.form.administrativeOffice=e.managementOffice
+			this.form.name=e.name
+			this.name=e.name
+			this.code=e.number
+			//this.getAdministrativeOffice(this.userId)
+			
 		},
 		methods: {
 			checkinletPressure(e) {
@@ -782,6 +785,10 @@
 			getAdministrativeOffice(userId){
 				service.getAdministrativeOffice({userId:userId}).then(res=>{
 					this.AdministrativeOfficeList=res
+					if(this.type!=1)
+					{
+					this.AdministrativeOfficeLabel=this.AdministrativeOfficeList.filter(item=>item.value==this.administrativeOffice)[0].name
+					}
 				})
 			},
 			getdictsysinfo() {
@@ -792,7 +799,7 @@
 					_this.typelist = res
 					if (this.type == 1) {
 						service.getregulatorBox(this.id).then(res => {
-							this.communityName = res.areaName
+							this.communityName = res.name
 							this.time = res.createTime
 							if (null != res.photoList) {
 								res.photoList.forEach(item => {
@@ -943,9 +950,10 @@
 				}
 				this.form.photoList = this.imgArr
 				this.form.unitId = this.unit
-				this.form.areaId =  this.communityId
+				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
@@ -981,10 +989,11 @@
 					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.AdministrativeOfficeLabel=''
 					this.form.administrativeOffice=this.administrativeOffice
 					 this.form.number=this.code
 					this.imgArr=[]

pages/noLogin/WarningPileForm/WarningPileForm.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="/static/icon/background-from.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images/background-from.png" mode="" class="background"></image>
 		<view class="project-content">
 			<u-form :model="form" :rules="rules" ref="form">
 				<u-form-item borderBottom ref="item1">
@@ -11,7 +11,7 @@
 				<u-form-item borderBottom ref="item1">
 					<view>警示柱照片</view>
 					<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
-						<image src="/static/icon/chooseimg.png" mode=""
+						<image src="https://121.37.40.217/app/images/chooseimg.png" mode=""
 							style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
 						</image>
 						<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">

pages/noLogin/WarningPileList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="/static/icon/background-from.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images//background-from.png" mode="" class="background"></image>
 		<view>
 			<view class="sousuo">
 				<u-search  placeholder="请输入阀井名称" @click="showName=true" v-model="userName"  :show-action="false"@search="getProjectList()" ></u-search>

pages/noLogin/buildinglist.vue

@@ -1,7 +1,7 @@
 
 <template>
 	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images/background.png" mode="" class="background"></image>
 		<view class="" style="padding-top: 90rpx;">
 			<back></back>
 		</view>

pages/noLogin/cityProject.vue

@@ -1,155 +0,0 @@
-<template>
-	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
-		<view class="" style="padding-top: 90rpx;">
-			<back></back>
-		</view>
-		<view style="padding-top: 60rpx;">
-			<view style="margin: 20rpx;">
-				<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>
-						<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}}
-						</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>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				list:[],
-				value:'',
-				nameValue:'',
-				civilPower:''
-			}
-		},
-		onLoad(e) {
-			console.log(e)
-			this.value = e.value
-			this.getProjectList();
-			this.getUserName();
-		},
-		methods: {
-			gotoindex(){
-				uni.switchTab({
-					url:'/pages/index/index'
-				})
-			},
-			topage(url){
-				uni.navigateTo({
-					url
-				})
-			},
-			getProjectList() {
-				service.getProjectList({engineType:this.value,name:this.nameValue}).then(res=>{
-					console.log('getProjectType', res)
-					if(res.length == 0){
-						this.$UTILS.showPrompt('暂无项目!')
-					}
-					this.list = res;
-				})
-			},
-			getUserName(){
-				service.getUserName().then(res=>{
-					this.civilPower = res.civilPower;
-				})
-			},
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.background {
-		z-index: -1;
-		position: fixed;
-		width: 100%;
-		height: 100%;
-		background-size: 100% 100%;
-	}
-
-	.project {
-		border-radius: 72rpx;
-		padding: 25rpx 0;
-		text-align: center;
-		margin: 170rpx 55rpx 0;
-	}
-
-	.project-content {
-		border: 4rpx solid #3857F3;
-		margin: 40rpx 55rpx 0;
-		padding: 30rpx 20rpx;
-		border-radius: 48rpx;
-	}
-	.position{
-		position: absolute;
-		bottom: 100rpx;
-		right: 50rpx;
-		.arrow{
-			width: 152rpx;
-			height: 152rpx;
-			border-radius: 50%;
-			padding: 25rpx;
-			margin-left: 20rpx;
-		}
-	}
-	
-</style>

pages/noLogin/communitylist.vue

@@ -1,7 +1,7 @@
 
 <template>
 	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images//background.png" mode="" class="background"></image>
 		<view style="padding-top: 40rpx;">
 			<view style="margin: 20rpx;">
 				<u-search placeholder="请输入小区名称" v-model="nameValue"  :action-style="{'font-size':'40rpx'}" :show-action="false" @search="getProjectList()"></u-search>

pages/noLogin/data.vue

@@ -1,89 +0,0 @@
-<template>
-	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
-		<view style="padding-top: 100rpx;">
-			<view class="align-items">
-				<back></back>
-			</view>
-			<view class="project-content">
-				<view class="font-forty-eight blue">
-					项目名称：{{name}}
-				</view>
-				<view class="font-forty-eight blue">
-					项目地址：{{address}}
-				</view>
-			</view>
-		</view>
-		<view class="">
-			<view class="project background-color1 font-sixty-four white" @click="add('repair')">添加</view>
-			<view class="project background-color1 font-sixty-four white" @click="add('list')">查看</view>
-			<view class="project background-color1 font-sixty-four white" @click="add('My')">我的</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: 0,
-				name: '',
-				address: '',
-			}
-		},
-		onLoad(e) {
-			console.log(e)
-			this.id = e.id;
-			this.name = e.name;
-			this.address = e.address
-		},
-		methods:{
-			add(type){
-				let that = this;
-				if(this.name === '安检'){
-					uni.navigateTo({
-						url: `/pages/noLogin/${type}?id=004&name=${that.name}&address=${that.address}`
-					})
-				}else if(this.name === '维修'){
-					uni.navigateTo({
-						url: `/pages/noLogin/${type}?id=005&name=${that.name}&address=${that.address}`
-					})
-				}else if(this.name === '开栓'){
-					uni.navigateTo({
-						url: `/pages/noLogin/${type}?id=006&name=${that.name}&address=${that.address}`
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.background {
-		z-index: -1;
-		position: fixed;
-		width: 100%;
-		height: 100%;
-		background-size: 100% 100%;
-	}
-
-	.project-content {
-		border: 4rpx solid #3857F3;
-		margin: 80rpx 55rpx 0;
-		padding: 30rpx 20rpx;
-		border-radius: 48rpx;
-	}
-
-	.project {
-		border-radius: 72rpx;
-		padding: 25rpx 0;
-		text-align: center;
-		margin: 60rpx 55rpx 0;
-	}
-
-	.project-img {
-		width: 300rpx;
-		height: 168rpx;
-		margin: 20rpx auto;
-	}
-</style>

pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.vue

@@ -1,11 +1,14 @@
 <template>
 	<view>
-		<image src="/static/icon/background-from.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images//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="涉及户数" labelWidth="150" borderBottom ref="item1">
+					<u-input v-model="form.houseHolds" 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>
@@ -112,7 +115,7 @@
 				</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="/static/icon/chooseimg.png" mode=""
+						<image src="https://121.37.40.217/app/images//chooseimg.png" mode=""
 							style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
 						</image>
 						<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">

pages/noLogin/fileList/fileList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images/background.png" mode="" class="background"></image>
 		<!-- <view class="" style="padding-top: 0rpx;">
 			<!-- <back></back> -->
 		<!-- </view> --> 

pages/noLogin/list.vue

@@ -1,778 +0,0 @@
-<template>
-	<view class="list_s">
-		<view class="header_s">
-			<u-popup v-model="show" mode="top">
-				<scroll-view scroll-y="true" style="height: 100vh; text-align: center" class="popup">
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('district')">
-								{{districtName ? districtName :'选择行政区'}}
-							</view>
-						</view>
-
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-								{{house ? house : '选择小区'}}
-							</view>
-
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
-								{{bulid ? bulid : '选择楼宇'}}
-							</view>
-
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('danyuan')">
-								{{unit ? unit : '选择单元'}}
-							</view>
-
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('menpai')">
-								{{houseNumber ? houseNumber  : '选择门牌'}}
-							</view>
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="showStart = true">
-								{{form.starTime ? form.starTime  : '开始时间'}}
-								<u-picker v-model="showStart" mode="time" @confirm="confirmStart"></u-picker>
-							</view>
-						</view>
-						<view>
-							<view class="font-fifty-six SourceHanSansCN choose" @click="showEnd = true">
-								{{form.endTime ? form.endTime  : '结束时间'}}
-								<u-picker v-model="showEnd" mode="time" @confirm="confirmEnd"></u-picker>
-							</view>
-						</view>
-						<view>
-							<!-- <view class="font-fifty-six SourceHanSansCN choose" @click="openType('shows')">
-							上门类型 <text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
-								{{type ? '----' +  type : ''}}</text>
-							<u-select v-model="shows" :list="mounicipalList" @confirm="confirm"></u-select>
-						</view> -->
-							<view style="display: flex;">
-								<view style="height: 100rpx; font-size: 64rpx; width: 180rpx; font-weight: 600;">工号
-								</view>
-								<u-input style="font-size: 64rpx!important; font-weight: 600; width: 400rpx!important;"
-									placeholder="请输入工号" placeholder-style="font-size: 64rpx;" v-model="form.jobNum"
-									maxlength='4' :type='numberType' :border="border" />
-							</view>
-							<view class="font-fifty-six SourceHanSansCN total background-color1"  @click="submit()">
-								提交数据
-							</view>
-						</view>
-					
-				</scroll-view>
-			</u-popup>
-			<view style="display: flex;">
-				<view class="btn_s" @click="show = true">查询</view>
-				<view class="btn_s" @click="kong">重置</view>
-			</view>
-		</view>
-		<view class="footer_s" v-if="list.length > 0">
-			<view class="footer-item" v-for="(item, index) in list">
-				<view class="item-title">地址: {{item.house}}</view>
-				<view class="item-title">职工: {{item.userName}}</view>
-				<view class="item-title">时间: {{item.time}}</view>
-				<view class="item-title">备注:
-					<text class="" v-if="item.remark != null">
-						{{item.remark}}
-					</text>
-					<text class="" v-else>
-						无
-					</text>
-				</view>
-				<view class="item-img">
-					<view class="img-view" v-for="img in item.picUrl">
-						<image :src="img" mode="" @tap="preAvatar(img)"
-							v-if="img.substring(img.length - 3) == 'png' || img.substring(img.length - 3) == 'jpg' ">
-						</image>
-						<video :src="img" controls v-else></video>
-					</view>
-					<!-- <image v-for="img in item.picUrl" :src="img" @tap="preAvatar(img)"></image> -->
-
-				</view>
-				<view class="main-list-icon"></view>
-			</view>
-		</view>
-		<view class="footer_s" style="padding-top: 100rpx;" v-else>
-			<u-empty text="暂无数据" mode="list"></u-empty>
-		</view>
-		
-		
-		<u-popup v-model="pop" mode="top">
-			<view style="margin: 20rpx;">
-				<u-search v-show="inputShow" placeholder="请输入搜索内容" v-model="keyword"
-					:action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)">
-				</u-search>
-			</view>
-			<view>
-				<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-					<view v-for="(item,index) in chooseHouseList" :key="item.value">
-						<view :class="current === index ? 'active' : '' "
-							style="color: #000000;font-size: 56rpx;" @click="active(item,index)">
-							{{item.label}}
-						</view>
-					</view>
-				</scroll-view>
-				<view class="">
-					<button type="default" class="font-fifty-six"
-						@click="search(selectType)">确定</button>
-				</view>
-				<view class="">
-					<button type="default" @click="pop = false;"
-						class="font-fifty-six">取消</button>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				id: 0,
-				numberType: 'number',
-				name: '',
-				address: '',
-				keyword: '',
-				selectType: '',
-				inputShow: false,
-				pop: false,
-				show: false,
-				border: false,
-				typeValue: '',
-				current: -1,
-				labelPosition: 'left',
-				errorType: ['message'],
-				list: [],
-				chooseHouseList: [],
-				typeList: [],
-				showStart: false,
-				showEnd: false,
-				form: {
-					starTime: '',
-					endTime: '',
-					jobNum: '',
-				},
-				params: {
-					pageNum: 1,
-					pageSize: 10,
-				},
-				listTypeShow: false,
-				tubeTypeShow: false,
-				tubeLongShow: false,
-				districtId: 0,
-				districtName: '选择行政区',
-				house: '选择小区',
-				bulid: '选择楼宇',
-				unit: '选择单元',
-				houseNumber: '选择门牌',
-				shows: false,
-				// mounicipalList: [],
-				tubeTypeLongList: [],
-				tubeTypeList: [],
-				houseid: '',
-				type: '',
-				buildid: '',
-				unitid: '',
-				numberid: '',
-			}
-		},
-		onLoad(e) {
-			this.id = e.id;
-			this.name = e.name;
-			this.address = e.address
-			this.getListFn();
-			// this.getArea();
-			// this.select();
-			this.getProjectType();
-			this.getTubeType();
-			this.getTubeLong();
-		},
-		onReachBottom() {
-			this.getNextListFn()
-		},
-		onPullDownRefresh() {
-			this.getListFn();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		methods: {
-			kong() {
-				this.houseid = '';
-				this.buildid = '';
-				this.unitid = '';
-				this.numberid = '';
-				this.form.starTime = '';
-				this.form.endTime = '';
-				this.form.jobNum = '';
-				this.getListFn();
-			},
-			confirmStart(e) {
-				console.log(e)
-				this.form.starTime = `${e.year}-${e.month}-${e.day}`
-			},
-			confirmEnd(e) {
-				console.log(e)
-				this.form.endTime = `${e.year}-${e.month}-${e.day}`
-			},
-			openUnit() {
-				this.unitShow = !this.unitShow
-			},
-			//选择门牌
-			open() {
-				this.houseNumberShow = !this.houseNumberShow
-			},
-			//选择上门类型
-			confirm(e) {
-				this.type = e[0].label
-				this.typeValue = e[0].value
-
-				this.imgArr = [];
-				this.tubeType = null;
-				this.tubeLong = null;
-				this.valueType = null;
-			},
-			//选择类型
-			// select() {
-			// 	service.getDic({
-			// 		dicType: 'service_type'
-			// 	}).then(res => {
-			// 		res.forEach(item => {
-			// 			this.mounicipalList.push({
-			// 				value: item.value,
-			// 				label: item.name
-			// 			})
-			// 		})
-			// 	})
-			// },
-			openType(type) {
-				if (type === 'shows') {
-					this.shows = !this.shows
-				} else if (type === 'tubeType') {
-					this.tubeTypeShow = !this.tubeTypeShow
-				} else {
-					this.tubeLongShow = !this.tubeLongShow
-				}
-
-			},
-			tubeTypeConfirm(e) {
-				this.tubeType = e[0].label
-			},
-			listType(e) {
-				this.valueType = e[0].label
-			},
-			tubeLongConfirm(e) {
-				this.tubeLong = e[0].label
-			},
-			getTubeType() {
-				service.getPipeType().then(res => {
-					res.forEach(item => {
-						this.tubeTypeList.push({
-							value: item.id,
-							label: item.pipeType
-						})
-					})
-				})
-			},
-			getTubeLong() {
-				service.getPipeLength().then(res => {
-					res.forEach(item => {
-						this.tubeTypeLongList.push({
-							value: item.id,
-							label: item.pipeLength
-						})
-					})
-				})
-			},
-			getProjectType() {
-				service.getProject().then(res => {
-					console.log('getProjectType', res)
-					this.typeList = [];
-					res.forEach(item => {
-						this.typeList.push({
-							value: item.id,
-							label: item.valveType
-						})
-					})
-
-				})
-			},
-			projectType() {
-				this.listTypeShow = !this.listTypeShow
-			},
-			search(selectType) {
-				// console.log('this.housename', this.housename)
-				// console.log('this.selectType', this.selectType)
-				if (selectType == 'district') {
-					this.districtName = this.housename;
-					service.getArea({
-						district: this.districtId
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.dictValue,
-								label: item.dictLabel,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-					this.current = -1;
-					this.house = null;
-					this.bulid = null;
-					this.unit = null;
-					this.houseNumber = null;
-				
-					this.houseid = 0;
-					this.buildid = 0;
-					this.unitid = 0;
-					this.housedata = 0;
-				
-				
-				} else if (selectType == 'xiaoqu') {
-					this.house = this.housename;
-					service.getBuilding({
-						areaId: this.houseid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-					this.current = -1;
-					this.bulid = null;
-					this.unit = null;
-					this.houseNumber = null;
-
-					this.buildid = 0;
-					this.unitid = 0;
-					this.housedata = 0;
-				} else if (selectType == 'louyu') {
-					this.bulid = this.housename;
-					service.getUnit({
-						buildingId: this.buildid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-					this.unit = null;
-					this.houseNumber = null;
-					this.current = -1;
-
-					this.unitid = 0;
-					this.housedata = 0;
-				} else if (selectType == 'danyuan') {
-					this.unit = this.housename;
-					service.getAllHouse({
-						unitId: this.unitid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-					this.houseNumber = null;
-					this.current = -1;
-
-					this.housedata = 0;
-				} else if (selectType == 'menpai') {
-					this.houseNumber = this.housename;
-					this.housedata = this.numberid;
-					this.current = -1;
-				}
-				this.pop = false;
-			},
-			openHouse(selectType) {
-				if (selectType === 'district') {
-					this.inputShow = false
-					//选择行政区
-					this.housename = null;
-					this.selectType = 'district'
-					service.getDistrict().then(res => {
-						// console.log(res);
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.dictValue,
-								label: item.dictLabel,
-								selectType: 'district'
-							})
-						})
-					})
-				} else if (selectType === 'xiaoqu') {
-					this.inputShow = false
-					//选择小区
-					this.selectType = 'xiaoqu';
-					service.getArea({
-						district: this.districtId
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-				} else if (selectType === 'louyu') {
-					this.inputShow = false
-					//选择楼宇
-					this.selectType = 'louyu'
-					service.getBuilding({
-						areaId: this.houseid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-				} else if (selectType === 'danyuan') {
-					this.inputShow = false
-					//选择单元
-					this.selectType = 'danyuan'
-					service.getUnit({
-						buildingId: this.buildid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-				} else if (selectType === 'menpai') {
-					this.inputShow = false
-					//选择门牌
-					this.selectType = 'menpai'
-					service.getAllHouse({
-						unitId: this.unitid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-				}
-				this.pop = !this.pop;
-			},
-			searchinfo(selectType) {
-				if (selectType == 'xiaoqu') {
-					console.log('ssss', this.selectType)
-					service.getArea({
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'louyu') {
-					console.log('ssss', this.selectType)
-					service.getBuilding({
-						areaId: this.houseid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'danyuan') {
-					console.log('ssss', this.selectType)
-					service.getUnit({
-						buildingId: this.buildid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'menpai') {
-					console.log('ssss', this.selectType)
-					service.getAllHouse({
-						unitId: this.unitid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-					this.keyword = '';
-				}
-
-			},
-			active(item, index) {
-				this.current = index;
-				this.housename = item.label;
-				if (item.selectType == 'district') { //行政区
-					this.districtId = item.value;
-				} else if (item.selectType == 'xiaoqu') {
-					this.houseid = item.value;
-				} else if (item.selectType == 'louyu') {
-					this.buildid = item.value;
-				} else if (item.selectType == 'danyuan') {
-					this.unitid = item.value;
-				} else if (item.selectType == 'menpai') {
-					this.numberid = item.value
-				}
-				this.selectType = item.selectType;
-			},
-			// //获取小区
-			// getArea() {
-			// 	service.getArea().then(res => {
-			// 		this.chooseHouseList = [];
-			// 		res.forEach((item, index) => {
-			// 			this.chooseHouseList.push({
-			// 				value: item.id,
-			// 				label: item.name,
-			// 				selectType:'xiaoqu'
-			// 			})
-			// 		})
-			// 	})
-			// },
-			getListFn() {
-				let that = this;
-				let params = {
-					areaId: this.houseid,
-					buildingId: this.buildid,
-					unitId: this.unitid,
-					houseId: this.numberid,
-					starTime: this.form.starTime,
-					endTime: this.form.endTime,
-					jobNum: this.form.jobNum,
-					pageSize: 10,
-					pageNum: 1,
-					serviceType: this.id
-				}
-				console.log('params', params)
-				service.getOtherList(params).then(res => {
-					console.log("999", res)
-					that.list = res.records;
-					that.total = res.total || 0;
-					that.params.pageNum = res.current + 1;
-				})
-			},
-			getNextListFn() {
-				let that = this;
-				let params = {
-					areaId: this.houseid,
-					buildingId: this.buildid,
-					unitId: this.unitid,
-					houseId: this.numberid,
-					starTime: this.form.starTime,
-					endTime: this.form.endTime,
-					jobNum: this.form.jobNum,
-					pageSize: this.params.pageSize,
-					pageNum: this.params.pageNum,
-					serviceType: this.id
-				}
-				if (this.list.length < this.total) {
-					service.getOtherList(params).then(response => {
-						that.params.pageNum = response.current + 1
-						response.records.forEach(item => {
-							that.list.push(item)
-						})
-					})
-				}
-			},
-			// 预览图片
-			preAvatar(url) {
-				console.log('url', url)
-				wx.previewImage({
-					current: url, // 当前显示图片的 http 链接
-					urls: [url], // 需要预览的图片 http 链接列表
-				})
-			},
-			submit() {
-				console.log('submit', this.houseid, this.buildid, this.unitid, this.numberid);
-				this.show = false;
-				this.getListFn()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	/deep/ .u-input__input {
-		font-size: 64rpx !important;
-		color: #303133;
-		width: calc(100% - 200rpx) !important;
-	}
-
-	/deep/ .u-column-item {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		font-size: 64rpx !important;
-		color: #303133;
-		padding: 8rpx;
-	}
-
-	/deep/ .u-btn-picker.data-v-70102400 {
-		padding: 16rpx;
-		box-sizing: border-box;
-		text-align: center;
-		text-decoration: none;
-		font-size: 64rpx !important;
-	}
-
-	.list_s {
-		min-height: 100vh;
-		background-color: #F9F9F9;
-	}
-
-	.header_s {
-		padding: 30rpx 30rpx 0rpx 30rpx;
-
-		.popup {
-			// padding: 0rpx 30rpx;
-		}
-
-		.btn_s {
-			margin: 0 15rpx;
-			width: calc(50% - 15px);
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			background-color: #3857F3;
-			color: #fff;
-			font-size: 64rpx;
-			border-radius: 16rpx;
-		}
-	}
-
-	.footer_s {
-		padding: 30rpx;
-
-		.footer-item {
-			background: #FFFFFF;
-			height: auto;
-			border-radius: 8rpx;
-			margin-bottom: 30rpx;
-			padding: 20rpx 0rpx 20rpx 66rpx;
-			position: relative;
-
-			.item-title {
-				font-size: 48rpx;
-				font-family: PingFangSC-Medium, PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				padding-bottom: 20rpx;
-			}
-
-			.main-list-icon {
-				position: absolute;
-				top: 43rpx;
-				left: 30rpx;
-				width: 16rpx;
-				height: 16rpx;
-				background: #3857F3;
-				border-radius: 2rpx;
-			}
-
-			.item-img {
-				display: flex;
-				justify-content: flex-start;
-				flex-wrap: wrap;
-
-				.img-view {
-					width: calc(50% - 20rpx);
-					height: 200rpx;
-					padding-bottom: 20rpx;
-					padding-right: 20rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-
-					video {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-		}
-	}
-
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-
-	.active {
-		background-color: #1890FF;
-	}
-
-	.select-type {
-		border: 2rpx solid #3857F3;
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #3857F3;
-		border-radius: 64rpx;
-	}
-
-	.total {
-		width: 100%;
-		padding: 40rpx 30rpx;
-		text-align: center;
-		color: #FFFFFF;
-	}
-</style>

pages/noLogin/listProject.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images//background.png" mode="" class="background"></image>
 		<view class="" style="padding-top: 0rpx;">
 			<!-- <back></back> -->
 		</view>
@@ -44,7 +44,7 @@
 				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'},{name:'阀井巡查',src:'../../static/icon/jsz.png'},{name:'输配站',src:'../../static/icon/jsz.png'}]
+				viewList:[{name:'抢险维修',src:'https://121.37.40.217/app/images/qxwx.png'},{name:'调压箱管理',src:'https://121.37.40.217/app/images/xxdy.png'},{name:'庭院网管',src:'https://121.37.40.217/app/images/tywg.png'},{name:'路段巡查',src:'https://121.37.40.217/app/images/luduan.png'},{name:'阀井巡查',src:'https://121.37.40.217/app/images/fajing.png'},{name:'输配站',src:'https://121.37.40.217/app/images/spzxc.png'}]
 			}
 		},
 		onLoad(e) {

pages/noLogin/regulatorBoxList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="/static/icon/background-from.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/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>
@@ -16,8 +16,8 @@
 					<view class="font-forty-eight houseList_in">
 						<view style="display: flex;flex-direction: column;">
 						<span>调压箱名称:{{item.name}}</span>
-						<span>调压箱编号:{{item.code}}</span>
-						<span>管理所:{{item.administrativeOffice}}</span>
+						<span style="font-size: 15px;">调压箱编号:{{item.number}}</span>
+						<!-- <span style="font-size: 15px;">管理所:{{item.managementOffice}}</span> -->
 						</view>
 						<u-icon name="arrow-right"></u-icon>
 					</view>
@@ -52,20 +52,50 @@
 				civilPower: '',
 				form:{},
 				userId:'',
-				code:'',administrativeOffice:''
+				code:'',administrativeOffice:'',
+				ReachBottom:false,
+				page:1,
+				total:0
 			}
 			
 		},
 		onLoad() {
-			this.getProjectList();
 			this.getUserName();
+			
 			this.getWorker();
 			uni.setNavigationBarColor({
 			    frontColor: '#ffffff',
 			    backgroundColor: '#2d95f4',
 			})
 		},
+		onTabItemTap(e)
+		{
+			console.log(e)
+			uni.removeStorageSync('type')
+		},
+		onReachBottom(){
+			console.log('触底')
+			this.getReachBottom()
+		},
+		onPullDownRefresh()
+		{
+			console.log('下拉刷新')
+			this.getReachBottom()
+		},
 		methods: {
+			getReachBottom()
+			{
+				if (this.ReachBottom) {
+					
+					this.page+=1
+					this.getProjectList()
+					}else
+					{
+						this.page=1
+						this.ReachBottom=false
+					}
+			
+			},
 			getWorker()
 			{
 				service.getWorker().then(res => {
@@ -90,7 +120,7 @@
 			gotoindex(item) {
 				console.log(item)
 				uni.navigateTo({
-					url:`/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?code=${item.code}&name=${item.name}&administrativeOffice=${item.administrativeOffice}`
+					url:`/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?number=${item.number}&name=${item.name}&managementOffice=${item.managementOffice}&id=${item.id}&type=2`
 				})
 			},
 			topage(url) {
@@ -99,18 +129,28 @@
 				})
 			},
 			getProjectList() {
-				this.list=[]
-				service.getregulatorBoxList({name:this.name,code:this.code,administrativeOffice:this.administrativeOffice}).then(res => {
+				//this.list=[]
+				service.getregulatorBoxList({inspector:this.userId,name:this.name,code:this.code,managementOffice:this.administrativeOffice,pageSize:10,pageNum:this.page}).then(res => {
 					console.log('getregulatorBoxList', res)
-					if (res.length == 0) {
+					if (res.rows.length == 0) {
 						this.$UTILS.showPrompt('暂无项目!')
 					}
-					this.list = res
+					this.total=res.total
+					if(res.total>this.page*10)
+					{
+						this.ReachBottom=true
+					}else
+					{
+						this.ReachBottom=false
+					}
+					this.list.push(...res.rows)
 				})
 			},
 			getUserName() {
 				service.getUserName().then(res => {
+					this.userId=res.id
 					this.civilPower = res.civilPower;
+					this.getProjectList();
 				})
 			},
 		},

pages/noLogin/repair.vue

@@ -1,730 +0,0 @@
-<template>
-	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
-		<view style="padding-top: 100rpx;">
-			<view class="align-items">
-				<back></back>
-			</view>
-			<view class="project-content">
-				<view class="font-forty-eight blue">
-					项目名称：{{name}}
-				</view>
-				<view class="font-forty-eight blue">
-					项目地址：{{address}}
-				</view>
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('district')">
-					{{districtName ? districtName :'选择行政区区'}}
-				</view>
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-					{{house ? house : '选择小区'}}
-				</view>
-
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
-					{{bulid ? bulid : '选择楼宇'}}
-				</view>
-
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('danyuan')">
-					{{unit ? unit : '选择单元'}}
-				</view>
-
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('menpai')">
-					{{houseNumber ? houseNumber  : '选择门牌'}}
-				</view>
-			</view>
-			<view>
-				<view class="font-fifty-six SourceHanSansCN choose" @click="openQualified()">
-					{{isqualified ? isqualified : '是否'+(id=='004'?'合格':'维修')}}
-					<u-select v-model="qualifiedShow" :list="qualifiedList" @confirm="qualifiedConfirm()"></u-select>
-				</view>
-			</view>
-			<view class="upload">
-				<text class="font-forty SourceHanSansCN">备注：</text>
-				<textarea value="" placeholder="请输入备注" v-model="remark" />
-			</view>
-			<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()"></image>
-				<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
-					<view v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ">
-						<image :src="item" mode="" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"
-							@click="showPhoto(index)">
-						</image>
-					</view>
-					<view v-else>
-						<video :src="item" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
-					</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"></u-icon>
-					</view>
-				</view>
-			</view>
-			<view class="project background-color1 font-sixty-four white" @click="updatePhoto()">
-				确定上传
-			</view>
-		</view>
-		<u-popup v-model="pop" mode="bottom" height="1000rpx">
-			<view style="margin: 20rpx;">
-				<u-search v-show="inputShow" placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}"
-					@custom="searchinfo(selectType)"></u-search>
-			</view>
-			<view>
-				<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-					<view v-for="(item,index) in chooseHouseList" :key="item.value">
-						<view :class="current === index ? 'active' : '' " style="color: #000000;font-size: 56rpx;"
-							@click="active(item,index)">
-							{{item.label}}
-						</view>
-					</view>
-				</scroll-view>
-				<view class="">
-					<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
-				</view>
-				<view class="">
-					<button type="default" @click="pop = false;" class="font-fifty-six">取消</button>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				action: this.$HTTP.webUrl + `/obs`,
-				headers: {
-					MAuthorization: "wxBearer " + uni.getStorageSync('token')
-				},
-				url: [],
-				id: 0,
-				name: '',
-				address: '',
-				photo: [],
-				uploading: false,
-				imgArr: [],
-				progress: 0, //图片或视频上传百分比
-				inputShow: false,
-				districtId: 0,
-				districtName: '选择行政区',
-				pop: false,
-				housename: '',
-				houseid: 0,
-				buildid: 0,
-				unitid: 0,
-				numberid: 0,
-				houseShow: false,
-				current: -1,
-				chooseHouseList: [],
-				house: '选择小区',
-				bulid: '选择楼宇',
-				unit: '选择单元',
-				houseNumber: '选择门牌',
-				serviceType: '',
-				housedata: 0,
-				remark: '',
-				keyword: '',
-				loading: false,
-
-				isqualified: null,
-				qualifiedShow: false,
-				qualifiedList: [{
-						value: '是',
-						label: '是',
-					},
-					{
-						value: '否',
-						label: '否',
-					}
-				]
-			}
-		},
-		onLoad(e) {
-			console.log(e)
-			this.id = e.id;
-			this.name = e.name;
-			this.address = e.address
-			// this.getEngineDetail();
-		},
-		methods: {
-			showPhoto(index) {
-				uni.previewImage({
-					current: index,
-					urls: this.imgArr,
-				})
-			},
-			updatePhoto() {
-				if (this.housedata == 0 || this.housedata == null) {
-					this.$UTILS.showPrompt('请选择门牌号!')
-					return
-				}
-				if (this.isqualified == null || this.isqualified == '') {
-					this.$UTILS.showPrompt('请选择是否合格!')
-					return
-				}
-				if (this.imgArr.length <= 0) {
-					this.$UTILS.showPrompt('请上传照片!')
-					return
-				}
-				if (this.loading == false) {
-					this.$UTILS.showPrompt('照片或视频未上传完毕，无法提交！')
-					return
-				}
-				let param = {
-					// photo: this.imgArr,
-					picUrl: this.imgArr,
-					serviceType: this.id,
-					houseId: this.housedata,
-					remark: this.remark,
-					whether: this.isqualified,
-					//小区
-					areaId: this.houseid,
-					areaName: this.house,
-					//楼宇
-					buildingId: this.buildid,
-					buildingName: this.bulid,
-					//单元
-					unitId: this.unitid,
-					unitName: this.unit,
-					//房间
-					houseName: this.houseNumber,
-				}
-				console.log('param', param)
-				// this.$UTILS.showPrompt('提交成功！')
-				service.submitOrder(param).then(res => {
-					this.$UTILS.showPrompt('提交成功！')
-					this.houseNumber = null;
-					this.imgArr = null;
-				}).catch(e => {
-					this.$UTILS.showPrompt('提交失败！')
-					console.error(e)
-				})
-
-			},
-			// //获取小区
-			// getArea() {
-			// 	service.getArea().then(res => {
-			// 		this.chooseHouseList = [];
-			// 		res.forEach((item, index) => {
-			// 			this.chooseHouseList.push({
-			// 				value: item.id,
-			// 				label: item.name,
-			// 				selectType: 'xiaoqu'
-			// 			})
-			// 		})
-			// 	})
-			// },
-			searchinfo(selectType) {
-				if (selectType == 'xiaoqu') {
-					console.log('ssss', this.selectType)
-					service.getArea({
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'louyu') {
-					console.log('ssss', this.selectType)
-					service.getBuilding({
-						areaId: this.houseid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'danyuan') {
-					console.log('ssss', this.selectType)
-					service.getUnit({
-						buildingId: this.buildid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-					this.keyword = '';
-				} else if (selectType == 'menpai') {
-					console.log('ssss', this.selectType)
-					service.getAllHouse({
-						unitId: this.unitid,
-						name: this.keyword
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-					this.keyword = '';
-				}
-
-			},
-			openHouse(selectType) {
-				if (selectType === 'district') {
-					this.inputShow = false
-					//选择行政区
-					this.housename = null;
-					this.selectType = 'district'
-					service.getDistrict().then(res => {
-						// console.log(res);
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.dictValue,
-								label: item.dictLabel,
-								selectType: 'district'
-							})
-						})
-					})
-				} else if (selectType === 'xiaoqu') {
-					this.inputShow = true
-					//选择小区
-					this.selectType = 'xiaoqu'
-					service.getArea({
-						district: this.districtId
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach((item, index) => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-				} else if (selectType === 'louyu') {
-					this.inputShow = true
-					//选择楼宇
-					this.selectType = 'louyu'
-					this.housename = null;
-					this.buildid = 0;
-					service.getBuilding({
-						areaId: this.houseid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-				} else if (selectType === 'danyuan') {
-					this.inputShow = true
-					//选择单元
-					this.selectType = 'danyuan'
-					this.housename = null;
-					this.unitid = 0;
-					service.getUnit({
-						buildingId: this.buildid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-				} else if (selectType === 'menpai') {
-					this.inputShow = true
-					//选择门牌
-					console.log('menpai', this.numberid)
-					this.selectType = 'menpai'
-					this.housename = null;
-					this.numberid = null;
-					service.getAllHouse({
-						unitId: this.unitid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-				}
-				this.pop = !this.pop;
-			},
-			active(item, index) {
-				this.current = index;
-				this.housename = item.label;
-				if (item.selectType == 'district') { //行政区
-					this.districtId = item.value;
-				} else if (item.selectType == 'xiaoqu') {
-					this.houseid = item.value;
-				} else if (item.selectType == 'louyu') {
-					this.buildid = item.value;
-				} else if (item.selectType == 'danyuan') {
-					this.unitid = item.value;
-				} else if (item.selectType == 'menpai') {
-					this.numberid = item.value
-				}
-				this.selectType = item.selectType;
-			},
-			search(selectType) {
-				if (selectType == 'district') {
-					this.districtName = this.housename;
-					service.getArea({
-						district: this.districtId
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.dictValue,
-								label: item.dictLabel,
-								selectType: 'xiaoqu'
-							})
-						})
-					})
-					this.current = -1;
-					this.house = null;
-					this.bulid = null;
-					this.unit = null;
-					this.houseNumber = null;
-
-					this.houseid = 0;
-					this.buildid = 0;
-					this.unitid = 0;
-					this.housedata = 0;
-
-
-				} else if (selectType == 'xiaoqu') {
-					this.house = this.housename;
-					service.getBuilding({
-						areaId: this.houseid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'louyu'
-							})
-						})
-					})
-					this.current = -1;
-					this.bulid = null;
-					this.unit = null;
-					this.houseNumber = null;
-
-					this.buildid = 0;
-					this.unitid = 0;
-					this.housedata = 0;
-				} else if (selectType == 'louyu') {
-					this.bulid = this.housename;
-					service.getUnit({
-						buildingId: this.buildid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'danyuan'
-							})
-						})
-					})
-					this.unit = null;
-					this.houseNumber = null;
-					this.current = -1;
-
-					this.unitid = 0;
-					this.housedata = 0;
-				} else if (selectType == 'danyuan') {
-					this.unit = this.housename;
-					service.getAllHouse({
-						unitId: this.unitid
-					}).then(res => {
-						this.chooseHouseList = [];
-						res.forEach(item => {
-							this.chooseHouseList.push({
-								value: item.id,
-								label: item.name,
-								selectType: 'menpai'
-							})
-						})
-					})
-					this.houseNumber = null;
-					this.current = -1;
-					this.housedata = 0;
-
-				} else if (selectType == 'menpai') {
-					this.houseNumber = this.housename;
-					this.housedata = this.numberid;
-					// console.log('this.housedata', this.housedata)
-					this.current = -1;
-				}
-				this.pop = false;
-			},
-			// getEngineDetail() {
-			// 	service.getEngineDetail({
-			// 		id: this.id
-			// 	}).then(res => {
-			// 		this.photo = res.photo
-			// 	})
-			// },
-			choose() {
-				let _this = this;
-				uni.showActionSheet({
-					title: '上传',
-					itemList: ['图片', '视频'],
-					success: (res) => {
-						// console.log(res)
-						if (res.tapIndex == 0) {
-							this.chooseimage()
-						} else {
-							this.choosevideo()
-						}
-					}
-				})
-			},
-			chooseimage() {
-				console.log('图片')
-				let _this = this;
-				uni.chooseImage({
-					sizeType: ['album', 'camera'],
-					success(resp) {
-						console.log('res--uni.chooseMedia', resp);
-						resp.tempFiles.forEach((item, index) => {
-							const task = uni.uploadFile({
-								url: _this.$HTTP.webUrl + `/obs`,
-								filePath: item.path,
-								name: 'file',
-								formData: {},
-								header: _this.headers,
-								success: res => {
-									// 判断是否json字符串，将其转为json格式
-									let data = _this.$u.test.jsonString(res
-										.data) ? JSON.parse(res.data) : res.data;
-									if (![200, 201, 204].includes(res.statusCode)) {
-										// this.uploadError(index, data);
-										_this.$UTILS.showPrompt('上传失败！')
-									} else {
-										// 上传成功
-										// this.lists[index].response = data;
-										// this.lists[index].progress = 100;
-										// this.lists[index].error = false;
-										// this.$emit('on-success', data, index, this.lists, this
-										// 	.index);
-										if (_this.progress === 100) {
-											// console.log('_this.progress', _this.progress)
-											// console.log('data----', data)
-											// console.log('res--', res)
-											_this.imgArr.push(data.data.url)
-											// console.log('imgArr', _this.imgArr)
-											_this.$UTILS.showPrompt('上传成功！')
-										}
-									}
-								},
-								fail: e => {
-									_this.$UTILS.showPrompt('上传失败！')
-									this.uploadError(index, e);
-								},
-								complete: res => {
-									_this.uploading = false;
-									// _this.uploadFile(index + 1);
-									// this.$emit('on-change', res, index, this.lists, this
-									// .index);
-								}
-							});
-							task.onProgressUpdate(res => {
-								// if (res.progress > 0) {
-								// 	this.lists[index].progress = res.progress;
-								// 	this.$emit('on-progress', res, index, this.lists, this.index);
-								// }
-								_this.progress = res.progress;
-								console.log('onProgressUpdate', res)
-								uni.showLoading({
-									title: '上传中'
-								})
-								if (_this.progress != 100) {
-									_this.loading = false
-									console.log('_this.loading false', _this.loading)
-								} else {
-									_this.loading = true
-									console.log('_this.loading true', _this.loading)
-								}
-							});
-						})
-					},
-				})
-			},
-			choosevideo() {
-				let _this = this;
-				console.log('视频')
-				uni.chooseVideo({
-					sourceType: ['album', 'camera'],
-					maxDuration: 30,
-					success(resp) {
-						const task = uni.uploadFile({
-							url: _this.$HTTP.webUrl + `/obs`,
-							filePath: resp.tempFilePath,
-							name: 'file',
-							formData: {},
-							header: _this.headers,
-							success: res => {
-								// 判断是否json字符串，将其转为json格式
-								let data = _this.$u.test.jsonString(res
-									.data) ? JSON.parse(res.data) : res.data;
-								if (![200, 201, 204].includes(res.statusCode)) {
-									this.uploadError(index, data);
-								} else {
-									// 上传成功
-									// this.lists[index].response = data;
-									// this.lists[index].progress = 100;
-									// this.lists[index].error = false;
-									// this.$emit('on-success', data, index, this.lists, this
-									// 	.index);	
-									if (_this.progress === 100) {
-										console.log('_this.progress', _this.progress)
-										console.log('data----', data)
-										console.log('res--', res)
-										_this.imgArr.push(data.data.url)
-										console.log('imgArr', _this.imgArr)
-										_this.$UTILS.showPrompt('上传成功！')
-									}
-								}
-							},
-							fail: e => {
-								_this.$UTILS.showPrompt('上传失败！')
-								this.uploadError(index, e);
-							},
-							complete: res => {
-								uni.hideLoading();
-								_this.uploading = false;
-								// _this.uploadFile(index + 1);
-								// this.$emit('on-change', res, index, this.lists, this
-								// .index);
-							}
-						});
-						task.onProgressUpdate(res => {
-							// if (res.progress > 0) {
-							// 	this.lists[index].progress = res.progress;
-							// 	this.$emit('on-progress', res, index, this.lists, this.index);
-							// }
-							_this.progress = res.progress;
-							console.log('onProgressUpdate', res)
-							uni.showLoading({
-								title: '上传中'
-							})
-							if (_this.progress != 100) {
-								_this.loading = false
-								console.log('_this.loading false', _this.loading)
-							} else {
-								_this.loading = true
-								console.log('_this.loading true', _this.loading)
-							}
-						});
-
-					},
-				})
-			},
-			remove(index) {
-				uni.showModal({
-					title: '提示',
-					content: '是否删除该图片或视频？',
-					success: (res) => {
-						if (res.confirm) {
-							this.imgArr.splice(index, 1)
-							console.log('this.imgarr', this.imgArr)
-						}
-					}
-				})
-			},
-			openQualified() {
-				this.qualifiedShow = !this.qualifiedShow;
-			},
-			qualifiedConfirm(e) {
-				this.isqualified = e[0].value;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.background {
-		z-index: -1;
-		position: fixed;
-		width: 100%;
-		height: 100%;
-		background-size: 100% 100%;
-	}
-
-	.choose {
-		text-align: center;
-		padding: 20rpx;
-		margin: 30rpx;
-		color: #FFFFFF;
-		background: #43CEB1;
-		border-radius: 64rpx;
-	}
-
-	.upload {
-		margin: 30rpx;
-		padding: 30rpx 20rpx;
-		border: 2rpx solid #3857F3;
-		border-radius: 48rpx;
-	}
-
-	.active {
-		background-color: #1890FF;
-	}
-
-	.project-content {
-		border: 4rpx solid #3857F3;
-		margin: 80rpx 55rpx 30rpx;
-		padding: 30rpx 20rpx;
-		border-radius: 48rpx;
-	}
-
-	.project {
-		border-radius: 72rpx;
-		padding: 25rpx 0;
-		text-align: center;
-		margin: 60rpx 55rpx 0;
-	}
-
-	.project-img {
-		width: 300rpx;
-		height: 168rpx;
-		margin: 20rpx auto;
-	}
-</style>

pages/noLogin/roadSection/roadSection.vue

@@ -1,6 +1,6 @@
 <template>
 <view>
-<image src="/static/icon/background-from.png" class="background"></image>
+<image src="https://121.37.40.217/app/images/background-from.png" class="background"></image>
 <view class="project-content">
 	<u-form :model="form" :rules="rules" ref="form">
 		<u-form-item label="路段名称" borderBottom ref="item1" labelWidth="140">
@@ -29,7 +29,7 @@
 			<view>巡检照片</view>
 			<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=""
+				<image src="https://121.37.40.217/app/images/chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
@@ -89,7 +89,9 @@ data() {
 		imgArr: [],
 		imgymxs: [],
 		progress: 0, //图片或视频上传百分比
-		form: {},
+		form: {
+			findProblem:1
+		},
 		typelist: [],
 		causesOfFamageLabel: null,
 		dictlist: ['find_problem'],
@@ -218,7 +220,7 @@ methods: {
 			// 		url: '/pages/index/index'
 			// 	})
 			// }, 2000)
-			this.form={}
+			this.form={findProblem:1}
 			// this.buildingName=''
 			this.imgArr=[]
 			this.imgymxs=[]

pages/noLogin/typeList.vue

@@ -1,11 +1,11 @@
 <template>
 	<view>
-		<image src="/static/icon/backgroundgz.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images//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()" style="color: #fff; font-size: 36rpx;margin: 0 40rpx 0 0;"></u-icon>
-				<image src="/static/icon/sgglpt.png" mode="" class="header-title" style="width: 300rpx;height: 36rpx;"></image>
+				<image src="https://121.37.40.217/app/images//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;">
 				{{name}} !欢迎你登录本应用
@@ -193,6 +193,12 @@
 						})
 					
 					}
+					else if(url.dictValue=='2')
+					{
+						uni.navigateTo({
+							url: `/pages/noLogin/regulatorBoxList?value=${url.dictValue}`
+						})
+					}
 					else
 					{
 
@@ -245,15 +251,15 @@
 						item.visable = true
 						if(item.dictValue==0)
 						{
-							item.image='../../static/icon/qxwx.png'
+							item.image='https://121.37.40.217/app/images/qxwx.png'
 						}else if(item.dictValue==1){
-							item.image='../../static/icon/xxdy.png'
+							item.image='https://121.37.40.217/app/images/xxdy.png'
 						}else if (item.dictValue==6)
 						{
-							item.image='../../static/icon/kggs.png'
+							item.image='https://121.37.40.217/app/images/kggs.png'
 						}
 						else if (item.dictValue==6 || item.dictValue == 8){
-							item.image='../../static/icon/kggs.png'
+							item.image='https://121.37.40.217/app/images/kggs.png'
 							item.visable = false
 						}
 						this.list1.push(item)
@@ -262,31 +268,31 @@
 						dictLabel: '调压箱管理',
 						dictValue: '2',
 						visable: false,
-						image:'../../static/icon/xxdy.png'
+						image:'https://121.37.40.217/app/images/xxdy.png'
 					})
 					this.list1.push({
 						dictLabel: '庭院网管',
 						dictValue: '3',
 						visable: false,
-						image:'../../static/icon/tywg.png'
+						image:'https://121.37.40.217/app/images/tywg.png'
 					})
 					this.list1.push({
 						dictLabel: '阀井巡查',
 						dictValue: '4',
 						visable: false,
-						image:'../../static/icon/jsz.png'
+						image:'https://121.37.40.217/app/images/fajing.png'
 					})
 					this.list1.push({
 						dictLabel: '路段巡查',
 						dictValue: '7',
 						visable: false,
-						image:'../../static/icon/kggs.png'
+						image:'https://121.37.40.217/app/images/luduan.png'
 					})
 					this.list1.push({
 						dictLabel: '输配站巡查',
 						dictValue: '8',
 						visable: false,
-						image:'../../static/icon/kggs.png'
+						image:'https://121.37.40.217/app/images/spzxc.png'
 					})
 					this.list = this.list1
 					console.log(this.list)

pages/noLogin/unitlist.vue

@@ -1,7 +1,7 @@
 
 <template>
 	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
+		<image src="https://121.37.40.217/app/images//background.png" mode="" class="background"></image>
 		<view class="" style="padding-top: 90rpx;">
 			<back></back>
 		</view>

pages/noLogin/uploadProject.vue

@@ -1,311 +0,0 @@
-<template>
-	<view>
-		<image src="/static/icon/background.png" mode="" class="background"></image>
-		<view style="padding-top: 100rpx;">
-			<view class="align-items">
-				<back></back>
-			</view>
-			<view class="project-content">
-				<view class="font-forty-eight blue">
-					项目名称：{{name}}
-				</view>
-				<view class="font-forty-eight blue">
-					项目地址：{{address}}
-				</view>
-			</view>
-			<view v-if="photo != null && photo.length >= 1">
-				<view class="flex" v-for="(item,index) in photo" :key="index">
-					<image :src="item" mode="" class="project-img" @click="showPhotos(index)" v-if="item.substring(item.length - 3) == 'jpg'"></image>
-					<image :src="item" mode="" class="project-img" @click="showPhotos(index)" v-else-if="item.substring(item.length - 3) == 'JPG'"></image>
-					<image :src="item" mode="" class="project-img" @click="showPhotos(index)" v-else-if="item.substring(item.length - 3) == 'png'"></image>
-					<image :src="item" mode="" class="project-img" @click="showPhotos(index)" v-else-if="item.substring(item.length - 3) == 'PNG'"></image>
-					<image :src="item" mode="" class="project-img" @click="showPhotos(index)" v-else-if="item.substring(item.length - 4) == 'jpeg'"></image>
-					<image :src="item" mode="" class="project-img" @click="showPhotos(index)" v-else-if="item.substring(item.length - 4) == 'JPEG'"></image>
-					<video :src="item" controls v-else class="project-img"></video>
-				</view>
-			</view>
-			<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()"></image>
-				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
-					<view v-if="item.type == 'image'">
-						<image :src="item.url" mode=""
-							style="width: 190rpx; height: 190rpx; margin: 0 20rpx;" @click="showPhoto(index)">
-						</image>
-					</view>
-					<view v-else>
-						<video :src="item"
-							style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
-					</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" ></u-icon> 
-					</view>
-				</view>
-			</view>
-			<view class="project background-color1 font-sixty-four white" @click="updatePhoto()">
-				保存数据
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import service from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				action: this.$HTTP.webUrl + `/obs`,
-				headers: {
-					MAuthorization: "wxBearer " + uni.getStorageSync('token')
-				},
-				url: [],
-				id: 0,
-				name: '',
-				address: '',
-				photo: [],
-
-				uploading: false,
-				imgArr: [],
-				imgymxs: [],
-				progress: 0 ,//图片或视频上传百分比
-			}
-		},
-		onLoad(e) {
-			console.log(e)
-			this.id = e.id;
-			this.name = e.name;
-			this.address = e.address
-			this.getEngineDetail();
-		},
-		methods: {
-			updatePhoto() {
-				if (this.imgArr.length > 0) {
-					
-					service.updateEnginePhoto({
-						photo: this.imgArr,
-						id: this.id
-					}).then(res => {
-						this.$UTILS.showPrompt('提交成功!')
-						setTimeout(function() {
-							uni.navigateTo({
-								url: '/pages/noLogin/typeList'
-							})
-						}, 1000)
-					}).catch(e => {
-						this.$UTILS.showPrompt('提交失败！')
-					})
-				} else {
-					this.$UTILS.showPrompt('请先选择照片!')
-				}
-			},
-			showPhoto(index){
-				uni.previewImage({
-					current:index,
-					urls:this.imgArr,
-				})
-			},
-			showPhotos(index){
-				uni.previewImage({
-					current:index,
-					urls:this.photo,
-				})
-			},
-			getEngineDetail() {
-				service.getEngineDetail({
-					id: this.id
-				}).then(res => {
-					this.photo = res.photo
-				})
-			},
-			choose() {
-				let _this = this;
-				uni.showActionSheet({
-					title: '上传',
-					itemList: ['图片', '视频'],
-					success: (res) => {
-						// console.log(res)
-						if (res.tapIndex == 0) {
-							this.chooseimage()
-						} else {
-							this.choosevideo()
-						}
-					}
-				})
-			},
-			chooseimage() {
-				console.log('图片')
-				let _this = this;
-				uni.chooseImage({
-					sizeType: ['album', 'camera'],
-					success(resp) {
-						console.log('res--uni.chooseMedia', resp);
-						resp.tempFiles.forEach((item, index) => {
-							const task = uni.uploadFile({
-								url: _this.$HTTP.webUrl + `/obs`,
-								filePath: item.path,
-								name: 'file',
-								formData: {},
-								header: _this.headers,
-								success: res => {
-									// 判断是否json字符串，将其转为json格式
-									let data = _this.$u.test.jsonString(res
-										.data) ? JSON.parse(res.data) : res.data;
-									if (![200, 201, 204].includes(res.statusCode)) {
-										// this.uploadError(index, data);
-										_this.$UTILS.showPrompt('选取失败！')
-									} else {
-										// 上传成功
-										// this.lists[index].response = data;
-										// this.lists[index].progress = 100;
-										// this.lists[index].error = false;
-										// this.$emit('on-success', data, index, this.lists, this
-										// 	.index);
-										if (_this.progress === 100) {
-											// console.log('_this.progress', _this.progress)
-											// console.log('data----', data)
-											// console.log('res--', res)
-											_this.imgymxs.push({url:data.data.url,type:'image'})
-											_this.imgArr.push(data.data.url)
-											// console.log('imgArr', _this.imgArr)
-											_this.$UTILS.showPrompt('选取成功！')
-										}
-									}
-								},
-								fail: e => {
-									_this.$UTILS.showPrompt('选取失败！')
-									this.uploadError(index, e);
-								},
-								complete: res => {
-									_this.uploading = false;
-									// _this.uploadFile(index + 1);
-									// this.$emit('on-change', res, index, this.lists, this
-									// .index);
-								}
-							});
-							task.onProgressUpdate(res => {
-								// if (res.progress > 0) {
-								// 	this.lists[index].progress = res.progress;
-								// 	this.$emit('on-progress', res, index, this.lists, this.index);
-								// }
-								_this.progress = res.progress;
-								console.log('onProgressUpdate', res)
-								uni.showLoading({
-									title: '选取中'
-								})
-							});
-						})
-					},
-				})
-			},
-			choosevideo() {
-				let _this = this;
-				console.log('视频')
-				uni.chooseVideo({
-					sourceType: ['album','camera'],
-					maxDuration: 30,
-					success(resp) {
-						const task = uni.uploadFile({
-							url: _this.$HTTP.webUrl + `/obs`,
-							filePath: resp.tempFilePath,
-							name: 'file',
-							formData: {},
-							header: _this.headers,
-							success: res => {
-								// 判断是否json字符串，将其转为json格式
-								let data = _this.$u.test.jsonString(res
-									.data) ? JSON.parse(res.data) : res.data;
-								if (![200, 201, 204].includes(res.statusCode)) {
-									this.uploadError(index, data);
-								} else {
-									// 上传成功
-									// this.lists[index].response = data;
-									// this.lists[index].progress = 100;
-									// this.lists[index].error = false;
-									// this.$emit('on-success', data, index, this.lists, this
-									// 	.index);	
-									if (_this.progress === 100) {
-										console.log('_this.progress', _this.progress)
-										console.log('data----', data)
-										console.log('res--', res)
-										// _this.imgArr.push(data.data.url)
-										_this.imgymxs.push({url:data.data.url,type:'video'})
-										_this.imgArr.push(data.data.url)
-										console.log('imgArr', _this.imgArr)
-										_this.$UTILS.showPrompt('选取成功！')
-									} 
-								}
-							},
-							fail: e => {
-								_this.$UTILS.showPrompt('选取失败！')
-								this.uploadError(index, e);
-							},
-							complete: res => {
-								uni.hideLoading();
-								_this.uploading = false;
-								// _this.uploadFile(index + 1);
-								// this.$emit('on-change', res, index, this.lists, this
-								// .index);
-							}
-						});
-						task.onProgressUpdate(res => {
-							// if (res.progress > 0) {
-							// 	this.lists[index].progress = res.progress;
-							// 	this.$emit('on-progress', res, index, this.lists, this.index);
-							// }
-							_this.progress = res.progress;
-							console.log('onProgressUpdate', res)
-							uni.showLoading({
-								title: '选取中'
-							})
-						});
-
-					},
-				})
-			},
-			remove(index) {
-				uni.showModal({
-					title: '提示',
-					content: '是否删除该图片或视频？',
-					success: (res) => {
-						if (res.confirm) {
-							this.imgArr.splice(index, 1);
-							this.imgymxs.splice(index, 1);
-							console.log('this.imgarr',this.imgArr)
-						}
-					}
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.background {
-		z-index: -1;
-		position: fixed;
-		width: 100%;
-		height: 100%;
-		background-size: 100% 100%;
-	}
-
-	.project-content {
-		border: 4rpx solid #3857F3;
-		margin: 80rpx 55rpx 30rpx;
-		padding: 30rpx 20rpx;
-		border-radius: 48rpx;
-	}
-
-	.project {
-		border-radius: 72rpx;
-		padding: 25rpx 0;
-		text-align: center;
-		margin: 60rpx 55rpx 0;
-	}
-
-	.project-img {
-		width: 300rpx;
-		height: 168rpx;
-		margin: 20rpx auto;
-	}
-</style>

pages/noLogin/valveWellInspection/valveWellInspection.vue

@@ -1,6 +1,6 @@
 <template>
 <view>
-<image src="/static/icon/background-from.png" class="background"></image>
+<image src="https://121.37.40.217/app/images/background-from.png" class="background"></image>
 <view class="project-content">
 	<u-form :model="form" :rules="rules" ref="form">
 		<u-form-item label="阀井名称" borderBottom ref="item1" labelWidth="140">
@@ -32,7 +32,7 @@
 			<view>巡检照片</view>
 			<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=""
+				<image src="https://121.37.40.217/app/images/chooseimg.png" mode=""
 					style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()" v-if="type!=1">
 				</image>
 				<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
@@ -93,7 +93,7 @@ data() {
 		imgArr: [],
 		imgymxs: [],
 		progress: 0, //图片或视频上传百分比
-		form: {},
+		form: {discoverProblems:1},
 		typelist: [],
 		causesOfFamageLabel: null,
 		dictlist: ['find_problem'],
@@ -231,7 +231,7 @@ methods: {
 			// 		url: '/pages/index/index'
 			// 	})
 			// }, 2000)
-			this.form={}
+			this.form={discoverProblems:1}
 			this.form.valveWellName=this.valveWellName
 			this.form.position=this.position
 			// this.buildingName=''