完成异常记录

common/apiurl.js

@@ -29,6 +29,18 @@ const apiurl = {
 	payeeReport:'/payeeexcption',
 	//收费员问题详情
 	payeeReportDetail:'/payeeexcption/getById',
+	//设备异常处理设备数据接口
+	processDevice:'/roadspace/type/process_device',
+	//地磁设备异常处理设备数据接口
+	processDeviceGeo:'/roadspace/type/process_device_geo',
+	//车位锁设备异常处理设备数据接口
+	processDeviceLock:'/roadspace/type/process_device_lock',
+	//停车场设备异常处理设备数据接口
+	processDeviceRoom:'/roadspace/type/process_device_room',
+	//设备异常损坏类型数据接口
+	damageType:'/roadspace/type/damage_type',
+	//设备异常处理方式数据接口
+	processType:'/roadspace/type/process_type',
 	//查询巡检员打卡路段信息
 	punchInfoUrl:'/officerpunch/punchInfo/',
 	//巡检员打卡签到
@@ -49,6 +61,8 @@ const apiurl = {
 	deviceLogUrl:'/roadspace/selectDeviceLog',
 	//设备异常上报
 	deviceexcptionprocessUrl:'/deviceexcptionprocess',
+	//异常记录详情
+	excptionById:'/deviceexcptionprocess/getExcptionById',
 	//心跳是否有车状态数据接口
 	placeStatusUrl:'/roadspace/type/place_status',
 	//道闸设备列表

common/http.api.js

@@ -30,6 +30,8 @@ const install = (Vue, vm) => {
 	let findRoadSpaceVoById = (params = {}) => vm.$u.get(apiurl.findRoadSpaceVoByIdUrl,params);
 	let deviceLog = (params = {}) => vm.$u.get(apiurl.deviceLogUrl,params);
 	let deviceexcptionprocess = (params = {}) => vm.$u.post(apiurl.deviceexcptionprocessUrl, params);
+	let editDeviceexcptionprocess = (params = {}) => vm.$u.put(apiurl.deviceexcptionprocessUrl, params);
+	let getReportList = (params = {}) => vm.$u.get(apiurl.deviceexcptionprocessUrl, params);
 	let placeStatus = (params = {}) => vm.$u.get(apiurl.placeStatusUrl,params);
 	let selectParkDeviceList = (params = {}) => vm.$u.get(apiurl.selectParkDeviceListUrl,params);
 	let selectParkVehicleList = (params = {}) => vm.$u.get(apiurl.selectParkVehicleList,params);
@@ -42,6 +44,13 @@ const install = (Vue, vm) => {
 	let getUnreadMsgTotal = (params = {}) => vm.$u.get(apiurl.getUnreadMsgTotalUrl,params);
 	let deviceLockStatus = (params = {}) => vm.$u.get(apiurl.deviceLockStatusUrl,params);
 	let payeeList = (params = {}) => vm.$u.get(apiurl.payeeList,params);
+	let processDevice = (params = {}) => vm.$u.get(apiurl.processDevice,params);
+	let processDeviceGeo = (params = {}) => vm.$u.get(apiurl.processDeviceGeo,params);
+	let processDeviceLock = (params = {}) => vm.$u.get(apiurl.processDeviceLock,params);
+	let processDeviceRoom = (params = {}) => vm.$u.get(apiurl.processDeviceRoom,params);
+	let damageType = (params = {}) => vm.$u.get(apiurl.damageType,params);
+	let processType = (params = {}) => vm.$u.get(apiurl.processType,params);
+	let excptionById = (params = {}) => vm.$u.get(apiurl.excptionById,params);
 	
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
@@ -71,6 +80,8 @@ const install = (Vue, vm) => {
 		findRoadSpaceVoById,
 		deviceLog,
 		deviceexcptionprocess,
+		editDeviceexcptionprocess,
+		getReportList,
 		placeStatus,
 		selectParkDeviceList,
 		selectParkVehicleList,
@@ -82,7 +93,14 @@ const install = (Vue, vm) => {
 		updateInspecMsgStatus,
 		getUnreadMsgTotal,
 		deviceLockStatus,
-		payeeList
+		payeeList,
+		processDevice,
+		processDeviceGeo,
+		processDeviceLock,
+		processDeviceRoom,
+		damageType,
+		processType,
+		excptionById,
 	};
 }
 

pages.json

@@ -138,6 +138,20 @@
 				"navigationBarTitleText": "重置密码"
 			}
 		},
+		{
+			"path": "pages/center/reportList/reportList",
+			"style": {
+				"navigationStyle":"custom",
+				"navigationBarTitleText": "异常记录"
+			}
+		},
+		{
+			"path": "pages/center/reportList/reportDetails",
+			"style": {
+				"navigationStyle":"custom",
+				"navigationBarTitleText": "异常记录详情"
+			}
+		},
 		{
 			"path": "pages/deviceList/deviceList",
 			"style": {

pages/center/index.vue

@@ -10,6 +10,15 @@
 			</view>
 		</view>
 		<view class="feature-list">
+			<view class="feature-item" @click="openPage('pages/center/reportList/reportList')">
+				<view class="feature-left">
+					<image src="../../static/img/icon-center-report.png" mode="widthFix"></image>
+					异常记录
+				</view>
+				<view class="feature-right">
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
 			<view class="feature-item" @click="openPage('pages/center/resetPass/resetPass')">
 				<view class="feature-left">
 					<image src="../../static/img/icon-center-mima.png" mode="widthFix"></image>

pages/center/reportList/reportDetails.vue

@@ -0,0 +1,117 @@
+<template>
+	<view>
+		<u-navbar
+		 :title="title" 
+		 title-color="#fff" 
+		 :custom-back="customBack" 
+		 :border-bottom="false" 
+		 back-icon-color="#CCE8FF" 
+		 :background="{background: 'linear-gradient(99deg, #7A4398 0%, #5A5DB9 100%)' }"></u-navbar>
+		<view class="base-info">
+			<view class="base-info-item u-flex u-row-between">
+				<view class=""><b>路段/停车场：</b>{{pageData.roadName}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>泊位号：</b>{{pageData.spaceNo}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>补充描述：</b>{{pageData.exceprionDes}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class="">
+					<b>图片：</b>
+					<view class="img-list">
+						<image class="img" @click="previewImage(index)" v-for="(item,index) in pageData.imgList" :src="item" mode="widthFix" :key="index"></image>
+					</view>
+				</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>处理设配：</b>{{pageData.processDeviceName}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>处理方式：</b>{{pageData.processTypeName}}</view>
+			</view>
+			<view class="base-info-item">
+				<view class=""><b>处理状态：</b>{{pageData.isProcess|filterIsProcess}}</view>
+			</view>
+		</view>
+		<view class="btn-wrap" v-if="pageData.isProcess!=1">
+			<u-button type="primary" @click="goReport">更新处理进度</u-button>
+		</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				title:'记录详情',
+				pageData:[],
+				id:'',
+				deviceId:'',
+				dataList:[],
+			}
+		},
+		onLoad(page){
+			this.id = page.id;
+			// this.deviceId = page.deviceId;
+		},
+		onShow(){
+			this.getReportDetail();
+		},
+		mounted() {
+		},
+		onReady() {
+			// this.$refs.uForm.setRules(this.rules);
+		},
+		methods:{
+			customBack(){
+				uni.navigateBack()
+			},
+			getReportDetail(){
+				this.$u.api.excptionById({id:this.id}).then(res=>{
+					if(res.code==200){
+						this.pageData = res.data;
+						// console.log('payeeReportDetail',res);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					console.log('res',res);
+				}).catch(err=>{
+					console.log('err',err);
+				})
+			},
+			previewImage(index){
+				uni.previewImage({
+					current: index,
+					urls: this.pageData.imgList
+				});
+			},
+			goReport(){
+				this.$u.route({
+				  url: '/pages/report/report',
+				  type:'navigateTo',
+					params:{
+						reportId:this.pageData.id,
+						deviceId:this.pageData.deviceId,
+						deviceType:this.pageData.deviceType,
+					}
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page{background: #F3F3F3;}
+</style>
+<style lang="scss" scoped>
+@import  '@/pages/report/report.scss';
+.btn-wrap{
+	margin: 80rpx 50rpx 24rpx;
+}
+</style>

pages/center/reportList/reportList.vue

@@ -0,0 +1,186 @@
+<template>
+	<view>
+		<u-navbar
+		 :title="title" 
+		 title-color="#fff" 
+		 :is-back="true"
+		 :custom-back="customBack" 
+		 :border-bottom="false" 
+		 back-icon-color="#CCE8FF" 
+		 :background="{background: 'linear-gradient(99deg, #7A4398 0%, #5A5DB9 100%)' }"></u-navbar>
+		<u-tabs :list="tabList" :is-scroll="false" height="108" bar-width="100" :current="tabCurrent" @change="tabChange"></u-tabs>
+		<!-- <u-gap height="20" bg-color="#F6F6F6"></u-gap> -->
+		<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?200:280" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<view class="report-list">
+				<view class="report-list-item u-m-b-24" :class="{'arrearage':item.vehicleNoStatus}" v-for="item in dataList" :key="item.id"
+				@click="goDetails(item)">
+					<view class="cell u-flex u-row-between">
+						<text>路段:{{item.roadName}}</text>
+						<text class="time">上报：{{$u.timeFormat(item.createTime, 'mm月dd日hh时MM分')}}</text>
+					</view>
+					<view class="cell u-flex u-row-between">
+						<text class="u-line-1">泊位号：{{item.spaceNo}}</text>
+						<text class="evaluate" 
+						:class="[{'evaluated0':item.isProcess==0,'evaluated1':item.isProcess==1,'evaluated2':item.isProcess==2}]">
+							{{item.isProcess|filterIsProcess}}
+						</text>
+					</view>
+					<view class="cell u-line-1">
+						异常详情：{{item.exceprionDes}}
+					</view>
+				</view>
+			</view>
+		</mescroll-uni>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default{
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components:{
+			
+		},
+		data(){
+			return{
+				roadName:'',
+				roadNo:'',
+				title:"异常记录",
+				tabCurrent:0,
+				breakStatus:'',
+				tabList:[
+					{name:'地磁',code:'1'},
+					{name:'车位锁',code:'2'},
+					{name:'停车场',code:'3'},
+				],
+				downOption:{
+					auto:false // 不自动加载 (mixin已处理第一个tab触发downCallback)
+				},
+				upOption:{
+					page: {
+						size: 10 // 每页数据的数量
+					},
+					auto:true,
+					// use:false,
+					noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+					empty:{
+						tip: '~ 暂无数据 ~', // 提示
+						// btnText: '去看看'
+					}
+				},
+				dataList:[],
+				deviceType:1,
+				
+			}
+		},
+		onLoad(page){
+			console.log('page',page);
+		},
+		onShow(){
+			
+		},
+		methods:{
+			customBack(){
+				uni.navigateBack()
+			},
+			openPage(path,id) {
+			  this.$u.route({
+			    url: path,
+				params:{
+					id:id
+				}
+			  })
+			},
+			goDetails(item){
+				this.$u.route({
+				  url: 'pages/center/reportList/reportDetails',
+					params:{
+						id:item.id,
+						deviceId:item.deviceId,
+						roadNo:this.roadNo,
+						roadName:this.roadName,
+						deviceType:this.deviceType,
+					}
+				})
+			},
+			// 切换菜单
+			tabChange(index) {
+				this.tabCurrent = index;
+				this.deviceType = this.tabList[index].code;
+				this.refresh()
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				// console.log('page',page);
+				let params ={
+					roadNo:this.roadNo,
+					deviceType:this.deviceType,//设备类型: 1-地磁 2-车位锁
+					pageNum:page.num,
+					pageSize:page.size
+				};
+				this.$u.api.getReportList(params).then(curPageData=>{
+					// console.log('word',word);
+					 console.log('curPageData',curPageData);
+					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+					this.mescroll.endSuccess(curPageData.data.total);
+					this.mescroll.endBySize(curPageData.data.rows.length, curPageData.data.total);
+					//设置列表数据
+					if(page.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					this.dataList=this.dataList.concat(curPageData.data.rows); //追加新数据
+					console.log('this.dataList',this.dataList);
+				}).catch(()=>{
+					console.log('catch');
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
+			//点击空布局按钮的回调
+			emptyClick(){
+				uni.showToast({
+					title:'点击了按钮,具体逻辑自行实现'
+				})
+			},
+			refresh(){
+				this.mescroll.resetUpScroll( );
+			}
+			
+		}
+	}
+</script>
+<style>
+	page{background-color: #F3F3F3;}
+</style>
+<style lang="scss" scoped>
+.report-list{
+	margin: 24rpx 0;
+	.report-list-item{
+		background-color: #fff;
+		margin:24rpx;
+		padding: 24rpx 30rpx;
+		border-radius: 13rpx;
+		font-size: 32rpx;
+		line-height: 45rpx;
+		color: #3A3A3A;
+		.cell{
+			& + .cell{
+				margin-top: 10rpx;
+			}
+		}
+		.time{
+			font-size: 26rpx;
+			color: #A7A7A7;
+		}
+		.evaluate{
+			color: #f00;
+			word-break: keep-all;
+			&.evaluated1{
+				color: #00AE44;
+			}
+			&.evaluated2{
+				color: #FFA400;
+			}
+		}
+	}
+	
+}
+</style>

pages/deviceList/deviceListType1/deviceInfo.vue

@@ -61,10 +61,17 @@
 				<u-form-item label="图片说明" :label-width="labelWidth" :border-bottom="false">
 					<u-upload ref="uploadRef" :action="action" max-count="3"></u-upload>
 				</u-form-item>
+				<u-form-item label="处理状态" :label-width="labelWidth" prop="status" :required="true">
+					<u-input @click="oneSelectOpen('status')" placeholder="请选择" v-model="form.status"
+						disabled />
+					<u-icon @click="oneSelectOpen('status')" color="#42494F" name="arrow-right"></u-icon>
+				</u-form-item>
 			</u-form>
 			<u-button type="primary" @click="submit" style="margin-top: 20vh;">提交</u-button>
 			</view>
 		</u-popup>
+		<!-- 单列下拉选择 -->
+		<u-select v-model="selectShow" :list="selectData" @confirm="selectConfirm"></u-select>
 	</view>
 </template>
 
@@ -124,6 +131,21 @@
 					],
 				},
 				placeStatus:[],
+				selectTag: '',
+				selectShow: false,
+				selectData: [],
+				listMap: {
+					status: [{
+						value: '0',
+						label: '未处理'
+					}, {
+						value: '1',
+						label: '部分处理'
+					}, {
+						value: '2',
+						label: '已处理'
+					}],
+				}
 			}
 		},
 		onLoad(page){
@@ -181,6 +203,35 @@
 					}
 				})
 			},
+			// 单列下拉选择框打开事件
+			oneSelectOpen(key) {
+				this.selectTag = key;
+				this.selectData = this.listMap[key];
+				this.selectShow = true
+				
+			},
+			selectConfirm(e) {
+				// console.log('selectConfirm',e);
+				// console.log('selectTag', this.selectTag);
+				switch (this.selectTag) {
+				 case 'status': //处理状态
+						console.log('处理状态',e);
+						this.form.status = e[0].label;
+						break;
+					case 'payWay': //结账方式
+						this.payWayLabel = e[0].label;
+						this.form.payWay = e[0].value;
+						this.$u.vuex('orderMap.payWay', e[0].value)
+						break;
+					case 'isInvoice': //是否开票
+						this.isInvoiceLabel = e[0].label;
+						this.form.isInvoice = e[0].value;
+						this.$u.vuex('orderMap.isInvoice', e[0].value)
+						break;
+					default:
+						// console.log('3', e);
+				}
+			},
 			findRoadSpaceVoById(){
 				this.$u.api.findRoadSpaceVoById({id:this.id}).then(res=>{
 					if(res.code==200){
@@ -229,10 +280,21 @@
 				})
 			},
 			handlepopupShow(){
-				this.popupShow = true;
-				this.$nextTick(() => {
-					this.$refs.uForm.setRules(this.rules)
+				this.$u.route({
+				  url: 'pages/report/report',
+					params:{
+						// id:this.id,
+						deviceId:this.pageData.deviceId,
+						roadNo:this.pageData.roadNo,
+						roadName:this.pageData.roadName,
+						deviceType:this.pageData.deviceType,
+					}
 				})
+				// 页面内上报
+				// this.popupShow = true;
+				// this.$nextTick(() => {
+				// 	this.$refs.uForm.setRules(this.rules)
+				// })
 			},
 			submit(){
 				let that = this;

pages/deviceList/deviceListType2/deviceInfo.vue

@@ -229,10 +229,21 @@
 				})
 			},
 			handlepopupShow(){
-				this.popupShow = true;
-				this.$nextTick(() => {
-					this.$refs.uForm.setRules(this.rules)
+				this.$u.route({
+				  url: 'pages/report/report',
+					params:{
+						id:this.id,
+						deviceId:this.pageData.deviceId,
+						roadNo:this.pageData.roadNo,
+						roadName:this.pageData.roadName,
+						deviceType:this.pageData.deviceType,
+					}
 				})
+				// 页面内上报
+				// this.popupShow = true;
+				// this.$nextTick(() => {
+				// 	this.$refs.uForm.setRules(this.rules)
+				// })
 			},
 			submit(){
 				let that = this;

pages/deviceList/deviceListType3/deviceInfo.vue

@@ -157,10 +157,21 @@
 				})
 			},
 			handlepopupShow(){
-				this.popupShow = true;
-				this.$nextTick(() => {
-					this.$refs.uForm.setRules(this.rules)
+				this.$u.route({
+				  url: 'pages/report/report',
+					params:{
+						id:this.id,
+						deviceId:this.pageData.deviceId,
+						roadNo:this.pageData.roadNo,
+						roadName:this.pageData.roadName,
+						deviceType:this.pageData.deviceType,
+					}
 				})
+				// 页面内上报
+				// this.popupShow = true;
+				// this.$nextTick(() => {
+				// 	this.$refs.uForm.setRules(this.rules)
+				// })
 			},
 			submit(){
 				let that = this;

pages/deviceList/deviceListType3/deviceListType3.vue

@@ -97,16 +97,14 @@
 		},
 		methods:{
 			customBack(){
-				this.$u.route({
-				  url: '/pages/deviceList/deviceList',
-				  type:'redirect',
-					params:{
-						param:this.deviceType
-					}
-				})
-				// uni.reLaunch({
-				//     url: '/pages/deviceList/deviceList'
-				// });
+				// this.$u.route({
+				//   url: '/pages/deviceList/deviceList',
+				//   type:'redirect',
+				// 	params:{
+				// 		param:this.deviceType
+				// 	}
+				// })
+				uni.navigateBack()
 			},
 			openPage(path,id) {
 			  this.$u.route({

pages/parkingInfo/parkingInfo.vue

@@ -17,7 +17,10 @@
 				<text>空余{{parkNum.remaeNum}}个</text>
 			</view>
 			<view class="u-flex u-row-between">
-				<text @click="goDeviceList">道闸列表</text>
+				<text @click="goDeviceList" style="color: #0082FF;">
+					出入口信息
+					<u-icon name="arrow-right" color="#0082FF" size="32" style="vertical-align: middle;"></u-icon>
+				</text>
 				<!-- <text>异常上报</text> -->
 			</view>
 		</view>
@@ -35,7 +38,7 @@
 							<text>{{item.roadwayName}}</text>
 						</view>
 					</view>
-					<image class="carImg" :src="item.inImage||'../../static/img/daozha-y.png'" mode="heightFix"></image>
+					<image class="carImg" :src="item.inImage||'../../static/img/qiche-g.png'" mode="heightFix"></image>
 					<view class="time">入场：{{item.inTime}}</view>
 					<view class="time">时长：{{item.parkingTime}}</view>
 				</view>

pages/report/payeeReport/report.vue

@@ -13,7 +13,7 @@
 				<u-select v-model="selectShow" :list="roadList" value-name="roadNo" label-name="roadName" @confirm="selectConfirm"></u-select>
 			</u-form-item>
 			<u-form-item label="收费员" prop="payeeName" required :label-width="labelWidth">
-				<u-input type="text" :border="true" maxlength="200" @click="$u.route('/pages/payee/payee')" v-model="form.payeeName" disabled />
+				<u-input type="text" placeholder="请选择收费员" :border="true" maxlength="200" @click="$u.route('/pages/payee/payee')" v-model="form.payeeName" disabled />
 			<!-- 	<u-input v-model="form.payeeName" type="select" :border="true" placeholder="请选择" @click="selectPayeeShow = true" />
 				<u-select v-model="selectPayeeShow" :list="payeeList" value-name="roadNo" label-name="roadName" @confirm="selectPayeeConfirm"></u-select> -->
 			</u-form-item>

pages/report/report.scss

@@ -32,4 +32,20 @@
 			margin-right: 3.3%;
 		}
 	}
+}
+
+.block-til{
+	margin-top: 28rpx;
+	font-size: 32rpx;
+	line-height: 1;
+	font-weight: 400;
+	padding-left: 20rpx;
+	color: #2F2F2F;
+	border-left: 2px solid #2F2F2F;
+}
+.block{
+	background-color: #fff;
+	margin-top: 24rpx;
+	padding: 0 24rpx;
+	border-radius: 10rpx;
 }

pages/report/report.vue

@@ -8,18 +8,57 @@
 		 back-icon-color="#CCE8FF" 
 		 :background="{background: 'linear-gradient(99deg, #7A4398 0%, #5A5DB9 100%)' }"></u-navbar>
 		<u-form :model="form" ref="uForm">
-			<u-form-item label="路段/停车场：" prop="roadName" required :label-width="labelWidth">
+			<!-- <u-form-item label="路段/停车场：" prop="roadName" required :label-width="labelWidth">
 				<u-input v-model="form.roadName" type="select" :border="true" placeholder="请选择" @click="selectShow = true" />
 				<u-select v-model="selectShow" :list="roadList" value-name="roadNo" label-name="roadName" @confirm="selectConfirm"></u-select>
+			</u-form-item> -->
+			<view class="block-til">异常信息</view>
+			<view class="block">
+				<u-form-item label="问题描述" prop="exceprionDes" required :label-width="labelWidth">
+					<u-input type="textarea" :border="true" maxlength="200" v-model="form.exceprionDes" />
+				</u-form-item>
+				<u-form-item label="图片说明" :label-width="labelWidth" :border-bottom="false">
+					<u-upload ref="uploadRef" :action="action" :file-list="fileList" max-count="3"></u-upload>
+				</u-form-item>
+			</view>
+			<view class="block-til">处理登记</view>
+			<view class="block">
+			<u-form-item label="处理状态" :label-width="labelWidth" prop="isProcess" :required="true">
+				<view class="select-view" @click="oneSelectOpen('isProcess')">
+					{{form.isProcess|filterIsProcess}}
+				</view>
+				<u-icon @click="oneSelectOpen('isProcess')" color="#42494F" name="arrow-right"></u-icon>
 			</u-form-item>
-			<u-form-item label="问题描述" prop="exceprionDes" required :label-width="labelWidth">
-				<u-input type="textarea" :border="true" maxlength="200" v-model="form.exceprionDes" />
-			</u-form-item>
-			<u-form-item label="图片说明" :label-width="labelWidth" :border-bottom="false">
-				<u-upload ref="uploadRef" :action="action" max-count="3"></u-upload>
-			</u-form-item>
+			<view v-if="form.isProcess&&form.isProcess!=0" class="">
+				<u-form-item label="处理员" prop="processBy" required :label-width="labelWidth">
+					<u-input type="text" :border="true" maxlength="200" v-model="form.processBy" />
+				</u-form-item>
+				<u-form-item label="处理设备" :label-width="labelWidth" prop="processDevice" :required="false">
+					<view class="select-view" @click="oneSelectOpen('processDeviceList')">
+						{{filterProcessDevice(form.processDevice)||'请选择'}}
+					</view>
+					<u-icon @click="oneSelectOpen('processDeviceList')" color="#42494F" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item label="损坏类型" :label-width="labelWidth" prop="damageType" :required="false">
+					<view class="select-view" @click="oneSelectOpen('damageTypeList')">
+						{{filterDamageType(form.damageType)||'请选择'}}
+					</view>
+					<u-icon @click="oneSelectOpen('damageTypeList')" color="#42494F" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item label="处理方式" :label-width="labelWidth" prop="processType" :required="false">
+					<view class="select-view" @click="oneSelectOpen('processTypeList')">
+						{{filterProcessType(form.processType)||'请选择'}}
+					</view>
+					<u-input @click="oneSelectOpen('processTypeList')" placeholder="请选择" v-model="form.processType"
+						disabled />
+					<u-icon @click="oneSelectOpen('processTypeList')" color="#42494F" name="arrow-right"></u-icon>
+				</u-form-item>
+				</view>
+			</view>
 		</u-form>
-		<u-button type="primary" @click="submit" style="margin-top: 20vh;">提交</u-button>
+		<u-button type="primary" @click="submit" style="margin-top: 5vh;">提交</u-button>
+		<!-- 单列下拉选择 -->
+		<u-select v-model="selectShow" :list="selectData" @confirm="selectConfirm"></u-select>
 	</view>
 </template>
 
@@ -30,9 +69,28 @@
 				title:'问题上报',
 				labelWidth:190,
 				action:this.config.upFileUrl,
+				fileList:[],
 				selectShow:false,
 				selectList:[],
 				roadList:[],
+				selectTag: '',
+				selectShow: false,
+				selectData: [],
+				listMap: {
+					isProcess: [{
+						value: '0',
+						label: '未处理'
+					}, {
+						value: '1',
+						label: '已处理'
+					}, {
+						value: '2',
+						label: '部分处理'
+					}],
+					processDeviceList:[],
+					damageTypeList:[],
+					processTypeList:[],
+				},
 				form:{
 					roadName:'',
 					roadNo:'',
@@ -47,6 +105,13 @@
 							trigger: ['change','blur'],
 						}
 					],
+					processBy: [
+						{ 
+							required: true, 
+							message: '请输入处理员', 
+							trigger: ['change','blur'],
+						}
+					],
 					exceprionDes: [
 						{ 
 							required: true, 
@@ -57,25 +122,169 @@
 				}
 			}
 		},
-		onLoad(){
+		onLoad(page){
+			this.form.deviceId = page.deviceId;
+			this.form.deviceType = page.deviceType;
+			this.form.roadNo = page.roadNo;
+			this.form.roadName = page.roadName;
+			this.reportId = page.reportId;
+			// console.log('this.reportId',this.reportId);
+			if(this.reportId){
+				this.getReportDetails();
+			}
 			
 		},
 		onShow(){
-			this.getRoadAllList();
+			this.getProcessDevice();
+			this.getDamageType();
+			this.getProcessType();
 		},
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
 		},
+		computed:{
+			filterProcessDevice(value){
+				return function(value){
+					let v = '';
+					for (let i = 0; i < this.listMap.processDeviceList.length; i++){
+						let item = this.listMap.processDeviceList[i];
+						if (value == item.value) {
+						  v = item.label;
+						  break;
+						}
+					}
+					return v
+				}
+			},
+			filterDamageType(value){
+				return function(value){
+					let v = '';
+					for (let i = 0; i < this.listMap.damageTypeList.length; i++){
+						let item = this.listMap.damageTypeList[i];
+						if (value == item.value) {
+						  v = item.label;
+						  break;
+						}
+					}
+					return v
+				}
+			},
+			filterProcessType(value){
+				return function(value){
+					let v = '';
+					for (let i = 0; i < this.listMap.processTypeList.length; i++){
+						let item = this.listMap.processTypeList[i];
+						if (value == item.value) {
+						  v = item.label;
+						  break;
+						}
+					}
+					return v
+				}
+			},
+		},
 		methods:{
 			customBack(){
-				uni.reLaunch({
-				    url: '/pages/index/index'
-				});
+				uni.navigateBack()
+			},
+			getReportDetails(){
+				this.$u.api.excptionById({id:this.reportId}).then(res=>{
+					if(res.code==200){
+						// this.reportDetails = res.data;
+						// this.fileList = res.data.imgList;
+						let imgList = res.data.imgList;
+						if(imgList.length>0){
+							this.fileList=imgList.map(img=>{
+								return {url:img}
+							})
+						}
+						this.form = {
+						  ...res.data,
+						  imgList:[],
+						}
+						console.log('this.formthis.form',this.form);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					console.log('res',res);
+				}).catch(err=>{
+					console.log('err',err);
+				})
+			},
+			getProcessDevice(){
+				console.log('this.form.deviceType',this.form.deviceType);
+				if(this.form.deviceType==1){
+					this.getProcessDeviceGeo();
+				}else if(this.form.deviceType==2){
+					this.getProcessDeviceLock();
+				}else if(this.form.deviceType==3){
+					this.getProcessDeviceRoom();
+				}
+				
+			},
+			getProcessDeviceGeo(){
+				this.$u.api.processDeviceGeo().then(res=>{
+					if(res.code==200){
+						this.listMap.processDeviceList = res.data.data.map(item=>{
+							return {value:item.dictValue,label:item.dictLabel}
+						});
+						// console.log('this.listMap.processDeviceList',this.listMap.processDeviceList);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					console.log('res',res);
+				}).catch(err=>{
+					console.log('err',err);
+				})
+			},
+			getProcessDeviceLock(){
+				this.$u.api.processDeviceLock().then(res=>{
+					if(res.code==200){
+						this.listMap.processDeviceList = res.data.data.map(item=>{
+							return {value:item.dictValue,label:item.dictLabel}
+						});
+						// console.log('this.listMap.processDeviceList',this.listMap.processDeviceList);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					console.log('res',res);
+				}).catch(err=>{
+					console.log('err',err);
+				})
+			},
+			getProcessDeviceRoom(){
+				this.$u.api.processDeviceRoom().then(res=>{
+					if(res.code==200){
+						this.listMap.processDeviceList = res.data.data.map(item=>{
+							return {value:item.dictValue,label:item.dictLabel}
+						});
+						// console.log('this.listMap.processDeviceList',this.listMap.processDeviceList);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					console.log('res',res);
+				}).catch(err=>{
+					console.log('err',err);
+				})
 			},
-			getRoadAllList(){
-				this.$u.api.getRoadAllList().then(res=>{
+			getDamageType(){
+				this.$u.api.damageType().then(res=>{
 					if(res.code==200){
-						this.roadList = res.data;
+						this.listMap.damageTypeList =  res.data.data.map(item=>{
+							return {value:item.dictValue,label:item.dictLabel}
+						});
 						// console.log('getDeviceStatis',res);
 					}else{
 						uni.showToast({
@@ -88,13 +297,64 @@
 					console.log('err',err);
 				})
 			},
-			selectConfirm(e){
-				// console.log('e',e);
-				this.form.roadNo = e[0].value;
-				this.form.roadName = e[0].label;
-				// console.log('this.form',this.form);
+			getProcessType(){
+				this.$u.api.processType().then(res=>{
+					if(res.code==200){
+						this.listMap.processTypeList =  res.data.data.map(item=>{
+							return {value:item.dictValue,label:item.dictLabel}
+						});
+						// console.log('getDeviceStatis',res);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					console.log('res',res);
+				}).catch(err=>{
+					console.log('err',err);
+				})
+			},
+			// selectConfirm(e){
+			// 	// console.log('e',e);
+			// 	this.form.roadNo = e[0].value;
+			// 	this.form.roadName = e[0].label;
+			// 	// console.log('this.form',this.form);
+			// },
+			// 单列下拉选择框打开事件
+			oneSelectOpen(key) {
+				this.selectTag = key;
+				this.selectData = this.listMap[key];
+				this.selectShow = true
+			},
+			selectConfirm(e) {
+				// console.log('selectConfirm',e);
+				// console.log('selectTag', this.selectTag);
+				switch (this.selectTag) {
+				 case 'isProcess': //处理状态
+						// console.log('处理状态',e);
+						this.form.isProcess = e[0].value;
+						break;
+					case 'processDeviceList': //处理设备
+						this.form.processDevice = e[0].value;
+						this.form.damageType = '';
+						this.form.processType = '';
+						// this.getDamageType();
+						break;
+					case 'damageTypeList': //损坏类型
+						this.form.damageType = e[0].value;
+						this.form.processType = '';
+						// this.getProcessType();
+						break;
+					case 'processTypeList': //处理方式
+						this.form.processType = e[0].value;
+						break;
+					default:
+						// console.log('3', e);
+				}
 			},
 			submit(){
+				// console.log('this.form',this.form);
 				let that = this;
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
@@ -109,37 +369,80 @@
 						// 如果您不需要进行太多的处理，直接如下即可
 						// files = this.$refs.uUpload.lists;
 						files.forEach(function(item){
-							if(item.response.data){that.form.imgList.push(item.response.data.url)}
+							console.log('item',item);
+							if(item?.response?.data){that.form.imgList.push(item.response.data.url)}
+							else if(item.url){that.form.imgList.push(item.url)}
 						});
-						this.$u.api.report(this.form).then(res=>{
-							console.log('res',res);
-							// this.form = {};
-							uni.showToast({
-								icon:'none',
-								title:res.msg,
-								duration:1500,
-							});
-							setTimeout(()=>{
-								uni.switchTab({
-									url: '/pages/index/index',
-								})
-							},1500)
-						}).catch(err=>{
-							uni.showToast({
-								icon:'none',
-								title:err.msg
-							})
-							console.log('err',err);
-						})
+						if(this.reportId){
+							this.editReport();
+						}else{
+							this.addReport();
+						}
+						
 					} else {
 						console.log('验证失败');
 					}
 				});
 			},
+			addReport(){
+				let that = this;
+				this.$u.api.deviceexcptionprocess(this.form).then(res=>{
+					console.log('res',res);
+					// this.form = {};
+					uni.showToast({
+						icon:'none',
+						title:res.msg,
+						duration:1500,
+					});
+					if(res.code==200){
+						setTimeout(()=>{
+							that.customBack()
+						},1500)
+					}
+				}).catch(err=>{
+					uni.showToast({
+						icon:'none',
+						title:err.msg
+					})
+					console.log('err',err);
+				})
+			},
+			editReport(){
+				let that = this;
+				this.$u.api.editDeviceexcptionprocess(this.form).then(res=>{
+					console.log('res',res);
+					// this.form = {};
+					uni.showToast({
+						icon:'none',
+						title:res.msg,
+						duration:1500,
+					});
+					if(res.code==200){
+						setTimeout(()=>{
+							that.customBack()
+						},1500)
+					}
+				}).catch(err=>{
+					uni.showToast({
+						icon:'none',
+						title:err.msg
+					})
+					console.log('err',err);
+				})
+				
+			}
 		}
 	}
 </script>
-
+<style>
+	page{background-color: #F3F3F3;}
+</style>
 <style lang="scss" scoped>
-	// @import  './report.scss'
+	@import  '@/pages/report/report.scss';
+	.select-view{
+		box-sizing: border-box;
+		padding-right: 24rpx;
+		width: 100%;
+		text-align: right;
+	}
 </style>

utils/filter.js

@@ -223,6 +223,24 @@ Vue.filter("filterMsgType",function(value){
 	}
 });
 
+// 处理状态
+Vue.filter("filterIsProcess",function(value){
+	let status = Number(value);
+	switch (status){
+		case 0:
+			return '未处理'
+			break;
+		case 1:
+			return '已处理'
+			break;
+		case 2:
+			return '部分处理'
+			break;
+		default:
+			return '请选择'
+			break;
+	}
+});