From 693c9d3311d4348cef2ecc39ea27af983d546015 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 16 Feb 2023 16:13:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=A7=86=E9=A2=91=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83-=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/media/device.ts               |  13 +
 src/components/AIcon/index.tsx        |   5 +-
 src/views/media/Device/Save/index.vue |   7 +
 src/views/media/Device/index.vue      | 334 ++++++++++++++++++++++++++
 src/views/media/Device/typings.d.ts   |  24 ++
 5 files changed, 382 insertions(+), 1 deletion(-)
 create mode 100644 src/api/media/device.ts
 create mode 100644 src/views/media/Device/Save/index.vue
 create mode 100644 src/views/media/Device/index.vue
 create mode 100644 src/views/media/Device/typings.d.ts

diff --git a/src/api/media/device.ts b/src/api/media/device.ts
new file mode 100644
index 00000000..d16d117e
--- /dev/null
+++ b/src/api/media/device.ts
@@ -0,0 +1,13 @@
+import server from '@/utils/request'
+
+export default {
+    // 列表
+    list: (data: any) => server.post(`/media/device/_query/`, data),
+    // 详情
+    detail: (id: string): any => server.get(`/media/device/${id}`),
+    // 新增
+    save: (data: any) => server.post(`/media/device/${data.channel}`, data),
+    // 修改
+    update: (data: any) => server.put(`/media/device/${data.channel}/${data.id}`, data),
+    del: (id: string) => server.remove(`/media/device/${id}`),
+}
\ No newline at end of file
diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx
index 7a8a21b3..4ebea3b2 100644
--- a/src/components/AIcon/index.tsx
+++ b/src/components/AIcon/index.tsx
@@ -45,7 +45,10 @@ const iconKeys = [
     'InfoCircleOutlined',
     'SearchOutlined',
     'EllipsisOutlined',
-    'ClockCircleOutlined'
+    'ClockCircleOutlined',
+    'PartitionOutlined',
+    'ShareAltOutlined',
+    'playCircleOutlined',
 ]
 
 const Icon = (props: {type: string}) => {
diff --git a/src/views/media/Device/Save/index.vue b/src/views/media/Device/Save/index.vue
new file mode 100644
index 00000000..e84d2a3b
--- /dev/null
+++ b/src/views/media/Device/Save/index.vue
@@ -0,0 +1,7 @@
+<template>
+    <div class="page-container">save</div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
new file mode 100644
index 00000000..141caa50
--- /dev/null
+++ b/src/views/media/Device/index.vue
@@ -0,0 +1,334 @@
+<template>
+    <div class="page-container">
+        <Search
+            :columns="columns"
+            target="notice-config"
+            @search="handleSearch"
+        />
+        <JTable
+            ref="listRef"
+            :columns="columns"
+            :request="DeviceApi.list"
+            :defaultParams="{
+                sorts: [{ name: 'createTime', order: 'desc' }],
+            }"
+            :params="params"
+        >
+            <template #headerTitle>
+                <a-button type="primary" @click="handleAdd"> 新增 </a-button>
+            </template>
+            <template #card="slotProps">
+                <CardBox
+                    :value="slotProps"
+                    :actions="getActions(slotProps, 'card')"
+                    v-bind="slotProps"
+                    :showStatus="true"
+                    :status="
+                        slotProps.state.value === 'online' ? 'success' : 'error'
+                    "
+                    :statusText="slotProps.state.text"
+                    :statusNames="{ success: 'success', error: 'error' }"
+                >
+                    <template #img>
+                        <slot name="img">
+                            <img :src="getImage('/device-media.png')" />
+                        </slot>
+                    </template>
+                    <template #content>
+                        <h3 class="card-item-content-title">
+                            {{ slotProps.name }}
+                        </h3>
+                        <a-row>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">厂商</div>
+                                <div>{{ slotProps.manufacturer }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    通道数量
+                                </div>
+                                <div>{{ slotProps.channelNumber }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">型号</div>
+                                <div>{{ slotProps.model }}</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    接入方式
+                                </div>
+                                <div>
+                                    {{ providerType[slotProps.provider] }}
+                                </div>
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <template #actions="item">
+                        <a-tooltip
+                            v-bind="item.tooltip"
+                            :title="item.disabled && item.tooltip.title"
+                        >
+                            <a-popconfirm
+                                v-if="item.popConfirm"
+                                v-bind="item.popConfirm"
+                                :disabled="item.disabled"
+                            >
+                                <a-button :disabled="item.disabled">
+                                    <AIcon type="DeleteOutlined" />
+                                </a-button>
+                            </a-popconfirm>
+                            <template v-else>
+                                <a-button
+                                    :disabled="item.disabled"
+                                    @click="item.onClick"
+                                >
+                                    <AIcon :type="item.icon" />
+                                    <span>{{ item.text }}</span>
+                                </a-button>
+                            </template>
+                        </a-tooltip>
+                    </template>
+                </CardBox>
+            </template>
+            <template #action="slotProps">
+                <a-space :size="16">
+                    <a-tooltip
+                        v-for="i in getActions(slotProps, 'table')"
+                        :key="i.key"
+                        v-bind="i.tooltip"
+                    >
+                        <a-popconfirm
+                            v-if="i.popConfirm"
+                            v-bind="i.popConfirm"
+                            :disabled="i.disabled"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-popconfirm>
+                        <a-button
+                            style="padding: 0"
+                            type="link"
+                            v-else
+                            @click="i.onClick && i.onClick(slotProps)"
+                        >
+                            <a-button
+                                :disabled="i.disabled"
+                                style="padding: 0"
+                                type="link"
+                                ><AIcon :type="i.icon"
+                            /></a-button>
+                        </a-button>
+                    </a-tooltip>
+                </a-space>
+            </template>
+        </JTable>
+    </div>
+</template>
+
+<script setup lang="ts">
+import DeviceApi from '@/api/media/device';
+import type { ActionsType } from '@/components/Table/index.vue';
+import { message } from 'ant-design-vue';
+import { getImage } from '@/utils/comm';
+
+const providerType = {
+    'gb28181-2016': 'GB/T28181',
+    'fixed-media': '固定地址',
+};
+
+const router = useRouter();
+
+const listRef = ref<Record<string, any>>({});
+const params = ref<Record<string, any>>({});
+
+const columns = [
+    {
+        title: 'ID',
+        dataIndex: 'id',
+        key: 'id',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '名称',
+        dataIndex: 'name',
+        key: 'name',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '接入方式',
+        dataIndex: 'type',
+        key: 'type',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '固定地址', value: 'fixed-media' },
+                { label: 'GB/T28181', value: 'gb28181-2016' },
+            ],
+            handleValue: (v: any) => {
+                return '123';
+            },
+        },
+    },
+    {
+        title: '通道数量',
+        dataIndex: 'channelNumber',
+        key: 'channelNumber',
+    },
+    {
+        title: '厂商',
+        dataIndex: 'manufacturer',
+        key: 'manufacturer',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '产品名称',
+        dataIndex: 'productId',
+        key: 'productId',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '固定地址', value: 'fixed-media' },
+                { label: 'GB/T28181', value: 'gb28181-2016' },
+            ],
+            handleValue: (v: any) => {
+                return '123';
+            },
+        },
+    },
+    {
+        title: '状态',
+        dataIndex: 'state',
+        key: 'state',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '禁用', value: 'notActive' },
+                { label: '离线', value: 'offline' },
+                { label: '在线', value: 'online' },
+            ],
+            handleValue: (v: any) => {
+                return '123';
+            },
+        },
+    },
+    {
+        title: '操作',
+        key: 'action',
+        fixed: 'right',
+        width: 250,
+        scopedSlots: true,
+    },
+];
+
+/**
+ * 搜索
+ * @param params
+ */
+const handleSearch = (e: any) => {
+    // console.log('handleSearch:', e);
+    params.value = e;
+};
+
+/**
+ * 新增
+ */
+const handleAdd = () => {
+    router.push(`/media/device/Save`);
+};
+
+const getActions = (
+    data: Partial<Record<string, any>>,
+    type: 'card' | 'table',
+): ActionsType[] => {
+    if (!data) return [];
+    const actions = [
+        {
+            key: 'edit',
+            text: '编辑',
+            tooltip: {
+                title: '编辑',
+            },
+            icon: 'EditOutlined',
+            onClick: () => {
+                router.push(`/media/device/Save?id=${data.id}`);
+            },
+        },
+        {
+            key: 'view',
+            text: '查看通道',
+            tooltip: {
+                title: '查看通道',
+            },
+            icon: 'PartitionOutlined',
+            onClick: () => {
+                router.push(
+                    `/media/device/Channel?id=${data.id}&type=${data.provider}`,
+                );
+            },
+        },
+        {
+            key: 'debug',
+            text: '更新通道',
+            tooltip: {
+                title:
+                    data.provider === 'fixed-media'
+                        ? '固定地址无法更新通道'
+                        : data.state.value === 'offline'
+                        ? '设备已离线'
+                        : data.state.value === 'notActive'
+                        ? '设备已禁用'
+                        : '',
+            },
+            disabled:
+                data.state.value === 'offline' ||
+                data.state.value === 'notActive' ||
+                data.provider === 'fixed-media',
+            icon: 'SyncOutlined',
+            onClick: () => {
+                // updateChannel()
+            },
+        },
+        {
+            key: 'delete',
+            text: '删除',
+            tooltip: {
+                title: '在线设备无法删除',
+            },
+            disabled: data.state.value === 'online',
+            popConfirm: {
+                title: '确认删除?',
+                onConfirm: async () => {
+                    const resp = await DeviceApi.del(data.id);
+                    if (resp.status === 200) {
+                        message.success('操作成功！');
+                        listRef.value?.reload();
+                    } else {
+                        message.error('操作失败！');
+                    }
+                },
+            },
+            icon: 'DeleteOutlined',
+        },
+    ];
+    return actions;
+};
+</script>
+<style lang="less" scoped>
+.page-container {
+    background: #f0f2f5;
+    padding: 24px;
+}
+</style>
diff --git a/src/views/media/Device/typings.d.ts b/src/views/media/Device/typings.d.ts
new file mode 100644
index 00000000..995964b8
--- /dev/null
+++ b/src/views/media/Device/typings.d.ts
@@ -0,0 +1,24 @@
+type BaseItem = {
+    id: string;
+    name: string;
+};
+type State = {
+    value: string;
+    text: string;
+};
+
+export type DeviceItem = {
+    photoUrl?: string;
+    channelNumber: number;
+    createTime: number;
+    firmware: string;
+    gatewayId: string;
+    host: string;
+    manufacturer: string;
+    model: string;
+    port: number;
+    provider: string;
+    state: State;
+    streamMode: string;
+    transport: string;
+} & BaseItem;

