Merge remote-tracking branch 'origin/master'

snowy-admin-web/src/views/biz/alarmuser/index.vue

@@ -24,8 +24,8 @@
 								class="ant-advanced-search-form"
 							>
 								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
-									><a-form-item label="微信昵称" name="nickname">
-										<a-input v-model:value="searchFormState.nickname" placeholder="请输入微信昵称" /> </a-form-item
+									><a-form-item label="微信昵称" name="nickName">
+										<a-input v-model:value="searchFormState.nickName" placeholder="请输入微信昵称" /> </a-form-item
 								></a-col>
 							</a-form>
 						</a-row>
@@ -117,7 +117,7 @@
 		},
 		{
 			title: '微信昵称',
-			dataIndex: 'nickname',
+			dataIndex: 'nickName',
 			align: 'center',
 			ellipsis: true,
 			resizable: true
@@ -127,7 +127,10 @@
 			dataIndex: 'sex',
 			align: 'center',
 			ellipsis: true,
-			resizable: true
+			resizable: true,
+			customRender({ value }) {
+				return value == '1' ? '男' : '女'
+			}
 		},
 		{
 			title: '省份',

snowy-admin-web/src/views/biz/monitor/object/form.vue

@@ -29,7 +29,7 @@
 					style="width: 100%"
 					placeholder="请选择报警接收人"
 					:options="alarmUsersOptions"
-					:field-names="{ label: 'userName', value: 'openId' }"
+					:field-names="{ label: 'nickName', value: 'openId' }"
 				></a-select>
 			</a-form-item>
 			<a-form-item label="监测位置区域">
@@ -58,12 +58,12 @@
 	// 默认要校验的
 	const formRules = {
 		name: [required('请输入对象名称')],
-		status: [required('请选择对象状态')]
-		// alarmUsers: [required('请选择报警接收人')]
+		status: [required('请选择对象状态')],
+		alarmUsers: [required('请选择报警接收人')]
 	}
 
 	// 表单数据
-	const formData = ref({ status: '1' })
+	const formData = ref({ status: '1', alarmUsers: [] })
 
 	// 打开抽屉
 	const onOpen = (record) => {
@@ -71,8 +71,12 @@
 		visible.value = true
 		if (record) {
 			formData.value = Object.assign({}, record)
+
+			if (formData.value.alarmUsers && formData.value.alarmUsers.length > 0) {
+				formData.value.alarmUsers = formData.value.alarmUsers.map((item) => item.openId)
+			}
 		} else {
-			formData.value = { status: '1' }
+			formData.value = { status: '1', alarmUsers: [] }
 		}
 	}
 	//获取报警接收人的数据
@@ -92,7 +96,11 @@
 		formRef.value
 			.validate()
 			.then(() => {
-				setupApi.submitForm(formData.value, formData.value.id).then(() => {
+				const parameter = {
+					...formData.value,
+					alarmUsers: alarmUsersOptions.value.filter((user) => formData.value.alarmUsers.includes(user.openId))
+				}
+				setupApi.submitForm(parameter, formData.value.id).then(() => {
 					onClose()
 					emit('successful')
 				})

snowy-admin-web/src/views/biz/monitor/object/index.vue

@@ -61,6 +61,9 @@
 						</a-tag>
 					</span>
 				</template>
+				<template v-if="column.dataIndex === 'alarmUsers'">
+					<span v-for="(e, i) in record.alarmUsers" :key="i">{{ e.nickName + ',' }} </span>
+				</template>
 				<template v-if="column.dataIndex === 'sensorType'">
 					{{ $TOOL.dictTypeData('SENSORTYPE', record.sensorType) }}
 				</template>
@@ -101,7 +104,7 @@
 								<a-descriptions-item label="传感器编号" :span="2">{{ item.sensorCode }}</a-descriptions-item>
 								<a-descriptions-item label="传感器路数" :span="2">{{ item.sensorRoute + '路' }}</a-descriptions-item>
 								<a-descriptions-item label="报警接收人">
-									<span v-for="(e, i) in item.alarmUsers" :key="i">{{ e.userName + ',' }} </span>
+									<span v-for="(e, i) in item.alarmUsers" :key="i">{{ e.nickName + ',' }} </span>
 								</a-descriptions-item>
 								<a-descriptions-item
 									v-if="item.sensorType == 'W' || item.sensorType == 'WS' || item.sensorType == 'WSC'"
@@ -180,6 +183,14 @@
 			ellipsis: true,
 			resizable: true
 		},
+		{
+			title: '报警接收人',
+			dataIndex: 'alarmUsers',
+			align: 'center',
+			ellipsis: true,
+			resizable: true
+		},
+
 		{
 			title: '监控位置区域',
 			dataIndex: 'monitorPoint',

snowy-admin-web/src/views/biz/monitor/point/form.vue

@@ -79,7 +79,7 @@
 							style="width: 100%"
 							placeholder="请选择报警接收人"
 							:options="alarmUsersOptions"
-							:field-names="{ label: 'userName', value: 'openId' }"
+							:field-names="{ label: 'nickName', value: 'openId' }"
 						></a-select>
 					</a-form-item>
 				</a-col>

snowy-admin-web/src/views/motoring/location/form.vue

@@ -79,7 +79,7 @@
 							style="width: 100%"
 							placeholder="请选择报警接收人"
 							:options="alarmUsersOptions"
-							:field-names="{ label: 'userName', value: 'openId' }"
+							:field-names="{ label: 'nickName', value: 'openId' }"
 						></a-select>
 					</a-form-item>
 				</a-col>