Commit 0a2f47104f6cabb25e9246c38b3114cb3fd2dbcf
Merge branch 'ww' into 'main'
perf: camera manage set sn column width && access mode tag See merge request huang/yun-teng-iot-front!262
Showing
2 changed files
with
9 additions
and
16 deletions
| @@ -37,9 +37,9 @@ export const columns: BasicColumn[] = [ | @@ -37,9 +37,9 @@ export const columns: BasicColumn[] = [ | ||
| 37 | width: 120, | 37 | width: 120, |
| 38 | }, | 38 | }, |
| 39 | { | 39 | { |
| 40 | - title: '摄像头编号', | 40 | + title: '摄像头编号/监控点编号', |
| 41 | dataIndex: 'sn', | 41 | dataIndex: 'sn', |
| 42 | - width: 120, | 42 | + width: 220, |
| 43 | }, | 43 | }, |
| 44 | { | 44 | { |
| 45 | title: '视频流', | 45 | title: '视频流', |
| @@ -54,18 +54,13 @@ export const columns: BasicColumn[] = [ | @@ -54,18 +54,13 @@ export const columns: BasicColumn[] = [ | ||
| 54 | { | 54 | { |
| 55 | title: '接受方式', | 55 | title: '接受方式', |
| 56 | dataIndex: 'accessMode', | 56 | dataIndex: 'accessMode', |
| 57 | - width: 160, | 57 | + width: 100, |
| 58 | slots: { customRender: 'accessMode' }, | 58 | slots: { customRender: 'accessMode' }, |
| 59 | }, | 59 | }, |
| 60 | { | 60 | { |
| 61 | title: '创建时间', | 61 | title: '创建时间', |
| 62 | dataIndex: 'createTime', | 62 | dataIndex: 'createTime', |
| 63 | - width: 180, | ||
| 64 | - }, | ||
| 65 | - { | ||
| 66 | - title: '更新时间', | ||
| 67 | - dataIndex: 'updateTime', | ||
| 68 | - width: 180, | 63 | + width: 140, |
| 69 | }, | 64 | }, |
| 70 | ]; | 65 | ]; |
| 71 | 66 |
| @@ -39,13 +39,9 @@ | @@ -39,13 +39,9 @@ | ||
| 39 | /> | 39 | /> |
| 40 | </template> | 40 | </template> |
| 41 | <template #accessMode="{ record }"> | 41 | <template #accessMode="{ record }"> |
| 42 | - <span>{{ | ||
| 43 | - record.accessMode === AccessMode.ManuallyEnter | ||
| 44 | - ? '手动输入' | ||
| 45 | - : record.accessMode === AccessMode.Streaming | ||
| 46 | - ? '流媒体获取' | ||
| 47 | - : '' | ||
| 48 | - }}</span> | 42 | + <Tag :color="record.accessMode === AccessMode.ManuallyEnter ? 'cyan' : 'blue'">{{ |
| 43 | + record.accessMode === AccessMode.ManuallyEnter ? '手动输入' : '流媒体获取' | ||
| 44 | + }}</Tag> | ||
| 49 | </template> | 45 | </template> |
| 50 | <template #action="{ record }"> | 46 | <template #action="{ record }"> |
| 51 | <TableAction | 47 | <TableAction |
| @@ -96,6 +92,7 @@ | @@ -96,6 +92,7 @@ | ||
| 96 | import { Authority } from '/@/components/Authority'; | 92 | import { Authority } from '/@/components/Authority'; |
| 97 | import { useBatchDelete } from '/@/hooks/web/useBatchDelete'; | 93 | import { useBatchDelete } from '/@/hooks/web/useBatchDelete'; |
| 98 | import { Popconfirm } from 'ant-design-vue'; | 94 | import { Popconfirm } from 'ant-design-vue'; |
| 95 | + import { Tag } from 'ant-design-vue'; | ||
| 99 | 96 | ||
| 100 | export default defineComponent({ | 97 | export default defineComponent({ |
| 101 | components: { | 98 | components: { |
| @@ -108,6 +105,7 @@ | @@ -108,6 +105,7 @@ | ||
| 108 | TableImg, | 105 | TableImg, |
| 109 | Authority, | 106 | Authority, |
| 110 | Popconfirm, | 107 | Popconfirm, |
| 108 | + Tag, | ||
| 111 | }, | 109 | }, |
| 112 | setup() { | 110 | setup() { |
| 113 | const searchInfo = reactive<Recordable>({}); | 111 | const searchInfo = reactive<Recordable>({}); |