From 1cf4a3f8b02c70be614cc1b3dab7eaa4e842e189 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Mon, 6 Mar 2023 18:03:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20dueros=E6=9B=BF=E6=8D=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DuerOS/Detail/command/EditTable.vue       |   4 +-
 .../DuerOS/Detail/command/index.vue           |  74 +++---
 src/views/Northbound/DuerOS/Detail/doc.vue    |   8 +-
 src/views/Northbound/DuerOS/Detail/index.vue  | 226 +++++++++---------
 src/views/Northbound/DuerOS/index.vue         |  34 ++-
 .../Diagnose/Message/Function/EditTable.vue   |   5 +-
 .../Detail/Info/components/Tags/Save.vue      |   2 +-
 yarn.lock                                     |   4 +-
 8 files changed, 177 insertions(+), 180 deletions(-)

diff --git a/src/views/Northbound/DuerOS/Detail/command/EditTable.vue b/src/views/Northbound/DuerOS/Detail/command/EditTable.vue
index 975d91fd..a080b038 100644
--- a/src/views/Northbound/DuerOS/Detail/command/EditTable.vue
+++ b/src/views/Northbound/DuerOS/Detail/command/EditTable.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-table
+    <j-table
         rowKey="id"
         :columns="columns"
         :data-source="dataSource"
@@ -36,7 +36,7 @@
                 </template>
             </div>
         </template>
-    </a-table>
+    </j-table>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/Northbound/DuerOS/Detail/command/index.vue b/src/views/Northbound/DuerOS/Detail/command/index.vue
index 22271343..bee8e5b1 100644
--- a/src/views/Northbound/DuerOS/Detail/command/index.vue
+++ b/src/views/Northbound/DuerOS/Detail/command/index.vue
@@ -1,60 +1,60 @@
 <template>
-    <a-form 
+    <j-form 
         :layout="'vertical'"
         ref="formRef"
         :model="modelRef"
     >
-        <a-row :gutter="24">
-            <a-col :span="24" v-if="actionType === 'command'">
-                <a-form-item name="messageType" label="指令类型" :rules="{
+        <j-row :gutter="24">
+            <j-col :span="24" v-if="actionType === 'command'">
+                <j-form-item name="messageType" label="指令类型" :rules="{
                     required: true,
                     message: '请选择指令类型',
                 }">
-                    <a-select placeholder="请选择指令类型" v-model:value="modelRef.messageType" show-search :filter-option="filterOption">
-                        <a-select-option value="READ_PROPERTY">读取属性</a-select-option>
-                        <a-select-option value="WRITE_PROPERTY">修改属性</a-select-option>
-                        <a-select-option value="INVOKE_FUNCTION">调用功能</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </a-col>
-            <a-col :span="(modelRef.messageType === 'READ_PROPERTY' || actionType === 'latestData') ? 24 : 12" v-if="(actionType === 'command' && ['READ_PROPERTY','WRITE_PROPERTY'].includes(modelRef.messageType)) || actionType === 'latestData'">
-                <a-form-item :name="['message', 'properties']" label="属性" :rules="{
+                    <j-select placeholder="请选择指令类型" v-model:value="modelRef.messageType" show-search :filter-option="filterOption">
+                        <j-select-option value="READ_PROPERTY">读取属性</j-select-option>
+                        <j-select-option value="WRITE_PROPERTY">修改属性</j-select-option>
+                        <j-select-option value="INVOKE_FUNCTION">调用功能</j-select-option>
+                    </j-select>
+                </j-form-item>
+            </j-col>
+            <j-col :span="(modelRef.messageType === 'READ_PROPERTY' || actionType === 'latestData') ? 24 : 12" v-if="(actionType === 'command' && ['READ_PROPERTY','WRITE_PROPERTY'].includes(modelRef.messageType)) || actionType === 'latestData'">
+                <j-form-item :name="['message', 'properties']" label="属性" :rules="{
                     required: true,
                     message: '请选择属性',
                 }">
