From eb43a5f5b211d4ae179497655ea235d7e982b56c Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 12:20:45 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix:=20bug#10676=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=85=A5=E7=BD=91=E5=85=B3=20Access?=
 =?UTF-8?q?Card=E7=BB=84=E4=BB=B6=E8=83=8C=E6=99=AF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{access-icon.png => access-media.png}     | Bin
 public/images/access-network.png              | Bin 4471 -> 9960 bytes
 public/images/access-protocol.png             | Bin 4982 -> 7219 bytes
 .../components/AccessCard/index.vue           |  15 ++++++++++++---
 .../AccessConfig/components/Cloud/Ctwing.vue  |   2 +-
 .../AccessConfig/components/Cloud/OneNet.vue  |   2 +-
 .../AccessConfig/components/Network/index.vue |   7 ++++---
 7 files changed, 18 insertions(+), 8 deletions(-)
 rename public/images/{access-icon.png => access-media.png} (100%)

diff --git a/public/images/access-icon.png b/public/images/access-media.png
similarity index 100%
rename from public/images/access-icon.png
rename to public/images/access-media.png
diff --git a/public/images/access-network.png b/public/images/access-network.png
index 90828abeb7d12b3edded0b6ffba29870a2234190..2bd14ec63162ed2a6dec61a356b55fe5eff1a5aa 100644
GIT binary patch
literal 9960
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

literal 4471
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

diff --git a/public/images/access-protocol.png b/public/images/access-protocol.png
index 37b8158ebf50cd73dd8393733aa4d46a476a253b..628ec99b780677d53f13fcd5409f510b747d0bc2 100644
GIT binary patch
literal 7219
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
Bu$TY<

literal 4982
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

diff --git a/src/views/link/AccessConfig/components/AccessCard/index.vue b/src/views/link/AccessConfig/components/AccessCard/index.vue
index 7ce0183d..be2c942a 100644
--- a/src/views/link/AccessConfig/components/AccessCard/index.vue
+++ b/src/views/link/AccessConfig/components/AccessCard/index.vue
@@ -3,7 +3,7 @@
         hoverable
         :class="[
             'card-render',
-            'container',
+            `access-${data.type || 'network'}`,
             checked === data.id ? 'checked' : '',
         ]"
         @click="checkedChange(data.id)"
@@ -41,6 +41,7 @@ const props = defineProps({
         default: () => {},
     },
 });
+console.log(111, props.data);
 
 const checkedChange = (id: string) => {
     emit('checkedChange', id);
@@ -106,8 +107,16 @@ const checkedChange = (id: string) => {
         }
     }
 }
-.container {
-    background: url('/public/images/access-icon.png') no-repeat;
+.access-media {
+    background: url('/public/images/access-media.png') no-repeat;
+    background-position: bottom right;
+}
+.access-network {
+    background: url('/public/images/access-network.png') no-repeat;
+    background-position: bottom right;
+}
+.access-protocol {
+    background: url('/public/images/access-protocol.png') no-repeat;
     background-position: bottom right;
 }
 </style>
diff --git a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
index 22d34c9f..f29d2089 100644
--- a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
+++ b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
@@ -193,7 +193,7 @@
                             <AccessCard
                                 @checkedChange="procotolChange"
                                 :checked="procotolCurrent"
-                                :data="item"
+                                :data="{ ...item, type: 'protocol' }"
                             >
                             </AccessCard>
                         </j-col>
diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
index 2d21a0b4..922e19f1 100644
--- a/src/views/link/AccessConfig/components/Cloud/OneNet.vue
+++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
@@ -275,7 +275,7 @@
                             <AccessCard
                                 @checkedChange="procotolChange"
                                 :checked="procotolCurrent"
-                                :data="item"
+                                :data="{ ...item, type: 'protocol' }"
                             >
                             </AccessCard>
                         </j-col>
diff --git a/src/views/link/AccessConfig/components/Network/index.vue b/src/views/link/AccessConfig/components/Network/index.vue
index a352aab6..d1b1e462 100644
--- a/src/views/link/AccessConfig/components/Network/index.vue
+++ b/src/views/link/AccessConfig/components/Network/index.vue
@@ -40,6 +40,7 @@
                                     description: item.description
                                         ? item.description
                                         : descriptionList[provider.id],
+                                    type: 'network',
                                 }"
                             >
                                 <template #other>
@@ -118,12 +119,12 @@
                             v-for="item in procotolList"
                             :key="item?.id"
                         >
-                            <access-card
+                            <AccessCard
                                 @checkedChange="procotolChange"
                                 :checked="procotolCurrent"
-                                :data="item"
+                                :data="{ ...item, type: 'protocol' }"
                             >
-                            </access-card>
+                            </AccessCard>
                         </j-col>
                     </j-row>
                     <j-empty v-else description="暂无数据" />

From ad89d1fbc2f539bd7d29b497fe44322f3241fc6f Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 14:18:57 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix:=20bug#10719=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=85=A5=E7=BD=91=E5=85=B3=20?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccessConfig/components/AccessCard/index.vue     |  1 -
 .../link/AccessConfig/components/Cloud/Ctwing.vue    |  6 +++++-
 .../link/AccessConfig/components/Cloud/OneNet.vue    |  6 +++++-
 .../link/AccessConfig/components/Edge/index.vue      |  6 +++++-
 .../link/AccessConfig/components/Network/index.vue   | 12 ++++++++++--
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/link/AccessConfig/components/AccessCard/index.vue b/src/views/link/AccessConfig/components/AccessCard/index.vue
index be2c942a..a82aa6a7 100644
--- a/src/views/link/AccessConfig/components/AccessCard/index.vue
+++ b/src/views/link/AccessConfig/components/AccessCard/index.vue
@@ -41,7 +41,6 @@ const props = defineProps({
         default: () => {},
     },
 });
-console.log(111, props.data);
 
 const checkedChange = (id: string) => {
     emit('checkedChange', id);
diff --git a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
index f29d2089..7c22d81e 100644
--- a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
+++ b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
@@ -184,7 +184,11 @@
                     </PermissionButton>
                 </div>
                 <j-scrollbar height="480">
-                    <j-row :gutter="[24, 24]" v-if="procotolList.length > 0">
+                    <j-row
+                        :gutter="[24, 24]"
+                        style="width: 100%"
+                        v-if="procotolList.length > 0"
+                    >
                         <j-col
                             :span="8"
                             v-for="item in procotolList"
diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
index 922e19f1..2e378fc9 100644
--- a/src/views/link/AccessConfig/components/Cloud/OneNet.vue
+++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
@@ -266,7 +266,11 @@
                     </PermissionButton>
                 </div>
                 <j-scrollbar height="480">
-                    <j-row :gutter="[24, 24]" v-if="procotolList.length > 0">
+                    <j-row
+                        :gutter="[24, 24]"
+                        style="width: 100%"
+                        v-if="procotolList.length > 0"
+                    >
                         <j-col
                             :span="8"
                             v-for="item in procotolList"
diff --git a/src/views/link/AccessConfig/components/Edge/index.vue b/src/views/link/AccessConfig/components/Edge/index.vue
index dc55b0e3..b0800cfe 100644
--- a/src/views/link/AccessConfig/components/Edge/index.vue
+++ b/src/views/link/AccessConfig/components/Edge/index.vue
@@ -30,7 +30,11 @@
                     </PermissionButton>
                 </div>
                 <j-scrollbar height="480">
-                    <j-row :gutter="[24, 24]" v-if="networkList.length > 0">
+                    <j-row
+                        :gutter="[24, 24]"
+                        style="width: 100%"
+                        v-if="networkList.length > 0"
+                    >
                         <j-col
                             :span="8"
                             v-for="item in networkList"
diff --git a/src/views/link/AccessConfig/components/Network/index.vue b/src/views/link/AccessConfig/components/Network/index.vue
index d1b1e462..ce93bc0a 100644
--- a/src/views/link/AccessConfig/components/Network/index.vue
+++ b/src/views/link/AccessConfig/components/Network/index.vue
@@ -26,7 +26,11 @@
                     </PermissionButton>
                 </div>
                 <j-scrollbar height="480">
-                    <j-row :gutter="[24, 24]" v-if="networkList.length > 0">
+                    <j-row
+                        :gutter="[24, 24]"
+                        style="width: 100%"
+                        v-if="networkList.length > 0"
+                    >
                         <j-col
                             :span="8"
                             v-for="item in networkList"
@@ -113,7 +117,11 @@
                     </PermissionButton>
                 </div>
                 <j-scrollbar height="480">
-                    <j-row :gutter="[24, 24]" v-if="procotolList.length > 0">
+                    <j-row
+                        :gutter="[24, 24]"
+                        style="width: 100%"
+                        v-if="procotolList.length > 0"
+                    >
                         <j-col
                             :span="8"
                             v-for="item in procotolList"

From a3ac144a7220cb40cb08b75500e4ffb7faafa38c Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 16:00:07 +0800
Subject: [PATCH 03/12] =?UTF-8?q?fix:=20bug#10677=E3=80=8110687=E3=80=8110?=
 =?UTF-8?q?688=E3=80=8110693=E3=80=8110701=E3=80=8110720=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=85=A5=E7=BD=91=E5=85=B3=E9=83=A8?=
 =?UTF-8?q?=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccessConfig/components/Channel/index.vue |  8 +-
 .../AccessConfig/components/Cloud/Ctwing.vue  | 16 +++-
 .../AccessConfig/components/Cloud/OneNet.vue  | 17 +++-
 .../AccessConfig/components/Edge/index.vue    | 14 ++-
 .../AccessConfig/components/Media/GB28181.vue | 86 +++++++++++++------
 .../AccessConfig/components/Media/index.vue   |  6 +-
 .../AccessConfig/components/Network/index.vue | 20 ++++-
 src/views/link/AccessConfig/index.vue         | 13 ++-
 src/views/link/Type/Detail/index.vue          |  2 +-
 9 files changed, 133 insertions(+), 49 deletions(-)

diff --git a/src/views/link/AccessConfig/components/Channel/index.vue b/src/views/link/AccessConfig/components/Channel/index.vue
index 01a37d29..a22f6776 100644
--- a/src/views/link/AccessConfig/components/Channel/index.vue
+++ b/src/views/link/AccessConfig/components/Channel/index.vue
@@ -20,7 +20,11 @@
                                     message: '请输入名称',
                                     trigger: 'blur',
                                 },
-                                { max: 64, message: '最多可输入64个字符' },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                    trigger: 'blur',
+                                },
                             ]"
                         >
                             <j-input
@@ -119,7 +123,7 @@ const onFinish = async (values: any) => {
 };
 
 onMounted(() => {
-    if (id === ':id') {
+    if (id !== ':id') {
         formState.value = {
             name: props.data.name,
             description: props.data?.description || '',
diff --git a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
index 7c22d81e..2eccd985 100644
--- a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
+++ b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <j-steps class="steps-steps" :current="stepCurrent">
-            <j-step v-for="item in steps" :key="item" :title="item" />
+            <j-step disabled v-for="item in steps" :key="item" :title="item" />
         </j-steps>
         <div class="steps-content">
             <div class="steps-box" v-if="current === 0">
@@ -51,6 +51,7 @@
                                                     max: 64,
                                                     message:
                                                         '最多可输入64个字符',
+                                                    trigger: 'blur',
                                                 },
                                             ]"
                                         >
@@ -75,6 +76,7 @@
                                                     max: 64,
                                                     message:
                                                         '最多可输入64个字符',
+                                                    trigger: 'blur',
                                                 },
                                             ]"
                                         >
@@ -202,7 +204,11 @@
                             </AccessCard>
                         </j-col>
                     </j-row>
-                    <j-empty v-else description="暂无数据" />
+                    <j-empty
+                        style="margin-top: 10%"
+                        v-else
+                        description="暂无数据"
+                    />
                 </j-scrollbar>
             </div>
         </div>
@@ -226,7 +232,11 @@
                                     message: '请输入名称',
                                     trigger: 'blur',
                                 },
-                                { max: 64, message: '最多可输入64个字符' },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                    trigger: 'blur',
+                                },
                             ]"
                         >
                             <j-input
diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
index 2e378fc9..894279e2 100644
--- a/src/views/link/AccessConfig/components/Cloud/OneNet.vue
+++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <j-steps class="steps-steps" :current="stepCurrent">
-            <j-step v-for="item in steps" :key="item" :title="item" />
+            <j-step disabled v-for="item in steps" :key="item" :title="item" />
         </j-steps>
         <div class="steps-content">
             <div class="steps-box" v-if="current === 0">
@@ -63,6 +63,7 @@
                                                     max: 64,
                                                     message:
                                                         '最多可输入64个字符',
+                                                    trigger: 'blur',
                                                 },
                                             ]"
                                         >
@@ -86,6 +87,7 @@
                                                     max: 64,
                                                     message:
                                                         '最多可输入64个字符',
+                                                    trigger: 'blur',
                                                 },
                                             ]"
                                         >
@@ -116,6 +118,7 @@
                                                     max: 64,
                                                     message:
                                                         '最多可输入64个字符',
+                                                    trigger: 'blur',
                                                 },
                                             ]"
                                         >
@@ -284,7 +287,11 @@
                             </AccessCard>
                         </j-col>
                     </j-row>
-                    <j-empty v-else description="暂无数据" />
+                    <j-empty
+                        style="margin-top: 10%"
+                        v-else
+                        description="暂无数据"
+                    />
                 </j-scrollbar>
             </div>
         </div>
@@ -309,7 +316,11 @@
                                         message: '请输入名称',
                                         trigger: 'blur',
                                     },
-                                    { max: 64, message: '最多可输入64个字符' },
+                                    {
+                                        max: 64,
+                                        message: '最多可输入64个字符',
+                                        trigger: 'blur',
+                                    },
                                 ]"
                             >
                                 <j-input
diff --git a/src/views/link/AccessConfig/components/Edge/index.vue b/src/views/link/AccessConfig/components/Edge/index.vue
index b0800cfe..b314afaa 100644
--- a/src/views/link/AccessConfig/components/Edge/index.vue
+++ b/src/views/link/AccessConfig/components/Edge/index.vue
@@ -5,7 +5,7 @@
             class="steps-steps"
             :current="stepCurrent"
         >
-            <j-step v-for="item in steps" :key="item" :title="item" />
+            <j-step disabled v-for="item in steps" :key="item" :title="item" />
         </j-steps>
         <div v-if="channel !== 'edge-child-device'" class="steps-content">
             <div class="steps-box" v-if="current === 0">
@@ -95,7 +95,11 @@
                             </AccessCard>
                         </j-col>
                     </j-row>
-                    <j-empty v-else description="暂无数据" />
+                    <j-empty
+                        style="margin-top: 10%"
+                        v-else
+                        description="暂无数据"
+                    />
                 </j-scrollbar>
             </div>
         </div>
@@ -123,7 +127,11 @@
                                     message: '请输入名称',
                                     trigger: 'blur',
                                 },
-                                { max: 64, message: '最多可输入64个字符' },
+                                {
+                                    max: 64,
+                                    message: '最多可输入64个字符',
+                                    trigger: 'blur',
+                                },
                             ]"
                         >
                             <j-input
diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue
index f3b17be4..c44876b7 100644
--- a/src/views/link/AccessConfig/components/Media/GB28181.vue
+++ b/src/views/link/AccessConfig/components/Media/GB28181.vue
@@ -1,7 +1,7 @@
 <template>
     <div style="margin-top: 10px">
         <j-steps :current="stepCurrent">
-            <j-step v-for="item in steps" :key="item" :title="item" />
+            <j-step disabled v-for="item in steps" :key="item" :title="item" />
         </j-steps>
         <div class="steps-content">
             <div class="steps-box" v-if="current === 0">
@@ -29,7 +29,8 @@
                                     },
                                     {
                                         max: 64,
-                                        message: '最大可输入64个字符',
+                                        message: '最多可输入64个字符',
+                                        trigger: 'blur',
                                     },
                                 ]"
                             >
@@ -50,7 +51,8 @@
                                     },
                                     {
                                         max: 64,
-                                        message: '最大可输入64个字符',
+                                        message: '最多可输入64个字符',
+                                        trigger: 'blur',
                                     },
                                 ]"
                             >
@@ -202,7 +204,11 @@
                             <j-collapse v-model:activeKey="activeKey">
                                 <j-collapse-panel
                                     :key="cluster.id"
-                                    :header="`#${index + 1}.节点`"
+                                    :header="
+                                        cluster.clusterNodeId
+                                            ? cluster.clusterNodeId
+                                            : `#${index + 1}.配置信息`
+                                    "
                                 >
                                     <template #extra>
                                         <span
