排查隐患

pages/investigation/components/investigation-item.vue

@@ -148,7 +148,13 @@
 			getData() {
 				this.$request.globalRequest('/hiddenDanger/highDanger/getImportDangers', {}, 'GET').then(res => {
 					if (res.code == 200) {
-						this.investigationList = res.result
+						for (let i = 0; i < res.result.length; i++) {
+							for (let j = 0; j < res.result[i].dangerItems.length; j++) {
+								res.result[i].dangerItems[j].nid = res.result[i].nid
+							}
+							// this.getInvestigationListDangerInfo(res.result[i].nid)
+						}
+						this.investigationList = res.result;
 					}
 				})
 			},
@@ -185,9 +191,9 @@
 			handleSelect(item, index) {
 				this.investigationSelect = index
 				this.investigationDetailTitle = item.name
-				this.showInvestigationDetail = true
+				// this.showInvestigationDetail = true
-				this.getData2(item.nid)
+				// this.getData2(item.nid)
-				// this.$emit('select', this.investigationSelect, this.investigationList[index])
+				this.$emit('select', this.investigationSelect, this.investigationList[index])
 			},
 			investigationDetailHandle() {
 				this.showInvestigationDetail = false

pages/investigation/components/investigation-item2.vue

@@ -35,6 +35,19 @@
 						@delete="(e) => deletePic(e, item)" name="1" :maxCount="1"></u-upload>
 				</view>
 			</view>
+			<view class="detail-item">
+				<uni-forms-item label="隐患描述" label-position="top" label-width="200px" />
+				<u-textarea placeholder="请输入" border="none" v-model="formData.hdDesc" />
+			</view>
+			<view class="detail-item">
+				<uni-forms-item label="隐患图片" label-position="top" label-width="200px" />
+				<u-upload :fileList="fileList" @afterRead="(e) => afterRead2(e, 'fileList')"
+					@delete="(e) => deletePic2(e, 'fileList')" name="1" :maxCount="1"></u-upload>
+			</view>
+			<view class="detail-item">
+				<uni-forms-item label="需采集补充信息" label-position="top" label-width="200px" />
+				<u-textarea placeholder="请输入" border="none" v-model="formData.hdInfo" />
+			</view>
 		</view>
 		<view class="blank" />
 	</view>
@@ -62,7 +75,16 @@
 				investigationList: [],
 				showInvestigationDetail: false,
 				investigationDetailTitle: '',
-				investigationDetailList: []
+				investigationDetailList: [],
+				formData: {
+					bigCategory: '',
+					smallCategory: '',
+					hdTerm: '',
+					hdPic: '',
+					hdDesc: '',
+					hdInfo: '',
+				},
+				fileList: [],
 			}
 		},
 		// 页面加载
@@ -70,6 +92,7 @@
 			// this.getData()
 		},
 		mounted() {
+
 			if (this.json.name) {
 				this.investigationDetailList = this.json.extraConfigs.map(item => {
 					if (!item.fileList) {
@@ -115,6 +138,7 @@
 		computed: {},
 		// 方法
 		methods: {
+
 			// 删除图片
 			deletePic(event, item) {
 				item.fileList.splice(event.index, 1)
@@ -170,6 +194,45 @@
 					});
 				})
 			},
+			// 删除图片
+			deletePic2(event, key) {
+				this[key].splice(event.index, 1)
+				this.formData.hdPic = this[key].filter(item => item.status === 'success').map(item => item.url).toString()
+				this.changeEmit()
+			},
+			// 新增图片
+			async afterRead2(event, key) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				const id = this.uuid()
+				this[key].push({
+					id,
+					...event.file,
+					status: 'uploading',
+					message: '上传中'
+				})
+				const result = await this.uploadFilePromise(this[key][0].url)
+				const resultInfo = JSON.parse(result)
+				const index = this[key].findIndex(v => v.id === id)
+				if (resultInfo.code == 200) {
+					this[key].splice(index, 1, Object.assign(this[key][index], {
+						status: 'success',
+						message: '',
+						result: resultInfo,
+						url: resultInfo.result
+					}))
+				} else {
+					this.$.toast('上传失败')
+					this[key].splice(index, 1, Object.assign(this[key][index], {
+						status: 'error',
+						message: '失败',
+					}))
+				}
+				this.formData.hdPic = this[key].filter(item => item.status === 'success').map(item => item.url).toString()
+				this.changeEmit()
+			},
+			changeEmit() {
+				this.$emit('change', this.formData)
+			},
 			getData() {
 				this.$request.globalRequest('/hiddenDanger/highDanger/getImportDangerInfo', {
 					sid: this.$props.sid
@@ -211,7 +274,7 @@
 				// this.$emit('select', this.investigationSelect, this.investigationList[index])
 			},
 			investigationDetailHandle() {
-				this.$emit('select', this.json)
+				// this.$emit('select', this.json)
 			}
 		},
 		onReady() { },
@@ -298,5 +361,4 @@
 			color: #2663BF;
 		}
 	}