-                    <a-select placeholder="请选择属性" v-model:value="modelRef.message.properties" show-search :filter-option="filterOption">
-                        <a-select-option v-for="i in (metadata?.properties) || []" :key="i.id" :value="i.id" :label="i.name">{{i.name}}</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </a-col>
-            <a-col :span="12" v-if="modelRef.messageType === 'WRITE_PROPERTY' && actionType === 'command'">
-                <a-form-item :name="['message', 'value']" label="值" :rules="{
+                    <j-select placeholder="请选择属性" v-model:value="modelRef.message.properties" show-search :filter-option="filterOption">
+                        <j-select-option v-for="i in (metadata?.properties) || []" :key="i.id" :value="i.id" :label="i.name">{{i.name}}</j-select-option>
+                    </j-select>
+                </j-form-item>
+            </j-col>
+            <j-col :span="12" v-if="modelRef.messageType === 'WRITE_PROPERTY' && actionType === 'command'">
+                <j-form-item :name="['message', 'value']" label="值" :rules="{
                     required: true,
                     message: '请输入值',
                 }">
-                    <a-input />
-                </a-form-item>
-            </a-col>
-            <a-col :span="24" v-if="modelRef.messageType === 'INVOKE_FUNCTION'">
-                <a-form-item :name="['message', 'functionId']" label="功能" :rules="{
+                    <j-input />
+                </j-form-item>
+            </j-col>
+            <j-col :span="24" v-if="modelRef.messageType === 'INVOKE_FUNCTION'">
+                <j-form-item :name="['message', 'functionId']" label="功能" :rules="{
                     required: true,
                     message: '请选择功能',
                 }">
-                    <a-select placeholder="请选择功能" v-model:value="modelRef.message.functionId" show-search :filter-option="filterOption" @change="funcChange">
-                        <a-select-option v-for="i in (metadata?.functions) || []" :key="i.id" :value="i.id" :label="i.name">{{i.name}}</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </a-col>
-            <a-col :span="24" v-if="modelRef.messageType === 'INVOKE_FUNCTION' && modelRef.message.functionId">
-                <a-form-item :name="['message', 'inputs']" label="参数列表" :rules="{
+                    <j-select placeholder="请选择功能" v-model:value="modelRef.message.functionId" show-search :filter-option="filterOption" @change="funcChange">
+                        <j-select-option v-for="i in (metadata?.functions) || []" :key="i.id" :value="i.id" :label="i.name">{{i.name}}</j-select-option>
+                    </j-select>
+                </j-form-item>
+            </j-col>
+            <j-col :span="24" v-if="modelRef.messageType === 'INVOKE_FUNCTION' && modelRef.message.functionId">
+                <j-form-item :name="['message', 'inputs']" label="参数列表" :rules="{
                     required: true,
                     message: '请输入参数列表',
                 }">
                     <EditTable v-model="modelRef.message.inputs"/>
-                </a-form-item>
-            </a-col>
-        </a-row>
-    </a-form>
+                </j-form-item>
+            </j-col>
+        </j-row>
+    </j-form>
 </template>
 
 <script lang="ts" setup>
@@ -62,8 +62,6 @@ import EditTable from './EditTable.vue'
 
 const formRef = ref();
 
-const funcList = ref<Record<string, any>[]>([])
-
 const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
diff --git a/src/views/Northbound/DuerOS/Detail/doc.vue b/src/views/Northbound/DuerOS/Detail/doc.vue
index 35bfcc33..ec2dc145 100644
--- a/src/views/Northbound/DuerOS/Detail/doc.vue
+++ b/src/views/Northbound/DuerOS/Detail/doc.vue
@@ -18,7 +18,7 @@
       <div>
         <h2>1、在百度小度技能平台创建技能，并授权。完成物联网平台与DuerOS的关联。</h2>
         <div class="image">
-          <a-image width="100%" :src="getImage('/cloud/dueros-doc.jpg')" />
+          <j-image width="100%" :src="getImage('/cloud/dueros-doc.jpg')" />
         </div>
         <h1>授权地址</h1>
         <div>物联网平台的登录地址。注意需要为https。</div>