@@ -504,7 +510,7 @@ interface Form2 {
 }
 interface FormState {
     domain: string | undefined;
-    sipId: string | undefined;
+    sipId: string | number | undefined;
     shareCluster: boolean;
     hostPort: {
         port: string | undefined;
@@ -576,7 +582,7 @@ const removeCluster = (item: Form2) => {
 };
 
 const addCluster = () => {
-    const id = Date.now();
+    const id: any = Date.now();
     dynamicValidateForm.cluster.push({
         clusterNodeId: undefined,
         port: undefined,
@@ -613,7 +619,11 @@ const { resetFields, validate, validateInfos } = useForm(
     reactive({
         name: [
             { required: true, message: '请输入名称', trigger: 'blur' },
-            { max: 64, message: '最多可输入64个字符' },
+            {
+                max: 64,
+                message: '最多可输入64个字符',
+                trigger: 'blur',
+            },
         ],
         description: [{ max: 200, message: '最多可输入200个字符' }],
     }),
@@ -628,7 +638,7 @@ const saveData = () => {
             transport: 'SIP',
             channel: 'gb28181',
         };
-
+        params.configuration.sipId = Number(params.configuration?.sipId);
         const resp =
             id === ':id' ? await save(params) : await update({ ...params, id });
         if (resp.status === 200) {
@@ -645,20 +655,32 @@ const next = async () => {
         data1.hostPort.port = port;
     }
     if (!data1?.shareCluster) {
-        let data2 = await formRef2.value?.validate();
-        if (data2 && data2?.cluster) {
-            data2.cluster.forEach((i: any) => {
-                i.enabled = true;
-                i.port = JSON.parse(i.port).port;
+        await formRef2.value
+            ?.validate()
+            .then((data2) => {
+                if (data2 && data2?.cluster) {
+                    data2.cluster.forEach((i: any) => {
+                        i.enabled = true;
+                        i.port = JSON.parse(i.port).port;
+                    });
+                    data1 = {
+                        ...data1,
+                        ...data2,
+                    };
+                }
+                current.value = current.value + 1;
+                params.configuration = data1;
+            })
+            .catch((err) => {
+                err.errorFields.forEach((item: any) => {
+                    const activeId: any =
+                        dynamicValidateForm.cluster[item.name[1]].id;
+                    if (!activeKey.value.includes(activeId)) {
+                        activeKey.value.push(activeId); // 校验未通过的展开
+                    }
+                });
             });
-            data1 = {
-                ...data1,
-                ...data2,
-            };
-        }
     }
-    current.value = current.value + 1;
-    params.configuration = data1;
 };
 const prev = () => {
     current.value = current.value - 1;
@@ -698,11 +720,25 @@ onMounted(() => {
     });
 
     if (id !== ':id') {
-        formState.value = props.data.configuration;
-        formData.value = {
-            name: props.data.name,
-            description: props.data?.description || '',
-        };
+        const { configuration, name, description = '' } = props.data;
+        formData.value = { name, description };
+
+        if (configuration?.shareCluster) {
+            formState.value = {
+                ...formState.value,
+                ...props.data.configuration,
+            };
+        } else {
+            formState.value = {
+                ...formState.value,
+                ...props.data.configuration,
+            };
+            dynamicValidateForm.cluster = configuration.cluster;
+            if (dynamicValidateForm.cluster.length === 1) {
+                activeKey.value = ['1'];
+                dynamicValidateForm.cluster[0].id = 1;
+            }
+        }
     }
 });
 
diff --git a/src/views/link/AccessConfig/components/Media/index.vue b/src/views/link/AccessConfig/components/Media/index.vue
index 5f1716f3..916988e8 100644
--- a/src/views/link/AccessConfig/components/Media/index.vue
+++ b/src/views/link/AccessConfig/components/Media/index.vue
@@ -21,7 +21,11 @@
                                         message: '请输入名称',
                                         trigger: 'blur',
                                     },
-                                    { max: 64, message: '最多可输入64个字符' },
+                                    {
+                                        max: 64,
+                                        message: '最多可输入64个字符',
+                                        trigger: 'blur',
+                                    },
                                 ]"
                             >
                                 <j-input
diff --git a/src/views/link/AccessConfig/components/Network/index.vue b/src/views/link/AccessConfig/components/Network/index.vue
index ce93bc0a..164319dc 100644
--- a/src/views/link/AccessConfig/components/Network/index.vue
+++ b/src/views/link/AccessConfig/components/Network/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <j-steps :current="stepCurrent">
-            <j-step v-for="item in steps" :key="item" :title="item" />
+            <j-step disabled v-for="item in steps" :key="item" :title="item" />
         </j-steps>
         <div class="steps-content">
             <div class="steps-box" v-if="current === 0">
@@ -92,7 +92,11 @@
                             </AccessCard>
                         </j-col>
                     </j-row>
-                    <j-empty v-else description="暂无数据" />
+                    <j-empty
+                        style="margin-top: 10%"
+                        v-else
+                        description="暂无数据"
+                    />
                 </j-scrollbar>
             </div>
             <div class="steps-box" v-else-if="current === 1">
@@ -135,7 +139,11 @@
                             </AccessCard>
                         </j-col>
                     </j-row>
-                    <j-empty v-else description="暂无数据" />
+                    <j-empty
+                        style="margin-top: 10%"
+                        v-else
+                        description="暂无数据"
+                    />
                 </j-scrollbar>
             </div>
             <div class="steps-box" v-else>
@@ -375,7 +383,11 @@ const { resetFields, validate, validateInfos } = useForm(
     reactive({
         name: [
             { required: true, message: '请输入名称', trigger: 'blur' },
-            { max: 64, message: '最多可输入64个字符' },
+            {
+                max: 64,
+                message: '最多可输入64个字符',
+                trigger: 'blur',
+            },
         ],
         description: [{ max: 200, message: '最多可输入200个字符' }],
     }),
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index 5564d8ac..5cfdbea5 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -186,6 +186,7 @@ const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 
 let providersList = ref<Record<string, any>>([]);
+const providersOptions = ref<Record<string, any>>([]);
 
 const statusMap = new Map();
 statusMap.set('enabled', 'success');
@@ -207,13 +208,7 @@ const columns = [
         key: 'provider',
         search: {
             type: 'select',
-            options: async () => {
-                const res: any = await getProviders();
-                return (res?.result || [])?.map((item: any) => ({
-                    lable: item.name,
-                    value: item.id,
-                }));
-            },
+            options: providersOptions,
         },
     },
     {
@@ -315,6 +310,10 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
 const getProvidersList = async () => {
     const res: any = await getProviders();
     providersList.value = res.result;
+    providersOptions.value = (res?.result || [])?.map((item: any) => ({
+        label: item.name,
+        value: item.id,
+    }));
 };
 getProvidersList();
 
diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index 5457b433..0f5ca6bd 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -1358,7 +1358,7 @@ watch(
             top: -10px;
             left: 10px;
             right: 10px;
-            width: calc(100%-10px);
+            width: calc(100% - 10px);
             height: 100%;
             background-color: #f4f4f4;
             content: ' ';

From 8606bfdb0bfd6d2d28d810cd82d811b3f7dbacf9 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 17:18:07 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix:=20bug#10645=E3=80=8110616=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E7=BB=9C=E7=BB=84=E4=BB=B6=E9=83=A8?=
 =?UTF-8?q?=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/link/Type/Detail/index.vue | 47 ++++++++++++++++++++++++++--
 src/views/link/Type/data.ts          | 18 ++++++-----
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index 0f5ca6bd..d1887f34 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -91,17 +91,41 @@
                         >
                             <j-collapse
                                 v-model:activeKey="activeKey"
-                                class="collapse"
+                                :class="[
+                                    !formData.shareCluster
+                                        ? 'collapse'
+                                        : 'collapse-panel',
+                                ]"
+                                :ghost="formData.shareCluster"
+                                collapsible="header"
                             >
                                 <j-collapse-panel
+                                    :key="cluster.id"
+                                    :show-arrow="!formData.shareCluster"
+                                >
+                                    <!-- <j-collapse-panel
                                     :key="cluster.id"
                                     :header="
                                         cluster.serverId
                                             ? cluster.serverId
-                                            : `#${index + 1}.配置信息`
+                                            : !formData.shareCluster
+                                            ? `#${index + 1}.配置信息`
+                                            : ''
                                     "
                                     collapsible="header"
-                                >
+                                    :show-arrow="!formData.shareCluster"
+                                > -->
+                                    <template #header v-if="!shareCluster">
+                                        <div class="collapse-header">
+                                            {{
+                                                cluster.serverId
+                                                    ? cluster.serverId
+                                                    : !formData.shareCluster
+                                                    ? `#${index + 1}.配置信息`
+                                                    : ''
+                                            }}
+                                        </div>
+                                    </template>
                                     <template #extra v-if="!shareCluster">
                                         <j-popconfirm
                                             @confirm.prevent="
@@ -1112,6 +1136,10 @@ const filterConfigByType = (data: any, type: string) => {
     });
 };
 
+const changeheader = (value: string) => {
+    console.log(22, value);
+};
+
 const getPortOptions = (portOptions: object, index = 0) => {
     if (!portOptions) return;
     const type = formData.value.type;
@@ -1369,7 +1397,20 @@ watch(
 .collapse {
     margin-bottom: 20px;
     background: #f4f4f4;
+    :deep(.ant-collapse-header-text) {
+        flex: 1;
+    }
 }
+.collapse-panel {
+    margin-bottom: 20px;
+    border: #d9d9d9 1px solid;
+    background: #f4f4f4;
+    border-radius: 2px;
+    :deep(.ant-collapse-header) {
+        padding: 0;
+    }
+}
+
 .delete-btn {
     display: inline-block;
     color: #e50012;
diff --git a/src/views/link/Type/data.ts b/src/views/link/Type/data.ts
index 302b581d..50c04a1f 100644
--- a/src/views/link/Type/data.ts
+++ b/src/views/link/Type/data.ts
@@ -20,8 +20,8 @@ export const Configuration = {
         script: '',
         size: '',
         length: '4',
-        offset: '0',
-        little: 'false',
+        offset: undefined,
+        little: undefined,
     },
 };
 
@@ -103,11 +103,12 @@ export const isVisible = (
 ) => VisibleData[LastName].includes(dependencies);
 
 export const Validator = {
-    regIp: new RegExp(
-        /((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/,
+    regIpv4: new RegExp(
+        /^((([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))\.){3}(([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))$/,
     ),
+    regIPv6: new RegExp(/^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/),
     regDomain: new RegExp(
-        /[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+\.?/,
+        /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i,
     ),
     regOnlyNumber: new RegExp(/^\d+$/),
 };
@@ -159,7 +160,8 @@ export const Rules = {
             message: '请输入公网地址',
         },
         {
-            pattern: Validator.regIp || Validator.regDomain,
+            pattern:
+                Validator.regIpv4 || Validator.regIPv6 || Validator.regDomain,
             message: '请输入正确格式的域名或ip',
         },
     ],
@@ -179,7 +181,9 @@ export const Rules = {
             message: '请输入远程地址',
         },
         {
-            pattern: Validator.regIp || Validator.regDomain,
+            pattern:
+                Validator.regIpv4 || Validator.regIPv6 || Validator.regDomain,
+
             message: '请输入正确格式的域名或ip',
         },
     ],

From c62c80ebc9ba055b8fe607c3ad68af977ea88e6c Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 17:30:46 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix:=20bug#10702=E3=80=8110704=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E5=AA=92=E4=BD=93=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Stream/Detail/index.vue | 33 +++++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/views/media/Stream/Detail/index.vue b/src/views/media/Stream/Detail/index.vue
index cfa20425..e6d033ec 100644
--- a/src/views/media/Stream/Detail/index.vue
+++ b/src/views/media/Stream/Detail/index.vue
@@ -76,7 +76,10 @@
                                     message: '请输入API Host',
                                 },
                                 {
-                                    pattern: regDomain,
+                                    pattern:
+                                        Validator.regIpv4 ||
+                                        Validator.regIPv6 ||
+                                        Validator.regDomain,
                                     message: '请输入正确的IP地址或者域名',
                                 },
                             ]"
@@ -130,7 +133,10 @@
                                     message: '请输入RTP IP',
                                 },
                                 {
-                                    pattern: regDomain,
+                                    pattern:
+                                        Validator.regIpv4 ||
+                                        Validator.regIPv6 ||
+                                        Validator.regDomain,
                                     message: '请输入正确的IP地址或者域名',
                                 },
                             ]"
@@ -191,7 +197,15 @@
                                 style="width: 100%"
                                 :min="1"
                                 :max="
-                                    formData.configuration.dynamicRtpPortRange1
+                                    Number(
+                                        formData.configuration
+                                            .dynamicRtpPortRange1,
+                                    ) < 65535
+                                        ? Number(
+                                              formData.configuration
+                                                  .dynamicRtpPortRange1,
+                                          )
+                                        : 65535
                                 "
                                 :precision="0"
                                 placeholder="起始端口"
@@ -279,8 +293,17 @@ const formRef = ref<FormInstance>();
 const loading = ref(false);
 const options = ref([]);
 const checked = ref(false);
-const regDomain =
-    /[j-zA-Z0-9][-j-zA-Z0-9]{0,62}(\.[j-zA-Z0-9][-j-zA-Z0-9]{0,62})+\.?/;
+
+const Validator = {
+    regIpv4: new RegExp(
+        /^((([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))\.){3}(([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))$/,
+    ),
+    regIPv6: new RegExp(/^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/),
+    regDomain: new RegExp(
+        /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i,
+    ),
+    regOnlyNumber: new RegExp(/^\d+$/),
+};
 
 const formData = ref<FormDataType>({
     name: '',

From 0b32328ce6c0f92d94278ae439bd86b370fc97c7 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 17:48:17 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fix:=20bug#10080=E3=80=8110705=E3=80=8110?=
 =?UTF-8?q?707=E3=80=8110713=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Log/Access/index.vue                | 29 +++++++++++++------
 src/views/Log/System/index.vue                | 10 +++----
 .../AccessConfig/components/Cloud/OneNet.vue  |  2 +-
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/views/Log/Access/index.vue b/src/views/Log/Access/index.vue
index 0298a403..b623504f 100644
--- a/src/views/Log/Access/index.vue
+++ b/src/views/Log/Access/index.vue
@@ -16,6 +16,9 @@
                     moment(slotProps.requestTime).format('YYYY-MM-DD HH:mm:ss')
                 }}
             </template>
+            <template #description="slotProps">
+                {{ slotProps.action }}
+            </template>
             <template #responseTime="slotProps">
                 <j-tag color="purple">
                     {{ slotProps.responseTime - slotProps.requestTime }} ms
@@ -59,12 +62,7 @@
             </template>
         </j-pro-table>
     </div>
-    <j-modal
-        :width="1100"
-        v-model:visible="visible"
-        title="详情"
-        @ok="handleOk"
-    >
+    <j-modal :width="1100" v-model:visible="visible" title="详情">
         <j-descriptions :data="descriptionsData" title="" bordered :column="2">
             <j-descriptions-item label="URL">
                 {{ descriptionsData?.url }}
@@ -112,6 +110,9 @@
                 />
             </j-descriptions-item>
         </j-descriptions>
+        <template #footer>
+            <j-button type="primary" @click="handleOk">关闭</j-button>
+        </template>
     </j-modal>
 </template>
 <script lang="ts" setup name="AccessLog">
@@ -145,6 +146,16 @@ const columns = [
         },
         ellipsis: true,
     },
+    {
+        title: '说明',
+        dataIndex: 'description',
+        key: 'description',
+        scopedSlots: true,
+        search: {
+            type: 'string',
+        },
+        ellipsis: true,
+    },
     {
         title: '请求方法',
         dataIndex: 'httpMethod',
@@ -198,9 +209,9 @@ const columns = [
         title: '请求用户',
         dataIndex: 'username',
         key: 'username',
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
         width: 150,
         scopedSlots: true,
     },
diff --git a/src/views/Log/System/index.vue b/src/views/Log/System/index.vue
index 6720bf93..b5b763db 100644
--- a/src/views/Log/System/index.vue
+++ b/src/views/Log/System/index.vue
@@ -66,12 +66,7 @@
             </template>
         </j-pro-table>
     </div>
-    <j-modal
-        :width="1100"
-        v-model:visible="visible"
-        title="详情"
-        @ok="handleOk"
-    >
+    <j-modal :width="1100" v-model:visible="visible" title="详情">
         <div>
             <span class="mr-10">[{{ descriptionsData?.threadName }}]</span>
             <span class="mr-10">{{
@@ -102,6 +97,9 @@
             placeholder="暂无数据"
             :auto-size="{ minRows: 24, maxRows: 28 }"
         />
+        <template #footer>
+            <j-button type="primary" @click="handleOk">关闭</j-button>
+        </template>
     </j-modal>
 </template>
 <script lang="ts" setup name="SystemLog">
diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
index 894279e2..314f81df 100644
--- a/src/views/link/AccessConfig/components/Cloud/OneNet.vue
+++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
@@ -94,7 +94,7 @@
                                             <template #label>
                                                 通知Token
                                                 <j-tooltip
-                                                    title="接收OneNet推送的Token地址"
+                                                    title="自定义token,可用于验证请求是否来自OneNet"
                                                 >
                                                     <AIcon
                                                         type="QuestionCircleOutlined"

From 45273951c5a329b1c81ba6c8f17f5fe2f82408c2 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Wed, 22 Mar 2023 18:08:56 +0800
Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/instance.ts                   |  2 +-
 src/api/iot-card/cardManagement.ts           |  2 +-
 src/utils/request.ts                         | 11 ++++-
 src/utils/utils.ts                           | 44 ++++++++---------
 src/views/device/Instance/Export/index.vue   | 22 ++++++---
 src/views/device/Instance/Process/index.vue  | 50 +++++++++-----------
 src/views/iot-card/CardManagement/Export.vue |  4 +-
 7 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts
index 841f2229..9562fd06 100644
--- a/src/api/device/instance.ts
+++ b/src/api/device/instance.ts
@@ -107,7 +107,7 @@ export const deviceImport = (productId: string, fileUrl: string, autoDeploy: boo
  * @param type 文件类型
  * @returns 
  */
-export const deviceExport = (productId: string, type: string) => `${BASE_API_PATH}/device-instance${!!productId ? `/${productId}` : ''}/export.${type}`
+export const deviceExport = (productId: string, type: string, params?: any) => server.get(`/device-instance${!!productId ? `/${productId}` : ''}/export.${type}`, params, {responseType: 'blob'})
 
 /**
  * 验证设备ID是否重复
diff --git a/src/api/iot-card/cardManagement.ts b/src/api/iot-card/cardManagement.ts
index 4b7441bc..ed75ce6e 100644
--- a/src/api/iot-card/cardManagement.ts
+++ b/src/api/iot-card/cardManagement.ts
@@ -97,7 +97,7 @@ export const _import = (configId: any, params: any) => server.get(`/network/card
  * @param format 类型 xlsx、csv
  * @param params
  */
-export const _export = (format: string, data: any) => server.post(`/network/card/download.${format}/_query`, data, { responseType: 'blob' });
+export const _export = (format: string, data: any) => server.postStream(`/network/card/download.${format}/_query`, data);
 
 /**
  * 下载模板
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 5eaf3044..2d56eed9 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -112,6 +112,12 @@ export const getStream = function(url: string, params = {}) {
     })
 }
 
+export const postStream = function(url: string, data={}, params = {}) {
+    return post<any>(url, data, params, {
+        responseType: 'arraybuffer' // 设置请求数据类型，返回blob可解析类型
+    })
+}
+
 /**
  * 异常拦截处理器
  * @param {Object} error
@@ -208,7 +214,7 @@ request.interceptors.response.use(response => {
         }
         // 如果返回的的是文件流，那么return值则为response
         if (response.headers['content-type'] === 'application/octet-stream; charset=UTF-8' || response.headers['content-type'] === 'application/vnd.ms-excel;charset=UTF-8') {
-            return response
+            return response.data
         } else {
             return response.data
         }
@@ -222,5 +228,6 @@ export default {
     patch,
     put,
     remove,
-    getStream
+    getStream,
+    postStream
 }
\ No newline at end of file
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 4c159487..8766bc6c 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,7 +1,7 @@
 import moment from "moment";
 import { LocalStore } from "./comm";
 import { TOKEN_KEY } from "./variable";
-import {SystemConst} from './consts';
+import { SystemConst } from './consts';
 
 /**
  * 把数据下载成JSON
@@ -30,7 +30,7 @@ export const downloadObject = (record: Record<string, any>, fileName: string, fo
  * @param url 下载链接
  * @param params 参数
  */
- export const downloadFile = (url: string, params?: Record<string, any>) => {
+export const downloadFile = (url: string, params?: Record<string, any>) => {
   const formElement = document.createElement('form');
   formElement.style.display = 'display:none;';
   formElement.method = 'GET';
@@ -91,29 +91,29 @@ export const randomString = (length?: number) => {
  * @returns 
  */
 export const timestampFormat = (time: number) => {
-    let hour = 0;
-    let minute = 0;
-    let second = 0;
-    const timeStr = 'hh小时mm分钟ss秒';
-    
-    if (time) {
-        if (time >= 60 * 60 * 1000) {
-            hour = Math.trunc(time / (60 * 60 * 1000));
-        }
+  let hour = 0;
+  let minute = 0;
+  let second = 0;
+  const timeStr = 'hh小时mm分钟ss秒';
 
-        if (time >= 60 * 1000) {
-            minute = Math.trunc((time - hour * 60 * 60 * 1000) / (60 * 1000));
-        }
-
-        second = Math.trunc(
-            (time - hour * (60 * 60 * 1000) - minute * 60 * 1000) / 1000,
-        );
+  if (time) {
+    if (time >= 60 * 60 * 1000) {
+      hour = Math.trunc(time / (60 * 60 * 1000));
     }
 
-    return timeStr
-        .replace('hh', hour.toString())
-        .replace('mm', minute.toString())
-        .replace('ss', second.toString());
+    if (time >= 60 * 1000) {
+      minute = Math.trunc((time - hour * 60 * 60 * 1000) / (60 * 1000));
+    }
+
+    second = Math.trunc(
+      (time - hour * (60 * 60 * 1000) - minute * 60 * 1000) / 1000,
+    );
+  }
+
+  return timeStr
+    .replace('hh', hour.toString())
+    .replace('mm', minute.toString())
+    .replace('ss', second.toString());
 };
 
 export const ArrayToTree = (list: any[]): any[] => {
diff --git a/src/views/device/Instance/Export/index.vue b/src/views/device/Instance/Export/index.vue
index 1a14d9dd..87cf1672 100644
--- a/src/views/device/Instance/Export/index.vue
+++ b/src/views/device/Instance/Export/index.vue
@@ -49,7 +49,7 @@
 
 <script lang="ts" setup>
 import { queryNoPagingPost } from '@/api/device/product';
-import { downloadFile } from '@/utils/utils';
+import { downloadFileByUrl } from '@/utils/utils';
 import encodeQuery from '@/utils/encodeQuery';
 import { deviceExport } from '@/api/device/instance';
 
@@ -83,13 +83,23 @@ watch(
     { immediate: true, deep: true },
 );
 
-const handleOk = () => {
+const handleOk = async () => {
     const params = encodeQuery(props.data);
-    downloadFile(
-        deviceExport(modelRef.product || '', modelRef.fileType),
-        params,
+    // downloadFile(
+    //     deviceExport(modelRef.product || '', modelRef.fileType),
+    //     params,
+    // );
+    const res: any = await deviceExport(
+        modelRef.product || '',
+        modelRef.fileType,
+        params
     );
-    emit('close');
+    if (res) {
+        const blob = new Blob([res], { type: modelRef.fileType });
+        const url = URL.createObjectURL(blob);
+        downloadFileByUrl(url, `设备实例`, modelRef.fileType);
+        emit('close');
+    }
 };
 
 const handleCancel = () => {
diff --git a/src/views/device/Instance/Process/index.vue b/src/views/device/Instance/Process/index.vue
index 784f6554..1f203be8 100644
--- a/src/views/device/Instance/Process/index.vue
+++ b/src/views/device/Instance/Process/index.vue
@@ -3,16 +3,22 @@
         :maskClosable="false"
         width="800px"
         :visible="true"
-        title="当前进度"
-        @ok="handleCancel"
-        @cancel="handleCancel"
+        :title="type === 'active' ? '启用' : '同步'"
+        :closable="false"
     >
-        <div>
-            <j-badge v-if="flag" status="processing" text="进行中" />
-            <j-badge v-else status="success" text="已完成" />
+        <div style="margin: 10px 0px 20px 0px">
+            <div v-if="flag">
+                <div>{{ type === 'active' ? '正在启用全部设备' : '正在同步设备状态' }}</div>
+                <j-progress :percent="50" />
+            </div>
+            <div v-else>
+                <p>{{ type === 'active' ? '启用' : '同步' }}成功：{{ count }}条</p>
+                <p v-if="type === 'active'">启用失败：{{ errCount }}条<j-tooltip title="实例信息页面中的配置项未完善"><AIcon type="QuestionCircleOutlined" /></j-tooltip></p>
+            </div>
         </div>
-        <p>总数量：{{ count }}</p>
-        <a style="color: red">{{ errMessage }}</a>
+        <template #footer>
+            <j-button v-if="!flag" type="primary" @click="handleCancel">完成</j-button>
+        </template>
     </j-modal>
 </template>
 
@@ -32,8 +38,8 @@ const props = defineProps({
 });
 // const eventSource = ref<Record<string, any>>({})
 const count = ref<number>(0);
-const flag = ref<boolean>(false);
-const errMessage = ref<string>('');
+const flag = ref<boolean>(true);
+const errCount = ref<number>(0);
 const isSource = ref<boolean>(false);
 const id = ref<string>('');
 const source = ref<Record<string, any>>({});
@@ -43,30 +49,27 @@ const handleCancel = () => {
     emit('save');
 };
 
-// const handleOk = () => {
-//     emit('close');
-//     emit('save');
-// };
-
 const getData = (api: string) => {
+    flag.value = true;
     let dt = 0;
     const _source = new EventSourcePolyfill(api);
     source.value = _source;
     _source.onmessage = (e: any) => {
         const res = JSON.parse(e.data);
+        // console.log(res)
         switch (props.type) {
             case 'active':
                 if (res.success) {
+                    _source.close();
                     dt += res.total;
                     count.value = dt;
                 } else {
                     if (res.source) {
-                        const msg = `${res.source.name}: ${res.message}`;
-                        errMessage.value = msg;
+                        errCount.value = 1
                         id.value = res.source.id;
                         isSource.value = true;
                     } else {
-                        errMessage.value = res.message;
+                        errCount.value = 1
                     }
                 }
                 break;
@@ -74,22 +77,13 @@ const getData = (api: string) => {
                 dt += res;
                 count.value = dt;
                 break;
-            case 'import':
-                if (res.success) {
-                    const temp = res.result.total;
-                    dt += temp;
-                    count.value = dt;
-                } else {
-                    errMessage.value = res.message;
-                }
-                break;
             default:
                 break;
         }
     };
     _source.onerror = () => {
-        flag.value = false;
         _source.close();
+        flag.value = false;
     };
     _source.onopen = () => {};
 };
diff --git a/src/views/iot-card/CardManagement/Export.vue b/src/views/iot-card/CardManagement/Export.vue
index 079f84ad..8638beac 100644
--- a/src/views/iot-card/CardManagement/Export.vue
+++ b/src/views/iot-card/CardManagement/Export.vue
@@ -43,11 +43,9 @@ const type = ref<string>('xlsx');
 
 const handleOk = () => {
     _export(type.value, props.data).then((res: any) => {
-        console.log(res)
         if (res) {
-            const blob = new Blob([res], { type: type.value });
+            const blob = new Blob([res.data], { type: type.value });
             const url = URL.createObjectURL(blob);
-            console.log(url, 123);
             downloadFileByUrl(
                 url,
                 `物联卡管理-${moment(new Date()).format(

From 470877eac6c5b9d175555af6c0f7e82bc959a7c4 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 19:08:02 +0800
Subject: [PATCH 08/12] =?UTF-8?q?fix:=20bug#10722=E3=80=8110723=E3=80=8110?=
 =?UTF-8?q?728=20=E4=BF=AE=E5=A4=8D=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Certificate/Detail/CertificateFile.vue    | 13 ++++--
 src/views/link/Certificate/Detail/index.vue   | 31 +-------------
 src/views/link/Certificate/index.vue          | 42 +++++++++++--------
 3 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/src/views/link/Certificate/Detail/CertificateFile.vue b/src/views/link/Certificate/Detail/CertificateFile.vue
index 275342ed..4ee0b529 100644
--- a/src/views/link/Certificate/Detail/CertificateFile.vue
+++ b/src/views/link/Certificate/Detail/CertificateFile.vue
@@ -54,12 +54,17 @@ const loading = ref(false);
 const handleChange = (info: UploadChangeParam) => {
     loading.value = true;
     if (info.file.status === 'done') {
-        onlyMessage('上传成功！', 'success');
         const result = info.file.response?.result;
-        keystoreBase64.value = result;
+        const reg = new RegExp(/\.pem$/i);
+        if (reg.test(info.file.name)) {
+            keystoreBase64.value = result;
+            emit('change', result);
+            emit('update:modelValue', result);
+            onlyMessage('上传成功！', 'success');
+        } else {
+            onlyMessage('请上传.pem格式的文件', 'error');
+        }
         loading.value = false;
-        emit('change', result);
-        emit('update:modelValue', result);
     }
 };
 const textChange = (val: any) => {
diff --git a/src/views/link/Certificate/Detail/index.vue b/src/views/link/Certificate/Detail/index.vue
index bc49e208..e6d5aa16 100644
--- a/src/views/link/Certificate/Detail/index.vue
+++ b/src/views/link/Certificate/Detail/index.vue
@@ -9,7 +9,7 @@
                         :model="formData"
                         name="basic"
                         :label-col="{ span: 8 }"
-                        :wrapper-col="{ span: 16 }"
+                        :wrapper-col="{ span: 24 }"
                         autocomplete="off"
                     >
                         <j-form-item
@@ -86,7 +86,7 @@
                         <h1>2. 配置说明</h1>
                         <h2>1、证书文件</h2>
                         <div>
-                            您可以使用文本编辑工具打开PEM或者CRT格式的证书文件，复制其中的内容并粘贴到该文本框，或者单击该文本框下的上传，并选择存储在本地计算机的证书文件，将文件内容上传到文本框。
+                            您可以使用文本编辑工具打开PEM格式的证书文件，复制其中的内容并粘贴到该文本框，或者单击该文本框下的上传，并选择存储在本地计算机的证书文件，将文件内容上传到文本框。
                         </div>
                         <h2>2、证书私钥</h2>
                         <div>
@@ -208,31 +208,4 @@ detail(id);
         }
     }
 }
-
-.doc {
-    height: 100%;
-    padding: 0 24px;
-    overflow-y: auto;
-    color: rgba(#000, 0.8);
-    font-size: 14px;
-    background-color: #fff;
-
-    h1 {
-        margin: 16px 0;
-        color: rgba(#000, 0.85);
-        font-weight: bold;
-        font-size: 14px;
-
-        &:first-child {
-            margin-top: 0;
-        }
-    }
-
-    h2 {
-        margin: 6px 10px;
-        color: rgba(0, 0, 0, 0.8);
-        font-weight: 400;
-        font-size: 14px;
-    }
-}
 </style>
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index 9023a06f..43d90035 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -76,14 +76,17 @@ const columns = [
         width: 200,
         ellipsis: true,
         search: {
-            type: 'select',
-            options: [
-                {
-                    label: '证书标准',
-                    value: 'common',
-                },
-            ],
+            type: 'string',
         },
+        // search: {
+        //     type: 'select',
+        //     options: [
+        //         {
+        //             label: '证书标准',
+        //             value: 'common',
+        //         },
+        //     ],
+        // },
         scopedSlots: true,
     },
     {
@@ -118,17 +121,17 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
         return [];
     }
     return [
-        {
-            key: 'view',
-            text: '查看',
-            tooltip: {
-                title: '查看',
-            },
-            icon: 'EyeOutlined',
-            onClick: async () => {
-                handlEye(data.id);
-            },
-        },
+        // {
+        //     key: 'view',
+        //     text: '查看',
+        //     tooltip: {
+        //         title: '查看',
+        //     },
+        //     icon: 'EyeOutlined',
+        //     onClick: async () => {
+        //         handlEye(data.id);
+        //     },
+        // },
         {
             key: 'update',
             text: '编辑',
@@ -143,6 +146,9 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
         {
             key: 'delete',
             text: '删除',
+            tooltip: {
+                title: '删除',
+            },
             popConfirm: {
                 title: '确认删除?',
                 okText: ' 确定',

From 4e123ac64cf29a138fe4270b478797a63ce95274 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Wed, 22 Mar 2023 19:45:54 +0800
Subject: [PATCH 09/12] fix: bug#10706-1

---
 src/api/system/department.ts                  |  2 +
 .../components/AddDeviceOrProductDialog.vue   | 87 +++++++++++++++----
 2 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/src/api/system/department.ts b/src/api/system/department.ts
index 565db91f..c7f4103a 100644
--- a/src/api/system/department.ts
+++ b/src/api/system/department.ts
@@ -18,6 +18,8 @@ export const getDeviceOrProductList_api = (data: object) => server.post(`/device
 export const getDeviceList_api = (data: object) => server.post(`/device/instance/_query`, data);
 // 根据产品的id获取产品的权限
 export const getPermission_api = (type: 'device' | 'product', ids: object, id: string) => server.post(`/assets/bindings/${type}/org/${id}/_query`, ids);
+// 获取绑定的权限
+export const getBindingsPermission = (type: 'device' | 'product', ids: string[]) => server.post(`/assets/bindings/${type}`, ids);
 // 获取产品的权限字典
 export const getPermissionDict_api = () => server.get(`/assets/bindings/product/permissions`);
 
diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index 8603e42f..6481f03e 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -139,6 +139,7 @@ import {
     getDeviceList_api,
     getPermission_api,
     bindDeviceOrProductList_api,
+    getBindingsPermission,
 } from '@/api/system/department';
 import { message } from 'jetlinks-ui-components';
 import { dictType } from '../typing';
@@ -295,22 +296,17 @@ const table: any = {
                 const { pageIndex, pageSize, total, data } =
                     resp.result as resultType;
                 const ids = data.map((item) => item.id);
-                getPermission_api(props.assetType, ids, parentId).then(
+                // fix: bug#10706
+                getBindingsPermission(props.assetType, ids).then(
                     (perResp: any) => {
-                        const permissionObj = {};
-                        perResp.result.forEach((item: any) => {
-                            permissionObj[item.assetId] = props.allPermission
-                                .filter((permission) =>
-                                    item.allPermissions.includes(permission.id),
-                                )
-                                .map((item) => ({
-                                    label: item.name,
-                                    value: item.id,
+                        data.forEach((item) => {
+                            item.permissionList = perResp.result
+                                .find((f: any) => f.assetId === item.id)
+                                .permissionInfoList?.map((m: any) => ({
+                                    label: m.name,
+                                    value: m.id,
                                     disabled: true,
                                 }));
-                        });
-                        data.forEach((item) => {
-                            item.permissionList = permissionObj[item.id];
                             item.selectPermissions = ['read'];
 
                             // 产品的状态进行转换处理
@@ -331,11 +327,10 @@ const table: any = {
                                 };
                             }
                         });
-
                         resolve({
                             code: 200,
                             result: {
-                                data: data,
+                                data: data.sort((a, b) => a.createTime - b.createTime),
                                 pageIndex,
                                 pageSize,
                                 total,
@@ -344,6 +339,57 @@ const table: any = {
                         });
                     },
                 );
+                // getPermission_api(props.assetType, ids, parentId).then(
+                //     (perResp: any) => {
+                //         console.log('perResp: ', perResp);
+                //         console.log('props.allPermission: ', props.allPermission);
+                //         const permissionObj = {};
+                //         perResp.result.forEach((item: any) => {
+                //             permissionObj[item.assetId] = props.allPermission
+                //                 .filter((permission) =>
+                //                     item.allPermissions.includes(permission.id),
+                //                 )
+                //                 .map((item) => ({
+                //                     label: item.name,
+                //                     value: item.id,
+                //                     disabled: true,
+                //                 }));
+                //         });
+                //         data.forEach((item) => {
+                //             item.permissionList = permissionObj[item.id];
+                //             item.selectPermissions = ['read'];
+
+                //             // 产品的状态进行转换处理
+                //             if (props.assetType === 'product') {
+                //                 item.state = {
+                //                     value:
+                //                         item.state === 1
+                //                             ? 'online'
+                //                             : item.state === 0
+                //                             ? 'offline'
+                //                             : '',
+                //                     text:
+                //                         item.state === 1
+                //                             ? '正常'
+                //                             : item.state === 0
+                //                             ? '禁用'
+                //                             : '',
+                //                 };
+                //             }
+                //         });
+
+                //         resolve({
+                //             code: 200,
+                //             result: {
+                //                 data: data,
+                //                 pageIndex,
+                //                 pageSize,
+                //                 total,
+                //             },
+                //             status: 200,
+                //         });
+                //     },
+                // );
             });
         }),
     // 整理参数并获取数据
@@ -398,10 +444,15 @@ const table: any = {
     },
 };
 table.init();
-const selectRow = (keys:string[], rows:any[]) => {
-    const okRows = rows.filter(item=>!!item.permissionList.find((permiss:any)=>permiss.value === 'share'));
+const selectRow = (keys: string[], rows: any[]) => {
+    const okRows = rows.filter(
+        (item) =>
+            !!item.permissionList.find(
+                (permiss: any) => permiss.value === 'share',
+            ),
+    );
     table.selectedRows = okRows;
-    table._selectedRowKeys.value = okRows.map(item=>item.id)
+    table._selectedRowKeys.value = okRows.map((item) => item.id);
 };
 </script>
 

From cde14681e72270573ffa8681a6cfd4d106780edf Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 20:39:03 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix:=20bug#10729=E3=80=8110738=E3=80=8110?=
 =?UTF-8?q?745=E3=80=8110734=E4=BF=AE=E5=A4=8D=E8=BF=9C=E7=A8=8B=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Firmware/Save/index.vue       | 18 ++++++++++++------
 .../device/Firmware/Task/Detail/index.vue      | 13 +++++++++----
 src/views/device/Firmware/Task/Save/index.vue  |  8 +-------
 src/views/device/Firmware/index.vue            |  5 ++++-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/views/device/Firmware/Save/index.vue b/src/views/device/Firmware/Save/index.vue
index c7209f7f..331bba0e 100644
--- a/src/views/device/Firmware/Save/index.vue
+++ b/src/views/device/Firmware/Save/index.vue
@@ -237,6 +237,8 @@ const emit = defineEmits(['change']);
 
 const id = props.data.id;
 const VersionOrder = props.data.versionOrder;
+const VersionSign = props.data.sign;
+const VersionUrl = props.data.url;
 
 const formData: any = ref({
     name: '',
@@ -254,12 +256,14 @@ const extraValue: any = ref({});
 
 const validatorSign = async (_: Record<string, any>, value: string) => {
     const { signMethod, url } = formData.value;
-    if (value && !!signMethod && !!url && !extraValue.value) {
-        return extraValue.value[signMethod] !== value
-            ? Promise.reject('签名不一致，请检查文件是否上传正确')
-            : Promise.resolve();
-    } else {
+    if (id && VersionSign === value && VersionUrl === url) {
         return Promise.resolve();
+    } else {
+        if (value && !!signMethod && !!url && !!extraValue.value) {
+            return extraValue.value[signMethod] !== value
+                ? Promise.reject('签名不一致，请检查文件是否上传正确')
+                : Promise.resolve();
+        }
     }
 };
 const validatorVersionOrder = async (_: Record<string, any>, value: string) => {
@@ -270,7 +274,9 @@ const validatorVersionOrder = async (_: Record<string, any>, value: string) => {
         if (value && !!signMethod && productId) {
             const res = await validateVersion(productId, value);
             if (res.status === 200) {
-                return Promise.reject(res.result ? '版本序号已存在' : '');
+                return res.result
+                    ? Promise.reject('版本序号已存在')
+                    : Promise.resolve();
             }
         }
     }
diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue
index 7eec3d8e..e677650a 100644
--- a/src/views/device/Firmware/Task/Detail/index.vue
+++ b/src/views/device/Firmware/Task/Detail/index.vue
@@ -280,7 +280,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     if (!data) {
         return [];
     }
-    const Actions = [
+    const Actions: any = [
         {
             key: 'view',
             text: '查看',
@@ -292,7 +292,11 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                 handlEye(data.errorReason);
             },
         },
-        {
+    ];
+
+    const { state, mode } = data;
+    if (mode.value === 'push' && state.value === 'failed') {
+        Actions.push({
             key: 'update',
             text: '重试',
             tooltip: {
@@ -305,8 +309,9 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                     handlTry(data.id);
                 },
             },
-        },
-    ];
+        });
+    }
+
     return Actions;
 };
 
diff --git a/src/views/device/Firmware/Task/Save/index.vue b/src/views/device/Firmware/Task/Save/index.vue
index 89bdb16b..b4658025 100644
--- a/src/views/device/Firmware/Task/Save/index.vue
+++ b/src/views/device/Firmware/Task/Save/index.vue
@@ -208,10 +208,4 @@ watch(
 );
 </script>
 
-<style lang="less" scoped>
-.form {
-    .form-submit {
-        background-color: @primary-color !important;
-    }
-}
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index 8d2f406d..7260fe16 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -143,7 +143,7 @@ const columns = [
         key: 'createTime',
         dataIndex: 'createTime',
         search: {
-            type: 'time',
+            type: 'date',
         },
         width: 200,
         scopedSlots: true,
@@ -197,6 +197,9 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
         {
             key: 'delete',
             text: '删除',
+            tooltip: {
+                title: '删除',
+            },
             popConfirm: {
                 title: '确认删除?',
                 okText: ' 确定',

From a8478617cdc13a288ace8e37a72eacdd1d1e812a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 22 Mar 2023 23:01:22 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix:=20bug#10763=E3=80=8110750=E3=80=8110?=
 =?UTF-8?q?732=E3=80=8110686?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  4 +-
 src/components/Layout/BasicLayoutPage.vue     |  5 ++
 src/components/ValueItem/index.vue            |  2 +-
 src/router/menu.ts                            |  2 +-
 src/utils/request.ts                          |  5 +-
 .../DashBoard/components/TimeSelect.vue       |  3 +-
 .../iot-card/CardManagement/Detail/index.vue  |  5 ++
 src/views/iot-card/CardManagement/Save.vue    |  4 +-
 src/views/iot-card/CardManagement/index.vue   | 18 +++++-
 src/views/iot-card/Home/index.vue             | 22 +++----
 src/views/iot-card/Platform/Detail/index.vue  |  1 +
 src/views/iot-card/Platform/index.vue         |  2 +-
 src/views/iot-card/components/TimeSelect.vue  | 47 +++++++--------
 .../Scene/Save/Device/AddModal.vue            |  2 +-
 .../Scene/Save/Device/DeviceList.vue          |  2 +-
 .../Scene/Save/Device/InvokeFunction.vue      | 29 ++++++++--
 .../rule-engine/Scene/Save/Device/Product.vue |  2 +-
 .../rule-engine/Scene/Save/Timer/AddModal.vue | 19 +++---
 .../rule-engine/Scene/Save/Timer/Title.vue    | 58 +++++++++++++++++++
 .../rule-engine/Scene/Save/Timer/index.vue    |  4 +-
 .../Scene/Save/action/Device/Product.vue      |  2 +-
 .../Save/action/Device/actions/index.vue      | 22 ++++++-
 .../Save/action/Device/device/Device.vue      |  2 +-
 .../components/FunctionCall/FunctionCall.vue  |  1 +
 .../Save/components/Timer/WhenOption.vue      |  2 +
 .../Scene/Save/components/Timer/index.vue     | 36 +++++++-----
 src/views/rule-engine/Scene/Save/index.vue    |  3 +
 src/views/rule-engine/Scene/Save/style.less   |  3 +
 src/views/system/Department/device/index.vue  | 18 +++---
 src/views/system/Department/product/index.vue | 10 ++--
 src/views/system/User/index.vue               | 19 +++++-
 yarn.lock                                     |  4 +-
 32 files changed, 255 insertions(+), 103 deletions(-)
 create mode 100644 src/views/rule-engine/Scene/Save/Timer/Title.vue
 create mode 100644 src/views/rule-engine/Scene/Save/style.less

diff --git a/src/App.vue b/src/App.vue
index b61b8ee9..815d1240 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,8 @@
 <template>
   <ConfigProvider :locale='zhCN'>
-    <router-view />
+    <keep-alive>
+      <router-view />
+    </keep-alive>
   </ConfigProvider>
 </template>
 
diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index 7a7ca687..1119f7f6 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -6,6 +6,7 @@
         v-model:selectedKeys="state.selectedKeys"
         :pure="state.pure"
         :breadcrumb="{ routes: breadcrumb }"
+        @back='routerBack'
     >
         <template #breadcrumbRender="slotProps">
             <a
@@ -70,6 +71,10 @@ const state = reactive<StateType>({
     selectedKeys: [],
 });
 
+const routerBack = () => {
+  router.go(-1)
+}
+
 const findRouteMeta = (code: string) => {
   let meta = []
   let menuItem: any = menu.menus[code]
diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index eb05c733..216eea2b 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -194,7 +194,7 @@ const timeChange = (e: any) => {
 }
 
 const inputChange = (e: any) => {
-  emit('change', e.target ? e.target.value : e)
+  emit('change', e && e.target ? e.target.value : e)
 }
 
 const dateChange = (e: any) => {
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 93c61abc..823178a7 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -51,7 +51,7 @@ export const AccountMenu = {
 export default [
     { path: '/*', redirect: '/'},
     {
-        path: '/login',
+        path: LoginPath,
         component: () => import('@/views/user/Login/index.vue')
     },
     {
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 2d56eed9..0cf20b9a 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -155,10 +155,11 @@ const errorHandler = (error: any) => {
             Notification.error({
                 key: '401',
                 message: 'Unauthorized',
-                description: 'Authorization verification failed'
+                description: '用户未登录'
             })
             setTimeout(() => {
-                router.replace({
+                debugger
+                router.push({
                     path: LoginPath
                 })
             }, 0)
diff --git a/src/views/device/DashBoard/components/TimeSelect.vue b/src/views/device/DashBoard/components/TimeSelect.vue
index bae04380..a55c28d2 100644
--- a/src/views/device/DashBoard/components/TimeSelect.vue
+++ b/src/views/device/DashBoard/components/TimeSelect.vue
@@ -19,6 +19,7 @@
             format="YYYY-MM-DD HH:mm:ss"
             valueFormat="YYYY-MM-DD HH:mm:ss"
             style="margin-left: 12px"
+            :show-time="{ format: 'HH:mm:ss' }"
             @change="rangeChange"
             v-model:value="rangeVal"
             :allowClear="false"
@@ -110,5 +111,5 @@ const handleBtnChange = (val: string) => {
     });
 };
 handleBtnChange(radioValue.value);
-watch(() => radioValue.value, { deep: true, immediate: true });
+// watch(() => radioValue.value, { deep: true, immediate: true });
 </script>
diff --git a/src/views/iot-card/CardManagement/Detail/index.vue b/src/views/iot-card/CardManagement/Detail/index.vue
index eb97b3b8..4ca3b42d 100644
--- a/src/views/iot-card/CardManagement/Detail/index.vue
+++ b/src/views/iot-card/CardManagement/Detail/index.vue
@@ -237,6 +237,11 @@ const getData = (
     return new Promise((resolve) => {
         queryFlow(start, end, {
             orderBy: 'date',
+            terms: [{
+              column : "cardId",
+              termType: "eq",
+              value: route.params.id
+            }]
         }).then((resp: any) => {
             if (resp.status === 200) {
                 const sortArray = resp.result.sort(
diff --git a/src/views/iot-card/CardManagement/Save.vue b/src/views/iot-card/CardManagement/Save.vue
index 0847419a..bd3ecf76 100644
--- a/src/views/iot-card/CardManagement/Save.vue
+++ b/src/views/iot-card/CardManagement/Save.vue
@@ -232,8 +232,8 @@ const handleOk = () => {
             btnLoading.value = true;
             const resp =
                 props.type === 'add'
-                    ? await add(toRaw(modelRef))
-                    : await edit(toRaw(modelRef));
+                    ? await add(toRaw(modelRef)).catch(err => err)
+                    : await edit(toRaw(modelRef)).catch(err => err);
             btnLoading.value = false;
             if (resp.status === 200) {
                 message.success('操作成功')
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 50425bcd..8762639a 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -457,6 +457,7 @@ const columns = [
         width: 200,
         search: {
             type: 'string',
+            defaultTermType: 'eq'
         },
     },
     {
@@ -466,6 +467,9 @@ const columns = [
         ellipsis: true,
         scopedSlots: true,
         width: 200,
+        search: {
+          type: 'string'
+        }
     },
     {
         title: '平台对接',
@@ -571,7 +575,8 @@ const columns = [
                 { label: '正常', value: 'using' },
                 { label: '未激活', value: 'toBeActivated' },
                 { label: '停机', value: 'deactivate' },
-            ],
+                { label: '其它', value: 'using,toBeActivated,deactivate' },
+            ]
         },
     },
     {
@@ -737,7 +742,16 @@ const getActions = (
 };
 
 const handleSearch = (e: any) => {
-    params.value = e;
+    const newParams = (e?.terms as any[])?.map(item1 => {
+      item1.terms = item1.terms.map((item2: any) => {
+        if (['cardStateType'].includes(item2.column)) {
+          item2.termType = 'nin'
+        }
+        return item2
+      })
+      return item1
+    })
+    params.value = { terms: newParams || [] };
 };
 
 const onSelectChange = (keys: string[], rows: []) => {
diff --git a/src/views/iot-card/Home/index.vue b/src/views/iot-card/Home/index.vue
index 739a84a1..2f561d60 100644
--- a/src/views/iot-card/Home/index.vue
+++ b/src/views/iot-card/Home/index.vue
@@ -87,7 +87,7 @@
     </page-container>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name='IotCardHome'>
 import { getImage } from '@/utils/comm';
 import Guide from '../components/Guide.vue';
 import moment from 'moment';
@@ -113,14 +113,14 @@ const menuHasPermission = useMenuStore().hasPermission;
 const btnHasPermission = usePermissionStore().hasPermission;
 
 // 菜单权限
-const dashBoardUrl = menuHasPermission('/iot-card/Dashboard');
-const platformUrl = menuHasPermission('/iot-card/Platform/Detail');
-const recordUrl = menuHasPermission('/iot-card/Record');
-const cardUrl = menuHasPermission('/iot-card/CardManagement');
+const dashBoardUrl = menuHasPermission('iot-card/Dashboard');
+const platformUrl = menuHasPermission('iot-card/Platform/Detail');
+const recordUrl = menuHasPermission('iot-card/Record');
+const cardUrl = menuHasPermission('iot-card/CardManagement');
 
 // 按钮权限
-const paltformPermission = btnHasPermission(`/iot-card/Platform:add`);
-const cardPermission = btnHasPermission(`/iot-card/CardManagement:add`);
+const paltformPermission = btnHasPermission(`iot-card/Platform:add`);
+const cardPermission = btnHasPermission(`iot-card/CardManagement:add`);
 
 const Image = {
     1: getImage('/home/1.png'),
@@ -179,23 +179,19 @@ const pieChartData = ref<any[]>([
 ]);
 
 const jumpPage = (data: GuideItemProps) => {
+  console.log(data.auth)
     if (!data.auth){
         message.warning('暂无权限，请联系管理员');
         return
     }
     if (data.key === 'EQUIPMENT') {
-        menuStory.jumpPage(data.url, { id: 'add' });
+        menuStory.jumpPage(data.url, { id: ':id'});
     } else {
         menuStory.jumpPage(data.url);
     }
 };
 
 const jumpDashboard = () => {
-    // if (dashBoardUrl) {
-    //     router.push(`${dashBoardUrl}`);
-    // } else {
-    //     message.warning('暂无权限，请联系管理员');
-    // }
     menuStory.jumpPage('iot-card/Dashboard');
 };
 
diff --git a/src/views/iot-card/Platform/Detail/index.vue b/src/views/iot-card/Platform/Detail/index.vue
index 66ba1ff3..579c7379 100644
--- a/src/views/iot-card/Platform/Detail/index.vue
+++ b/src/views/iot-card/Platform/Detail/index.vue
@@ -204,6 +204,7 @@ const rules = {
 };
 
 const getDetail = async () => {
+    console.log(route.params)
     if (route.params.id === ':id') return;
     const resp: any = await queryById(route.params.id);
     if (resp.status === 200) {
diff --git a/src/views/iot-card/Platform/index.vue b/src/views/iot-card/Platform/index.vue
index aa8c2ce5..86c52371 100644
--- a/src/views/iot-card/Platform/index.vue
+++ b/src/views/iot-card/Platform/index.vue
@@ -238,7 +238,7 @@ const handleSearch = (e: any) => {
  * 新增
  */
 const handleAdd = () => {
-    menuStory.jumpPage('iot-card/Platform/Detail', { id: 'add' })
+    menuStory.jumpPage('iot-card/Platform/Detail', { id: ':id' })
 };
 </script>
 
diff --git a/src/views/iot-card/components/TimeSelect.vue b/src/views/iot-card/components/TimeSelect.vue
index de656b5e..6e785fff 100644
--- a/src/views/iot-card/components/TimeSelect.vue
+++ b/src/views/iot-card/components/TimeSelect.vue
@@ -16,8 +16,9 @@
             </j-radio-button>
         </j-radio-group>
         <j-range-picker
-            format="YYYY-MM-DD"
-            valueFormat="YYYY-MM-DD"
+            format="YYYY-MM-DD HH:mm:ss"
+            valueFormat="YYYY-MM-DD HH:mm:ss"
+            :show-time="{ format: 'HH:mm:ss' }"
             style="margin-left: 12px"
             @change="rangeChange"
             v-model:value="rangeVal"
@@ -28,7 +29,7 @@
 </template>
 
 <script setup lang="ts">
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { PropType } from 'vue';
 
 interface BtnOptions {
@@ -70,38 +71,37 @@ const rangeVal = ref<[string, string]>();
 const rangeChange = (val: any) => {
     radioValue.value = undefined;
     emit('change', {
-        start: moment(val[0]).valueOf(),
-        end: moment(val[1]).valueOf(),
+        start: dayjs(val[0]).valueOf(),
+        end: dayjs(val[1]).valueOf(),
         type: undefined,
     });
 };
 
-const getTimeByType = (type: string) => {
+const getTimeByType = (type?: string) => {
     switch (type) {
         case 'hour':
-            return moment().subtract(1, 'hours').valueOf();
+            return dayjs().subtract(1, 'hours').valueOf();
         case 'week':
-            return moment().subtract(6, 'days').valueOf();
+            return dayjs().subtract(6, 'days').valueOf();
         case 'month':
-            return moment().subtract(29, 'days').valueOf();
+            return dayjs().subtract(29, 'days').valueOf();
         case 'year':
-            return moment().subtract(365, 'days').valueOf();
+            return dayjs().subtract(365, 'days').valueOf();
         default:
-            return moment().startOf('day').valueOf();
+            return dayjs().startOf('day').valueOf();
     }
 };
 
-const handleBtnChange = (val: string) => {
-    radioValue.value = val;
-    let endTime = moment(new Date()).valueOf();
+const handleBtnChange = (val?: string) => {
+    let endTime = dayjs(new Date()).valueOf();
     let startTime = getTimeByType(val);
     if (val === 'yesterday') {
-        startTime = moment().subtract(1, 'days').startOf('day').valueOf();
-        endTime = moment().subtract(1, 'days').endOf('day').valueOf();
+        startTime = dayjs().subtract(1, 'days').startOf('day').valueOf();
+        endTime = dayjs().subtract(1, 'days').endOf('day').valueOf();
     }
     rangeVal.value = [
-        moment(startTime).format('YYYY-MM-DD'),
-        moment(endTime).format('YYYY-MM-DD'),
+      dayjs(startTime).format('YYYY-MM-DD HH:mm:ss'),
+      dayjs(endTime).format('YYYY-MM-DD HH:mm:ss'),
     ];
     emit('change', {
         start: startTime,
@@ -110,11 +110,8 @@ const handleBtnChange = (val: string) => {
     });
 };
 
-watch(
-    () => radioValue.value,
-    (val) => {
-        handleBtnChange(val);
-    },
-    { deep: true, immediate: true },
-);
+nextTick(() => {
+  handleBtnChange(radioValue.value)
+})
+
 </script>
diff --git a/src/views/rule-engine/Scene/Save/Device/AddModal.vue b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
index 7566f936..9f06c747 100644
--- a/src/views/rule-engine/Scene/Save/Device/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
@@ -3,7 +3,7 @@
     title='触发规则'
     visible
     :width='820'
-    @click='save'
+    @ok='save'
     @cancel='cancel'
     :maskClosable="false"
   >
diff --git a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
index 28b61408..b3d493a7 100644
--- a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
@@ -3,7 +3,7 @@
     :columns="columns"
     type='simple'
     @search="handleSearch"
-    class='search'
+    class="scene-search"
     target="scene-triggrt-device-device"
   />
   <j-divider style='margin: 0' />
diff --git a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
index 4e0aaa39..0973539b 100644
--- a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
+++ b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
@@ -22,11 +22,16 @@
         <j-form-item>定时调用所选功能</j-form-item>
       </j-col>
       <j-col :span='24'>
+        <j-form-item
+          name='functionData'
+          :rules="rules"
+        >
         <FunctionCall
-          :value='_value'
+          v-model:value='formModel.functionData'
           :data='functionData'
           @change='callDataChange'
         />
+        </j-form-item>
       </j-col>
     </j-row>
   </j-form>
@@ -66,9 +71,9 @@ const props = defineProps({
 const emit = defineEmits<Emit>()
 const invokeForm = ref()
 const formModel = reactive({
-  functionId: props.functionId
+  functionId: props.functionId,
+  functionData: props.functionParameters
 })
-const _value = ref<any[]>(props.functionParameters)
 
 /**
  * 获取当前选择功能属性
@@ -94,13 +99,29 @@ const functionData = computed(() => {
   return arrCache
 })
 
+const rules = [{
+  validator(_: string, value: any) {
+    if (!value?.length && functionData.value.length) {
+      return Promise.reject('请输入功能值')
+    } else {
+      let hasValue = value.find((item: { name: string, value: any}) => !item.value)
+      if (hasValue) {
+        const functionItem = functionData.value.find((item: any) => item.id === hasValue.name)
+        return Promise.reject(functionItem?.name ? `请输入${functionItem?.name}值` : '请输入功能值')
+      }
+    }
+    return Promise.resolve();
+  }
+}]
+
 const onSelect = (v: string, item: any) => {
+  formModel.functionData = []
   emit('update:action', `执行${item.name}`)
   emit('update:functionId', v)
+  emit('update:functionParameters', [])
 }
 
 const callDataChange = (v: any[]) => {
-  _value.value = v
   emit('update:functionParameters', v)
 }
 
diff --git a/src/views/rule-engine/Scene/Save/Device/Product.vue b/src/views/rule-engine/Scene/Save/Device/Product.vue
index 73c2a386..b8b42a27 100644
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@@ -3,7 +3,7 @@
     :columns="columns"
     type='simple'
     @search="handleSearch"
-    class='search'
+    class="scene-search"
     target="scene-triggrt-device-device"
   />
   <j-divider style='margin: 0' />
diff --git a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
index db8b21a9..cf5afd85 100644
--- a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
@@ -3,7 +3,7 @@
       title='触发规则'
       visible
       :width='820'
-      @click='save'
+      @ok='save'
       @cancel='cancel'
   >
     <Timer
@@ -15,17 +15,16 @@
 <script setup lang="ts" name="timerAddModel">
 import Timer from '../components/Timer'
 import type { OperationTimer } from '@/views/rule-engine/Scene/typings'
-import {nextTick, PropType} from "vue";
-import {TriggerDevice} from "@/views/rule-engine/Scene/typings";
+import { PropType} from "vue";
 import {handleTimerOptions} from "@/views/rule-engine/Scene/Save/components/Timer/util";
 
 type Emit = {
   (e: 'cancel'): void
-  (e: 'save', data: TriggerDevice, options: Record<string, any>): void
+  (e: 'save', data: OperationTimer, options: Record<string, any>): void
 }
 
 const props = defineProps({
-  timer: {
+  value: {
     type: Object as PropType<OperationTimer>,
     default: () => ({})
   }
@@ -39,14 +38,14 @@ interface AddModelType {
 }
 
 const addModel = reactive<AddModelType>({
-  timer: props.timer
+  timer: props.value
 })
 
 const save = async () => {
   const timerData = await timerRef.value?.validateFields()
   if (timerData) {
-    const options = handleTimerOptions(timerData)
-    emit("save", timerData, options)
+    const options = handleTimerOptions(addModel.timer)
+    emit("save", addModel.timer, options)
   }
 }
 
@@ -54,8 +53,8 @@ const cancel = () => {
   emit("cancel")
 }
 
-nextTick(() => {
-  Object.assign(addModel, props.timer)
+watchEffect(() => {
+  addModel.timer = props.value
 })
 
 </script>
diff --git a/src/views/rule-engine/Scene/Save/Timer/Title.vue b/src/views/rule-engine/Scene/Save/Timer/Title.vue
new file mode 100644
index 00000000..b37d035c
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Timer/Title.vue
@@ -0,0 +1,58 @@
+<template>
+  <div :class='["trigger-options-content", isAdd ? "is-add" : ""]'>
+    <span v-if='!isAdd'> 点击配置定时触发 </span>
+    <template v-else>
+      <div class='center-item'>
+        <AIcon v-if='options.selectorIcon' :type='options.selectorIcon' class='icon-padding-right' />
+        <span class='trigger-options-name'>
+            <Ellipsis style='max-width: 310px'>
+              {{ options.name }}
+            </Ellipsis>
+        </span>
+        <span v-if='options.extraName'>{{ options.extraName }}</span>
+      </div>
+      <div v-if='options.when'>
+        <span className='trigger-options-when'>{{ options.when }}</span>
+      </div>
+      <div v-if='options.time'>
+        <span className='trigger-options-time'>{{ options.time }}</span>
+      </div>
+      <div v-if='options.extraTime'>
+        <span className='trigger-options-extraTime'>{{ options.extraTime }}</span>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang='ts' name='TimerTitle'>
+
+const props = defineProps({
+  options: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const isAdd = computed(() => {
+  console.log(props.options, Object.keys(props.options).length)
+  return !!Object.keys(props.options).length
+})
+
+</script>
+
+<style scoped lang='less'>
+.trigger-options-content {
+  display: inline-flex;
+  gap: 16px;
+
+  .center-item {
+    display: flex;
+    align-items: center;
+  }
+
+  .icon-padding-right {
+    padding-right: 4px;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue
index 6d750bb6..30edd897 100644
--- a/src/views/rule-engine/Scene/Save/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/index.vue
@@ -29,8 +29,7 @@
         v-if="visible"
         @cancel='visible = false'
         @save="save"
-        :value="data.trigger.device"
-        :options="data.options.trigger"
+        :value="data.trigger.timer"
       />
     </div>
 </template>
@@ -41,6 +40,7 @@ import { storeToRefs } from 'pinia';
 import Action from '../action/index.vue';
 import AddModel from './AddModal.vue'
 import AddButton from '../components/AddButton.vue'
+import Title from './Title.vue'
 import type { OperationTimer, BranchesThen } from '@/views/rule-engine/Scene/typings'
 
 const sceneStore = useSceneStore();
diff --git a/src/views/rule-engine/Scene/Save/action/Device/Product.vue b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
index a487395f..a59386ad 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
@@ -3,7 +3,7 @@
         :columns="columns"
         type="simple"
         @search="handleSearch"
-        class="search"
+        class="scene-search"
         target="scene-trigger-device-product"
     />
     <j-divider style="margin: 0" />
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
index ff7cdbb5..f935083e 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
@@ -22,6 +22,7 @@
                         showSearch
                         placeholder="请选择功能"
                         v-model:value="modelRef.message.functionId"
+                        @select='functionSelect'
                     >
                         <j-select-option
                             v-for="item in metadata?.functions || []"
@@ -34,7 +35,7 @@
                 <j-form-item
                     v-if="modelRef.message.functionId"
                     :name="['message', 'inputs']"
-                    :rules="[{ required: true, message: '请输入功能值' }]"
+                    :rules="functionRules"
                 >
                     <EditTable
                         :functions="functions"
@@ -138,6 +139,25 @@ const modelRef = reactive({
     },
 });
 
+const functionSelect = () => {
+  modelRef.message.inputs = []
+}
+
+const functionRules = [{
+  validator(_: string, value: any) {
+    if (!value?.length && functions.value.length) {
+      return Promise.reject('请输入功能值')
+    } else {
+      const hasValue = value.find((item: { name: string, value: any}) => !item.value)
+      if (hasValue) {
+        const functionItem = functions.value.find((item: any) => item.id === hasValue.name)
+        return Promise.reject(functionItem?.name ? `请输入${functionItem.name}值` : '请输入功能值')
+      }
+    }
+    return Promise.resolve();
+  }
+}]
+
 const metadata = ref<{
     functions: any[];
     properties: any[];
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
index b5d35ad2..d3a07b0e 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
@@ -3,7 +3,7 @@
         :columns="columns"
         type="simple"
         @search="handleSearch"
-        class="search"
+        class="scene-search"
         target="scene-trigger-device-device"
     />
     <j-divider style="margin: 0" />
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
index 25a9270a..1dda6f53 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -101,6 +101,7 @@ const valueChange = debounce(() => {
   const _value = dataSource.value.map(item => ({
     name: item.id, value: item.value
   }))
+  console.log(_value)
   emit('change', _value)
   emit('update:value', _value)
 }, 500)
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
index 345f3fb1..3e7782a1 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
@@ -17,6 +17,7 @@ import { numberToString } from './util'
 
 type Emit = {
   (e: 'update:value', data: Array<number>):void
+  (e: 'change', data: Array<number>):void
 }
 
 const props = defineProps({
@@ -48,6 +49,7 @@ const change = (number: number) => {
   }
   rowKeys.value = [..._keys.values()]
   emit('update:value', rowKeys.value)
+  emit('change', rowKeys.value)
 }
 
 const allActive = computed(() => {
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/index.vue b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
index 84eb7e26..7b902b18 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
@@ -15,6 +15,7 @@
         ]'
         option-type='button'
         button-style='solid'
+        @change='updateValue'
       />
     </j-form-item>
     <j-form-item v-if='showCron' name='cron' :rules="[
@@ -32,11 +33,11 @@
         }
       }
     ]">
-      <j-input placeholder='corn表达式' v-model:value='formModel.cron' />
+      <j-input placeholder='corn表达式' v-model:value='formModel.cron' @change='updateValue' />
     </j-form-item>
     <template v-else>
       <j-form-item name='when'>
-        <WhenOption v-model:value='formModel.when' :type='formModel.trigger' />
+        <WhenOption v-model:value='formModel.when' :type='formModel.trigger' @change='updateValue' />
       </j-form-item>
       <j-form-item name='mod'>
         <j-radio-group
@@ -47,13 +48,19 @@
         ]'
           option-type='button'
           button-style='solid'
+          @change='updateValue'
         />
       </j-form-item>
     </template>
     <j-space v-if='showOnce' style='display: flex;gap: 24px'>
       <j-form-item :name="['once', 'time']">
-        <j-time-picker valueFormat='HH:mm:ss' v-model:value='formModel.once.time' style='width: 100%'
-                       format='HH:mm:ss' />
+        <j-time-picker
+          valueFormat='HH:mm:ss'
+          v-model:value='formModel.once.time'
+          style='width: 100%'
+          format='HH:mm:ss'
+          @change='updateValue'
+        />
       </j-form-item>
       <j-form-item> 执行一次</j-form-item>
     </j-space>
@@ -68,6 +75,7 @@
           @change='(v) => {
                   formModel.period.from = v[0]
                   formModel.period.to = v[1]
+                  updateValue()
               }'
         />
       </j-form-item>
@@ -83,6 +91,7 @@
           :min='1'
           :max='59'
           v-model:value='formModel.period.every'
+          @change='updateValue'
         >
           <template #addonAfter>
             <j-select
@@ -92,6 +101,7 @@
                 { label: "分", value: "minutes" },
                 { label: "小时", value: "hours" },
               ]'
+              @select='updateValue'
             />
           </template>
         </j-input-number>
@@ -103,7 +113,7 @@
 
 <script setup lang='ts' name='Timer'>
 import type { PropType } from 'vue'
-import moment from 'moment'
+import dayjs from 'dayjs'
 import WhenOption from './WhenOption.vue'
 import { cloneDeep } from 'lodash-es'
 import type { OperationTimer } from '../../../typings'
@@ -131,23 +141,21 @@ const emit = defineEmits<Emit>()
 
 const formModel = reactive<OperationTimer>({
   trigger: 'week',
-  when: [],
+  when: props.value.when || [],
   mod: 'period',
   cron: undefined,
   once: {
-    time: moment(new Date()).format('HH:mm:ss')
+    time: dayjs(new Date()).format('HH:mm:ss')
   },
   period: {
-    from: moment(new Date()).startOf('day').format('HH:mm:ss'),
-    to: moment(new Date()).endOf('day').format('HH:mm:ss'),
+    from: dayjs(new Date()).startOf('day').format('HH:mm:ss'),
+    to: dayjs(new Date()).endOf('day').format('HH:mm:ss'),
     every: 1,
     unit: 'seconds'
   }
 })
 const timerForm = ref()
 
-Object.assign(formModel, props.value)
-
 const showCron = computed(() => {
   return formModel.trigger === 'cron'
 })
@@ -160,7 +168,7 @@ const showPeriod = computed(() => {
   return formModel.trigger !== 'cron' && formModel.mod === 'period'
 })
 
-watch(() => formModel, () => {
+const updateValue = () => {
   const cloneValue = cloneDeep(formModel)
   if (cloneValue.trigger === 'cron') {
     delete cloneValue.when
@@ -174,7 +182,7 @@ watch(() => formModel, () => {
     delete cloneValue.period
   }
   emit('update:value', cloneValue)
-}, { deep: true })
+}
 
 defineExpose({
   validateFields: () => new Promise(async (resolve)  => {
@@ -182,6 +190,8 @@ defineExpose({
     resolve(data)
   })
 })
+Object.assign(formModel, props.value)
+formModel.when = props.value.when || []
 
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/index.vue b/src/views/rule-engine/Scene/Save/index.vue
index d66d8a7c..12d93a3c 100644
--- a/src/views/rule-engine/Scene/Save/index.vue
+++ b/src/views/rule-engine/Scene/Save/index.vue
@@ -114,4 +114,7 @@ onUnmounted(() => {
     }
   }
 }
+</style>
+<style lang='less'>
+@import "./style.less";
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/style.less b/src/views/rule-engine/Scene/Save/style.less
new file mode 100644
index 00000000..27da287d
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/style.less
@@ -0,0 +1,3 @@
+.scene-search {
+  padding: 24px 0 0 0;
+}
\ No newline at end of file
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index 1d1f076e..4ca49771 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -70,7 +70,7 @@
                     :status="slotProps.state?.value"
                     :statusText="slotProps.state?.text"
                     :statusNames="{
-                        online: 'success',
+                        online: 'processing',
                         offline: 'error',
                         notActive: 'warning',
                     }"
@@ -147,7 +147,7 @@
                     :status="slotProps.state.value"
                     :text="slotProps.state.text"
                     :statusNames="{
-                        online: 'success',
+                        online: 'processing',
                         offline: 'error',
                         notActive: 'warning',
                     }"
@@ -247,6 +247,9 @@ const columns = [
         search: {
             rename: 'productId$product-info',
             type: 'select',
+            handleValue(value: string) {
+              return `id is ${value}`
+            },
             options: () =>
                 new Promise((resolve) => {
                     const params = {
@@ -288,14 +291,9 @@ const columns = [
         search: {
             type: 'select',
             options: [
-                {
-                    label: '正常',
-                    value: 1,
-                },
-                {
-                    label: '禁用',
-                    value: 0,
-                },
+              { label: '禁用', value: 'notActive' },
+              { label: '离线', value: 'offline' },
+              { label: '在线', value: 'online' },
             ],
         },
         scopedSlots: true,
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 9537f7ff..0a113a4c 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -68,9 +68,8 @@
                     :status="slotProps.state?.value"
                     :statusText="slotProps.state?.text"
                     :statusNames="{
-                        online: 'success',
-                        offline: 'error',
-                        notActive: 'warning',
+                        1: 'processing',
+                        0: 'error',
                     }"
                 >
                     <template #img>
@@ -172,9 +171,8 @@
                     :status="slotProps.state.value"
                     :text="slotProps.state.text"
                     :statusNames="{
-                        online: 'success',
-                        offline: 'error',
-                        notActive: 'warning',
+                        1: 'processing',
+                        0: 'error',
                     }"
                 ></BadgeStatus>
             </template>
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 8fe8b0a6..2283af2d 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -4,7 +4,7 @@
             <pro-search
                 :columns="columns"
                 target="category"
-                @search="(params:any)=>queryParams = {...params}"
+                @search="handleParams"
             />
 
             <j-pro-table
@@ -262,6 +262,23 @@ type dictType = {
     name: string;
 };
 type modalType = '' | 'add' | 'edit' | 'reset';
+
+const handleParams = (params: any)=> {
+
+  const newParams = (params?.terms as any[])?.map(item1 => {
+    item1.terms = item1.terms.map((item2: any) => {
+      if (['telephone', 'email'].includes(item2.column)) {
+        return {
+          column: 'id$user-detail',
+          value: [item2]
+        }
+      }
+      return item2
+    })
+    return item1
+  })
+  queryParams.value = { terms: newParams || [] }
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/yarn.lock b/yarn.lock
index 6167c435..90d450e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#682711e0f69c141fff2c256db61a060c82539611"
-  integrity sha512-rQxD/YlE+XSAG7BWIcFTtKrCQJXk5o+TUgejyuUT/baBThJB6xYt1k2dQEdXyiwpukYen5FzaoLpelSD9SUegw==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#77bd58156212d793fdebe41fc8864eeed5db7182"
+  integrity sha512-VXuCMJlMV/bbmBhPtBzY/BUBIvGebQbguLPE06xps79i5Pjq46+HBW8VPsJ9MwvyMhYkhzPlQJu9Ft7v5uo+yA==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"

From 5600e49b87c0e689bab9eb8a8d6544f382355006 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 23 Mar 2023 09:31:29 +0800
Subject: [PATCH 12/12] =?UTF-8?q?fix:=20bug#10787=E3=80=8110786?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  9 +++++---
 .../rule-engine/Scene/Save/Manual/index.vue   | 19 +++++++++++++++--
 .../rule-engine/Scene/Save/Timer/AddModal.vue |  6 +++---
 .../rule-engine/Scene/Save/Timer/index.vue    | 21 +++++++++++++++++--
 .../Save/components/Timer/WhenOption.vue      |  4 +++-
 .../Scene/Save/components/TriggerWay.vue      | 19 ++++++++++++++---
 src/views/rule-engine/Scene/index.vue         |  2 +-
 vite.config.ts                                |  4 ++--
 8 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 815d1240..1206b11a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,11 @@
 <template>
   <ConfigProvider :locale='zhCN'>
-    <keep-alive>
-      <router-view />
-    </keep-alive>
+<!--    <router-view v-slot="{ Component }">-->
+<!--      <keep-alive>-->
+<!--        <component :is="Component" />-->
+<!--      </keep-alive>-->
+<!--    </router-view>-->
+    <router-view />
   </ConfigProvider>
 </template>
 
diff --git a/src/views/rule-engine/Scene/Save/Manual/index.vue b/src/views/rule-engine/Scene/Save/Manual/index.vue
index 4885ced5..98677d24 100644
--- a/src/views/rule-engine/Scene/Save/Manual/index.vue
+++ b/src/views/rule-engine/Scene/Save/Manual/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class='actions-branches-item'>
+  <div class='manual actions-branches-item'>
     <j-form-item
       :rules="actionRules"
       :name="['branches', 0, 'then']"
@@ -32,6 +32,21 @@ const actionRules = [{
 
 </script>
 
-<style scoped>
+<style scoped lang='less'>
+@minWidth: 75%;
 
+.manual {
+  &.actions-branches-item {
+    width: 100%;
+  }
+}
+
+
+@media (min-width: 1600px) {
+  .manual {
+    &.actions-branches-item {
+      width: @minWidth;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
index cf5afd85..82631c0f 100644
--- a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
@@ -53,9 +53,9 @@ const cancel = () => {
   emit("cancel")
 }
 
-watchEffect(() => {
-  addModel.timer = props.value
-})
+// watchEffect(() => {
+//   addModel.timer = props.value
+// })
 
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue
index 30edd897..81d29554 100644
--- a/src/views/rule-engine/Scene/Save/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/index.vue
@@ -2,7 +2,7 @@
     <div class='timer'>
       <j-form-item
         :rules="rules"
-        name="timer"
+        :name="['trigger', 'timer']"
       >
         <template #label>
           <TitleComponent data='触发规则' style='font-size: 14px;' />
@@ -49,6 +49,7 @@ const visible = ref(false)
 
 const rules = [{
   validator(_: any, v: any) {
+    console.log(v)
     if (!v) {
       return Promise.reject(new Error('请配置定时触发规则'));
     }
@@ -85,5 +86,21 @@ const save = (_data: OperationTimer, options: Record<string, any>) => {
 }
 </script>
 
-<style scoped>
+<style scoped lang='less'>
+@minWidth: 75%;
+
+.timer {
+  .actions-branches-item {
+    width: 100%;
+  }
+}
+
+
+@media (min-width: 1600px) {
+  .timer {
+    .actions-branches-item {
+      width: @minWidth;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
index 3e7782a1..f1adc12b 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
@@ -59,7 +59,9 @@ const allActive = computed(() => {
 watch(() => props.type, () => {
   const isMonth = props.type === 'month'
   const day = isMonth ? 31 : 7
-  change(0)
+  if (!props.value.length) {
+    change(0)
+  }
   timeOptions.value = new Array(day)
     .fill(1)
     .map((_, index) => {
diff --git a/src/views/rule-engine/Scene/Save/components/TriggerWay.vue b/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
index 9f5401cc..a079509b 100644
--- a/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
+++ b/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
@@ -57,15 +57,17 @@ const classNames = computed(() => {
 })
 
 const handleClick = (type: string) => {
-  emit('update:modelValue', type)
+  if (!props.disabled) {
+    emit('update:modelValue', type)
+  }
 }
 
 </script>
 
 <style scoped lang='less'>
-// @import 'ant-design-vue/es/style/themes/default.less';
 
-.scene-trigger-way-warp {display: flex;
+.scene-trigger-way-warp {
+  display: flex;
   flex-wrap: wrap;
   gap: 16px 24px;
   width: 100%;
@@ -115,5 +117,16 @@ const handleClick = (type: string) => {
       }
     }
   }
+
+  &.disabled {
+    color: rgba(#000, .8);
+    .way-item-image {
+      opacity: 0.6;
+    }
+
+    .trigger-way-item {
+      cursor: not-allowed;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index 535e7bf4..92f38c15 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -300,7 +300,7 @@ const getActions = (
     ];
     if (data.triggerType === 'manual') {
         const _item: ActionsType = {
-            key: 'trigger',
+            key: 'tigger',
             text: '手动触发',
             disabled: data.state?.value === 'disable',
             tooltip: {
diff --git a/vite.config.ts b/vite.config.ts
index 3686a5bf..baf145c2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
-                //   target: 'http://120.77.179.54:8844', // 120测试
-                  target: 'http://192.168.33.46:8844', // 本地开发环境
+                  target: 'http://120.77.179.54:8844', // 120测试
+                //   target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')