-	
 </style>

pages/investigation/components/problem-box.vue

@@ -84,7 +84,6 @@ export default {
   },
   // 页面加载
   onLoad(e) {
-    console.log(12312312312)
     // this.getData()
   },
   mounted(){

pages/investigation/task-zancun.vue

@@ -273,10 +273,7 @@ export default {
       showInvestigation: false,
       investigationSelectList: [],
       investigationSelectIDList: [],
-      investigationList: [
+      investigationList: [],
-        { name: '基本信息基本信息基本信息基本信息基本信息基本信息基本信息基本信息基本信息基本信息基本信息基本信息', value: 1 },
-        { name: 'xxxxx', value: 2 },
-      ],
       investigationSelect: 1,
       showInvestigationDetail: false,
       investigationDetailList: [
@@ -398,7 +395,7 @@ export default {
 
     },
     investigationHandle() {
-      console.log(this.investigationSelect)
+      // console.log(this.investigationSelect)
       if(!this.investigationSelectIDList.includes(this.investigationList[this.investigationSelect].nid)){
         this.investigationSelectList.push(this.investigationList[this.investigationSelect].name)
         this.investigationSelectIDList.push(this.investigationList[this.investigationSelect].nid)

pages/investigation/task.vue

@@ -74,14 +74,14 @@
 					<uni-forms-item label="设计时速">
 						<input v-if="isEdit" type="number" class="BorderNone Height100" v-model="formData.designSpeed"
 							placeholder="请输入设计时速" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center"
+						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.designSpeed
-							v-else>{{ formData.designSpeed }}Km/h</text>
+							}}Km/h</text>
 					</uni-forms-item>
 					<uni-forms-item label="限速">
 						<input v-if="isEdit" type="number" class="BorderNone Height100" v-model="formData.limitSpeed"
 							placeholder="请输入限速" />
-						<text class="Height100 Flex Flex_C_S-Center Flex_end"
+						<text class="Height100 Flex Flex_C_S-Center Flex_end" v-else>{{ formData.limitSpeed
-							v-else>{{ formData.limitSpeed }}Km/h</text>
+							}}Km/h</text>
 					</uni-forms-item>
 				</uni-forms>
 				<view class="photo">
@@ -113,20 +113,20 @@
 					<uni-forms-item label="平峰流量">
 						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
 							v-model="formData.normalTraffic" placeholder="请输入平峰流量" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center"
+						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.normalTraffic
-							v-else>{{ formData.normalTraffic }}辆</text>
+							}}辆</text>
 					</uni-forms-item>
 					<uni-forms-item label="大车占比">
 						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
 							v-model="formData.largeVehicleRate" placeholder="请输入大车占比" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center"
+						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.largeVehicleRate
-							v-else>{{ formData.largeVehicleRate }}%</text>
+							}}%</text>
 					</uni-forms-item>
 					<uni-forms-item label="非机动车流量">
 						<input v-if="isEditStep2" type="number" class="BorderNone Height100"
 							v-model="formData.nonvehicleTraffic" placeholder="请输入非机动车流量" />
-						<text class="Height100 Flex Flex_end Flex_C_S-Center"
+						<text class="Height100 Flex Flex_end Flex_C_S-Center" v-else>{{ formData.nonvehicleTraffic
-							v-else>{{ formData.nonvehicleTraffic }}辆</text>
+							}}辆</text>
 					</uni-forms-item>
 				</uni-forms>
 			</view>
@@ -146,6 +146,10 @@
 						</view>
 					</view>
 				</view>
+				<u-checkbox-group v-model="checked" iconPlacement="right" placement="row">
+					<u-checkbox v-for="(item,index) in troubleshootingData" :label="item.itemname" activeColor="#2663BF"
+						:name="item.id"></u-checkbox>
+				</u-checkbox-group>
 				<u-popup :show="showInvestigation" @close="showInvestigation = false">
 					<InvestigationItem @select="select2"></InvestigationItem>
 				</u-popup>