@@ -26,19 +26,19 @@
         <h1>Client_Id</h1>
         <div>请填写系统管理-应用管理中的clientId。</div>
         <div class="image">
-          <a-image width="100%" :src="getImage('/cloud/dueros-doc1.png')" />
+          <j-image width="100%" :src="getImage('/cloud/dueros-doc1.png')" />
         </div>
         <h1>回调地址</h1>
         <div>请复制DuerOS平台中的值，填写到系统管理-应用管理中-redirectUrl中。</div>
         <div class="image">
-          <a-image width="100%" :src="getImage('/cloud/dueros-doc2.png')" />
+          <j-image width="100%" :src="getImage('/cloud/dueros-doc2.png')" />
         </div>
         <h1>Token地址</h1>
         <div>请复制并填写：HTTPS://{location.host}/api/v1/token</div>
         <h1>ClientSecret</h1>
         <div>请复制系统管理-应用管理中的secureKey，填写到DuerOS平台。</div>
         <div class="image">
-          <a-image width="100%" :src="getImage('/cloud/dueros-doc3.png')" />
+          <j-image width="100%" :src="getImage('/cloud/dueros-doc3.png')" />
         </div>
         <div></div>
         <h1>WebService</h1>
diff --git a/src/views/Northbound/DuerOS/Detail/index.vue b/src/views/Northbound/DuerOS/Detail/index.vue
index 89042204..f9273b01 100644
--- a/src/views/Northbound/DuerOS/Detail/index.vue
+++ b/src/views/Northbound/DuerOS/Detail/index.vue
@@ -1,17 +1,17 @@
 <template>
     <page-container>
-        <a-card>
-            <a-row :gutter="24">
-                <a-col :span="16">
+        <j-card>
+            <j-row :gutter="24">
+                <j-col :span="16">
                     <TitleComponent data="基本信息" />
-                    <a-form
+                    <j-form
                         :layout="'vertical'"
                         ref="formRef"
                         :model="modelRef"
                     >
-                        <a-row :gutter="24">
-                            <a-col :span="24">
-                                <a-form-item
+                        <j-row :gutter="24">
+                            <j-col :span="24">
+                                <j-form-item
                                     label="名称"
                                     name="name"
                                     :rules="[
@@ -25,14 +25,14 @@
                                         },
                                     ]"
                                 >
-                                    <a-input
+                                    <j-input
                                         placeholder="请输入名称"
                                         v-model:value="modelRef.name"
                                     />
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="12">
-                                <a-form-item
+                                </j-form-item>
+                            </j-col>
+                            <j-col :span="12">
+                                <j-form-item
                                     label="产品"
                                     name="id"
                                     :rules="[
@@ -42,7 +42,7 @@
                                         },
                                     ]"
                                 >
-                                    <a-select
+                                    <j-select
                                         :disabled="
                                             type !== 'edit' &&
                                             modelRef.id &&
@@ -54,18 +54,18 @@
                                         :filter-option="filterOption"
                                         @change="productChange"
                                     >
-                                        <a-select-option
+                                        <j-select-option
                                             v-for="item in productList"
                                             :key="item.id"
                                             :value="item.id"
                                             :label="item.name"
-                                            >{{ item.name }}</a-select-option
+                                            >{{ item.name }}</j-select-option
                                         >
-                                    </a-select>
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="12">
-                                <a-form-item
+                                    </j-select>
+                                </j-form-item>
+                            </j-col>
+                            <j-col :span="12">
+                                <j-form-item
                                     name="applianceType"
                                     :rules="{
                                         required: true,
@@ -75,50 +75,50 @@
                                     <template #label>
                                         <span>
                                             设备类型
-                                            <a-tooltip
+                                            <j-tooltip
                                                 title="DuerOS平台拟定的规范"
                                             >
                                                 <AIcon
                                                     type="QuestionCircleOutlined"
                                                     style="margin-left: 2px"
                                                 />
