1

pages/index/index.vue

@@ -187,7 +187,7 @@
 				} else {
 					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode +
 						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
-						'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode)
+						'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode+ '&enumname=' + row.enumname+ '&deadlineStatus=' + row.deadlineStatus)
 				}
 			},
 			konw() {

pages/investigation/complete.vue

@@ -53,7 +53,7 @@
 						</view>
 						<uni-forms-item label="道路类型" label-width="80">
 							<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
-								<view class="Height100">{{ formData.roadType }}</view>
+								<view class="Height100">{{ initDic(formData.roadType, columnsdlPicker) }}</view>
 								<view class="Height100"></view>
 							</view>
 						</uni-forms-item>
@@ -66,24 +66,24 @@
 						<uni-forms-item label="车道数" label-width="80">
 							<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 								<view class="Height100">{{ formData.laneCount }}</view>
-								<view class="Height100">道</view>
+								<view class="Height100">车道</view>
 							</view>
 						</uni-forms-item>
 						<uni-forms-item label="路面结构">
 							<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
-								<view class="Height100">{{ formData.roadStructure }}</view>
+								<view class="Height100">{{ initDic(formData.roadStructure, columnsEnumPicker) }}</view>
 								<view class="Height100"></view>
 							</view>
 						</uni-forms-item>
 						<uni-forms-item label="路侧防护">
 							<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
-								<view class="Height100">{{ formData.sideProtec }}</view>
+								<view class="Height100">{{ initDic(formData.sideProtec, columnsEnum2Picker) }}</view>
 								<view class="Height100"></view>
 							</view>
 						</uni-forms-item>
 						<uni-forms-item label="中央隔离">
 							<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
-								<view class="Height100">{{ formData.centerSeparate }}</view>
+								<view class="Height100">{{ initDic(formData.centerSeparate, columnsEnum3Picker) }}</view>
 								<view class="Height100"></view>
 							</view>
 						</uni-forms-item>
@@ -254,13 +254,29 @@
 				investigationSelectList: [],
 				hiddenDangerList: [],
 				
-
+showEnumPicker: false,
+				columnsEnumPicker: [
+[]
+				],
+				showEnum2Picker: false,
+				columnsEnum2Picker: [
+[]
+				],
+				columnsdlPicker:[[]],
+				showEnum3Picker: false,
+				columnsEnum3Picker: [
+				[]
+								],
 			}
 		},
 		// 页面加载
 		onLoad(e) {
 
 			this.boxHeight = uni.getSystemInfoSync().windowHeight;
+			 this.getEnumValues1()
+			 this.getRoadTypes()
+			 this.getEnumValues2()
+			 this.getEnumValues3()
 			if (e.id) {
 				this.businessId = e.id;
 				this.name = e.taskName
@@ -305,6 +321,98 @@
 
 		// 方法
 		methods: {
+			getEnumValues1() {
+				this.$request
+					.globalRequest(
+						"/hiddenDanger/highDanger/getEnumValues", {
+							enumType: '3119'
+						},
+						"GET"
+					)
+					.then((res) => {
+						if (res.code === 200) {
+							console.log(res.result)
+							// console.log(res)
+							let arr = res.result
+							for (let item of arr) {
+								item.label = item.enumName
+							}
+							this.columnsEnumPicker = [arr]
+						}
+					});
+			},
+			// 数据回显
+			initDic(val, arr, label='label', value = 'enumvalue') {
+				// console.log(val==0)
+				let str = '- -'
+				for (let item of arr[0]) {
+					if (item[value] == val) {
+						str = item[label]
+					}
+				}
+				return str
+			},
+			getRoadTypes() {
+			
+				this.$request
+					.globalRequest(
+						"/hiddenDanger/highDanger/getRoadTypes", {
+							enumType: '303'
+						},
+						"GET"
+					)
+					.then((res) => {
+						if (res.code === 200) {
+							console.log(res.result)
+							// console.log(res)
+							let arr = res.result
+							for (let item of arr) {
+								item.label = item.enumName
+							}
+							this.columnsdlPicker = [arr]
+						}
+					});
+			},
+			getEnumValues2() {
+				this.$request
+					.globalRequest(
+						"/hiddenDanger/highDanger/getEnumValues", {
+							enumType: '3127'
+						},
+						"GET"
+					)
+					.then((res) => {
+						if (res.code === 200) {
+							console.log(res.result)
+							// console.log(res)
+							let arr = res.result
+							for (let item of arr) {
+								item.label = item.enumName
+							}
+							this.columnsEnum2Picker = [arr]
+						}
+					});
+			},
+			getEnumValues3() {
+				this.$request
+					.globalRequest(
+						"/hiddenDanger/highDanger/getEnumValues", {
+							enumType: '3121'
+						},
+						"GET"
+					)
+					.then((res) => {
+						if (res.code === 200) {
+							console.log(res.result)
+							// console.log(res)
+							let arr = res.result
+							for (let item of arr) {
+								item.label = item.enumName
+							}
+							this.columnsEnum3Picker = [arr]
+						}
+					});
+			},
 			handleTabClick(tab) {
 				this.tab = tab;
 

pages/investigation/index.vue

@@ -60,13 +60,13 @@
 								<!-- <text v-if="tab === 1">排查</text>
 								<text v-if="tab === 3">治理</text> -->
 								<text>{{ item.enumname || '--' }}</text>
-								<text>{{ item.deadlineStatus || '--' }}</text>
+								<text v-show="tab!=3">{{ item.deadlineStatus || '--' }}</text>
 							</view>
 						</view>
-						<view class="trapezoidal" v-if="item.deadlineType == 1">
+						<view class="trapezoidal" v-if="item.deadlineType == 1&&tab!=3">
 							超期
 						</view>
-						<view class="trapezoidal lin" v-if="item.deadlineType == 2">
+						<view class="trapezoidal lin" v-if="item.deadlineType == 2&&tab!=3">
 							临期
 						</view>
 					</view>
@@ -300,7 +300,7 @@
 							'&deptId=' + row.handleDept +
 							'&pcType=' + row.pcType +
 							'&type=' + (this.tab == 1 ? 'edit' : 'view') + '&sectionName=' + row.sectionName +
-							'&sectionCode=' + row.sectionCode + '&taskName=' + row.name)
+							'&sectionCode=' + row.sectionCode + '&taskName=' + row.name+ '&enumname=' + row.enumname+ '&deadlineStatus=' + row.deadlineStatus)
 						// this.$.open('/pages/map/index?businessId=' + row.businessId)
 					}
 

pages/investigation/task.vue

@@ -71,9 +71,10 @@
 							<!-- <input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
 								v-model="formData.roadType" placeholder="请输入道路类型" @focus="focus" /> -->
 							<view class="Height100" :class="formData.roadTypeName?'':'gary'" v-if="isEdit"
-								@click="showdlPicker=true">{{ formData.roadTypeName?formData.roadTypeName:'请选择道路类型' }}
+								@click="showdlPicker=true">
+								{{ formData.roadTypeName?initDic(formData.roadType, columnsdlPicker) :'请选择道路类型' }}
 							</view>
-							<view class="Height100" v-else>{{ formData.roadTypeName }}</view>
+							<view class="Height100" v-else> {{ initDic(formData.roadType, columnsdlPicker) }}</view>
 							<view class="Height100"></view>
 						</view>
 					</uni-forms-item>
@@ -87,8 +88,9 @@
 					</uni-forms-item>
 					<uni-forms-item label="车道数" name="laneCount" required label-width="80">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
-							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput" style="width:88%"
+							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" @blur="blur" />
+								v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" @blur="blur"
+								style='width:88%' />
 							<view class="Height100" v-else>{{ formData.laneCount }}</view>
 							<view class="Height100">车道</view>
 						</view>
@@ -97,17 +99,20 @@
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<view class="Height100" :class="formData.roadStructure?'':'gary'" v-if="isEdit"
 								@click="showEnumPicker=true">
-								{{ formData.roadStructure?initDic(formData.roadStructure, columnsEnumPicker):'请选择路面结构' }} </view>
+								{{ formData.roadStructure?initDic(formData.roadStructure, columnsEnumPicker):'请选择路面结构' }}
+							</view>
 							<!-- 	<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
 								v-model="formData.roadStructure" placeholder="请输入路面结构" @focus="focus" @blur="blur" /> -->
-							<view class="Height100" v-else>{{ initDic(formData.roadStructure, columnsEnumPicker) }}</view>
+							<view class="Height100" v-else>{{ initDic(formData.roadStructure, columnsEnumPicker) }}
+							</view>
 							<view class="Height100"></view>
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="路侧防护">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<view class="Height100" :class="formData.sideProtec?'':'gary'" v-if="isEdit"
-								@click="showEnum2Picker=true">{{ formData.sideProtec?initDic(formData.sideProtec, columnsEnum2Picker):'请选择路侧防护' }}
+								@click="showEnum2Picker=true">
+								{{ formData.sideProtec?initDic(formData.sideProtec, columnsEnum2Picker):'请选择路侧防护' }}
 							</view>
 							<!-- <input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
 								v-model="formData.sideProtec" placeholder="请输入路侧防护" @focus="focus" @blur="blur" /> -->
@@ -119,10 +124,12 @@
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<view class="Height100" :class="formData.centerSeparate?'':'gary'" v-if="isEdit"
 								@click="showEnum3Picker=true">
-								{{ formData.centerSeparate?initDic(formData.centerSeparate, columnsEnum2Picker):'请选择中央隔离' }} </view>
+								{{ formData.centerSeparate?initDic(formData.centerSeparate, columnsEnum3Picker):'请选择中央隔离' }}
+							</view>
 							<!-- <input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
 								v-model="formData.centerSeparate" placeholder="请输入中央隔离" @focus="focus" @blur="blur" /> -->
-							<view class="Height100" v-else>{{ initDic(formData.centerSeparate, columnsEnum2Picker) }}</view>
+							<view class="Height100" v-else>{{ initDic(formData.centerSeparate, columnsEnum3Picker) }}
+							</view>
 							<view class="Height100"></view>
 						</view>
 					</uni-forms-item>
@@ -153,7 +160,7 @@
 				@confirm="pickerEnumConfirm"></u-picker>
 			<u-picker :show="showEnum2Picker" :columns="columnsEnum2Picker" keyName="label" @cancel="pickerEnum2Cancel"
 				@confirm="pickerEnum2Confirm"></u-picker>
-			<u-picker :show="showEnum3Picker" :columns="columnsEnum2Picker" keyName="label" @cancel="pickerEnum3Cancel"
+			<u-picker :show="showEnum3Picker" :columns="columnsEnum3Picker" keyName="label" @cancel="pickerEnum3Cancel"
 				@confirm="pickerEnum3Confirm"></u-picker>
 			<u-picker :show="showxqPicker" :columns="columnsxqPicker" keyName="label" @cancel="pickerxqCancel"
 				@confirm="pickerxqConfirm"></u-picker>
@@ -529,6 +536,7 @@
 				await this.getRoadTypes()
 				await this.getEnumValues1()
 				await this.getEnumValues2()
+				await this.getEnumValues3()
 				await this.getBaseData(e.id);
 				await this.getStreetCommunity()
 			}
