by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

Browse Source
This commit is contained in:
zcxlsm
2025-09-03 15:14:13 +08:00
parent 27cf960ce1 e82d2e7a3e
commit eaee51af76
2 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
View File

@@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, shallowRef } from 'vue'; import { ref, shallowRef } from 'vue';
import { useVbenModal } from '@vben/common-ui'; 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 { queryAlarmEventAttachmentsList } from '#/api/sis/alarmEventAttachments';
import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model'; import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model';
import { fallImg } from './data'; import { fallImg } from './data';
@@ -110,25 +110,10 @@ function loadProcessList() {
{{ warningDetail.description }} {{ warningDetail.description }}
</DescriptionsItem> </DescriptionsItem>
<DescriptionsItem label="所在位置"> <DescriptionsItem label="所在位置" :span="2">
{{ warningDetail.deviceName }} {{ warningDetail.deviceName }}
</DescriptionsItem> </DescriptionsItem>
<DescriptionsItem :span="2" label="附件信息">
<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="附件信息">
<div class="file-box"> <div class="file-box">
<div class="img-box" v-for="item in currFiles"> <div class="img-box" v-for="item in currFiles">
<Image <Image
@@ -140,7 +125,33 @@ function loadProcessList() {
</div> </div>
</DescriptionsItem> </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> </Descriptions>
</BasicModal> </BasicModal>
</template> </template>

34
apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
View File

@@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, shallowRef } from 'vue'; import { ref, shallowRef } from 'vue';
import { useVbenModal } from '@vben/common-ui'; 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 { queryAlarmEventAttachmentsList } from '#/api/sis/alarmEventAttachments';
import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model'; import type { AlarmEventAttachmentsVO } from '#/api/sis/alarmEventAttachments/model';
import { fallImg } from './data'; import { fallImg } from './data';
@@ -108,17 +108,11 @@ function loadProcessList() {
{{ warningDetail.description }} {{ warningDetail.description }}
</DescriptionsItem> </DescriptionsItem>
<DescriptionsItem label="所在位置"> <DescriptionsItem label="所在位置" :span="2">
{{ warningDetail.deviceName }} {{ warningDetail.deviceName }}
</DescriptionsItem> </DescriptionsItem>
<DescriptionsItem label="处理状态"> <DescriptionsItem label="附件信息" :span="2">
<Tag color="success">
{{ warningDetail.stateName }}
</Tag>
</DescriptionsItem>
<DescriptionsItem :span="1" label="附件信息">
<div class="file-box"> <div class="file-box">
<div class="img-box" v-for="item in currFiles"> <div class="img-box" v-for="item in currFiles">
<Image <Image
@@ -130,7 +124,27 @@ function loadProcessList() {
</div> </div>
</DescriptionsItem> </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> </Descriptions>
</BasicModal> </BasicModal>
</template> </template>