-                                            </a-tooltip>
+                                            </j-tooltip>
                                         </span>
                                     </template>
-                                    <a-select
+                                    <j-select
                                         placeholder="请选择设备类型"
                                         v-model:value="modelRef.applianceType"
                                         show-search
                                         :filter-option="filterOption"
                                         @change="typeChange"
                                     >
-                                        <a-select-option
+                                        <j-select-option
                                             v-for="item in typeList"
                                             :key="item.id"
                                             :value="item.id"
                                             :label="item.name"
-                                            >{{ item.name }}</a-select-option
+                                            >{{ item.name }}</j-select-option
                                         >
-                                    </a-select>
-                                </a-form-item>
-                                <a-form-item
+                                    </j-select>
+                                </j-form-item>
+                                <j-form-item
                                     name="productName"
                                     v-show="false"
                                     label="产品名称"
                                 >
-                                    <a-input
+                                    <j-input
                                         v-model:value="modelRef.productName"
                                     />
-                                </a-form-item>
-                            </a-col>
-                            <a-col :span="24">
+                                </j-form-item>
+                            </j-col>
+                            <j-col :span="24">
                                 <p>动作映射</p>
-                                <a-collapse
+                                <j-collapse
                                     v-if="modelRef.actionMappings.length"
                                     :activeKey="actionActiveKey"
                                     @change="onActionCollChange"
                                 >
-                                    <a-collapse-panel
+                                    <j-collapse-panel
                                         v-for="(
                                             item, index
                                         ) in modelRef.actionMappings"
@@ -139,9 +139,9 @@
                                                 type="DeleteOutlined"
                                                 @click="delItem(index)"
                                         /></template>
-                                        <a-row :gutter="24">
-                                            <a-col :span="12">
-                                                <a-form-item
+                                        <j-row :gutter="24">
+                                            <j-col :span="12">
+                                                <j-form-item
                                                     :name="[
                                                         'actionMappings',
                                                         index,
@@ -155,16 +155,16 @@
                                                     <template #label>
                                                         <span>
                                                             动作
-                                                            <a-tooltip
+                                                            <j-tooltip
                                                                 title="DuerOS平台拟定的设备类型具有的相关动作"
                                                             >
                                                                 <AIcon
                                                                     type="QuestionCircleOutlined"
                                                                 />
-                                                            </a-tooltip>
+                                                            </j-tooltip>
                                                         </span>
                                                     </template>
-                                                    <a-select
+                                                    <j-select
                                                         placeholder="请选择动作"
                                                         v-model:value="
                                                             item.action
@@ -174,7 +174,7 @@
                                                             filterOption
                                                         "
                                                     >
-                                                        <a-select-option
+                                                        <j-select-option
                                                             v-for="i in getTypesActions(
                                                                 item.action,
                                                             )"
@@ -183,13 +183,13 @@
                                                             :label="i.name"
                                                             >{{
                                                                 i.name
-                                                            }}</a-select-option
+                                                            }}</j-select-option
                                                         >
-                                                    </a-select>
-                                                </a-form-item>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-form-item
+                                                    </j-select>
+                                                </j-form-item>
+                                            </j-col>
+                                            <j-col :span="12">
+                                                <j-form-item
                                                     :name="[
                                                         'actionMappings',
                                                         index,
@@ -203,16 +203,16 @@
                                                     <template #label>
                                                         <span>
                                                             操作
-                                                            <a-tooltip
+                                                            <j-tooltip
                                                                 title="映射物联网平台中所选产品具备的动作"
                                                             >
                                                                 <AIcon
                                                                     type="QuestionCircleOutlined"
                                                                 />
-                                                            </a-tooltip>
+                                                            </j-tooltip>
                                                         </span>
                                                     </template>
-                                                    <a-select
+                                                    <j-select
                                                         placeholder="请选择操作"
                                                         v-model:value="
                                                             item.actionType
@@ -222,22 +222,22 @@
                                                             filterOption
                                                         "
                                                     >
-                                                        <a-select-option
+                                                        <j-select-option
                                                             value="command"