@@ -840,17 +848,20 @@
 				showdlPicker: false,
 				showtimePicker: false,
 				columnsdlPicker: [
-
+					[]
 				],
 				showEnumPicker: false,
 				columnsEnumPicker: [
-
+					[]
 				],
 				showEnum2Picker: false,
 				columnsEnum2Picker: [
-
+					[]
 				],
 				showEnum3Picker: false,
+				columnsEnum3Picker: [
+					[]
+				],
 				nidZD: '',
 				lockZD: false,
 				nidYH: '',
@@ -979,6 +990,27 @@
 				this.showInvestigation2 = true;
 				this.showInvestigation2Item = v;
 			},
+			pickerEnumCancel(e) {
+				this.showEnumPicker = false
+			},
+			pickerEnumConfirm(e) {
+				this.showEnumPicker = false
+				this.$set(this.formData, 'roadStructure', e.value[0].enumvalue)
+			},
+			pickerEnum2Cancel(e) {
+				this.showEnum2Picker = false
+			},
+			pickerEnum2Confirm(e) {
+				this.showEnum2Picker = false
+				this.$set(this.formData, 'sideProtec', e.value[0].enumvalue)
+			},
+			pickerEnum3Cancel(e) {
+				this.showEnum3Picker = false
+			},
+			pickerEnum3Confirm(e) {
+				this.showEnum3Picker = false
+				this.$set(this.formData, 'centerSeparate', e.value[0].enumvalue)
+			},
 
 			showInvestigationTag2(v) {
 				console.log('gxh查看1', v, this.investigationSelectList, this.hiddenDangerList)
@@ -1017,21 +1049,11 @@
 
 			},
 			pickerdlConfirm(e) {
+				console.log(e)
 				this.showdlPicker = false
 				this.$set(this.formData, 'roadType', e.value[0].enumvalue)
 				this.$set(this.formData, 'roadTypeName', e.value[0].label)
 			},
