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:
FLL
2025-09-04 17:02:35 +08:00
parent 9cefe1847e 0ffe547df8
commit 45d7ae177a
6 changed files with 86 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts
View File

@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
options: getDictOptions(DictEnum.alarm_level, true),
},
fieldName: 'level',
label: '级别',
label: '预警级别',
},
/*{
component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
field: 'reportTime',
},
{
title: '设备ip',
title: '设备IP',
field: 'deviceIp',
},
{
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
field: 'deviceName',
},
{
title: '级别',
title: '预警级别',
field: 'level',
slots: {
default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
disabled: true,
},
{
label: '设备名称',
label: '设备IP',
fieldName: 'deviceIp',
component: 'Input',
disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'required',
},
{
label: '重要级别',
label: '预警级别',
fieldName: 'level',
component: 'Select',
disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'selectRequired',
},
{
label: '描述',
label: '预警描述',
disabled: true,
fieldName: 'description',
component: 'Textarea',

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

@@ -72,15 +72,24 @@ function loadProcessList() {
:labelStyle="{ width: '120px' }"
style="margin-bottom: 30px"
>
<DescriptionsItem label="预警编号">
<DescriptionsItem label="预警编码">
{{ warningDetail.id }}
</DescriptionsItem>
<DescriptionsItem label="预警时间">
{{ warningDetail.reportTime }}
<DescriptionsItem label="预警类型">
{{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
</DescriptionsItem>
<DescriptionsItem label="级别">
<DescriptionsItem label="设备IP"
>{{ warningDetail.deviceIp }}
</DescriptionsItem>
<DescriptionsItem label="设备名称"
>{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="预警位置" :span="2">
{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="预警级别">
<Tag
:color="
warningDetail.level === '特大'
@@ -93,27 +102,15 @@ function loadProcessList() {
{{ warningDetail.levelName }}
</Tag>
</DescriptionsItem>
<DescriptionsItem label="预警类型">
{{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
<DescriptionsItem label="预警时间">
{{ warningDetail.reportTime }}
</DescriptionsItem>
<DescriptionsItem label="设备ip"
>{{ warningDetail.deviceIp }}
</DescriptionsItem>
<DescriptionsItem label="设备ip"
>{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="描述" :span="2">
<DescriptionsItem label="预警描述" :span="2">
{{ warningDetail.description }}
</DescriptionsItem>
<DescriptionsItem label="所在位置" :span="2">
{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem :span="2" label="附件信息">
<DescriptionsItem :span="2" label="相关图片">
<div class="file-box">
<div class="img-box" v-for="item in currFiles">
<Image

12
apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts
View File

@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
options: getDictOptions(DictEnum.alarm_level, true),
},
fieldName: 'level',
label: '级别',
label: '预警级别',
},
/*{
component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
field: 'reportTime',
},
{
title: '设备ip',
title: '设备IP',
field: 'deviceIp',
},
{
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
field: 'deviceName',
},
{
title: '级别',
title: '预警级别',
field: 'level',
slots: {
default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
disabled: true,
},
{
label: '设备名称',
label: '设备IP',
fieldName: 'deviceIp',
component: 'Input',
disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'required',
},
{
label: '重要级别',
label: '预警级别',
fieldName: 'level',
component: 'Select',
disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'selectRequired',
},
{
label: '描述',
label: '预警描述',
disabled: true,
fieldName: 'description',
component: 'Textarea',

44
apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue
View File

@@ -70,15 +70,23 @@ function loadProcessList() {
:labelStyle="{ width: '120px' }"
style="margin-bottom: 30px"
>
<DescriptionsItem label="预警编号">
<DescriptionsItem label="预警编码">
{{ warningDetail.id }}
</DescriptionsItem>
<DescriptionsItem label="预警时间">
{{ warningDetail.reportTime }}
<DescriptionsItem label="预警类型">
{{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
</DescriptionsItem>
<DescriptionsItem label="设备IP"
>{{ warningDetail.deviceIp }}
</DescriptionsItem>
<DescriptionsItem label="级别">
<DescriptionsItem label="设备名称"
>{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="预警位置" :span="2">
{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="预警级别">
<Tag
:color="
warningDetail.level === '特大'
@@ -91,28 +99,16 @@ function loadProcessList() {
{{ warningDetail.levelName }}
</Tag>
</DescriptionsItem>
<DescriptionsItem label="预警类型">
{{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
<DescriptionsItem label="预警时间">
{{ warningDetail.reportTime }}
</DescriptionsItem>
<DescriptionsItem label="设备ip"
>{{ warningDetail.deviceIp }}
</DescriptionsItem>
<DescriptionsItem label="设备ip"
>{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="描述" :span="2">
<DescriptionsItem label="预警描述" :span="2">
{{ warningDetail.description }}
</DescriptionsItem>
<DescriptionsItem label="所在位置">
{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="处理状态">
<DescriptionsItem label="处理状态" :span="2">
<Tag color="processing">
{{ warningDetail.stateName }}
</Tag>
@@ -126,7 +122,7 @@ function loadProcessList() {
{{ warningDetail.processingTime || '-' }}
</DescriptionsItem>-->
<DescriptionsItem :span="1" label="附件信息">
<DescriptionsItem :span="2" label="相关图片">
<div class="file-box">
<div class="img-box" v-for="item in currFiles">
<Image
@@ -138,7 +134,7 @@ function loadProcessList() {
</div>
</DescriptionsItem>
<DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
<DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
</Descriptions>
</BasicModal>
</template>

38
apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts
View File

@@ -22,7 +22,7 @@ export const querySchema: FormSchemaGetter = () => [
options: getDictOptions(DictEnum.alarm_level, true),
},
fieldName: 'level',
label: '级别',
label: '预警级别',
},
/*{
component: 'Select',
@@ -46,7 +46,7 @@ export const columns: VxeGridProps['columns'] = [
field: 'reportTime',
},
{
title: '设备ip',
title: '设备IP',
field: 'deviceIp',
},
{
@@ -54,7 +54,7 @@ export const columns: VxeGridProps['columns'] = [
field: 'deviceName',
},
{
title: '级别',
title: '预警级别',
field: 'level',
slots: {
default: ({ row }: any) => {
@@ -139,7 +139,7 @@ export const modalSchema: FormSchemaGetter = () => [
disabled: true,
},
{
label: '设备名称',
label: '设备IP',
fieldName: 'deviceIp',
component: 'Input',
disabled: true,
@@ -153,7 +153,7 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'required',
},
{
label: '重要级别',
label: '预警级别',
fieldName: 'level',
component: 'Select',
disabled: true,
@@ -186,7 +186,7 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'selectRequired',
},
{
label: '描述',
label: '预警描述',
disabled: true,
fieldName: 'description',
component: 'Textarea',
@@ -196,6 +196,19 @@ export const modalSchema: FormSchemaGetter = () => [
},
},
// 插入分割线
{
component: 'Divider',
fieldName: '_divider',
formItemClass: 'col-span-2',
hideLabel: true,
renderComponentContent: () => {
return {
default: () => h('div', '处理'),
};
},
},
{
label: '处理人',
fieldName: 'solveName',
@@ -212,19 +225,6 @@ export const modalSchema: FormSchemaGetter = () => [
fieldName: 'solveEmail',
component: 'Input',
},
// 插入分割线
{
component: 'Divider',
fieldName: '_divider',
formItemClass: 'col-span-2',
hideLabel: true,
renderComponentContent: () => {
return {
default: () => h('div', '处理'),
};
},
},
{
label: '备注',
fieldName: 'remark',

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

@@ -70,15 +70,23 @@ function loadProcessList() {
:labelStyle="{ width: '120px' }"
style="margin-bottom: 30px"
>
<DescriptionsItem label="预警编号">
<DescriptionsItem label="预警编码">
{{ warningDetail.id }}
</DescriptionsItem>
<DescriptionsItem label="预警时间">
{{ warningDetail.reportTime }}
<DescriptionsItem label="预警类型">
{{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
</DescriptionsItem>
<DescriptionsItem label="设备IP"
>{{ warningDetail.deviceIp }}
</DescriptionsItem>
<DescriptionsItem label="级别">
<DescriptionsItem label="设备名称"
>{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="预警位置" :span="2">
{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="预警级别">
<Tag
:color="
warningDetail.level === '特大'
@@ -91,28 +99,13 @@ function loadProcessList() {
{{ warningDetail.levelName }}
</Tag>
</DescriptionsItem>
<DescriptionsItem label="预警类型">
{{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
<DescriptionsItem label="预警时间">
{{ warningDetail.reportTime }}
</DescriptionsItem>
<DescriptionsItem label="设备ip"
>{{ warningDetail.deviceIp }}
</DescriptionsItem>
<DescriptionsItem label="设备ip"
>{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="描述" :span="2">
<DescriptionsItem label="预警描述" :span="2">
{{ warningDetail.description }}
</DescriptionsItem>
<DescriptionsItem label="所在位置" :span="2">
{{ warningDetail.deviceName }}
</DescriptionsItem>
<DescriptionsItem label="附件信息" :span="2">
<DescriptionsItem label="相关图片" :span="2">
<div class="file-box">
<div class="img-box" v-for="item in currFiles">
<Image