-                                                            >下发指令</a-select-option
+                                                            >下发指令</j-select-option
                                                         >
-                                                        <a-select-option
+                                                        <j-select-option
                                                             value="latestData"
-                                                            >获取历史数据</a-select-option
+                                                            >获取历史数据</j-select-option
                                                         >
-                                                    </a-select>
-                                                </a-form-item>
-                                            </a-col>
-                                            <a-col
+                                                    </j-select>
+                                                </j-form-item>
+                                            </j-col>
+                                            <j-col
                                                 :span="24"
                                                 v-if="item.actionType"
                                             >
-                                                <a-form-item
+                                                <j-form-item
                                                     :name="[
                                                         'actionMappings',
                                                         index,
@@ -256,14 +256,14 @@
                                                             item.actionType
                                                         "
                                                     />
-                                                </a-form-item>
-                                            </a-col>
-                                        </a-row>
-                                    </a-collapse-panel>
-                                </a-collapse>
-                            </a-col>
-                            <a-col :span="24">
-                                <a-button
+                                                </j-form-item>
+                                            </j-col>
+                                        </j-row>
+                                    </j-collapse-panel>
+                                </j-collapse>
+                            </j-col>
+                            <j-col :span="24">
+                                <j-button
                                     type="dashed"
                                     style="width: 100%; margin-top: 10px"
                                     @click="addItem"
@@ -272,16 +272,16 @@
                                         type="PlusOutlined"
                                         style="margin-left: 2px"
                                     />新增动作
-                                </a-button>
-                            </a-col>
-                            <a-col :span="24">
+                                </j-button>
+                            </j-col>
+                            <j-col :span="24">
                                 <p style="margin-top: 20px">属性映射</p>
-                                <a-collapse
+                                <j-collapse
                                     v-if="modelRef.propertyMappings.length"
                                     :activeKey="propertyActiveKey"
                                     @change="onPropertyCollChange"
                                 >
-                                    <a-collapse-panel
+                                    <j-collapse-panel
                                         v-for="(
                                             item, index
                                         ) in modelRef.propertyMappings"
@@ -302,9 +302,9 @@
                                                 type="DeleteOutlined"
                                                 @click="delPropertyItem(index)"
                                         /></template>
-                                        <a-row :gutter="24">
-                                            <a-col :span="12">
-                                                <a-form-item
+                                        <j-row :gutter="24">
+                                            <j-col :span="12">
+                                                <j-form-item
                                                     label="DuerOS属性"
                                                     :name="[
                                                         'propertyMappings',
@@ -317,7 +317,7 @@
                                                             '请选择DuerOS属性',
                                                     }"
                                                 >
-                                                    <a-select
+                                                    <j-select
                                                         placeholder="请选择DuerOS属性"
                                                         v-model:value="
                                                             item.source
@@ -327,7 +327,7 @@
                                                             filterOption
                                                         "
                                                     >
-                                                        <a-select-option
+                                                        <j-select-option
                                                             v-for="i in getDuerOSProperties(
                                                                 item.source,
                                                             )"
@@ -335,13 +335,13 @@
                                                             :value="i.id"
                                                             >{{
                                                                 i.name
-                                                            }}</a-select-option
+                                                            }}</j-select-option
                                                         >
-                                                    </a-select>
-                                                </a-form-item>
-                                            </a-col>
-                                            <a-col :span="12">
-                                                <a-form-item
+                                                    </j-select>
+                                                </j-form-item>
+                                            </j-col>
+                                            <j-col :span="12">
+                                                <j-form-item
                                                     label="平台属性"
                                                     :name="[
                                                         'propertyMappings',
@@ -354,7 +354,7 @@
                                                             '请选择平台属性',
                                                     }"
                                                 >
-                                                    <a-select
+                                                    <j-select
                                                         placeholder="请选择平台属性"
                                                         v-model:value="
                                                             item.target
@@ -365,7 +365,7 @@
                                                             filterOption
                                                         "
                                                     >