-			// 数据回显
-			initDic(val, arr, label='label', value = 'enumvalue') {
-				// console.log(val==0)
-				let str = '- -'
-				for (let item of arr[0]) {
-					if (item[value] == val) {
-						str = item[label]
-					}
-				}
-				return str
-			},
 			pickerdlCancel(e) {
 				this.showdlPicker = false
 			},
@@ -1039,29 +1061,6 @@
 				this.showtimePicker = false
 				this.$set(this.formData, 'peakHours', e.value[0] + ' - ' + e.value[1])
 			},
-			pickerEnumCancel(e) {
-				this.showEnumPicker = false
-			},
-			pickerEnumConfirm(e) {
-				this.showEnumPicker = false
-				this.$set(this.formData, 'roadStructure', e.value[0].enumvalue)
-			},
-			pickerEnum2Cancel(e) {
-				this.showEnum2Picker = false
-			},
-			pickerEnum2Confirm(e) {
-				this.showEnum2Picker = false
-				this.$set(this.formData, 'sideProtec', e.value[0].enumvalue)
-			},
-			pickerEnum3Cancel(e) {
-				this.showEnum3Picker = false
-			},
-			pickerEnum3Confirm(e) {
-				this.showEnum3Picker = false
-				this.$set(this.formData, 'centerSeparate', e.value[0].enumvalue)
-			},
-
-
 			pickertimeCancel(e) {
 				this.showtimePicker = false
 			},
