From 5670470fcf3219db116052fd31da28bd0eae6db3 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 16 Mar 2023 17:17:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10481=E3=80=8110480=E3=80=8110471?=
 =?UTF-8?q?=E3=80=8110487=E3=80=8110477?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Device/Channel/Save.vue |  2 ++
 src/views/media/Device/Save/index.vue   |  3 ++-
 src/views/media/Device/index.vue        | 27 +++++++++++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/views/media/Device/Channel/Save.vue b/src/views/media/Device/Channel/Save.vue
index 7c1df256..2dc4fe43 100644
--- a/src/views/media/Device/Channel/Save.vue
+++ b/src/views/media/Device/Channel/Save.vue
@@ -238,6 +238,8 @@ watch(
  * @param value
  */
 let validateChannelId = async (_rule: Rule, value: string) => {
+    // ID非必填, 没有输入ID时, 不校验ID是否存在
+    if (!value) return;
     const { result } = await ChannelApi.validateField({
         deviceId: route.query.id,
         channelId: value,
diff --git a/src/views/media/Device/Save/index.vue b/src/views/media/Device/Save/index.vue
index 50ff4092..4ef4eeaa 100644
--- a/src/views/media/Device/Save/index.vue
+++ b/src/views/media/Device/Save/index.vue
@@ -15,6 +15,7 @@
                                 :checkStyle="true"
                                 :disabled="!!route.query.id"
                                 v-model="formData.channel"
+                                @change="formData.productId = undefined"
                             />
                         </j-form-item>
                         <j-row :gutter="24">
@@ -264,7 +265,7 @@ const formData = ref({
     name: '',
     channel: 'gb28181-2016',
     photoUrl: getImage('/device-media.png'),
-    productId: '',
+    productId: undefined,
     others: {
         access_pwd: '',
     },
diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
index 3f18f0d1..e5888f35 100644
--- a/src/views/media/Device/index.vue
+++ b/src/views/media/Device/index.vue
@@ -92,6 +92,23 @@
                     </template>
                 </CardBox>
             </template>
+
+            <template #channelNumber="slotProps">
+                {{ slotProps.channelNumber || 0 }}
+            </template>
+            <template #provider="slotProps">
+                {{ providerType[slotProps.provider] }}
+            </template>
+            <template #state="slotProps">
+                <j-badge
+                    :text="slotProps.state?.text"
+                    :status="
+                        slotProps.state?.value === 'online'
+                            ? 'success'
+                            : 'error'
+                    "
+                />
+            </template>
             <template #action="slotProps">
                 <j-space :size="16">
                     <template
@@ -139,6 +156,8 @@ const columns = [
         title: 'ID',
         dataIndex: 'id',
         key: 'id',
+        width: 200,
+        fixed: 'left',
         search: {
             type: 'string',
         },
@@ -169,6 +188,8 @@ const columns = [
         title: '通道数量',
         dataIndex: 'channelNumber',
         key: 'channelNumber',
+        scopedSlots: true,
+        width: 100,
     },
     {
         title: '厂商',
@@ -182,7 +203,7 @@ const columns = [
         title: '产品名称',
         dataIndex: 'productId',
         key: 'productId',
-        scopedSlots: true,
+        // scopedSlots: true,
         search: {
             type: 'select',
             options: () =>
@@ -215,6 +236,7 @@ const columns = [
         dataIndex: 'state',
         key: 'state',
         scopedSlots: true,
+        width: 100,
         search: {
             type: 'select',
             options: [
@@ -325,7 +347,8 @@ const getActions = (
             key: 'delete',
             text: '删除',
             tooltip: {
-                title: '在线设备无法删除',
+                title:
+                    data.state.value === 'online' ? '在线设备无法删除' : '删除',
             },
             disabled: data.state.value === 'online',
             popConfirm: {