-                                                        <a-select-option
+                                                        <j-select-option
                                                             v-for="i in getProductProperties(
                                                                 item.target,
                                                             )"
@@ -373,17 +373,17 @@
                                                             :value="item.id"
                                                             >{{
                                                                 i.name
-                                                            }}</a-select-option
+                                                            }}</j-select-option
                                                         >
-                                                    </a-select>
-                                                </a-form-item>
-                                            </a-col>
-                                        </a-row>
-                                    </a-collapse-panel>
-                                </a-collapse>
-                            </a-col>
-                            <a-col :span="24">
-                                <a-button
+                                                    </j-select>
+                                                </j-form-item>
+                                            </j-col>
+                                        </j-row>
+                                    </j-collapse-panel>
+                                </j-collapse>
+                            </j-col>
+                            <j-col :span="24">
+                                <j-button
                                     type="dashed"
                                     style="width: 100%; margin-top: 10px"
                                     @click="addPropertyItem"
@@ -392,10 +392,10 @@
                                         type="PlusOutlined"
                                         style="margin-left: 2px"
                                     />新增属性
-                                </a-button>
-                            </a-col>
-                            <a-col :span="24" style="margin-top: 20px">
-                                <a-form-item
+                                </j-button>
+                            </j-col>
+                            <j-col :span="24" style="margin-top: 20px">
+                                <j-form-item
                                     label="说明"
                                     name="description"
                                     :rules="{
@@ -403,16 +403,16 @@
                                         message: '最多输入200个字符',
                                     }"
                                 >
-                                    <a-textarea
+                                    <j-textarea
                                         v-model:value="modelRef.description"
                                         placeholder="请输入说明"
                                         showCount
                                         :maxlength="200"
                                     />
-                                </a-form-item>
-                            </a-col>
-                        </a-row>
-                    </a-form>
+                                </j-form-item>
+                            </j-col>
+                        </j-row>
+                    </j-form>
                     <div v-if="type === 'edit'">
                         <PermissionButton
                             type="primary"
@@ -423,12 +423,12 @@
                             保存
                         </PermissionButton>
                     </div>
-                </a-col>
-                <a-col :span="8">
+                </j-col>
+                <j-col :span="8">
                     <Doc />
-                </a-col>
-            </a-row>
-        </a-card>
+                </j-col>
+            </j-row>
+        </j-card>
     </page-container>
 </template>
 
@@ -442,9 +442,10 @@ import {
     detail,
 } from '@/api/northbound/dueros';
 import _ from 'lodash';
-import { message } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
+import { useMenuStore } from '@/store/menu';
 
-const router = useRouter();
+const menuStory = useMenuStore();
 const route = useRoute();
 
 const formRef = ref();
@@ -640,7 +641,8 @@ const saveBtn = async () => {
                 if (resp.status === 200) {
                     message.success('操作成功！');
                     formRef.value.resetFields();
-                    router.push('/iot/northbound/DuerOS/');
+                    menuStory.jumpPage('Northbound/DuerOS');
+
                 }
             }
         })
diff --git a/src/views/Northbound/DuerOS/index.vue b/src/views/Northbound/DuerOS/index.vue
index 39cf2dcf..f43960d7 100644
--- a/src/views/Northbound/DuerOS/index.vue
+++ b/src/views/Northbound/DuerOS/index.vue
@@ -1,11 +1,11 @@
 <template>
     <page-container>
-        <Search
+        <j-advanced-search
             :columns="columns"
             target="northbound-dueros"
             @search="handleSearch"
         />
-        <JTable
+        <JProTable
             ref="instanceRef"
             :columns="columns"
             :request="query"
@@ -13,7 +13,7 @@
             :params="params"
         >
             <template #headerTitle>
-                <a-space>
+                <j-space>
                     <PermissionButton
                         type="primary"
                         @click="handleAdd"
@@ -22,7 +22,7 @@
                         <template #icon><AIcon type="PlusOutlined" /></template>
                         新增
                     </PermissionButton>
