From c23d9b379a278251fdce141b60fe73837d7452c7 Mon Sep 17 00:00:00 2001 From: sjh Date: Mon, 18 Nov 2024 11:40:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=B6=85=E5=B8=82=E9=A1=B5=E9=9D=A2-=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=8D=A2=E8=A1=8C=E9=87=8D=E5=8F=A0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sensitivePerception/Model.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/sensitivePerception/Model.vue b/src/views/sensitivePerception/Model.vue index 2fce083..7bc0c98 100644 --- a/src/views/sensitivePerception/Model.vue +++ b/src/views/sensitivePerception/Model.vue @@ -783,7 +783,10 @@ function goClue() { background: #e1e5ff; cursor: pointer; } + white-space: nowrap; + text-overflow: ellipsis; } + overflow: auto; } .model-card { background: #f6f7ff; From 8401a799cd8cec1025dc225d98771ad5901c469c Mon Sep 17 00:00:00 2001 From: sjh Date: Mon, 18 Nov 2024 11:55:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E9=A1=B5=E9=9D=A2-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sensitivePerception/ModelClue.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/sensitivePerception/ModelClue.vue b/src/views/sensitivePerception/ModelClue.vue index 782e7ba..048b921 100644 --- a/src/views/sensitivePerception/ModelClue.vue +++ b/src/views/sensitivePerception/ModelClue.vue @@ -229,8 +229,11 @@ watch( ); watch( () => query.value.modelIds, - () => { - getList(); + (newVal, oldVal) => { + if (newVal !== oldVal) { + query.value.current = 1; + getList(); + } } ); From 20474b3a875ced238f66548bae6f5e81faa5ae48 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Mon, 18 Nov 2024 13:46:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/work/alarm.ts | 8 + src/components/police-select.vue | 2 +- .../sensitivePerception/DepartNegative.vue | 99 +- .../sensitivePerception/PoliceNegative.vue | 1372 +++++++++-------- src/views/sensitivePerception/RiskClue.vue | 441 ++++-- .../sensitivePerception/RiskPersonnel.vue | 614 +++++--- src/views/work/Alarm.vue | 26 +- 7 files changed, 1590 insertions(+), 972 deletions(-) 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" /> + + +