信息处理

pages/index/index.vue

@@ -180,11 +180,13 @@
 			},
 			handleClick(row) {
 				if (row.pcType == 2) {
-					this.$.open("/pages/investigation/task" + "?id=" + row.businessId);
+					this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
+						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
+						'&pcType' + row.pcType+'&sectionName='+row.sectionName);
 				} else {
 					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode +
 						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
-						'&pcType' + row.pcType)
+						'&pcType' + row.pcType+'&sectionName='+row.sectionName)
 				}
 			},
 			konw() {

pages/investigation/index.vue

@@ -205,13 +205,15 @@
 				console.log(row)
 				if (this.tab === 1) {
 					if (row.pcType == 2) {
-						this.$.open("/pages/investigation/task" + "?id=" + row.businessId);
+						this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
+						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
+						'&pcType' + row.pcType+'&sectionName='+row.sectionName);
 					} else {
 						this.$.open('/pages/map/index?businessId=' + row.businessId +
 							'&operator=' + row.operator +
 							'&deptId=' + row.handleDept +
 							'&pcType=' + row.pcType +
-							'&type=' + (this.tab == 1 ? 'edit' : 'view'))
+							'&type=' + (this.tab == 1 ? 'edit' : 'view')+'&sectionName='+row.sectionName)
 						// this.$.open('/pages/map/index?businessId=' + row.businessId)
 					}
 

pages/investigation/task.vue

@@ -33,6 +33,32 @@
 			</view>
 			<view class="formBox" v-if="active === 1">
 				<uni-forms :modelValue="formData" border>
+
+					<view class="label-box">
+						<view class="border"></view> {{name}}
+					</view>
+					<uni-forms-item label="所属辖区"  class="border-top">
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+
+							<!-- <input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
+								v-model="formData.roadType" placeholder="请输入所属辖区" @focus="focus" /> -->
+							<view class="Height100" :class="formData.xqname?'':'gary'" v-if="isEdit"
+								@click="openPicker">{{ formData.xqname?formData.xqname:'请选择所属辖区' }} </view>
+							<view class="Height100" v-else>{{ formData.xqname }}</view>
+							<view class="Height100"></view>
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="所属街道" class="border-bottom">
+						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
+							<view class="Height100" :class="formData.jdname?'':'gary'" v-if="isEdit"
+								@click="openPicker">{{ formData.jdname?formData.jdname:'请选择所属街道' }} </view>
+							<view class="Height100" v-else>{{ formData.jdname }}</view>
+							<view class="Height100"></view>
+						</view>
+					</uni-forms-item>
+					<view class="label-box">
+						<view class="border"></view> {{sectionName}}
+					</view>
 					<uni-forms-item label="道路类型">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
@@ -49,10 +75,10 @@
 							<view class="Height100">米</view>
 						</view>
 					</uni-forms-item>
-					<uni-forms-item label="车辆数">
+					<uni-forms-item label="车道数">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.laneCount" placeholder="请输入车辆数" @focus="focus"/>
+								v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.laneCount }}</view>
 							<view class="Height100">辆</view>
 						</view>
@@ -102,6 +128,8 @@
 					<image src="/static/base.jpg" mode="widthFix"></image>
 				</view> -->
 			</view>
+			<u-picker :show="showPicker" :columns="columnsPicker" keyName="label" @cancel="pickerCancel"
+				@confirm="pickerConfirm"></u-picker>
 			<view class="echarts" v-if="active === 2">
 				<qiun-data-charts type="area" :opts="opts" :chartData="chartData" />
 			</view>
@@ -391,14 +419,20 @@
 			this.boxHeight = uni.getSystemInfoSync().windowHeight;
 			if (e.id) {
 				this.businessId = e.id;
-
+				this.name = e.taskName
+				this.sectionName = e.sectionName
+				console.log(e)
 				this.type = e.type;
+
 				this.getBaseData(e.id);
+				this.getStreetCommunity()
 			}
 		},
 		data() {
 			return {
 				businessId: "",
+				name: "",
+				sectionName:'',
 				$: this.$,
 				fileList1: [],
 				fileList: [],
@@ -567,7 +601,11 @@
 				describeArr: [],
 				temporary: '',
 				type: 'edit',
-				boxHeight: 773
+				boxHeight: 773,
+				showPicker: false,
+				columnsPicker: [
+
+				],
 			};
 		},
 		watch: {
@@ -602,6 +640,22 @@
 				}
 
 			},
+			pickerCancel(e) {
+				this.showPicker = false
+			},
+			pickerConfirm(e) {
+				console.log(e.value)
+				this.showPicker = false
+				this.formData.jdcode = e.value[0].id
+				this.formData.xqcode = e.value[0].id
+				this.$set(this.formData, 'jdname', e.value[0].label)
+				this.$set(this.formData, 'xqname', e.value[0].label)
+
+			},
+			openPicker() {
+
+				this.showPicker = true
+			},
 			select2(v, list, list2) {
 				list.dangerItems.forEach(item => {
 					// 假设this.troubleshootingData中没有与当前item.id相同的id  
@@ -731,7 +785,10 @@
 						console.error(error)
 					}
 					for (let item of arr) {
-						this.fileList.push({ url: item, name: '' })
+						this.fileList.push({
+							url: item,
+							name: ''
+						})
 					}
 				} else {
 					this.fileList = [];
@@ -770,6 +827,25 @@
 				// };
 				// this.fileList = [];
 			},
+			getStreetCommunity() {
+				this.$request
+					.globalRequest(
+						"/hiddenDanger/config/getStreetCommunity", {
+
+						},
+						"GET"
+					)
+					.then((res) => {
+						if (res.code === 200) {
+							console.log(res)
+							let arr = res.result
+							for (let item of arr) {
+								item.label = item.xqname + '-' + item.jdname
+							}
+							this.columnsPicker = [arr]
+						}
+					});
+			},
 			getBaseData(businessId) {
 				this.$request
 					.globalRequest(
@@ -959,8 +1035,7 @@
 				this.troubleshootingData[index].extraConfigs = []
 				this.$request
 					.globalRequest(
-						"/hiddenDanger/highDanger/getImportDangerDisplayDetail",
+						"/hiddenDanger/highDanger/getImportDangerDisplayDetail", {
-						{
 							dangerId: id,
 							businessId: this.businessId,
 						},
@@ -1225,7 +1300,11 @@
 
 							if (foundIndex === -1) {
 								if (item2.checkedSelect) {
-									describe.push({ ...item2.checkedSelect, pcType: 1, hdTerm: item2.id, });
+									describe.push({
+										...item2.checkedSelect,
+										pcType: 1,
+										hdTerm: item2.id,
+									});
 								}
 								// 如果在describe中找不到对应的hdTerm，将item2添加到describe中
 
@@ -1717,4 +1796,28 @@
 		margin-right: 4px;
 		font-size: 14px;
 	}
+
+	.gary {
+		color: #B4BAC9;
+	}
+
+	.label-box {
+		display: flex;
+		align-items: center;
+		height: 110rpx;
+font-size: 30rpx;
+		.border {
+			background-color: #2663BF;
+			height: 35rpx;
+			width: 6rpx;
+			margin-right: 14rpx;
+		}
+	}
+
+	.border-bottom {
+		border-bottom: 1px #eee solid;
+	}
+	.border-top {
+		border-top: 1px #eee solid;
+	}
 </style>