diff --git a/src/api/work/alarm.ts b/src/api/work/alarm.ts index 2853717..090587d 100644 --- a/src/api/work/alarm.ts +++ b/src/api/work/alarm.ts @@ -13,3 +13,11 @@ export function alarmNotificationReply(data) { body: data }); } + +export function alarmNotificationCommit(data) { + return request.post({ + url: `/alarm/notification/commit`, + body: data + }); +} + diff --git a/src/components/police-select.vue b/src/components/police-select.vue index 94a6054..080c7af 100644 --- a/src/components/police-select.vue +++ b/src/components/police-select.vue @@ -78,4 +78,4 @@ function onChange(val) { } \ No newline at end of file + diff --git a/src/views/sensitivePerception/DepartNegative.vue b/src/views/sensitivePerception/DepartNegative.vue index c8a3659..d8bec59 100644 --- a/src/views/sensitivePerception/DepartNegative.vue +++ b/src/views/sensitivePerception/DepartNegative.vue @@ -103,6 +103,12 @@ @click="handleShowProfile(row)" >问题详情 + 预警提醒 @@ -411,6 +417,63 @@ + + + +
+ + + + + +
+
+ + + + + + +
+ +
+ ([]); const total = ref(0); +let showNotification = ref(false) +let formData2 = ref({ + alarmTypeId: 1, + involveDepartId: '', + involveDepartName: '', + alarmContent: '' +}) const mainLoading = ref(false); function getList() { @@ -463,6 +536,30 @@ function reset() { getList(); } +const handleShowNotification = () => { + showNotification.value = true +} + +const handleNotification = async () => { + if(formData2.value.involveDepartId == '') { + feedback.msgWarning("请选择被提醒单位"); + return; + } + if(formData2.value.alarmContent == '') { + feedback.msgWarning("请填写提醒内容"); + return; + } + let data = { + alarmTypeId: formData2.value.alarmTypeId, + notificationDepartCode: formData2.value.involveDepartId, + notificationDepartName: formData2.value.involveDepartName, + alarmContent: formData2.value.alarmContent + } + await alarmNotificationCommit(data); + showNotification.value = false; + feedback.msgSuccess("操作成功"); +} + onMounted(() => { getList(); }); @@ -676,4 +773,4 @@ main { color: var(--danger-color); } } - \ No newline at end of file + diff --git a/src/views/sensitivePerception/PoliceNegative.vue b/src/views/sensitivePerception/PoliceNegative.vue index 9c11bff..9828406 100644 --- a/src/views/sensitivePerception/PoliceNegative.vue +++ b/src/views/sensitivePerception/PoliceNegative.vue @@ -1,504 +1,666 @@ \ No newline at end of file + diff --git a/src/views/sensitivePerception/RiskClue.vue b/src/views/sensitivePerception/RiskClue.vue index 5ed22d1..849a4de 100644 --- a/src/views/sensitivePerception/RiskClue.vue +++ b/src/views/sensitivePerception/RiskClue.vue @@ -1,193 +1,350 @@ diff --git a/src/views/sensitivePerception/RiskPersonnel.vue b/src/views/sensitivePerception/RiskPersonnel.vue index f3cec5d..85848e3 100644 --- a/src/views/sensitivePerception/RiskPersonnel.vue +++ b/src/views/sensitivePerception/RiskPersonnel.vue @@ -1,263 +1,425 @@ diff --git a/src/views/work/Alarm.vue b/src/views/work/Alarm.vue index b5f8af7..6658a62 100644 --- a/src/views/work/Alarm.vue +++ b/src/views/work/Alarm.vue @@ -102,7 +102,13 @@ + + + + @@ -245,6 +260,15 @@ style="width: 280px" /> + + +