up

rainmaintain/rainmaintain/rainmaintain.vue

@@ -307,6 +307,7 @@
 					that.aboutShow = true
 					that.numShow = true
 				}
+				that.loadAskContent();
 				console.log("res", that.form)
 			},
 			confirmAskType(e) {
@@ -320,7 +321,7 @@
 					api: '/api/admin/parameter/show',
 					method: "get",
 					data: {
-						number: "maintainContent"
+						number: "maintainContent" + "_" + that.form.type
 					},
 					utilSuccess: function(result) {
 						that.rainArr.askContentList = result.detail
@@ -409,8 +410,10 @@
 
 								that.form = result.circulation_info;
 								that.form.circulation_id = result.circulation_id;
-								that.roadName = result.circulation_info.road?result.circulation_info.road.name:""
-								that.askName = result.circulation_info.title_detail?result.circulation_info.title_detail.value:""
+								that.roadName = result.circulation_info.road ? result.circulation_info.road
+									.name : ""
+								that.askName = result.circulation_info.title_detail ? result.circulation_info
+									.title_detail.value : ""
 
 								let _files = [];
 								for (var mod of result.circulation_info.circulation_files) {
@@ -440,8 +443,10 @@
 								that.aboutShow = true
 								that.form = result.out_water_info;
 								that.form.out_water_id = result.out_water_id
-								that.roadName = result.out_water_info.road?result.out_water_info.road.name:""
-								that.askName = result.out_water_info.title_detail?result.out_water_info.title_detail.value:""
+								that.roadName = result.out_water_info.road ? result.out_water_info.road.name :
+									""
+								that.askName = result.out_water_info.title_detail ? result.out_water_info
+									.title_detail.value : ""
 								let water_files = [];
 								for (var mod of result.out_water_info.out_water_files) {
 									let m = Object.assign({}, mod);

rainmaintain/rainmaintaininfo/rainmaintainInfo.vue

@@ -78,7 +78,8 @@
 								<view class="demo-layout bg-purple">现场图片：</view>
 							</u-col>
 							<u-col span="12" v-for="(item,index) in filesList">
-								<u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
+								<u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%"
+									height="300rpx" :src="item.files.url"></u-image>
 							</u-col>
 						</u-row>
 						<view v-if="formshow">
@@ -119,7 +120,8 @@
 									<view class="demo-layout bg-purple">处理后图片：</view>
 								</u-col>
 								<u-col span="12" v-for="(item,index) in dealFilesList">
-									<u-image @click="imgListPreview" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
+									<u-image @click="imgListPreview" style="margin:20rpx 0" width="100%" height="300rpx"
+										:src="item.files.url"></u-image>
 								</u-col>
 							</u-row>
 						</view>
@@ -212,11 +214,15 @@
 								}
 								that.dealFilesList = _filesafter;
 								that.form.type = result.type
-							result.circulation_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
-							result.circulation_info.is_law==0 ? that.form.lawName="否":that.form.lawName="是"
+								that.form.typeName = result.type == 1 ? "雨水管道疏挖" : "雨水管道疏通"
+								result.circulation_info.is_solve == 0 ? that.form.solveName = "否" : that
+									.form.solveName = "是"
+								result.circulation_info.is_law == 0 ? that.form.lawName = "否" : that.form
+									.lawName = "是"
 								that.form.areaName = result.area_info ? result.area_info.name : ""
 								that.form.created_at = result.created_at
-							that.titleName = result.circulation_info.title_detail?result.circulation_info.title_detail.value:''
+								that.titleName = result.circulation_info.title_detail ? result
+									.circulation_info.title_detail.value : ''
 						 	break;
 							case 3:
 								that.lawshow = false
@@ -242,9 +248,12 @@
 								that.dealFilesList = discharge_filesafter;
 								that.form.type = result.type
 								that.form.typeName = "汛期助排"
-							result.help_discharge_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
+								result.help_discharge_info.is_solve == 0 ? that.form.solveName = "否" : that
+									.form.solveName = "是"
 								that.form.areaName = result.area_info ? result.area_info.name : ""
 								that.form.created_at = result.created_at
+								that.titleName = result.help_discharge_info.title_detail ? result
+									.help_discharge_info.title_detail.value : ''
 								break;
 							case 4:
 								that.formshow = false
@@ -287,11 +296,14 @@
 								that.dealFilesList = water_filesafter;
 								that.form.type = result.type
 								that.form.typeName = "出水口排查"
-							result.out_water_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
-							result.out_water_info.is_law==0 ? that.form.lawName="否":that.form.lawName="是"
+								result.out_water_info.is_solve == 0 ? that.form.solveName = "否" : that.form
+									.solveName = "是"
+								result.out_water_info.is_law == 0 ? that.form.lawName = "否" : that.form
+									.lawName = "是"
 								that.form.areaName = result.area_info ? result.area_info.name : ""
 								that.form.created_at = result.created_at
-							that.titleName = result.out_water_info.title_detail?result.out_water_info.title_detail.value:''
+								that.titleName = result.out_water_info.title_detail ? result.out_water_info
+									.title_detail.value : ''
 								break;
 						}
 					},
@@ -331,6 +343,7 @@
 		margin: 10rpx 0;
 		font-size: 28rpx;
 	}
+
 	.u-card {
 		z-index: 1;
 	}
@@ -341,9 +354,11 @@
 	.overflowmask {
 		overflow: hidden;
 	}
+
 	.loadmore {
 		padding: 24rpx !important
 	}
+
 	.search-wrap {
 		background: #0385e5;
 		padding: 20rpx;