From 24690e1cdb1e43728859da49b1b5823fad51355f Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Thu, 16 Feb 2023 16:22:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PermissionButton/index.vue | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/PermissionButton/index.vue b/src/components/PermissionButton/index.vue
index 57268e91..cd95769d 100644
--- a/src/components/PermissionButton/index.vue
+++ b/src/components/PermissionButton/index.vue
@@ -4,14 +4,14 @@
       <a-popconfirm v-bind="popConfirm" @confirm="conform" :disabled="!isPermission || props.disabled">
         <a-tooltip v-if="tooltip" v-bind="tooltip">
           <slot v-if="noButton"></slot>
-          <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+          <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
             <slot></slot>
             <template #icon>
               <slot name="icon"></slot>
             </template>
           </a-button>
         </a-tooltip>
-        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
           <slot></slot>
           <template #icon>
             <slot name="icon"></slot>
@@ -22,7 +22,7 @@
     <template v-else-if="tooltip">
       <a-tooltip v-bind="tooltip">
         <slot v-if="noButton"></slot>
-        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+        <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
           <slot></slot>
           <template #icon>
             <slot name="icon"></slot>
@@ -32,7 +32,7 @@
     </template>
     <template v-else>
       <slot v-if="noButton"></slot>
-      <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+      <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
         <slot></slot>
         <template #icon>
           <slot name="icon"></slot>
@@ -42,7 +42,7 @@
   </template>
   <a-tooltip v-else title="没有权限">
     <slot v-if="noButton"></slot>
-    <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" @click="handleClick">
+    <a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
       <slot></slot>
       <template #icon>
         <slot name="icon"></slot>
@@ -56,11 +56,11 @@ import { TooltipProps, PopconfirmProps } from 'ant-design-vue/es'
 import { buttonProps } from 'ant-design-vue/es/button/button'
 import { usePermissionStore } from '@/store/permission';
 
-interface PermissionButtonEmits {
-  (e: 'click', data: MouseEvent): void;
-}
+// interface PermissionButtonEmits {
+//   (e: 'click', data: MouseEvent): void;
+// }
 
-const emits = defineEmits<PermissionButtonEmits>()
+// const emits = defineEmits<PermissionButtonEmits>()
 
 // interface PermissionButtonProps extends ButtonProps {
 //   tooltip?: TooltipProps;
@@ -105,9 +105,6 @@ const _isPermission = computed(() =>
       : false
     : true
 )
-const handleClick = (e: MouseEvent) => {
-  emits('click', e)
-}
 
 const conform = (e: MouseEvent) => {
   props.popConfirm?.onConfirm?.(e)