From c6106ccef51965b27b206ae8684098a1436c90b3 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Sun, 7 Dec 2025 19:34:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-vue/packages/biz/views/biz/warningAlert/list.vue      | 5 +++--
 .../views/desktop/analysis/components/WarningAlert.vue    | 3 +--
 .../desktop/analysis/components/info/WarningInfo.vue      | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/web-vue/packages/biz/views/biz/warningAlert/list.vue b/web-vue/packages/biz/views/biz/warningAlert/list.vue
index fb2935fd..314e1e51 100644
--- a/web-vue/packages/biz/views/biz/warningAlert/list.vue
+++ b/web-vue/packages/biz/views/biz/warningAlert/list.vue
@@ -78,7 +78,7 @@
         field: 'alertLevel',
         component: 'Select',
         componentProps: {
-          dictType: '',
+          dictType: 'alert_level',
           allowClear: true,
         },
       },
@@ -97,7 +97,7 @@
         field: 'alertStatus',
         component: 'Select',
         componentProps: {
-          dictType: '',
+          dictType: 'alert_status',
           allowClear: true,
         },
       },
@@ -112,6 +112,7 @@
       sorter: true,
       width: 180,
       align: 'left',
+	  fixed: 'left'
     },
     {
       title: t('预警编码'),
diff --git a/web-vue/packages/core/layouts/views/desktop/analysis/components/WarningAlert.vue b/web-vue/packages/core/layouts/views/desktop/analysis/components/WarningAlert.vue
index a41ca42f..2043d595 100644
--- a/web-vue/packages/core/layouts/views/desktop/analysis/components/WarningAlert.vue
+++ b/web-vue/packages/core/layouts/views/desktop/analysis/components/WarningAlert.vue
@@ -52,8 +52,7 @@
       </div>
     </div>
   </Card>
-  
-  <Modal @register="register" @modalClose="fetchAppList('0')" />
+  <Modal @register="register" @modalClose="fetchAppList(currentStatus)" />
 </template>
 
 <script setup lang="ts">
diff --git a/web-vue/packages/core/layouts/views/desktop/analysis/components/info/WarningInfo.vue b/web-vue/packages/core/layouts/views/desktop/analysis/components/info/WarningInfo.vue
index b9074e35..e6fc3a8e 100644
--- a/web-vue/packages/core/layouts/views/desktop/analysis/components/info/WarningInfo.vue
+++ b/web-vue/packages/core/layouts/views/desktop/analysis/components/info/WarningInfo.vue
@@ -118,6 +118,7 @@ export default defineComponent({
     const handleOpinion = ref('');
     const currentStatus = ref('');
     const alertContent = ref('');
+	const paramId = ref()
 	const { createMessage } = useMessage();
 
     const [register, { closeModal }] = useModalInner(async (data: any) => {
@@ -125,6 +126,7 @@ export default defineComponent({
 	  currentStatus.value = data.alertStatus
 	  alertContent.value = data.alertContent
 	  handleOpinion.value = data.handleNote
+	  paramId.value = data.id
     });
 
     watch(currentStatus, (val) => {
@@ -151,7 +153,9 @@ export default defineComponent({
     };
 
     async function handleSubmit() {
-      if (!handleOpinion.value.trim()) {
+	  const opinionDesc = handleOpinion.value ?? '';
+	  
+      if (!opinionDesc.trim()) {
         createMessage.warning('请输入处理意见');
         return;
       }
@@ -162,7 +166,7 @@ export default defineComponent({
 	  }
 	  
       const params = {
-		  id: warningData.value.id
+		  id: paramId.value
       };
 
       const res = await bizWarningAlertSave(params, data);