-                </a-space>
+                </j-space>
             </template>
             <template #card="slotProps">
                 <CardBox
@@ -45,18 +45,18 @@
                         >
                             {{ slotProps.name }}
                         </h3>
-                        <a-row>
-                            <a-col :span="12">
+                        <j-row>
+                            <j-col :span="12">
                                 <div class="card-item-content-text">产品</div>
                                 <div>{{ slotProps?.productName }}</div>
-                            </a-col>
-                            <a-col :span="12">
+                            </j-col>
+                            <j-col :span="12">
                                 <div class="card-item-content-text">
                                     设备类型
                                 </div>
                                 <div>{{ slotProps?.applianceType?.text }}</div>
-                            </a-col>
-                        </a-row>
+                            </j-col>
+                        </j-row>
                     </template>
                     <template #actions="item">
                         <PermissionButton
@@ -81,7 +81,7 @@
                 </CardBox>
             </template>
             <template #state="slotProps">
-                <a-badge
+                <j-badge
                     :text="slotProps.state?.text"
                     :status="statusMap.get(slotProps.state?.value)"
                 />
@@ -90,7 +90,7 @@
                 {{ slotProps.applianceType.text }}
             </template>
             <template #action="slotProps">
-                <a-space>
+                <j-space>
                     <template
                         v-for="i in getActions(slotProps, 'table')"
                         :key="i.key"
@@ -109,9 +109,9 @@
                             <template #icon><AIcon :type="i.icon" /></template>
                         </PermissionButton>
                     </template>
-                </a-space>
+                </j-space>
             </template>
-        </JTable>
+        </JProTable>
     </page-container>
 </template>
 
@@ -124,15 +124,13 @@ import {
     queryProductList,
     queryTypes,
 } from '@/api/northbound/dueros';
-import type { ActionsType } from '@/components/Table/index.vue';
+import type { ActionsType } from '@/views/device/Instance/typings';
 import { getImage } from '@/utils/comm';
-import { message } from 'ant-design-vue';
+import { message } from 'jetlinks-ui-components';
 import { useMenuStore } from 'store/menu';
 
-const router = useRouter();
 const instanceRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
-const current = ref<Record<string, any>>({});
 const menuStory = useMenuStore();
 
 const statusMap = new Map();
diff --git a/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue b/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue
index 2a2f2d30..d0d4c40d 100644
--- a/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue
+++ b/src/views/device/Instance/Detail/Diagnose/Message/Function/EditTable.vue
@@ -2,7 +2,7 @@
     <j-table
         rowKey="id"
         :columns="columns"
-        :datj-source="dataSource"
+        :data-source="dataSource"
         bordered
         :pagination="false"
     >
@@ -40,8 +40,7 @@
 </template>
 
 <script lang="ts" setup>
-import { PropType } from "vue-demi";
-
+import { PropType } from "vue";
 
 type Emits = {
     (e: 'update:modelValue', data: Record<string, any>[]): void;
diff --git a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
index 68011ce4..11757f17 100644
--- a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
+++ b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
@@ -9,7 +9,7 @@
         <j-table
             rowKey="id"
             :columns="columns"
-            :datj-source="dataSource"
+            :data-source="dataSource"
             bordered
             :pagination="false"
         >
diff --git a/yarn.lock b/yarn.lock
index 40dff6cf..b8ef732f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3903,8 +3903,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.4.tgz#418d9218c2d0076b4a16606eb87ea755db303409"
-  integrity sha512-7c509Xx4YVamM/R6Xg62iIOxh2gWz8ASKCN2Pa8lU2CP1n+Vn5Xi5Q0fpd0AiFdi1QadssGaGUkpzbqCqWXLsQ==
+  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.4.tgz#4c7dc568b20a9bda7decbbb6b30f0191cb4340af"
+  integrity sha512-V1lydb150+9N+wKPaZSF+WYF1bPj1bQ8nCge8EP093tqH/wVHEs3mYRlHEEfNf/+SLIcrWuPCISihfMatVIlTQ==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"