@@ -509,7 +513,10 @@
 				addInvestigationInfo: {
 					type: '',
 					index: 0
-				}
+				},
+				//选中排查数据
+				troubleshootingData: [],
+				checked: [],
 			};
 		},
 		methods: {
@@ -519,19 +526,43 @@
 				this.showInvestigation2Item = v;
 			},
 			select2(v, list) {
-				this.showInvestigation = false;
+				// this.showInvestigation = false;
-				let id = 0;
+				// let id = 0;
-				this.investigationSelectList.map((r) => {
+				// this.investigationSelectList.map((r) => {
-					if (r.nid == v.nid) {
+				// 	if (r.nid == v.nid) {
-						id = r.nid;
+				// 		id = r.nid;
+				// 	}
+				// });
+				// if (!id) {
+				// 	v.extraConfigs = list;
+				// 	this.investigationSelectList.push(v);
+				// 	this.showInvestigation = false;
+				// } else {
+				// 	this.$.toast("已添加");
+				// }
+				list.dangerItems.forEach(item => {
+					// 假设this.troubleshootingData中没有与当前item.id相同的id  
+					let found = false;
+
+					// 遍历this.troubleshootingData数组来查找id  
+					this.troubleshootingData.forEach(item2 => {
+						if (item.id === item2.id) {
+							// 如果找到了，设置found为true并退出循环  
+							found = true;
+							return;
 						}
 					});
-				if (!id) {
+
-					v.extraConfigs = list;
+					// 如果在this.troubleshootingData中没有找到相同的id，则将其添加到result数组中  
-					this.investigationSelectList.push(v);
+					if (!found) {
-					this.showInvestigation = false;
+						this.troubleshootingData.push(item);
-				} else {
+					}
-					this.$.toast("已添加");
+				});
+				// this.troubleshootingData = result
+				this.showInvestigation = false
+				let isId = this.investigationSelectList.some(item => item.nid === list.nid);
+				if (!isId) {
+					this.investigationSelectList.push(list)
 				}
 			},
 			select3(v) {
@@ -668,7 +699,8 @@
 								.globalRequest(
 									"/hiddenDanger/highDanger/getImportDangerDisplayDetail", {
 									nuserid: this.$.getData("token"),
-										businessId
+									businessId,
+									dangerId: '26'
 								},
 									"GET"
 								)
@@ -966,11 +998,11 @@
 						console.log(res);
 						if (res.code === 200) {
 							this.$.toast("保存成功");
-							setTimeout(() => {
+							// setTimeout(() => {
-								uni.navigateBack({
+							// 	uni.navigateBack({
-									delta: 2, // 默认值是1，表示返回的页面层数
+							// 		delta: 2, // 默认值是1，表示返回的页面层数
-								});
+							// 	});
-							}, 1000);
+							// }, 1000);
 
 							// this.data = res.result;
 							// this.rname = this.data[0].name;
@@ -1275,4 +1307,12 @@
 		padding: 0 20rpx;
 		overflow-x: auto;
 	}
+	.u-checkbox-group--row {
+		flex-direction: column;
+		padding: 0 20rpx;
+
+		.u-checkbox {
+			margin-bottom: 30rpx;
+		}
+	}
 </style>

uni_modules/uview-ui/components/u-checkbox-group/props.js

@@ -5,6 +5,11 @@ export default {
             type: String,
             default: uni.$u.props.checkboxGroup.name
         },
+        // 标识符
+        obj: {
+            type: [Object],
+            default: uni.$u.props.checkboxGroup.item
+        },
         // 绑定的值
         value: {
             type: Array,

uni_modules/uview-ui/components/u-checkbox/props.js

@@ -3,67 +3,72 @@ export default {
     // checkbox的名称
     name: {
       type: [String, Number, Boolean],
-            default: uni.$u.props.checkbox.name
+      default: uni.$u.props.checkbox.name,
+    },
+    // item
+    obj: {
+      type: [ Object],
+      default: uni.$u.props.checkbox.obj,
     },
     // 形状，square为方形，circle为圆型
     shape: {
       type: String,
-            default: uni.$u.props.checkbox.shape
+      default: uni.$u.props.checkbox.shape,
     },
     // 整体的大小
     size: {
       type: [String, Number],
-            default: uni.$u.props.checkbox.size
+      default: uni.$u.props.checkbox.size,
     },
     // 是否默认选中
     checked: {
       type: Boolean,
-            default: uni.$u.props.checkbox.checked
+      default: uni.$u.props.checkbox.checked,
     },
     // 是否禁用
     disabled: {
       type: [String, Boolean],
-            default: uni.$u.props.checkbox.disabled
+      default: uni.$u.props.checkbox.disabled,
     },
     // 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值
     activeColor: {
       type: String,
-            default: uni.$u.props.checkbox.activeColor
+      default: uni.$u.props.checkbox.activeColor,
     },
     // 未选中的颜色
     inactiveColor: {
       type: String,
-            default: uni.$u.props.checkbox.inactiveColor
+      default: uni.$u.props.checkbox.inactiveColor,
     },
     // 图标的大小，单位px
     iconSize: {
       type: [String, Number],
-            default: uni.$u.props.checkbox.iconSize
+      default: uni.$u.props.checkbox.iconSize,
     },
     // 图标颜色
     iconColor: {
       type: String,
-            default: uni.$u.props.checkbox.iconColor
+      default: uni.$u.props.checkbox.iconColor,
     },
     // label提示文字，因为nvue下，直接slot进来的文字，由于特殊的结构，无法修改样式
     label: {
       type: [String, Number],
-            default: uni.$u.props.checkbox.label
+      default: uni.$u.props.checkbox.label,
     },
     // label的字体大小，px单位
     labelSize: {
       type: [String, Number],
-            default: uni.$u.props.checkbox.labelSize
+      default: uni.$u.props.checkbox.labelSize,
     },
     // label的颜色
     labelColor: {
       type: String,
-            default: uni.$u.props.checkbox.labelColor
+      default: uni.$u.props.checkbox.labelColor,
     },
     // 是否禁止点击提示语选中复选框
     labelDisabled: {
       type: [String, Boolean],
-            default: uni.$u.props.checkbox.labelDisabled
+      default: uni.$u.props.checkbox.labelDisabled,
-        }
+    },
-    }
+  },
-}
+};

uni_modules/uview-ui/components/u-checkbox/u-checkbox.vue

@@ -2,12 +2,12 @@
 	<view
 	    class="u-checkbox"
 	    :style="[checkboxStyle]"
-	    @tap.stop="wrapperClickHandler"
+	    @tap.stop="wrapperClickHandler($event)"
 	    :class="[`u-checkbox-label--${parentData.iconPlacement}`, parentData.borderBottom && parentData.placement === 'column' && 'u-border-bottom']"
 	>
 		<view
 		    class="u-checkbox__icon-wrap"
-		    @tap.stop="iconClickHandler"
+		    @tap.stop="iconClickHandler($event)"
 		    :class="iconClasses"
 		    :style="[iconWrapStyle]"
 		>
@@ -21,7 +21,7 @@
 			</slot>
 		</view>
 		<text
-		    @tap.stop="labelClickHandler"
+		    @tap.stop="labelClickHandler($event)"
 		    :style="{
 				color: elDisabled ? elInactiveColor : elLabelColor,
 				fontSize: elLabelSize,
@@ -197,13 +197,16 @@
 			// 横向两端排列时，点击组件即可触发选中事件
 			wrapperClickHandler(e) {
 				this.parentData.iconPlacement === 'right' && this.iconClickHandler(e)
+				
 			},
 			// 点击图标
 			iconClickHandler(e) {
+				// console.log(this.obj)
 				this.preventEvent(e)
 				// 如果整体被禁用，不允许被点击
 				if (!this.elDisabled) {
 					this.setRadioCheckedStatus()
+					this.$emit('click', this.obj)
 				}
 			},
 			// 点击label
@@ -212,6 +215,7 @@
 				// 如果按钮整体被禁用或者label被禁用，则不允许点击文字修改状态
 				if (!this.elLabelDisabled && !this.elDisabled) {
 					this.setRadioCheckedStatus()
+					this.$emit('click', this.obj)
 				}
 			},
 			emitEvent() {

uni_modules/uview-ui/libs/config/props/checkboxGroup.js

@@ -11,6 +11,7 @@ export default {
     // checkbox-group组件
     checkboxGroup: {
         name: '',
+        obj: () => {},
         value: () => [],
         shape: 'square',
         disabled: false,