From 760d08ec455f8e4ad06c4816acabe6394ff5c113 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Wed, 12 Jul 2023 11:58:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Cascade/Channel/BindChannel/index.vue | 3 ++-
 src/views/media/Cascade/Channel/index.vue             | 2 ++
 src/views/media/Cascade/Save/index.vue                | 8 ++++++++
 src/views/media/Device/Channel/index.vue              | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/media/Cascade/Channel/BindChannel/index.vue b/src/views/media/Cascade/Channel/BindChannel/index.vue
index 45f2c3e3..7c273fd6 100644
--- a/src/views/media/Cascade/Channel/BindChannel/index.vue
+++ b/src/views/media/Cascade/Channel/BindChannel/index.vue
@@ -22,7 +22,7 @@
             :columns="columns"
             :request="CascadeApi.queryChannelList"
             :defaultParams="{
-                sorts: [{ name: 'name', order: 'desc' }],
+                sorts: [{ name: 'deviceName', order: 'asc' }, { name: 'name', order: 'asc' }],
                 terms: [
                     {
                         column: 'id',
@@ -145,6 +145,7 @@ const columns = [
         dataIndex: 'status',
         key: 'status',
         scopedSlots: true,
+        width: 150,
         search: {
             type: 'select',
             options: [
diff --git a/src/views/media/Cascade/Channel/index.vue b/src/views/media/Cascade/Channel/index.vue
index 970460fe..e9a76559 100644
--- a/src/views/media/Cascade/Channel/index.vue
+++ b/src/views/media/Cascade/Channel/index.vue
@@ -215,6 +215,7 @@ const columns = [
         dataIndex: 'status',
         key: 'status',
         scopedSlots: true,
+        width: 150,
         search: {
             type: 'select',
             options: [
@@ -229,6 +230,7 @@ const columns = [
     {
         title: '操作',
         key: 'action',
+        width: 100,
         scopedSlots: true,
     },
 ];
diff --git a/src/views/media/Cascade/Save/index.vue b/src/views/media/Cascade/Save/index.vue
index afdd92ab..013b7da1 100644
--- a/src/views/media/Cascade/Save/index.vue
+++ b/src/views/media/Cascade/Save/index.vue
@@ -428,6 +428,10 @@
                                             required: true,
                                             message: '请输入心跳周期',
                                         },
+                                        {
+                                            pattern: /^[1-9]\d*$/,
+                                            message: '请输入1~10000的整数',
+                                        }
                                     ]"
                                 >
                                     <j-input-number
@@ -450,6 +454,10 @@
                                             required: true,
                                             message: '请输入注册间隔',
                                         },
+                                        {
+                                            pattern: /^[1-9]\d*$/,
+                                            message: '请输入1~10000的整数',
+                                        }
                                     ]"
                                 >
                                     <j-input-number
diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 163ee7fe..be573c49 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -194,6 +194,7 @@ const columns = [
         dataIndex: 'status',
         key: 'status',
         scopedSlots: true,
+        width: 150,
         search: {
             type: 'select',
             options: [