@@ -1296,6 +1295,7 @@
 					});
 			},
 			getRoadTypes() {
+
 				this.$request
 					.globalRequest(
 						"/hiddenDanger/highDanger/getRoadTypes", {
@@ -1318,7 +1318,7 @@
 			getEnumValues1() {
 				this.$request
 					.globalRequest(
-						"/hiddenDanger/highDanger/getEnumValue", {
+						"/hiddenDanger/highDanger/getEnumValues", {
 							enumType: '3119'
 						},
 						"GET"
@@ -1335,11 +1335,22 @@
 						}
 					});
 			},
+			// 数据回显
+			initDic(val, arr, label = 'label', value = 'enumvalue') {
+				// console.log(val==0)
+				let str = '- -'
+				for (let item of arr[0]) {
+					if (item[value] == val) {
+						str = item[label]
+					}
+				}
+				return str
+			},
 			getEnumValues2() {
 				this.$request
 					.globalRequest(
-						"/hiddenDanger/highDanger/getEnumValue", {
+						"/hiddenDanger/highDanger/getEnumValues", {
-							enumType: '973'
+							enumType: '3127'
 						},
 						"GET"
 					)
@@ -1355,6 +1366,27 @@
 						}
 					});
 			},
+			getEnumValues3() {
+				this.$request
+					.globalRequest(
+						"/hiddenDanger/highDanger/getEnumValues", {
+							enumType: '3121'
+						},
+						"GET"
+					)
+					.then((res) => {
+						if (res.code === 200) {
+							console.log(res.result)
+							// console.log(res)
+							let arr = res.result
+							for (let item of arr) {
+								item.label = item.enumName
+							}
+							this.columnsEnum3Picker = [arr]
+						}
+					});
+			},
+
 			getBaseDefaultData() {
 				this.$request
 					.globalRequest(
@@ -1413,10 +1445,10 @@
 					if (res.code === 200) {
 						for (let k in res.result) {
 							if (res.result[k] == 0) {
-								if(k!='sideProtec'&&k!='centerSeparate'&&k!='roadStructure'){
+								if (k != 'sideProtec' && k != 'centerSeparate' && k != 'roadStructure') {
 									res.result[k] = ""
 								}
-								
+
 							}
 						}
 						this.formData = {
@@ -1459,7 +1491,9 @@
 						// console.log(res.result,11111)
 						this.investigationSelectList = res.result;
 						this.investigationSelectList.map((r) => {
-							this.troubleshootingData = [...this.troubleshootingData, ...r.dangerItems]
+							this.troubleshootingData = [...this.troubleshootingData, ...r
+								.dangerItems
+							]
 						});
 						console.log('this.troubleshootingData', this.troubleshootingData)
 						// console.log(this.troubleshootingData, 11111)
@@ -1665,7 +1699,8 @@
 						hdPic: hdPic,
 						nid: $.createUUID(),
 						hdInfo: this.describe.hdInfo,
-						dangerProblem: this.hiddenDangerList2[0].itemname + '/' + this.hiddenDangerList2[1].itemname +
+						dangerProblem: this.hiddenDangerList2[0].itemname + '/' + this.hiddenDangerList2[1]
+							.itemname +
 							'/' + this.hiddenDangerList2[2].itemname
 					}
 					if (this.addInvestigationInfo.type == 'add') {
@@ -1781,23 +1816,23 @@
 				}
 			},
 			bottomButtonTwo() {
-				if (!this.type) {
+				// if (!this.type) {
-					if (!this.formData.roadType) {
+				if (!this.formData.roadType) {
-						return this.$.toast("请输入道路类型");
+					return this.$.toast("请选择道路类型");
-					}
+				}
-					if (!this.formData.roadWidth) {
+				if (!this.formData.roadWidth) {
-						return this.$.toast("请输入道路宽度");
+					return this.$.toast("请输入道路宽度");
-					}
+				}
-					if (!this.formData.laneCount) {
+				if (!this.formData.laneCount) {
-						return this.$.toast("请输入车道数");
+					return this.$.toast("请输入车道数");
-					}
-					if (!this.formData.designSpeed) {
-						return this.$.toast("请输入设计时速");
-					}
-					if (!this.formData.limitSpeed) {
-						return this.$.toast("请输入限速");
-					}
 				}
+				if (!this.formData.designSpeed) {
+					return this.$.toast("请输入设计时速");
+				}
+				if (!this.formData.limitSpeed) {
+					return this.$.toast("请输入限速");
+				}
+				// }
 				this.pageScrollTo()
 				this.isEdit = false;
 				this.active = 3;
@@ -1877,7 +1912,8 @@
 					} else {
 						checkedArr.forEach((item2, index2) => {
 							let idToFind = item2.id;
-							let foundIndex = describe.findIndex(item1 => item1.hdTerm === idToFind);
+							let foundIndex = describe.findIndex(item1 => item1.hdTerm ===
+								idToFind);
 
 							if (foundIndex === -1) {
 								if (item2.checkedSelect) {
@@ -1893,9 +1929,12 @@
 							} else {
 								let obj = {
 									hdTerm: item2.id,
-									hdDesc: item2.checkedSelect ? item2.checkedSelect.hdDesc : '',
+									hdDesc: item2.checkedSelect ? item2.checkedSelect
-									hdPic: item2.checkedSelect ? item2.checkedSelect.hdPic : '',
+										.hdDesc : '',
-									hdInfo: item2.checkedSelect ? item2.checkedSelect.hdInfo : '',
+									hdPic: item2.checkedSelect ? item2.checkedSelect
+										.hdPic : '',
+									hdInfo: item2.checkedSelect ? item2.checkedSelect
+										.hdInfo : '',
 									pcType: 1
 								}
 								// console.log(obj, 111111)
@@ -1950,7 +1989,8 @@
 					this.extraConfigs = extraConfigs
 					this.describeArr = describe
 					this.temporary = temporary
-					console.log('describeArrdescribeArrdescribeArr', this.extraConfigs, this.describeArr)
+					console.log('describeArrdescribeArrdescribeArr', this.extraConfigs, this
+						.describeArr)
 					if (!temporary) {
 						this.postSaveManualInvestigation()
 						return