From e82d2e7a3eebee5b915490e753ef97275525b3ec Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Wed, 3 Sep 2025 12:10:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=86=E9=A2=91=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2=E5=8A=9E=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=84=E7=90=86=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../videoWarningHasDone/warning-detail.vue    | 49 ++++++++++++-------
 .../videoWarningToDone/warning-detail.vue     | 34 +++++++++----
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
index dd9e1bdb..755d9fcc 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, shallowRef } from 'vue';
 import { useVbenModal } from '@vben/common-ui';
-import { Descriptions, DescriptionsItem, Image, Tag } from 'ant-design-vue';
+import { Descriptions, DescriptionsItem, Image, Tag,Divider } from 'ant-design-vue';
 import { queryAlarmEventAttachmentsList } from '#/api/sis/alarmEventAttachments';
 import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model';
 import { fallImg } from './data';
@@ -110,25 +110,10 @@ function loadProcessList() {
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置">
+      <DescriptionsItem label="所在位置" :span="2">
         {{ warningDetail.deviceName }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="处理状态">
-        <Tag>
-          {{ warningDetail.stateName }}
-        </Tag>
-      </DescriptionsItem>
-
-      <DescriptionsItem label="处理情况" :span="2">
-        {{ warningDetail.processingDetails || '-' }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="处理时间" :span="2">
-        {{ warningDetail.solveTime || '-' }}
-      </DescriptionsItem>
-
-      <DescriptionsItem :span="1" label="附件信息">
+      <DescriptionsItem :span="2" label="附件信息">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
@@ -140,7 +125,33 @@ function loadProcessList() {
         </div>
       </DescriptionsItem>
 
-      <DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
+      <DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
+    </Descriptions>
+    <Divider orientation="left">处理</Divider>
+    <Descriptions
+      v-if="warningDetail"
+      size="small"
+      :column="2"
+      bordered
+      :labelStyle="{ width: '120px' }"
+      style="margin-bottom: 30px">
+      <DescriptionsItem label="处理状态">
+        <Tag>
+          {{ warningDetail.stateName }}
+        </Tag>
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人">
+        {{ warningDetail.solveName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人电话">
+        {{ warningDetail.solvePhone }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理时间">
+        {{ warningDetail.solveTime || '-' }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理情况" :span="2">
+        {{ warningDetail.processingDetails || '-' }}
+      </DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
index cc1c4112..dc0fa3eb 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, shallowRef } from 'vue';
 import { useVbenModal } from '@vben/common-ui';
-import { Descriptions, DescriptionsItem, Image, Tag } from 'ant-design-vue';
+import {Descriptions, DescriptionsItem, Divider, Image, Tag} from 'ant-design-vue';
 import { queryAlarmEventAttachmentsList } from '#/api/sis/alarmEventAttachments';
 import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model';
 import { fallImg } from './data';
@@ -108,17 +108,11 @@ function loadProcessList() {
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置">
+      <DescriptionsItem label="所在位置" :span="2">
         {{ warningDetail.deviceName }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="处理状态">
-        <Tag color="success">
-          {{ warningDetail.stateName }}
-        </Tag>
-      </DescriptionsItem>
-
-      <DescriptionsItem :span="1" label="附件信息">
+      <DescriptionsItem label="附件信息"  :span="2">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
@@ -130,7 +124,27 @@ function loadProcessList() {
         </div>
       </DescriptionsItem>
 
-      <DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
+      <DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
+    </Descriptions>
+    <Divider orientation="left">处理</Divider>
+    <Descriptions
+      v-if="warningDetail"
+      size="small"
+      :column="2"
+      bordered
+      :labelStyle="{ width: '120px' }"
+      style="margin-bottom: 30px">
+      <DescriptionsItem label="处理状态" :span="2">
+        <Tag>
+          {{ warningDetail.stateName }}
+        </Tag>
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人">
+        {{ warningDetail.solveName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理人电话">
+        {{ warningDetail.solvePhone }}
+      </DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>