From 4d8f68dabb15c95f51b22d578081f27cffce4025 Mon Sep 17 00:00:00 2001
From: wzyyy <1175160654@qq.com>
Date: Thu, 2 Mar 2023 20:43:33 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E7=89=A9=E8=81=94=E5=8D=A1=E5=8F=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/Instance/Detail/Parsing/index.vue  |  22 ++--
 .../Product/Detail/DataAnalysis/index.vue     |  22 ++--
 .../iot-card/CardManagement/BindDevice.vue    |  10 +-
 .../iot-card/CardManagement/Detail/index.vue  | 104 +++++++++---------
 src/views/iot-card/CardManagement/Import.vue  |  56 +++++-----
 src/views/iot-card/CardManagement/Save.vue    |  56 +++++-----
 src/views/iot-card/CardManagement/index.vue   |   8 +-
 src/views/iot-card/Dashboard/index.vue        |  54 ++++-----
 src/views/iot-card/Home/index.vue             |  18 ++-
 src/views/iot-card/Platform/Detail/index.vue  | 100 ++++++++---------
 src/views/iot-card/Platform/doc/index.vue     |  16 +--
 src/views/iot-card/Platform/index.vue         |  33 +++---
 src/views/iot-card/Recharge/Detail.vue        |  36 +++---
 src/views/iot-card/Recharge/Save.vue          |  36 +++---
 src/views/iot-card/Recharge/index.vue         |  12 +-
 src/views/iot-card/Record/index.vue           |   4 +-
 src/views/iot-card/components/TimeSelect.vue  |   8 +-
 yarn.lock                                     |   8 +-
 18 files changed, 302 insertions(+), 301 deletions(-)

diff --git a/src/views/device/Instance/Detail/Parsing/index.vue b/src/views/device/Instance/Detail/Parsing/index.vue
index c69af54a..dd31b0bd 100644
--- a/src/views/device/Instance/Detail/Parsing/index.vue
+++ b/src/views/device/Instance/Detail/Parsing/index.vue
@@ -1,6 +1,6 @@
 
 <template>
-    <a-card>
+    <j-card>
         <div>
             <div class="top">
                 <div class="top-left">
@@ -25,9 +25,9 @@
                 </div>
                 <div>
                     脚本语言:
-                    <a-select :defaultValue="'JavaScript'" style="width: 200;margin-left: 5px;">
-                        <a-select-option value="JavaScript">JavaScript(ECMAScript 5)</a-select-option>
-                    </a-select>
+                    <j-select :defaultValue="'JavaScript'" style="width: 200;margin-left: 5px;">
+                        <j-select-option value="JavaScript">JavaScript(ECMAScript 5)</j-select-option>
+                    </j-select>
                     <AIcon type="ExpandOutlined" style="margin-left: 20px;" @click="toggle" />
                 </div>
             </div>
@@ -42,7 +42,7 @@
 
                     })
                 }"></div>
-                <MonacoEditor language="javascript" style="height: 100%;" theme="vs" v-model:modelValue="editorValue" />
+                <j-monaco-editor language="javascript" style="height: 100%;" theme="vs" v-model:modelValue="editorValue" />
             </div>
             <div class="bottom">
                 <div style="width: 49.5%;">
@@ -51,25 +51,25 @@
                         <div class="bottom-title-topic">
                             <template v-if="instanceStore.current.transport === 'MQTT'">
                                 <div style="margin-right: 5px;">Topic:</div>
-                                <a-auto-complete placeholder="请输入Topic" style="width: 300px" :options="topicList"
+                                <j-auto-complete placeholder="请输入Topic" style="width: 300px" :options="topicList"
                                     :allowClear="true" :filterOption="(inputValue: any, option: any) =>
                                         option!.value.indexOf(inputValue) !== -1" v-model:value="topic" />
                             </template>
                             <template v-else>
                                 <div style="margin-right: 5px;">URL:</div>
-                                <a-input placeholder="请输入URL" v-model:value="url" style="width: 300px"></a-input>
+                                <j-input placeholder="请输入URL" v-model:value="url" style="width: 300px"></j-input>
                             </template>
                         </div>
 
                     </div>
-                    <a-textarea :rows="5" placeholder="// 二进制数据以0x开头的十六进制输入，字符串数据输入原始字符串" style="margin-top: 10px;"
+                    <j-textarea :rows="5" placeholder="// 二进制数据以0x开头的十六进制输入，字符串数据输入原始字符串" style="margin-top: 10px;"
                         v-model:value="simulation" />
                 </div>
                 <div style="width: 49.5%;">
                     <div class="bottom-title">
                         <div class="bottom-title-text">运行结果</div>
                     </div>
-                    <a-textarea :autoSize="{ minRows: 5 }" :style="resStyle" v-model:value="result" />
+                    <j-textarea :autoSize="{ minRows: 5 }" :style="resStyle" v-model:value="result" />
                 </div>
             </div>
         </div>
@@ -87,13 +87,13 @@
                 保存
             </PermissionButton>
         </div>
-    </a-card>
+    </j-card>
 </template>
 
 <script setup lang='ts' name="Parsing">
 import AIcon from '@/components/AIcon'
 import PermissionButton from '@/components/PermissionButton/index.vue'
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
+// import MonacoEditor from '@/components/MonacoEditor/index.vue';
 import { useFullscreen } from '@vueuse/core'
 import { useInstanceStore } from '@/store/instance';
 import {
diff --git a/src/views/device/Product/Detail/DataAnalysis/index.vue b/src/views/device/Product/Detail/DataAnalysis/index.vue
index 4fbe01a1..0db2b63a 100644
--- a/src/views/device/Product/Detail/DataAnalysis/index.vue
+++ b/src/views/device/Product/Detail/DataAnalysis/index.vue
@@ -1,18 +1,18 @@
 
 <template>
-    <a-card>
+    <j-card>
         <div>
             <div class="top">
                 <div>
                     脚本语言:
-                    <a-select :defaultValue="'JavaScript'" style="width: 200;margin-left: 5px;">
-                        <a-select-option value="JavaScript">JavaScript(ECMAScript 5)</a-select-option>
-                    </a-select>
+                    <j-select :defaultValue="'JavaScript'" style="width: 200;margin-left: 5px;">
+                        <j-select-option value="JavaScript">JavaScript(ECMAScript 5)</j-select-option>
+                    </j-select>
                     <AIcon type="ExpandOutlined" style="margin-left: 20px;" @click="toggle" />
                 </div>
             </div>
             <div class="edit" ref="el">
-                <MonacoEditor language="javascript" style="height: 100%;" theme="vs" v-model:modelValue="editorValue" />
+                <j-monaco-editor language="javascript" style="height: 100%;" theme="vs" v-model:modelValue="editorValue" />
             </div>
             <div class="bottom">
                 <div style="width: 49.5%;">
@@ -21,25 +21,25 @@
                         <div class="bottom-title-topic">
                             <template v-if="productStore.current.transportProtocol === 'MQTT'">
                                 <div style="margin-right: 5px;">Topic:</div>
-                                <a-auto-complete placeholder="请输入Topic" style="width: 300px" :options="topicList"
+                                <j-auto-complete placeholder="请输入Topic" style="width: 300px" :options="topicList"
                                     :allowClear="true" :filterOption="(inputValue: any, option: any) =>
                                         option!.value.indexOf(inputValue) !== -1" v-model:value="topic" />
                             </template>
                             <template v-else>
                                 <div style="margin-right: 5px;">URL:</div>
-                                <a-input placeholder="请输入URL" v-model:value="url" style="width: 300px"></a-input>
+                                <j-input placeholder="请输入URL" v-model:value="url" style="width: 300px"></j-input>
                             </template>
                         </div>
 
                     </div>
-                    <a-textarea :rows="5" placeholder="// 二进制数据以0x开头的十六进制输入，字符串数据输入原始字符串" style="margin-top: 10px;"
+                    <j-textarea :rows="5" placeholder="// 二进制数据以0x开头的十六进制输入，字符串数据输入原始字符串" style="margin-top: 10px;"
                         v-model:value="simulation" />
                 </div>
                 <div style="width: 49.5%;">
                     <div class="bottom-title">
                         <div class="bottom-title-text">运行结果</div>
                     </div>
-                    <a-textarea :autoSize="{ minRows: 5 }" :style="resStyle" v-model:value="result" />
+                    <j-textarea :autoSize="{ minRows: 5 }" :style="resStyle" v-model:value="result" />
                 </div>
             </div>
         </div>
@@ -57,13 +57,13 @@
                 保存
             </PermissionButton>
         </div>
-    </a-card>
+    </j-card>
 </template>
 
 <script setup lang='ts' name="DataAnalysis">
 import AIcon from '@/components/AIcon'
 import PermissionButton from '@/components/PermissionButton/index.vue'
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
+// import MonacoEditor from '@/components/MonacoEditor/index.vue';
 import { useFullscreen } from '@vueuse/core'
 import { useProductStore } from '@/store/product';
 import {
diff --git a/src/views/iot-card/CardManagement/BindDevice.vue b/src/views/iot-card/CardManagement/BindDevice.vue
index 1861c0dd..cc2b100a 100644
--- a/src/views/iot-card/CardManagement/BindDevice.vue
+++ b/src/views/iot-card/CardManagement/BindDevice.vue
@@ -1,6 +1,6 @@
 <!-- 绑定设备 -->
 <template>
-    <a-modal
+    <j-modal
         :maskClosable="false"
         width="1100px"
         :visible="true"
@@ -18,7 +18,7 @@
                 @search="handleSearch"
                 type="simple"
             />
-            <JTable
+            <j-pro-table
                 ref="bindDeviceRef"
                 :columns="columns"
                 :request="queryUnbounded"
@@ -44,14 +44,14 @@
                     }}
                 </template>
                 <template #state="slotProps">
-                    <a-badge
+                    <j-badge
                         :text="slotProps.state.text"
                         :status="statusMap.get(slotProps.state.value)"
                     />
                 </template>
-            </JTable>
+            </j-pro-table>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/iot-card/CardManagement/Detail/index.vue b/src/views/iot-card/CardManagement/Detail/index.vue
index e36063b1..eb97b3b8 100644
--- a/src/views/iot-card/CardManagement/Detail/index.vue
+++ b/src/views/iot-card/CardManagement/Detail/index.vue
@@ -8,15 +8,15 @@
             :data="current"
             @change="saveChange"
         />
-        <a-row :gutter="[24, 24]">
-            <a-col :span="24">
-                <a-card>
-                    <a-descriptions size="small" :column="3" bordered>
+        <j-row :gutter="[24, 24]">
+            <j-col :span="24">
+                <j-card>
+                    <j-descriptions size="small" :column="3" bordered>
                         <template #title>
                             <Guide>
                                 <template #title>
                                     <span>基本信息</span>
-                                    <a-button
+                                    <j-button
                                         type="link"
                                         @click="
                                             () => {
@@ -28,74 +28,74 @@
                                     >
                                         <AIcon type="EditOutlined"></AIcon>
                                         编辑
-                                    </a-button>
+                                    </j-button>
                                 </template>
                             </Guide>
                         </template>
 
-                        <a-descriptions-item label="卡号">{{
+                        <j-descriptions-item label="卡号">{{
                             detail.id
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="ICCID">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="ICCID">{{
                             detail.iccId
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="绑定设备">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="绑定设备">{{
                             detail.deviceName
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="平台类型">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="平台类型">{{
                             detail.operatorPlatformType?.text
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="平台名称">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="平台名称">{{
                             detail.platformConfigName
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="运营商">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="运营商">{{
                             detail.operatorName
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="类型">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="类型">{{
                             detail.cardType?.text
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="激活日期">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="激活日期">{{
                             detail.activationDate
                                 ? moment(detail.activationDate).format(
                                       'YYYY-MM-DD HH:mm:ss',
                                   )
                                 : ''
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="更新时间">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="更新时间">{{
                             detail.updateTime
                                 ? moment(detail.updateTime).format(
                                       'YYYY-MM-DD HH:mm:ss',
                                   )
                                 : ''
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="总流量">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="总流量">{{
                             detail.totalFlow
                                 ? detail.totalFlow.toFixed(2) + ' M'
                                 : ''
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="使用流量">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="使用流量">{{
                             detail.usedFlow
                                 ? detail.usedFlow.toFixed(2) + ' M'
                                 : ''
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="剩余流量">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="剩余流量">{{
                             detail.residualFlow
                                 ? detail.residualFlow.toFixed(2) + ' M'
                                 : ''
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="状态">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="状态">{{
                             detail?.cardState?.text
-                        }}</a-descriptions-item>
-                        <a-descriptions-item label="说明">{{
+                        }}</j-descriptions-item>
+                        <j-descriptions-item label="说明">{{
                             detail?.describe
-                        }}</a-descriptions-item>
-                    </a-descriptions>
-                </a-card>
-            </a-col>
-            <a-col :span="24">
+                        }}</j-descriptions-item>
+                    </j-descriptions>
+                </j-card>
+            </j-col>
+            <j-col :span="24">
                 <!-- 流量统计 -->
-                <a-row :gutter="24">
-                    <a-col :span="16">
+                <j-row :gutter="24">
+                    <j-col :span="16">
                         <div class="card">
                             <Guide title="流量统计">
                                 <template #extra>
@@ -113,15 +113,15 @@
                                 :chartData="flowData"
                             />
                         </div>
-                    </a-col>
-                    <a-col :span="8">
+                    </j-col>
+                    <j-col :span="8">
                         <div class="card">
                             <Guide title="数据统计" />
                             <div class="static-info" style="min-height: 490px">
                                 <div class="data-statistics-item">
                                     <div class="flow-info" style="width: 100%">
                                         <div class="label">昨日流量消耗</div>
-                                        <a-tooltip placement="bottomLeft">
+                                        <j-tooltip placement="bottomLeft">
                                             <template #title>
                                                 <span>{{ dayTotal }} M</span>
                                             </template>
@@ -129,7 +129,7 @@
                                                 {{ dayTotal }}
                                                 <span class="unit">M</span>
                                             </div>
-                                        </a-tooltip>
+                                        </j-tooltip>
                                     </div>
                                     <LineChart
                                         color="#FBA500"
@@ -139,7 +139,7 @@
                                 <div class="data-statistics-item">
                                     <div class="flow-info" style="width: 100%">
                                         <div class="label">当月流量消耗</div>
-                                        <a-tooltip placement="bottomLeft">
+                                        <j-tooltip placement="bottomLeft">
                                             <template #title>
                                                 <span>{{ monthTotal }} M</span>
                                             </template>
@@ -147,14 +147,14 @@
                                                 {{ monthTotal }}
                                                 <span class="unit">M</span>
                                             </div>
-                                        </a-tooltip>
+                                        </j-tooltip>
                                     </div>
                                     <LineChart :chartData="monthOptions" />
                                 </div>
                                 <div class="data-statistics-item">
                                     <div class="flow-info" style="width: 100%">
                                         <div class="label">本年流量消耗</div>
-                                        <a-tooltip placement="bottomLeft">
+                                        <j-tooltip placement="bottomLeft">
                                             <template #title>
                                                 <span>{{ yearTotal }} M</span>
                                             </template>
@@ -162,7 +162,7 @@
                                                 {{ yearTotal }}
                                                 <span class="unit">M</span>
                                             </div>
-                                        </a-tooltip>
+                                        </j-tooltip>
                                     </div>
                                     <LineChart
                                         color="#58E1D3"
@@ -171,10 +171,10 @@
                                 </div>
                             </div>
                         </div>
-                    </a-col>
-                </a-row>
-            </a-col>
-        </a-row>
+                    </j-col>
+                </j-row>
+            </j-col>
+        </j-row>
     </page-container>
 </template>
 
diff --git a/src/views/iot-card/CardManagement/Import.vue b/src/views/iot-card/CardManagement/Import.vue
index 91aa8962..9e03d66e 100644
--- a/src/views/iot-card/CardManagement/Import.vue
+++ b/src/views/iot-card/CardManagement/Import.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 导入 -->
-    <a-modal
+    <j-modal
         :maskClosable="false"
         :visible="true"
         title="导入"
@@ -10,30 +10,30 @@
         @cancel="handleCancel"
     >
         <div style="margin-top: 10px">
-            <a-form :layout="'vertical'">
-                <a-form-item label="平台对接" required>
-                    <a-select
+            <j-form :layout="'vertical'">
+                <j-form-item label="平台对接" required>
+                    <j-select
                         showSearch
                         v-model:value="modelRef.configId"
                         :options="configList"
                         placeholder="请选择平台对接"
                     >
-                    </a-select>
-                </a-form-item>
+                    </j-select>
+                </j-form-item>
 
-                <a-form-item v-if="modelRef.configId" label="文件格式">
-                    <a-radio-group
+                <j-form-item v-if="modelRef.configId" label="文件格式">
+                    <j-radio-group
                         button-style="solid"
                         v-model:value="modelRef.fileType"
                         placeholder="请选择文件格式"
                     >
-                        <a-radio-button value="xlsx">xlsx</a-radio-button>
-                        <a-radio-button value="csv">csv</a-radio-button>
-                    </a-radio-group>
-                </a-form-item>
+                        <j-radio-button value="xlsx">xlsx</j-radio-button>
+                        <j-radio-button value="csv">csv</j-radio-button>
+                    </j-radio-group>
+                </j-form-item>
 
-                <a-form-item label="文件上传" v-if="modelRef.configId">
-                    <a-upload
+                <j-form-item label="文件上传" v-if="modelRef.configId">
+                    <j-upload
                         v-model:fileList="modelRef.upload"
                         name="file"
                         :action="FILE_UPLOAD"
@@ -44,24 +44,24 @@
                         :showUploadList="false"
                         @change="fileChange"
                     >
-                        <a-button :loading="loading">
+                        <j-button :loading="loading">
                             <template #icon>
                                 <AIcon type="UploadOutlined" />
                             </template>
                             文件上传
-                        </a-button>
-                    </a-upload>
-                </a-form-item>
-                <a-form-item v-if="modelRef.configId" label="下载模板">
-                    <a-space>
-                        <a-button icon="file" @click="downFileFn('xlsx')">
+                        </j-button>
+                    </j-upload>
+                </j-form-item>
+                <j-form-item v-if="modelRef.configId" label="下载模板">
+                    <j-space>
+                        <j-button icon="file" @click="downFileFn('xlsx')">
                             .xlsx
-                        </a-button>
-                        <a-button icon="file" @click="downFileFn('csv')">
+                        </j-button>
+                        <j-button icon="file" @click="downFileFn('csv')">
                             .csv
-                        </a-button>
-                    </a-space>
-                </a-form-item>
+                        </j-button>
+                    </j-space>
+                </j-form-item>
                 <div v-if="totalCount">
                     <a-icon class="check-num" type="check" /> 已完成 总数量
                     <span class="check-num">{{ totalCount }}</span>
@@ -71,9 +71,9 @@
                     失败 总数量
                     <span class="check-num">{{ errCount }}</span>
                 </div>
-            </a-form>
+            </j-form>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/iot-card/CardManagement/Save.vue b/src/views/iot-card/CardManagement/Save.vue
index 1ae255a5..ad45f377 100644
--- a/src/views/iot-card/CardManagement/Save.vue
+++ b/src/views/iot-card/CardManagement/Save.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-modal
+    <j-modal
         :maskClosable="false"
         width="600px"
         :visible="true"
@@ -11,39 +11,39 @@
         :confirmLoading="btnLoading"
     >
         <div style="margin-top: 10px">
-            <a-form
+            <j-form
                 :layout="'vertical'"
                 ref="formRef"
                 :rules="rules"
                 :model="modelRef"
             >
-                <a-form-item label="卡号" name="id">
-                    <a-input
+                <j-form-item label="卡号" name="id">
+                    <j-input
                         v-model:value="modelRef.id"
                         placeholder="请输入卡号"
                         :disabled="type === 'edit'"
-                    ></a-input>
-                </a-form-item>
-                <a-form-item name="iccId">
+                    ></j-input>
+                </j-form-item>
+                <j-form-item name="iccId">
                     <template #label>
                         <span>
                             ICCID
-                            <a-tooltip title="IC卡的唯一识别号码">
+                            <j-tooltip title="IC卡的唯一识别号码">
                                 <AIcon
                                     type="QuestionCircleOutlined"
                                     style="margin-left: 2px"
                                 />
-                            </a-tooltip>
+                            </j-tooltip>
                         </span>
                     </template>
-                    <a-input
+                    <j-input
                         v-model:value="modelRef.iccId"
                         placeholder="请输入ICCID"
                         :disabled="type === 'edit'"
                     />
-                </a-form-item>
-                <a-form-item label="平台对接" name="platformConfigId">
-                    <a-select
+                </j-form-item>
+                <j-form-item label="平台对接" name="platformConfigId">
+                    <j-select
                         showSearch
                         :filter-option="filterOption"
                         :disabled="type === 'edit'"
@@ -52,11 +52,11 @@
                         v-model:value="modelRef.platformConfigId"
                         placeholder="请选择平台对接"
                     >
-                    </a-select>
-                </a-form-item>
+                </j-select>
+                </j-form-item>
 
-                <a-form-item label="运营商" name="operatorName">
-                    <a-select
+                <j-form-item label="运营商" name="operatorName">
+                    <j-select
                         allowClear
                         showSearch
                         :filter-option="filterOption"
@@ -64,10 +64,10 @@
                         v-model:value="modelRef.operatorName"
                         placeholder="请选择运营商"
                     >
-                    </a-select>
-                </a-form-item>
-                <a-form-item label="类型" name="cardType">
-                    <a-select
+                    </j-select>
+                </j-form-item>
+                <j-form-item label="类型" name="cardType">
+                    <j-select
                         allowClear
                         showSearch
                         :disabled="type === 'edit'"
@@ -76,19 +76,19 @@
                         v-model:value="modelRef.cardType"
                         placeholder="请选择类型"
                     >
-                    </a-select>
-                </a-form-item>
-                <a-form-item label="说明" name="describe">
-                    <a-textarea
+                    </j-select>
+                </j-form-item>
+                <j-form-item label="说明" name="describe">
+                    <j-textarea
                         v-model:value="modelRef.describe"
                         placeholder="请输入说明"
                         showCount
                         :maxlength="200"
                     />
-                </a-form-item>
-            </a-form>
+                </j-form-item>
+            </j-form>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 050197aa..56564f63 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -2,13 +2,13 @@
 <template>
     <page-container>
         <Search :columns="columns" target="iot-card-management-search" @search="handleSearch" />
-        <JTable ref="cardManageRef" :columns="columns" :request="query"
+        <j-pro-table ref="cardManageRef" :columns="columns" :request="query"
             :defaultParams="{ sorts: [{ name: 'createTime', order: 'desc' }] }" :rowSelection="{
                 selectedRowKeys: _selectedRowKeys,
                 onChange: onSelectChange,
             }" @cancelSelect="cancelSelect" :params="params" :gridColumn="3">
             <template #headerTitle>
-                <a-space>
+                <j-space>
                     <a-button type="primary" @click="handleAdd">
                         <AIcon type="PlusOutlined" />新增
                     </a-button>
@@ -80,7 +80,7 @@
                             </a-menu>
                         </template>
                     </a-dropdown>
-                </a-space>
+                </j-space>
             </template>
             <template #card="slotProps">
                 <CardBox :value="slotProps" @click="handleClick" :actions="getActions(slotProps, 'card')" v-bind="slotProps"
@@ -265,7 +265,7 @@
                     </template>
                 </a-space>
             </template>
-        </JTable>
+        </j-pro-table>
         <!-- 批量导入 -->
         <Import v-if="importVisible" @close="importVisible = false" />
         <!-- 批量导出 -->
diff --git a/src/views/iot-card/Dashboard/index.vue b/src/views/iot-card/Dashboard/index.vue
index ece76606..f281f309 100644
--- a/src/views/iot-card/Dashboard/index.vue
+++ b/src/views/iot-card/Dashboard/index.vue
@@ -2,14 +2,14 @@
 <template>
     <page-container>
         <div class="card-dashboard-container">
-            <a-card style="margin-bottom: 24px">
-                <a-row :gutter="24">
-                    <a-col :span="24"><Guide title="数据统计" /></a-col>
-                    <a-col :span="8">
+            <j-card style="margin-bottom: 24px">
+                <j-row :gutter="24">
+                    <j-col :span="24"><Guide title="数据统计" /></j-col>
+                    <j-col :span="8">
                         <div class="data-statistics-item">
                             <div class="flow-info" style="width: 100%">
                                 <div class="label">昨日流量消耗</div>
-                                <a-tooltip placement="bottomLeft">
+                                <j-tooltip placement="bottomLeft">
                                     <template #title>
                                         <span>{{ dayTotal }} M</span>
                                     </template>
@@ -17,19 +17,19 @@
                                         {{ dayTotal }}
                                         <span class="unit">M</span>
                                     </div>
-                                </a-tooltip>
+                                </j-tooltip>
                             </div>
                             <LineChart
                                 color="#FBA500"
                                 :chartData="dayOptions"
                             />
                         </div>
-                    </a-col>
-                    <a-col :span="8">
+                    </j-col>
+                    <j-col :span="8">
                         <div class="data-statistics-item">
                             <div class="flow-info" style="width: 100%">
                                 <div class="label">当月流量消耗</div>
-                                <a-tooltip placement="bottomLeft">
+                                <j-tooltip placement="bottomLeft">
                                     <template #title>
                                         <span>{{ monthTotal }} M</span>
                                     </template>
@@ -37,16 +37,16 @@
                                         {{ monthTotal }}
                                         <span class="unit">M</span>
                                     </div>
-                                </a-tooltip>
+                                </j-tooltip>
                             </div>
                             <LineChart :chartData="monthOptions" />
                         </div>
-                    </a-col>
-                    <a-col :span="8">
+                    </j-col>
+                    <j-col :span="8">
                         <div class="data-statistics-item">
                             <div class="flow-info" style="width: 100%">
                                 <div class="label">本年流量消耗</div>
-                                <a-tooltip placement="bottomLeft">
+                                <j-tooltip placement="bottomLeft">
                                     <template #title>
                                         <span>{{ yearTotal }} M</span>
                                     </template>
@@ -54,18 +54,18 @@
                                         {{ yearTotal }}
                                         <span class="unit">M</span>
                                     </div>
-                                </a-tooltip>
+                                </j-tooltip>
                             </div>
                             <LineChart
                                 color="#58E1D3"
                                 :chartData="yearOptions"
                             />
                         </div>
-                    </a-col>
-                </a-row>
-            </a-card>
-            <a-row :gutter="24">
-                <a-col :span="16">
+                    </j-col>
+                </j-row>
+            </j-card>
+            <j-row :gutter="24">
+                <j-col :span="16">
                     <div class="static-card">
                         <Guide title="流量统计">
                             <template #extra>
@@ -85,11 +85,11 @@
                             :chartData="flowData"
                         />
                         <div class="empty-body" v-else>
-                            <a-empty :image="Empty.PRESENTED_IMAGE_SIMPLE" />
+                            <j-empty :image="Empty.PRESENTED_IMAGE_SIMPLE" />
                         </div>
                     </div>
-                </a-col>
-                <a-col :span="8">
+                </j-col>
+                <j-col :span="8">
                     <div class="static-card">
                         <Guide title="流量使用TOP10">
                             <template #extra>
@@ -118,7 +118,7 @@
                                 </div>
                                 <div class="cardNum">{{ item.cardNum }}</div>
                                 <div class="progress">
-                                    <a-progress
+                                    <j-progress
                                         :strokeColor="'#ADC6FF'"
                                         :trailColor="'#E0E4E8'"
                                         :strokeLinecap="'butt'"
@@ -128,7 +128,7 @@
                                                 (item.value / topTotal) * 100,
                                             )
                                         "
-                                    ></a-progress>
+                                    ></j-progress>
                                 </div>
                                 <div class="total">
                                     {{ item?.value?.toFixed(2) }} M
@@ -136,11 +136,11 @@
                             </div>
                         </div>
                         <div class="empty-body" v-else>
-                            <a-empty :image="Empty.PRESENTED_IMAGE_SIMPLE" />
+                            <j-empty :image="Empty.PRESENTED_IMAGE_SIMPLE" />
                         </div>
                     </div>
-                </a-col>
-            </a-row>
+                </j-col>
+            </j-row>
         </div>
     </page-container>
 </template>
diff --git a/src/views/iot-card/Home/index.vue b/src/views/iot-card/Home/index.vue
index e5300d1f..af9a0b33 100644
--- a/src/views/iot-card/Home/index.vue
+++ b/src/views/iot-card/Home/index.vue
@@ -1,8 +1,8 @@
 <!-- 物联卡-首页 -->
 <template>
     <page-container>
-        <a-row :gutter="24">
-            <a-col :span="14">
+        <j-row :gutter="24">
+            <j-col :span="14">
                 <div class="home-guide">
                     <Guide title="物联卡引导"></Guide>
                     <div
@@ -25,8 +25,8 @@
                         </div>
                     </div>
                 </div>
-            </a-col>
-            <a-col :span="10">
+            </j-col>
+            <j-col :span="10">
                 <div class="home-statistics">
                     <Guide title="基础统计">
                         <template #extra>
@@ -71,8 +71,8 @@
                         </div>
                     </div>
                 </div>
-            </a-col>
-            <a-col :span="24" style="min-height: 580px">
+            </j-col>
+            <j-col :span="24" style="min-height: 580px">
                 <div class="home-body">
                     <Guide
                         title="平台架构图"
@@ -82,22 +82,20 @@
                         <img :src="getImage('/iot-card/iotcard-home.png')" />
                     </div>
                 </div>
-            </a-col>
-        </a-row>
+            </j-col>
+        </j-row>
     </page-container>
 </template>
 
 <script setup lang="ts">
 import { getImage } from '@/utils/comm';
 import Guide from '../components/Guide.vue';
-import { message } from 'ant-design-vue';
 import moment from 'moment';
 import { queryFlow, list } from '@/api/iot-card/home';
 import * as echarts from 'echarts';
 import { useMenuStore } from '@/store/menu';
 import { usePermissionStore } from '@/store/permission';
 
-const router = useRouter();
 const { proxy } = <any>getCurrentInstance();
 
 interface GuideItemProps {
diff --git a/src/views/iot-card/Platform/Detail/index.vue b/src/views/iot-card/Platform/Detail/index.vue
index d1e2c40d..a5613d7e 100644
--- a/src/views/iot-card/Platform/Detail/index.vue
+++ b/src/views/iot-card/Platform/Detail/index.vue
@@ -1,16 +1,16 @@
 <template>
     <page-container>
-        <a-card>
-            <a-row :gutter="24">
-                <a-col :span="14">
+        <j-card>
+            <j-row :gutter="24">
+                <j-col :span="14">
                     <TitleComponent data="详情" />
-                    <a-form
+                    <j-form
                         :layout="'vertical'"
                         ref="formRef"
                         :rules="rules"
                         :model="form"
                     >
-                        <a-form-item
+                        <j-form-item
                             label="平台类型"
                             name="operatorName"
                             required
@@ -28,104 +28,104 @@
                                 v-model:value="form.operatorName"
                                 @change="typeChange"
                             ></PlatformType
-                        ></a-form-item>
-                        <a-form-item label="名称" name="name">
-                            <a-input
+                        ></j-form-item>
+                        <j-form-item label="名称" name="name">
+                            <j-input
                                 v-model:value="form.name"
                                 placeholder="请输入名称"
                             />
-                        </a-form-item>
+                        </j-form-item>
 
                         <!-- onelink -->
                         <div v-if="form.operatorName === 'onelink'">
-                            <a-form-item label="App ID" name="appId">
-                                <a-input
+                            <j-form-item label="App ID" name="appId">
+                                <j-input
                                     v-model:value="form.appId"
                                     placeholder="请输入App ID"
                                 />
-                            </a-form-item>
-                            <a-form-item label="Password" name="passWord">
-                                <a-input-password
+                            </j-form-item>
+                            <j-form-item label="Password" name="passWord">
+                                <j-input-password
                                     v-model:value="form.passWord"
                                     placeholder="请输入密码"
                                 />
-                            </a-form-item>
-                            <a-form-item label="接口地址" name="apiAddr">
-                                <a-input
+                            </j-form-item>
+                            <j-form-item label="接口地址" name="apiAddr">
+                                <j-input
                                     v-model:value="form.apiAddr"
                                     placeholder="请输入接口地址"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </div>
                         <!-- ctwing -->
                         <div v-if="form.operatorName === 'ctwing'">
-                            <a-form-item label="用户id" name="userId">
-                                <a-input
+                            <j-form-item label="用户id" name="userId">
+                                <j-input
                                     v-model:value="form.userId"
                                     placeholder="请输入用户id"
                                 />
-                            </a-form-item>
-                            <a-form-item label="密码" name="passWord">
-                                <a-input-password
+                            </j-form-item>
+                            <j-form-item label="密码" name="passWord">
+                                <j-input-password
                                     v-model:value="form.passWord"
                                     placeholder="请输入密码"
                                 />
-                            </a-form-item>
-                            <a-form-item label="secretKey" name="secretKey">
-                                <a-input
+                            </j-form-item>
+                            <j-form-item label="secretKey" name="secretKey">
+                                <j-input
                                     v-model:value="form.secretKey"
                                     placeholder="请输入secretKey"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </div>
                         <!-- unicom -->
                         <div v-if="form.operatorName === 'unicom'">
-                            <a-form-item label="App ID" name="appId">
-                                <a-input
+                            <j-form-item label="App ID" name="appId">
+                                <j-input
                                     v-model:value="form.appId"
                                     placeholder="请输入App ID"
                                 />
-                            </a-form-item>
-                            <a-form-item label="App Secret" name="appSecret">
-                                <a-input
+                            </j-form-item>
+                            <j-form-item label="App Secret" name="appSecret">
+                                <j-input
                                     v-model:value="form.appSecret"
                                     placeholder="请输入App Secret"
                                 />
-                            </a-form-item>
-                            <a-form-item label="创建者ID" name="openId">
-                                <a-input
+                            </j-form-item>
+                            <j-form-item label="创建者ID" name="openId">
+                                <j-input
                                     v-model:value="form.openId"
                                     placeholder="请输入创建者ID"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </div>
 
-                        <a-form-item label="说明" name="explain">
-                            <a-textarea
+                        <j-form-item label="说明" name="explain">
+                            <j-textarea
                                 v-model:value="form.explain"
                                 placeholder="请输入说明"
                                 showCount
                                 :rows="3"
                                 :maxlength="200"
                             />
-                        </a-form-item>
-                        <a-form-item>
-                            <a-divider />
-                            <a-button
+                        </j-form-item>
+                        <j-form-item>
+                            <j-divider />
+                            <j-button
                                 :loading="saveBtnLoading"
                                 type="primary"
                                 @click="handleSave"
                             >
                                 保存
-                            </a-button>
-                        </a-form-item>
-                    </a-form>
-                </a-col>
-                <a-col :span="10">
+                            </j-button>
+                        </j-form-item>
+                    </j-form>
+                </j-col>
+                <j-col :span="10">
                     <Doc :type="form.operatorName" />
-                </a-col>
-            </a-row>
-        </a-card>
+                </j-col>
+            </j-row>
+        </j-card>
     </page-container>
 </template>
 
diff --git a/src/views/iot-card/Platform/doc/index.vue b/src/views/iot-card/Platform/doc/index.vue
index a47c0aba..0aced7f7 100644
--- a/src/views/iot-card/Platform/doc/index.vue
+++ b/src/views/iot-card/Platform/doc/index.vue
@@ -24,7 +24,7 @@
             获取路径：“中移物联卡能力开放平台”--“个人中心”--“客户信息”--“接入信息”
         </p>
         <div class="image">
-            <a-image
+            <j-image
                 width="100%"
                 :src="getImage('/iot-card/onelink-appid.png')"
             />
@@ -37,7 +37,7 @@
             获取路径：“中移物联卡能力开放平台”--“个人中心”--“客户信息”--“接入信息”
         </p>
         <div class="image">
-            <a-image
+            <j-image
                 width="100%"
                 :src="getImage('/iot-card/onelink-pass.png')"
             />
@@ -77,7 +77,7 @@
                 获取路径：“5G连接管理平台”--“能力开放”--“API网关账号管理”
             </p>
             <div class="image">
-                <a-image
+                <j-image
                     width="100%"
                     :src="getImage('/iot-card/ctwing-id.png')"
                 />
@@ -90,7 +90,7 @@
                 获取路径：“5G连接管理平台”--“能力开放”--“API网关账号管理”
             </p>
             <div class="image">
-                <a-image
+                <j-image
                     width="100%"
                     :src="getImage('/iot-card/ctwing-pass.png')"
                 />
@@ -103,7 +103,7 @@
                 获取路径：“5G连接管理平台”--“能力开放”--“API网关账号管理”
             </p>
             <div class="image">
-                <a-image
+                <j-image
                     width="100%"
                     :src="getImage('/iot-card/ctwing-secret.png')"
                 />
@@ -137,7 +137,7 @@
                 获取路径：“雁飞智连CMP平台”--“我的应用”--“应用列表”
             </p>
             <div class="image">
-                <a-image
+                <j-image
                     width="100%"
                     :src="getImage('/iot-card/unicom-id.png')"
                 />
@@ -150,7 +150,7 @@
                 获取路径：“雁飞智连CMP平台”--“我的应用”--“应用列表”
             </p>
             <div class="image">
-                <a-image
+                <j-image
                     width="100%"
                     :src="getImage('/iot-card/unicom-secret.png')"
                 />
@@ -164,7 +164,7 @@
                 <br />
             </p>
             <div class="image">
-                <a-image
+                <j-image
                     width="100%"
                     :src="getImage('/iot-card/unicom-openid.png')"
                 />
diff --git a/src/views/iot-card/Platform/index.vue b/src/views/iot-card/Platform/index.vue
index b84b3808..6151779a 100644
--- a/src/views/iot-card/Platform/index.vue
+++ b/src/views/iot-card/Platform/index.vue
@@ -6,7 +6,7 @@
             target="platform-search"
             @search="handleSearch"
         />
-        <JTable
+        <j-pro-table
             ref="platformRef"
             :columns="columns"
             :request="queryList"
@@ -15,11 +15,14 @@
             :gridColumn="3"
         >
             <template #headerTitle>
-                <a-space>
-                    <a-button type="primary" @click="handleAdd">
+                <j-space>
+                    <!-- <j-button type="primary" @click="handleAdd">
                         <AIcon type="PlusOutlined" />新增
-                    </a-button>
-                </a-space>
+                    </j-button> -->
+                    <PermissionButton @click="handleAdd" :hasPermission="'iot-card/Platform:add'" type="primary">
+                        <AIcon type="PlusOutlined" />新增
+                    </PermissionButton>
+                </j-space>
             </template>
             <template #card="slotProps">
                 <CardBox
@@ -42,18 +45,18 @@
                         <h3 class="card-item-content-title">
                             {{ slotProps.name }}
                         </h3>
-                        <a-row>
-                            <a-col :span="12">
+                        <j-row>
+                            <j-col :span="12">
                                 <div class="card-item-content-text">
                                     平台类型
                                 </div>
                                 <div>{{ slotProps.operatorName }}</div>
-                            </a-col>
-                            <a-col :span="12">
+                            </j-col>
+                            <j-col :span="12">
                                 <div class="card-item-content-text">说明</div>
                                 <div>{{ slotProps.explain }}</div>
-                            </a-col>
-                        </a-row>
+                            </j-col>
+                        </j-row>
                     </template>
                     <template #actions="item">
                         <PermissionButton :disabled="item.disabled" :popConfirm="item.popConfirm" :tooltip="{
@@ -69,7 +72,7 @@
                 </CardBox>
             </template>
             <template #state="slotProps">
-                <a-badge
+                <j-badge
                     :text="slotProps.state.text"
                     :status="
                         slotProps.state.value === 'disabled'
@@ -79,7 +82,7 @@
                 />
             </template>
             <template #action="slotProps">
-                <a-space :size="16">
+                <j-space :size="16">
                     <template
                         v-for="i in getActions(slotProps,'table')"
                         :key="i.key"
@@ -98,9 +101,9 @@
                             <template #icon><AIcon :type="i.icon" /></template>
                         </PermissionButton>
                     </template>
-                </a-space>
+                </j-space>
             </template>
-        </JTable>
+        </j-pro-table>
     </page-container>
 </template>
 
diff --git a/src/views/iot-card/Recharge/Detail.vue b/src/views/iot-card/Recharge/Detail.vue
index 7e9531fd..5cfd5ee7 100644
--- a/src/views/iot-card/Recharge/Detail.vue
+++ b/src/views/iot-card/Recharge/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-modal
+    <j-modal
         :maskClosable="false"
         width="1000px"
         :visible="true"
@@ -10,40 +10,40 @@
         @cancel="handleCancel"
     >
         <div style="margin-top: 10px">
-            <a-descriptions
+            <j-descriptions
                 :column="2"
                 bordered
                 :contentStyle="{ minWidth: '300px' }"
                 :labelStyle="{ minWidth: '120px' }"
             >
-                <a-descriptions-item label="充值金额">{{
+                <j-descriptions-item label="充值金额">{{
                     data.chargeMoney
-                }}</a-descriptions-item>
-                <a-descriptions-item label="账户id">{{
+                }}</j-descriptions-item>
+                <j-descriptions-item label="账户id">{{
                     data?.rechargeId
-                }}</a-descriptions-item>
-                <a-descriptions-item label="平台对接">{{
+                }}</j-descriptions-item>
+                <j-descriptions-item label="平台对接">{{
                     data.configName
-                }}</a-descriptions-item>
-                <a-descriptions-item label="订单号">{{
+                }}</j-descriptions-item>
+                <j-descriptions-item label="订单号">{{
                     data.orderNumber
-                }}</a-descriptions-item>
-                <a-descriptions-item label="支付方式">{{
+                }}</j-descriptions-item>
+                <j-descriptions-item label="支付方式">{{
                     data.paymentType
-                }}</a-descriptions-item>
-                <a-descriptions-item label="支付URL">
+                }}</j-descriptions-item>
+                <j-descriptions-item label="支付URL">
                     <div style="height: 100px; overflow: auto">
                         {{ data.url ? data.url : '' }}
                     </div>
-                </a-descriptions-item>
-                <a-descriptions-item label="订单时间">{{
+                </j-descriptions-item>
+                <j-descriptions-item label="订单时间">{{
                     data.createTime
                         ? moment(data.createTime).format('YYYY-MM-DD HH:mm:ss')
                         : '-'
-                }}</a-descriptions-item>
-            </a-descriptions>
+                }}</j-descriptions-item>
+            </j-descriptions>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/iot-card/Recharge/Save.vue b/src/views/iot-card/Recharge/Save.vue
index 1605e761..a1e2b289 100644
--- a/src/views/iot-card/Recharge/Save.vue
+++ b/src/views/iot-card/Recharge/Save.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-modal
+    <j-modal
         :maskClosable="false"
         width="600px"
         :visible="true"
@@ -17,14 +17,14 @@
                     style="margin-right: 6px"
                 />暂只支持移动OneLink平台
             </div>
-            <a-form
+            <j-form
                 layout="vertical"
                 ref="formRef"
                 :rules="rules"
                 :model="modelRef"
             >
-                <a-form-item label="平台对接" name="configId">
-                    <a-select
+                <j-form-item label="平台对接" name="configId">
+                    <j-select
                         v-model:value="modelRef.configId"
                         :options="configList"
                         allowClear
@@ -32,16 +32,16 @@
                         style="width: 100%"
                         placeholder="请选择平台对接"
                     >
-                    </a-select>
-                </a-form-item>
-                <a-form-item label="账户id" name="rechargeId">
-                    <a-input
+                    </j-select>
+                </j-form-item>
+                <j-form-item label="账户id" name="rechargeId">
+                    <j-input
                         v-model:value="modelRef.rechargeId"
                         placeholder="请输入账户id"
                     />
-                </a-form-item>
-                <a-form-item label="充值金额" name="chargeMoney">
-                    <a-input-number
+                </j-form-item>
+                <j-form-item label="充值金额" name="chargeMoney">
+                    <j-input-number
                         allowClear
                         :precision="2"
                         style="width: 100%"
@@ -50,20 +50,20 @@
                         :max="500"
                         placeholder="请输入1~500之间的金额"
                     />
-                </a-form-item>
+                </j-form-item>
 
-                <a-form-item label="支付方式" name="paymentType">
-                    <a-select
+                <j-form-item label="支付方式" name="paymentType">
+                    <j-select
                         allowClear
                         :options="PaymentMethod"
                         v-model:value="modelRef.paymentType"
                         placeholder="请选择支付方式"
                     >
-                    </a-select>
-                </a-form-item>
-            </a-form>
+                    </j-select>
+                </j-form-item>
+            </j-form>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/iot-card/Recharge/index.vue b/src/views/iot-card/Recharge/index.vue
index 5b7624cd..a7124625 100644
--- a/src/views/iot-card/Recharge/index.vue
+++ b/src/views/iot-card/Recharge/index.vue
@@ -2,10 +2,10 @@
 <template>
     <page-container>
         <Search :columns="columns" target="recharge-search" @search="handleSearch" />
-        <JTable ref="rechargeRef" :columns="columns" :request="queryRechargeList" model="TABLE"
+        <j-pro-table ref="rechargeRef" :columns="columns" :request="queryRechargeList" model="TABLE"
             :defaultParams="{ sorts: [{ name: 'createTime', order: 'desc' }] }" :params="params">
             <template #headerTitle>
-                <a-space>
+                <j-space>
                     <PermissionButton @click="visible = true" :hasPermission="'iot-card/Recharge:pay'" type="primary">
                         充值
                     </PermissionButton>
@@ -15,7 +15,7 @@
                         </span>
                         本平台仅提供充值入口，具体充值结果需以运营商的充值结果为准
                     </div>
-                </a-space>
+                </j-space>
             </template>
             <template #createTime="slotProps">
                 {{
@@ -27,7 +27,7 @@
                 }}
             </template>
             <template #action="slotProps">
-                <a-space :size="16">
+                <j-space :size="16">
                     <template
                         v-for="i in getActions(slotProps)"
                         :key="i.key"
@@ -46,9 +46,9 @@
                             <template #icon><AIcon :type="i.icon" /></template>
                         </PermissionButton>
                     </template>
-                </a-space>
+                </j-space>
             </template>
-        </JTable>
+        </j-pro-table>
         <!-- 充值 -->
         <Save v-if="visible" @change="saveChange" />
         <Detail v-if="detailVisible" :data="current" @close="close" />
diff --git a/src/views/iot-card/Record/index.vue b/src/views/iot-card/Record/index.vue
index fbedfd35..dc3cc6ad 100644
--- a/src/views/iot-card/Record/index.vue
+++ b/src/views/iot-card/Record/index.vue
@@ -6,7 +6,7 @@
             target="record-search"
             @search="handleSearch"
         />
-        <JTable
+        <j-pro-table
             ref="RecordRef"
             :columns="columns"
             :request="queryList"
@@ -21,7 +21,7 @@
                         : ''
                 }}
             </template>
-        </JTable>
+        </j-pro-table>
     </page-container>
 </template>
 
diff --git a/src/views/iot-card/components/TimeSelect.vue b/src/views/iot-card/components/TimeSelect.vue
index c7017454..073cf4f2 100644
--- a/src/views/iot-card/components/TimeSelect.vue
+++ b/src/views/iot-card/components/TimeSelect.vue
@@ -1,20 +1,20 @@
 <template>
     <div>
-        <a-radio-group
+        <j-radio-group
             v-if="quickBtn"
             default-value="today"
             button-style="solid"
             v-model:value="radioValue"
             @change="(e) => handleBtnChange(e.target.value)"
         >
-            <a-radio-button
+            <j-radio-button
                 v-for="item in quickBtnList"
                 :key="item.value"
                 :value="item.value"
             >
                 {{ item.label }}
-            </a-radio-button>
-        </a-radio-group>
+            </j-radio-button>
+        </j-radio-group>
         <a-range-picker
             format="YYYY-MM-DD"
             valueFormat="YYYY-MM-DD"
diff --git a/yarn.lock b/yarn.lock
index 135ad32f..6ee04b4e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3896,10 +3896,10 @@ jetlinks-store@^0.0.3:
   resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz"
   integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==
 
-jetlinks-ui-components@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.0.tgz#dca7bb82e53f464990b0851635e8f82be6c69db6"
-  integrity sha512-pgJ0Uiw4Dxc0AU2GqaOaVhNYun1VEmv78OtJcir2sq9rVSIuXCtTl1eHYMPiiPb6z1fG677KKs1gqvrpUwhguQ==
+jetlinks-ui-components@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.1.tgz#d9e6f5bd9b98523fb4708269be9b4e9bba3437b9"
+  integrity sha512-P8ykIynH6ti9c4KndFfHu/dwewqiWm4Gjki4e+IlCJcwq1at2iokWAITOVm9UsBnEBqWhTQowpK6vlSyTlW+9g==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"

From 6ba0f0cbb68bc09b8f47f4bde35dfd2482c04b0f Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 2 Mar 2023 20:43:37 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/rule-engine/configuration.ts          |  11 +-
 src/store/alarm.ts                            |  76 +++---
 .../Alarm/Configuration/Save/Base/index.vue   |   9 +-
 .../Alarm/Configuration/Save/Log/indev.vue    |  14 ++
 .../Configuration/Save/Scene/Save/index.vue   | 233 ++++++++++++++++++
 .../Alarm/Configuration/Save/Scene/index.vue  | 167 ++++++++++++-
 .../Alarm/Configuration/Save/index.vue        |   7 +-
 .../Alarm/Log/TabComponent/indev.vue          |   5 -
 8 files changed, 477 insertions(+), 45 deletions(-)
 create mode 100644 src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
 create mode 100644 src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue

diff --git a/src/api/rule-engine/configuration.ts b/src/api/rule-engine/configuration.ts
index 1d31bcef..74bf7eba 100644
--- a/src/api/rule-engine/configuration.ts
+++ b/src/api/rule-engine/configuration.ts
@@ -34,4 +34,13 @@ export const save = (data:any) =>server.post('/alarm/config',data);
 /**
  * 获取基础设置数据
  */
-export const detail = (id:string) => server.get(`/alarm/config/${id}`);
\ No newline at end of file
+export const detail = (id:string) => server.get(`/alarm/config/${id}`);
+/**
+ * 解除场景联动绑定
+ */
+export const unbindScene = (id:string,data:any) => server.post(`/alarm/rule/bind/${id}/_delete`,data);
+
+/**
+ * 保存关联场景
+ */
+export const bindScene = (data:any) => server.patch("/alarm/rule/bind",data)
\ No newline at end of file
diff --git a/src/store/alarm.ts b/src/store/alarm.ts
index bb255798..b0f998e4 100644
--- a/src/store/alarm.ts
+++ b/src/store/alarm.ts
@@ -1,37 +1,47 @@
 import { defineStore } from "pinia";
 
-export const useAlarmStore = defineStore('alarm',()=>{
-    const data = reactive({
-        tab: 'all',
-        current: {},
-        solveVisible: false,
-        logVisible: false,
-        defaultLevel: [],
-        columns: [
-          {
-            dataIndex: 'alarmConfigName',
-            title: '告警名称',
-            // hideInSearch: true,
-          },
-          {
-            dataIndex: 'alarmTime',
-            title: '告警时间',
-            valueType: 'dateTime',
-          },
-          {
-            dataIndex: 'description',
-            title: '说明',
-            // hideInSearch: true,
-          },
-          {
-            dataIndex: 'action',
-            title: '操作',
-            hideInSearch: true,
-            valueType: 'option',
-          },
-        ],
-    })
-    return {
-        data
+export const useAlarmStore = defineStore('alarm', () => {
+  const data = reactive({
+    tab: 'all',
+    current: {},
+    solveVisible: false,
+    logVisible: false,
+    defaultLevel: [],
+    columns: [
+      {
+        dataIndex: 'alarmConfigName',
+        title: '告警名称',
+        // hideInSearch: true,
+      },
+      {
+        dataIndex: 'alarmTime',
+        title: '告警时间',
+        valueType: 'dateTime',
+      },
+      {
+        dataIndex: 'description',
+        title: '说明',
+        // hideInSearch: true,
+      },
+      {
+        dataIndex: 'action',
+        title: '操作',
+        hideInSearch: true,
+        valueType: 'option',
+      },
+    ],
+  })
+  return {
+    data
+  }
+})
+
+
+export const useAlarmConfigurationStore = defineStore('alarmConfigration', () => {
+  const configurationData = reactive({
+    current:{
+
     }
+  })
+  return { configurationData }
 })
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
index 81b622a3..7f488d20 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
@@ -61,10 +61,13 @@ import { getImage } from '@/utils/comm';
 import { message } from 'ant-design-vue';
 import { useMenuStore } from '@/store/menu';
 import { useRoute } from 'vue-router';
-import { Store } from 'jetlinks-store';
+import { useAlarmConfigurationStore } from '@/store/alarm';
+import { storeToRefs } from 'pinia';
 const route = useRoute();
 const id = route.query?.id;
 let selectDisable = ref(false);
+const alarmConfigurationStore = useAlarmConfigurationStore();
+let { configurationData } = storeToRefs(alarmConfigurationStore);
 const queryData = () => {
     if (id) {
         detail(id).then((res) => {
@@ -73,7 +76,7 @@ const queryData = () => {
                 form.name = res?.result?.name;
                 form.targetType = res?.result?.targetType;
                 form.description = res?.result?.description;
-                Store.set('configuration-data', res.result);
+                configurationData.value.current = res.result;
                 query({
                     terms: [
                         {
@@ -183,7 +186,7 @@ const handleSave = async () => {
                     { id: res.result?.id },
                 );
                 if (!id) {
-                    Store.set('configuration-data', res.result);
+                    configurationData.value.current = res.result;
                 }
             }
         })
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue b/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
new file mode 100644
index 00000000..d4ca0792
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Log/indev.vue
@@ -0,0 +1,14 @@
+<template>
+    <div>
+        <TabComponent type="detail" :id="id"/>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import TabComponent from '@/views/rule-engine/Alarm/Log/TabComponent/indev.vue'
+import { useRoute } from 'vue-router';
+const route = useRoute();
+const id = route.query?.id
+</script>
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue
new file mode 100644
index 00000000..449b40fb
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue
@@ -0,0 +1,233 @@
+<template>
+    <a-modal
+        visible
+        title="新增"
+        okText="确定"
+        cancelText="取消"
+        :width="1000"
+        @cancel="closeModal"
+        @ok="saveCorrelation"
+    >
+        <Search :columns="columns" @search="handleSearch"></Search>
+        <div style="height: 500px; overflow-y: auto">
+            <JTable
+                model="CARD"
+                :request="query"
+                :rowSelection="{
+                    selectedRowKeys: _selectedRowKeys,
+                }"
+                @cancelSelect="cancelSelect"
+                :gridColumns="[1, 1, 1]"
+                :defaultParams="{
+                    sorts: [
+                        {
+                            name: 'createTime',
+                            order: 'desc',
+                        },
+                    ],
+                    terms,
+                }"
+                :params="params"
+            >
+                <template #card="slotProps">
+                    <SceneCard
+                        :value="slotProps"
+                        :status="slotProps.state?.value"
+                        :statusText="slotProps.state?.text"
+                        :active="_selectedRowKeys.includes(slotProps.id)"
+                        @click="handleClick"
+                        :statusNames="{
+                            started: 'success',
+                            disable: 'error',
+                        }"
+                    >
+                        <template #type>
+                            <span
+                                ><img
+                                    :height="16"
+                                    :src="
+                                        typeMap.get(slotProps.triggerType)?.icon
+                                    "
+                                    style="margin-right: 5px"
+                                />{{
+                                    typeMap.get(slotProps.triggerType)?.text
+                                }}</span
+                            >
+                        </template>
+                        <template #img>
+                            <img
+                                :src="typeMap.get(slotProps.triggerType)?.img"
+                            />
+                        </template>
+                        <template #title>
+                            <Ellipsis style="width: calc(100% - 100px)">
+                                <span style="font-size: 16px; font-weight: 600">
+                                    {{ slotProps.name }}
+                                </span>
+                            </Ellipsis>
+                        </template>
+                        <template #subTitle>
+                            <Ellipsis :lineClamp="2">
+                                说明：{{
+                                    slotProps?.description ||
+                                    typeMap.get(slotProps.triggerType)?.tip
+                                }}
+                            </Ellipsis>
+                        </template>
+                    </SceneCard>
+                </template>
+            </JTable>
+        </div>
+    </a-modal>
+</template>
+
+<script lang="ts" setup>
+import { query } from '@/api/rule-engine/scene';
+import { bindScene } from '@/api/rule-engine/configuration';
+import SceneCard from '@/views/rule-engine/Scene/SceneCard.vue';
+import { getImage } from '@/utils/comm';
+import { message } from 'ant-design-vue';
+const columns = [
+    {
+        title: '名称',
+        dataIndex: 'name',
+        key: 'name',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '触发方式',
+        dataIndex: 'triggerType',
+        key: 'triggerType',
+        search: {
+            type: 'select',
+            options: [
+                {
+                    label: '手动触发',
+                    value: 'manual',
+                },
+                {
+                    label: '定时触发',
+                    value: 'timer',
+                },
+                {
+                    label: '设备触发',
+                    value: 'device',
+                },
+            ],
+        },
+    },
+    {
+        title: '状态',
+        dataIndex: 'state',
+        key: 'state',
+        search: {
+            type: 'select',
+            options: [
+                {
+                    label: '正常',
+                    value: 'started',
+                },
+                {
+                    label: '禁用',
+                    value: 'disable',
+                },
+            ],
+        },
+    },
+];
+const props = defineProps({
+    id: {
+        type: String,
+    },
+    type: {
+        type: String,
+    },
+});
+const terms = [
+    {
+        terms: [
+            {
+                column: 'id',
+                termType: 'alarm-bind-rule$not',
+                value: props.id,
+                type: 'and',
+            },
+            {
+                column: 'triggerType',
+                termType: 'eq',
+                value: props.type === 'other' ? undefined : 'device',
+            },
+        ],
+        type: 'and',
+    },
+];
+const params = ref();
+const typeMap = new Map();
+typeMap.set('manual', {
+    text: '手动触发',
+    img: getImage('/scene/scene-hand.png'),
+    icon: getImage('/scene/trigger-type-icon/manual.png'),
+    tip: '适用于第三方平台向物联网平台下发指令控制设备',
+});
+typeMap.set('timer', {
+    text: '定时触发',
+    img: getImage('/scene/scene-timer.png'),
+    icon: getImage('/scene/trigger-type-icon/timing.png'),
+    tip: '适用于定期执行固定任务',
+});
+typeMap.set('device', {
+    text: '设备触发',
+    img: getImage('/scene/scene-device.png'),
+    icon: getImage('/scene/trigger-type-icon/device.png'),
+    tip: '适用于设备数据或行为满足触发条件时，执行指定的动作',
+});
+const _selectedRowKeys = ref<string[]>([]);
+const handleClick = (dt: any) => {
+    if (_selectedRowKeys.value.includes(dt.id)) {
+        const _index = _selectedRowKeys.value.findIndex((i) => i === dt.id);
+        _selectedRowKeys.value.splice(_index, 1);
+    } else {
+        _selectedRowKeys.value = [..._selectedRowKeys.value, dt.id];
+    }
+    console.log(_selectedRowKeys.value);
+};
+/**
+ * 取消选择事件
+ */
+const cancelSelect = () => {
+    _selectedRowKeys.value = [];
+};
+const log = () => {};
+log();
+const handleSearch = (e: any) => {
+    params.value = e;
+};
+const emit = defineEmits(['closeSave','saveScene']);
+/**
+ * 保存选中关联场景
+ */
+const saveCorrelation = async () => {
+    if (_selectedRowKeys.value.length > 0) {
+        const list = _selectedRowKeys.value.map((item: any) => {
+            return {
+                alarmId: props.id,
+                releId: item,
+            };
+        });
+        const res = await bindScene([...list]);
+        if (res.status === 200) {
+            message.success('操作成功');
+            emit('saveScene');
+        }
+    } else {
+        message.error('请选择至少一条数据');
+    }
+};
+const closeModal = () => {
+    emit('closeSave');
+};
+</script>
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
index 016a7a4c..4e24527d 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
@@ -1,9 +1,174 @@
 <template>
-  <div>123</div>
+    <JTable
+        model="CARD"
+        :request="query"
+        :defaultParams="{
+            sorts: [{ name: 'createTime', order: 'desc' }],
+            terms,
+        }"
+        :gridColumns="[1, 1, 1]"
+        ref="actionRef"
+    >
+        <template #headerTitle>
+            <a-space>
+                <PermissionButton type="primary" @click="showModal">
+                    <template #icon><AIcon type="PlusOutlined" /></template>
+                    新增
+                </PermissionButton>
+            </a-space>
+        </template>
+        <template #card="slotProps">
+            <SceneCard
+                :value="slotProps"
+                @click="handleClick"
+                :actions="getActions(slotProps, 'card')"
+                :status="slotProps.state?.value"
+                :statusText="slotProps.state?.text"
+                :statusNames="{
+                    started: 'success',
+                    disable: 'error',
+                }"
+            >
+                <template #type>
+                    <span
+                        ><img
+                            :height="16"
+                            :src="typeMap.get(slotProps.triggerType)?.icon"
+                            style="margin-right: 5px"
+                        />{{ typeMap.get(slotProps.triggerType)?.text }}</span
+                    >
+                </template>
+                <template #img>
+                    <img :src="typeMap.get(slotProps.triggerType)?.img" />
+                </template>
+                <template #title>
+                    <Ellipsis style="width: calc(100% - 100px)">
+                        <span style="font-size: 16px; font-weight: 600">
+                            {{ slotProps.name }}
+                        </span>
+                    </Ellipsis>
+                </template>
+                <template #subTitle>
+                    <Ellipsis :lineClamp="2">
+                        说明：{{
+                            slotProps?.description ||
+                            typeMap.get(slotProps.triggerType)?.tip
+                        }}
+                    </Ellipsis>
+                </template>
+                <template #actions="item">
+                    <PermissionButton
+                        :disabled="item.disabled"
+                        :popConfirm="item.popConfirm"
+                        :tooltip="{
+                            ...item.tooltip,
+                        }"
+                        @click="item.onClick"
+                    >
+                        <AIcon :type="item.icon" />
+                        <span>{{ item?.text }}</span>
+                    </PermissionButton>
+                </template>
+            </SceneCard>
+        </template>
+    </JTable>
+    <Save
+        :id="id"
+        :type="configurationData.current?.targetType"
+        @close-save="closeSave"
+        @save-scene="saveSuccess"
+        v-if="visible"
+    ></Save>
 </template>
 
 <script lang="ts" setup>
+import { query } from '@/api/rule-engine/scene';
+import { unbindScene } from '@/api/rule-engine/configuration';
+import { useRoute } from 'vue-router';
+import SceneCard from '@/views/rule-engine/Scene/SceneCard.vue';
+import type { ActionsType } from '@/components/Table';
+import { getImage } from '@/utils/comm';
+import { message } from 'ant-design-vue/es';
+import Save from './save/index.vue';
+import { useAlarmConfigurationStore } from '@/store/alarm';
+import { storeToRefs } from 'pinia';
+const route = useRoute();
+const id = route.query?.id;
 
+const alarmConfigurationStore = useAlarmConfigurationStore();
+const { configurationData } = storeToRefs(alarmConfigurationStore);
+
+const terms = [
+    {
+        terms: [
+            {
+                column: 'id',
+                termType: 'alarm-bind-rule',
+                value: id,
+            },
+        ],
+        type: 'and',
+    },
+];
+const actionRef = ref();
+const typeMap = new Map();
+typeMap.set('manual', {
+    text: '手动触发',
+    img: getImage('/scene/scene-hand.png'),
+    icon: getImage('/scene/trigger-type-icon/manual.png'),
+    tip: '适用于第三方平台向物联网平台下发指令控制设备',
+});
+typeMap.set('timer', {
+    text: '定时触发',
+    img: getImage('/scene/scene-timer.png'),
+    icon: getImage('/scene/trigger-type-icon/timing.png'),
+    tip: '适用于定期执行固定任务',
+});
+typeMap.set('device', {
+    text: '设备触发',
+    img: getImage('/scene/scene-device.png'),
+    icon: getImage('/scene/trigger-type-icon/device.png'),
+    tip: '适用于设备数据或行为满足触发条件时，执行指定的动作',
+});
+const getActions = (
+    data: Partial<Record<string, any>>,
+    type: 'card' | 'table',
+): ActionsType[] => {
+    if (!data) return [];
+    const actions: ActionsType[] = [
+        {
+            key: 'unbind',
+            text: '解绑',
+            icon: 'DisconnectOutlined',
+            popConfirm: {
+                title: '确定解绑？',
+                onConfirm: async () => {
+                    const res = await unbindScene(id, [data.id]);
+                    if (res.status === 200) {
+                        message.success('操作成功');
+                        actionRef.value.reload();
+                    }
+                },
+            },
+        },
+    ];
+    return actions;
+};
+const visible = ref(false);
+const log = () => {
+    console.log();
+};
+log();
+const showModal = () => {
+    visible.value = true;
+};
+const closeSave = () => {
+    visible.value = false;
+};
+const saveSuccess = () =>{
+    visible.value = false;
+    actionRef.value.reload();
+}
 </script>
 <style lang="less" scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/index.vue
index bafdcba7..3de8d357 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/index.vue
@@ -8,7 +8,9 @@
                     <a-tab-pane key="2" tab="关联场景联动">
                         <Scene></Scene>
                     </a-tab-pane>
-                    <a-tab-pane key="3" tab="告警记录"></a-tab-pane>
+                    <a-tab-pane key="3" tab="告警记录">
+                        <Log/>
+                    </a-tab-pane>
                 </a-tabs>
             </a-card>
         </page-container>
@@ -17,7 +19,8 @@
 <script lang="ts" setup>
 import Base from './Base/index.vue';
 import Scene from './Scene/index.vue'
-const activeKey = ref('2');
+import Log from './Log/indev.vue'
+const activeKey = ref('1');
 </script>
 <style lang="less" scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
index 6a05b5e9..0962cc7d 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
@@ -280,11 +280,6 @@ let params = ref({
     sorts: [{ name: 'alarmTime', order: 'desc' }],
     terms: [],
 });
-let param = reactive({
-    pageSize: 10,
-    terms: [],
-});
-
 const handleSearch = async (params: any) => {
     const resp = await query(params);
     if (resp.status === 200) {

From 376d54fdb42b621d0bf55fcfb5fe6b9fb08127e5 Mon Sep 17 00:00:00 2001
From: wzyyy <1175160654@qq.com>
Date: Thu, 2 Mar 2023 20:45:37 +0800
Subject: [PATCH 3/8] fix: a-rang-picker

---
 src/views/iot-card/components/TimeSelect.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/iot-card/components/TimeSelect.vue b/src/views/iot-card/components/TimeSelect.vue
index 073cf4f2..de656b5e 100644
--- a/src/views/iot-card/components/TimeSelect.vue
+++ b/src/views/iot-card/components/TimeSelect.vue
@@ -15,7 +15,7 @@
                 {{ item.label }}
             </j-radio-button>
         </j-radio-group>
-        <a-range-picker
+        <j-range-picker
             format="YYYY-MM-DD"
             valueFormat="YYYY-MM-DD"
             style="margin-left: 12px"
@@ -23,7 +23,7 @@
             v-model:value="rangeVal"
             :allowClear="false"
         >
-        </a-range-picker>
+        </j-range-picker>
     </div>
 </template>
 

From 6467b4ef4f5e24b6392f20cede87832dc2c271e9 Mon Sep 17 00:00:00 2001
From: wzyyy <1175160654@qq.com>
Date: Thu, 2 Mar 2023 20:58:56 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E7=89=A9=E8=81=94=E5=8D=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot-card/CardManagement/index.vue | 73 +++++++++++----------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 56564f63..80b5d4c7 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -9,30 +9,33 @@
             }" @cancelSelect="cancelSelect" :params="params" :gridColumn="3">
             <template #headerTitle>
                 <j-space>
-                    <a-button type="primary" @click="handleAdd">
+                    <!-- <a-button type="primary" @click="handleAdd">
                         <AIcon type="PlusOutlined" />新增
-                    </a-button>
-                    <a-dropdown>
-                        <a-button>
+                    </a-button> -->
+                    <PermissionButton @click="handleAdd" :hasPermission="'iot-card/CardManagement:add'" type="primary">
+                        <AIcon type="PlusOutlined" />新增
+                    </PermissionButton>
+                    <j-dropdown>
+                        <j-button>
                             批量操作
                             <AIcon type="DownOutlined" />
-                        </a-button>
+                        </j-button>
                         <template #overlay>
-                            <a-menu>
-                                <a-menu-item>
+                            <j-menu>
+                                <j-menu-item>
                                     <PermissionButton @click="exportVisible = true"
                                         :hasPermission="'iot-card/CardManagement:export'">
                                         <AIcon type="ExportOutlined" />
                                         批量导出
                                     </PermissionButton>
-                                </a-menu-item>
-                                <a-menu-item>
+                                </j-menu-item>
+                                <j-menu-item>
                                     <PermissionButton @click="importVisible = true"
                                         :hasPermission="'iot-card/CardManagement:import'">
                                         <AIcon type="ImportOutlined" />批量导入
                                     </PermissionButton>
-                                </a-menu-item>
-                                <a-menu-item>
+                                </j-menu-item>
+                                <j-menu-item>
                                     <PermissionButton :popConfirm="{
                                         title: '确认激活吗？',
                                         onConfirm: handleActive,
@@ -40,8 +43,8 @@
                                         <AIcon type="CheckCircleOutlined" />
                                         批量激活
                                     </PermissionButton>
-                                </a-menu-item>
-                                <a-menu-item>
+                                </j-menu-item>
+                                <j-menu-item>
                                     <PermissionButton :popConfirm="{
                                         title: '确认停用吗？',
                                         onConfirm: handleStop,
@@ -49,8 +52,8 @@
                                         <AIcon type="StopOutlined" />
                                             批量停用
                                     </PermissionButton>
-                                </a-menu-item>
-                                <a-menu-item>
+                                </j-menu-item>
+                                <j-menu-item>
                                     <PermissionButton :popConfirm="{
                                         title: '确认复机吗？',
                                         onConfirm: handleResumption,
@@ -58,8 +61,8 @@
                                          <AIcon type="PoweroffOutlined" />
                                             批量复机
                                     </PermissionButton>
-                                </a-menu-item>
-                                <a-menu-item>
+                                </j-menu-item>
+                                <j-menu-item>
                                     <PermissionButton :popConfirm="{
                                         title: '确认同步状态吗？',
                                         onConfirm: handleSync,
@@ -67,8 +70,8 @@
                                          <AIcon type="SwapOutlined" />
                                             同步状态
                                     </PermissionButton>
-                                </a-menu-item>
-                                <a-menu-item v-if="_selectedRowKeys.length > 0">
+                                </j-menu-item>
+                                <j-menu-item v-if="_selectedRowKeys.length > 0">
                                     <PermissionButton :popConfirm="{
                                         title: '确认删除吗？',
                                         onConfirm: handelRemove,
@@ -76,10 +79,10 @@
                                          <AIcon type="SwapOutlined" />
                                          批量删除
                                     </PermissionButton>
-                                </a-menu-item>
-                            </a-menu>
+                                </j-menu-item>
+                            </j-menu>
                         </template>
-                    </a-dropdown>
+                    </j-dropdown>
                 </j-space>
             </template>
             <template #card="slotProps">
@@ -99,23 +102,23 @@
                         <h3 class="card-item-content-title">
                             {{ slotProps.id }}
                         </h3>
-                        <a-row>
-                            <a-col :span="8">
+                        <j-row>
+                            <j-col :span="8">
                                 <div class="card-item-content-text">
                                     平台对接
                                 </div>
                                 <div>{{ slotProps.platformConfigName }}</div>
-                            </a-col>
-                            <a-col :span="6">
+                            </j-col>
+                            <j-col :span="6">
                                 <div class="card-item-content-text">类型</div>
                                 <div>{{ slotProps.cardType.text }}</div>
-                            </a-col>
-                            <a-col :span="6">
+                            </j-col>
+                            <j-col :span="6">
                                 <div class="card-item-content-text">提醒</div>
                                 <!-- <div>{{ slotProps.cardType.text }}</div> -->
-                            </a-col>
-                        </a-row>
-                        <a-divider style="margin: 12px 0" />
+                            </j-col>
+                        </j-row>
+                        <j-divider style="margin: 12px 0" />
                         <div v-if="slotProps.usedFlow === 0">
                             <span class="flow-text">
                                 {{ slotProps.totalFlow }}
@@ -135,7 +138,7 @@
                                     总共 {{ slotProps.totalFlow }} M
                                 </div>
                             </div>
-                            <a-progress :strokeColor="'#ADC6FF'" :showInfo="false" :percent="
+                            <j-progress :strokeColor="'#ADC6FF'" :showInfo="false" :percent="
                                 slotProps.totalFlow - slotProps.usedFlow
                             " />
                         </div>
@@ -185,7 +188,7 @@
                                     </template>
                                 </a-button>
                             </template>
-                                    </a-tooltip> -->
+                                    </j-tooltip> -->
                     </template>
                 </CardBox>
             </template>
@@ -244,7 +247,7 @@
                 }}
             </template>
             <template #action="slotProps">
-                <a-space :size="16">
+                <j-space :size="16">
                     <template
                         v-for="i in getActions(slotProps,'table')"
                         :key="i.key"
@@ -263,7 +266,7 @@
                             <template #icon><AIcon :type="i.icon" /></template>
                         </PermissionButton>
                     </template>
-                </a-space>
+                </j-space>
             </template>
         </j-pro-table>
         <!-- 批量导入 -->

From 68a52db344885c61856e148adc8091420996749f Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Thu, 2 Mar 2023 21:40:21 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E5=8F=B3=E4=B8=8A=E8=A7=92?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.ts                              |   7 +-
 src/components/Layout/BasicLayoutPage.vue     | 142 ++++++++++--------
 src/components/Layout/components/Notice.vue   |  31 ++++
 .../Layout/components/NoticeInfo.vue          |  24 +++
 src/components/Layout/components/UserInfo.vue |  45 ++++++
 .../components/ViewDialog.vue                 |  78 ++++++----
 .../account/NotificationRecord/index.vue      |   4 +-
 yarn.lock                                     |  94 +++++++++++-
 8 files changed, 325 insertions(+), 100 deletions(-)
 create mode 100644 src/components/Layout/components/Notice.vue
 create mode 100644 src/components/Layout/components/NoticeInfo.vue
 create mode 100644 src/components/Layout/components/UserInfo.vue

diff --git a/src/api/login.ts b/src/api/login.ts
index 6391c6b8..fd3eed95 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -51,4 +51,9 @@ export const settingDetail = (scopes: string) => server.get(`/system/config/${sc
 /**
  * 获取当前登录用户信息
  */
-export const userDetail = () => server.get<any>('/user/detail')
\ No newline at end of file
+export const userDetail = () => server.get<any>('/user/detail')
+
+/**
+ * 退出登录
+ */
+export const loginout_api = () => server.get<any>('/user-token/reset')
diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index 59079f75..7d00fd37 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -1,84 +1,102 @@
 <template>
-  <j-pro-layout
-    v-bind='layoutConf'
-    v-model:openKeys="state.openKeys"
-    v-model:collapsed="state.collapsed"
-    v-model:selectedKeys="state.selectedKeys"
-    :pure='state.pure'
-    :breadcrumb='{ routes: breadcrumb }'
-  >
-    <template #breadcrumbRender='slotProps'>
-      <a v-if='slotProps.route.index !== 0'>{{slotProps.route.breadcrumbName}}</a>
-      <span v-else>{{slotProps.route.breadcrumbName}}</span>
-    </template>
-    <router-view v-slot='{ Component}'>
-      <component :is='Component' />
-    </router-view>
-  </j-pro-layout>
+    <j-pro-layout
+        v-bind="layoutConf"
+        v-model:openKeys="state.openKeys"
+        v-model:collapsed="state.collapsed"
+        v-model:selectedKeys="state.selectedKeys"
+        :pure="state.pure"
+        :breadcrumb="{ routes: breadcrumb }"
+    >
+        <template #breadcrumbRender="slotProps">
+            <a v-if="slotProps.route.index !== 0">{{
+                slotProps.route.breadcrumbName
+            }}</a>
+            <span v-else>{{ slotProps.route.breadcrumbName }}</span>
+        </template>
+        <template #rightContentRender> 
+          <div style="margin-right: 24px;display: flex;align-items: center;">
+            <AIcon type="QuestionCircleOutlined" @click="toDoc" />
+            <Notice style="margin: 0 24px;" />
+            <UserInfo />
+          </div>
+        </template>
+        <router-view v-slot="{ Component }">
+            <component :is="Component" />
+        </router-view>
+    </j-pro-layout>
 </template>
 
-<script setup lang="ts" name='BasicLayoutPage'>
-import DefaultSetting from '../../../config/config'
-import { useMenuStore } from '@/store/menu'
-import { clearMenuItem } from 'jetlinks-ui-components/es/ProLayout/util'
+<script setup lang="ts" name="BasicLayoutPage">
+import UserInfo from './components/UserInfo.vue';
+import Notice from './components/Notice.vue'
+import DefaultSetting from '../../../config/config';
+import { useMenuStore } from '@/store/menu';
+import { clearMenuItem } from 'jetlinks-ui-components/es/ProLayout/util';
 
 type StateType = {
-  collapsed: boolean
-  openKeys: string[]
-  selectedKeys: string[]
-  pure: boolean
-}
+    collapsed: boolean;
+    openKeys: string[];
+    selectedKeys: string[];
+    pure: boolean;
+};
 
-const router = useRouter()
-const route = useRoute()
+const router = useRouter();
+const route = useRoute();
 
-const menu = useMenuStore()
+const menu = useMenuStore();
 
 const layoutConf = reactive({
-  theme: DefaultSetting.layout.theme,
-  siderWidth: DefaultSetting.layout.siderWidth,
-  logo: DefaultSetting.layout.logo,
-  title: DefaultSetting.layout.title,
-  menuData: clearMenuItem(menu.siderMenus),
-  splitMenus: true
+    theme: DefaultSetting.layout.theme,
+    siderWidth: DefaultSetting.layout.siderWidth,
+    logo: DefaultSetting.layout.logo,
+    title: DefaultSetting.layout.title,
+    menuData: clearMenuItem(menu.siderMenus),
+    splitMenus: true,
 });
 
 const state = reactive<StateType>({
-  pure: false,
-  collapsed: false, // default value
-  openKeys: [],
-  selectedKeys: [],
+    pure: false,
+    collapsed: false, // default value
+    openKeys: [],
+    selectedKeys: [],
 });
 
 const breadcrumb = computed(() =>
-  router.currentRoute.value.matched.concat().map((item, index) => {
-    return {
-      index,
-      path: item.path,
-      breadcrumbName: item.meta.title || ''
+    router.currentRoute.value.matched.concat().map((item, index) => {
+        return {
+            index,
+            path: item.path,
+            breadcrumbName: item.meta.title || '',
+        };
+    }),
+);
+
+watchEffect(() => {
+    if (router.currentRoute) {
+        const matched = router.currentRoute.value.matched.concat();
+        state.selectedKeys = matched.map((r) => r.path);
+        state.openKeys = matched
+            .filter((r) => r.path !== router.currentRoute.value.path)
+            .map((r) => r.path);
+        console.log(state.selectedKeys);
     }
-  })
-)
+    // TODO 获取当前路由中参数，用于控制pure
+});
 
 watchEffect(() => {
-  if (router.currentRoute) {
-    const matched = router.currentRoute.value.matched.concat()
-    state.selectedKeys = matched.map(r => r.path)
-    state.openKeys = matched.filter((r) => r.path !== router.currentRoute.value.path).map(r => r.path)
-    console.log(state.selectedKeys)
-  }
-  // TODO 获取当前路由中参数，用于控制pure
-})
+    if (
+        route.query &&
+        'layout' in route.query &&
+        route.query.layout === 'false'
+    ) {
+        state.pure = true;
+    } else {
+        state.pure = false;
+    }
+});
 
-watchEffect(() => {
-  if (route.query && 'layout' in route.query && route.query.layout === 'false') {
-    state.pure = true
-  } else {
-    state.pure = false
-  }
-})
 
+const toDoc = ()=>window.open('http://doc.v2.jetlinks.cn/')
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/src/components/Layout/components/Notice.vue b/src/components/Layout/components/Notice.vue
new file mode 100644
index 00000000..2ed7f639
--- /dev/null
+++ b/src/components/Layout/components/Notice.vue
@@ -0,0 +1,31 @@
+<template>
+    <div>
+        <a-dropdown :trigger="['click']">
+            <div style="height: 48px; display: flex; display: flex">
+                <AIcon type="BellOutlined" @click.prevent />
+            </div>
+            <template #overlay>
+                <div class="content">
+                    <NoticeInfo />
+                </div>
+            </template>
+        </a-dropdown>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { getList_api } from '@/api/account/notificationRecord';
+import NoticeInfo from './NoticeInfo.vue';
+
+const getList = () => {
+    const params = {
+        'terms[0].column': 'state',
+        'terms[0].value': 'unread',
+        'sorts[0].name': 'notifyTime',
+        'sorts[0].order': 'desc',
+    };
+    getList_api(params).then((resp) => {});
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/components/Layout/components/NoticeInfo.vue b/src/components/Layout/components/NoticeInfo.vue
new file mode 100644
index 00000000..dd1e0aa7
--- /dev/null
+++ b/src/components/Layout/components/NoticeInfo.vue
@@ -0,0 +1,24 @@
+<template>
+    <div class="notice-info-container">
+        <a-tabs :activeKey="'default'">
+            <a-tab-pane key="default" tab="未读消息"> 111 </a-tab-pane>
+        </a-tabs>
+    </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style lang="less" scoped>
+.notice-info-container {
+    width: 336px;
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: 0 6px 16px -8px rgb(0 0 0 / 8%), 0 9px 28px 0 rgb(0 0 0 / 5%),
+        0 12px 48px 16px rgb(0 0 0 / 3%);
+
+    :deep(.ant-tabs-nav-wrap) {
+        display: flex;
+        justify-content: center;
+    }
+}
+</style>
diff --git a/src/components/Layout/components/UserInfo.vue b/src/components/Layout/components/UserInfo.vue
new file mode 100644
index 00000000..d1a920df
--- /dev/null
+++ b/src/components/Layout/components/UserInfo.vue
@@ -0,0 +1,45 @@
+<template>
+    <div>
+        <a-dropdown placement="bottomRight">
+            <div style="cursor: pointer;height: 100%;">
+                <img
+                    :src="userInfo.avatar"
+                    alt=""
+                    style="width: 24px; margin-right: 12px"
+                />
+                <span>{{ userInfo.name }}</span>
+            </div>
+            <template #overlay>
+                <a-menu>
+                    <a-menu-item @click="jumpPage('account/center')" style="width: 160px;">
+                        <AIcon type="UserOutlined" />
+                        <span>个人中心</span>
+                    </a-menu-item>
+                    <a-menu-item @click="logOut">
+                        <AIcon type="LogoutOutlined" />
+                        <span>退出登录</span>
+                    </a-menu-item>
+                </a-menu>
+            </template>
+        </a-dropdown>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { loginout_api } from '@/api/login';
+import { useMenuStore } from '@/store/menu';
+import { useUserInfo } from '@/store/userInfo';
+
+const userInfo = useUserInfo().$state.userInfos as any;
+
+const { jumpPage } = useMenuStore();
+
+const logOut = () => {
+    loginout_api().then(() => {
+        localStorage.clear();
+        jumpPage('user/login');
+    });
+};
+</script>
+
+<style scoped></style>
diff --git a/src/views/account/NotificationRecord/components/ViewDialog.vue b/src/views/account/NotificationRecord/components/ViewDialog.vue
index 2085f3b6..d5bc7010 100644
--- a/src/views/account/NotificationRecord/components/ViewDialog.vue
+++ b/src/views/account/NotificationRecord/components/ViewDialog.vue
@@ -5,50 +5,55 @@
         width="1000px"
         @ok="emits('update:visible', false)"
         @cancel="emits('update:visible', false)"
+        class="view-dialog-container"
     >
         <a-row v-if="data?.targetType === 'device'">
-            <a-col :span="6" class="label">告警设备</a-col>
-            <a-col :span="6" class="value">
+            <a-col :span="4" class="label">告警设备</a-col>
+            <a-col :span="8" class="value">
                 {{ data?.targetName || '' }}
             </a-col>
-            <a-col :span="6" class="label">设备ID</a-col>
-            <a-col :span="6" class="value">
+            <a-col :span="4" class="label">设备ID</a-col>
+            <a-col :span="8" class="value">
                 {{ data?.targetId || '' }}
             </a-col>
         </a-row>
         <a-row>
-            <a-col :span="6" class="label">告警名称</a-col>
-            <a-col :span="6" class="value">
+            <a-col :span="4" class="label">告警名称</a-col>
+            <a-col :span="8" class="value">
                 {{ data?.alarmName || data?.alarmConfigName || '' }}
             </a-col>
-            <a-col :span="6" class="label">告警时间</a-col>
-            <a-col :span="6" class="value">
+            <a-col :span="4" class="label">告警时间</a-col>
+            <a-col :span="8" class="value">
                 {{ moment(data?.alarmTime).format('YYYY-MM-DD HH:mm:ss') }}
             </a-col>
 
-            <a-col :span="6" class="label">告警级别</a-col>
-            <a-col :span="6" class="value">
+            <a-col :span="4" class="label">告警级别</a-col>
+            <a-col :span="8" class="value">
                 {{ (levelList.length > 0 && getLevelLabel(data.level)) || '' }}
             </a-col>
-            <a-col :span="6" class="label">告警说明</a-col>
-            <a-col :span="6" class="value">{{ data?.description || '' }}</a-col>
+            <a-col :span="4" class="label">告警说明</a-col>
+            <a-col :span="8" class="value">{{ data?.description || '' }}</a-col>
 
-            <a-col :span="6" class="label">告警流水</a-col>
-            <a-col :span="18" class="value">
-                <!-- <MonacoEditor
-                    style="width: 100%; height: 370px"
-                    theme="vs"
-                    v-model="jsonData"
-                /> -->
-                <JsonViewer :value="jsonData" copyable boxed sort />
+            <a-col
+                :span="4"
+                class="label"
+                style="display: flex; height: 440px; align-items: center"
+                >告警流水</a-col
+            >
+            <a-col
+                :span="20"
+                class="value"
+                style="max-height: 440px; overflow: auto"
+            >
+                <JsonViewer :value="JSON.parse(data?.alarmInfo || '{}')" />
             </a-col>
         </a-row>
     </a-modal>
 </template>
 
 <script setup lang="ts">
-import MonacoEditor from '@/components/MonacoEditor/index.vue';
-import {JsonViewer} from 'vue3-json-viewer';
+import { JsonViewer } from 'vue3-json-viewer';
+import 'vue3-json-viewer/dist/index.css';
 import { queryLevel as queryLevel_api } from '@/api/rule-engine/config';
 import moment from 'moment';
 
@@ -69,18 +74,25 @@ const getLevel = () => {
     });
 };
 getLevel();
-const getLevelLabel = (id: string) => {
+const getLevelLabel = (id: number) => {
     if (levelList.value.length < 1 || !id) return '';
-    const obj = levelList.value.find((item) => item.id === id);
-    return obj.title;
+    const obj = levelList.value.find((item) => item.level === id);
+    return obj?.title;
 };
-
-const jsonData = JSON.stringify({
-    name: 'qiu', 
-    age: 18, 
-    isMan: false, 
-    arr: [1, 2, 5],
-});
 </script>
 
-<style scoped></style>
+<style lang="less" scoped>
+.view-dialog-container {
+    .ant-row {
+        .ant-col {
+            padding: 16px 24px;
+            border-right: 1px solid #f0f0f0;
+        }
+        .label {
+            background-color: #fafafa;
+        }
+        .value {
+        }
+    }
+}
+</style>
diff --git a/src/views/account/NotificationRecord/index.vue b/src/views/account/NotificationRecord/index.vue
index 977ec8b3..70b27377 100644
--- a/src/views/account/NotificationRecord/index.vue
+++ b/src/views/account/NotificationRecord/index.vue
@@ -3,7 +3,7 @@
         <div class="notification-record-container">
             <Search :columns="columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="columns"
                 :request="getList_api"
@@ -78,7 +78,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <ViewDialog v-if="viewVisible" v-model:visible="viewVisible" :data="viewItem" />
         </div>
diff --git a/yarn.lock b/yarn.lock
index d32136ba..2d33894c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1072,6 +1072,16 @@
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
+"@vue/compiler-core@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fcompiler-core/-/compiler-core-3.2.47.tgz#3e07c684d74897ac9aa5922c520741f3029267f8"
+  integrity sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.47"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"
+
 "@vue/compiler-dom@3.2.45", "@vue/compiler-dom@^3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz"
@@ -1080,6 +1090,14 @@
     "@vue/compiler-core" "3.2.45"
     "@vue/shared" "3.2.45"
 
+"@vue/compiler-dom@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fcompiler-dom/-/compiler-dom-3.2.47.tgz#a0b06caf7ef7056939e563dcaa9cbde30794f305"
+  integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==
+  dependencies:
+    "@vue/compiler-core" "3.2.47"
+    "@vue/shared" "3.2.47"
+
 "@vue/compiler-sfc@3.2.45", "@vue/compiler-sfc@^3.2.29", "@vue/compiler-sfc@^3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz"
@@ -1096,6 +1114,22 @@
     postcss "^8.1.10"
     source-map "^0.6.1"
 
+"@vue/compiler-sfc@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fcompiler-sfc/-/compiler-sfc-3.2.47.tgz#1bdc36f6cdc1643f72e2c397eb1a398f5004ad3d"
+  integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.47"
+    "@vue/compiler-dom" "3.2.47"
+    "@vue/compiler-ssr" "3.2.47"
+    "@vue/reactivity-transform" "3.2.47"
+    "@vue/shared" "3.2.47"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+    postcss "^8.1.10"
+    source-map "^0.6.1"
+
 "@vue/compiler-ssr@3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz"
@@ -1104,6 +1138,14 @@
     "@vue/compiler-dom" "3.2.45"
     "@vue/shared" "3.2.45"
 
+"@vue/compiler-ssr@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fcompiler-ssr/-/compiler-ssr-3.2.47.tgz#35872c01a273aac4d6070ab9d8da918ab13057ee"
+  integrity sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==
+  dependencies:
+    "@vue/compiler-dom" "3.2.47"
+    "@vue/shared" "3.2.47"
+
 "@vue/devtools-api@^6.4.5":
   version "6.4.5"
   resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"
@@ -1120,6 +1162,17 @@
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
+"@vue/reactivity-transform@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2freactivity-transform/-/reactivity-transform-3.2.47.tgz#e45df4d06370f8abf29081a16afd25cffba6d84e"
+  integrity sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.47"
+    "@vue/shared" "3.2.47"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+
 "@vue/reactivity@3.2.45", "@vue/reactivity@^3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz"
@@ -1127,6 +1180,13 @@
   dependencies:
     "@vue/shared" "3.2.45"
 
+"@vue/reactivity@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2freactivity/-/reactivity-3.2.47.tgz#1d6399074eadfc3ed35c727e2fd707d6881140b6"
+  integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==
+  dependencies:
+    "@vue/shared" "3.2.47"
+
 "@vue/runtime-core@3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz"
@@ -1135,6 +1195,14 @@
     "@vue/reactivity" "3.2.45"
     "@vue/shared" "3.2.45"
 
+"@vue/runtime-core@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fruntime-core/-/runtime-core-3.2.47.tgz#406ebade3d5551c00fc6409bbc1eeb10f32e121d"
+  integrity sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==
+  dependencies:
+    "@vue/reactivity" "3.2.47"
+    "@vue/shared" "3.2.47"
+
 "@vue/runtime-dom@3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz"
@@ -1144,6 +1212,15 @@
     "@vue/shared" "3.2.45"
     csstype "^2.6.8"
 
+"@vue/runtime-dom@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fruntime-dom/-/runtime-dom-3.2.47.tgz#93e760eeaeab84dedfb7c3eaf3ed58d776299382"
+  integrity sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==
+  dependencies:
+    "@vue/runtime-core" "3.2.47"
+    "@vue/shared" "3.2.47"
+    csstype "^2.6.8"
+
 "@vue/server-renderer@3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz"
@@ -1152,11 +1229,24 @@
     "@vue/compiler-ssr" "3.2.45"
     "@vue/shared" "3.2.45"
 
+"@vue/server-renderer@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fserver-renderer/-/server-renderer-3.2.47.tgz#8aa1d1871fc4eb5a7851aa7f741f8f700e6de3c0"
+  integrity sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==
+  dependencies:
+    "@vue/compiler-ssr" "3.2.47"
+    "@vue/shared" "3.2.47"
+
 "@vue/shared@3.2.45", "@vue/shared@^3.2.45":
   version "3.2.45"
   resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz"
   integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==
 
+"@vue/shared@3.2.47":
+  version "3.2.47"
+  resolved "https://registry.jetlinks.cn/@vue%2fshared/-/shared-3.2.47.tgz#e597ef75086c6e896ff5478a6bfc0a7aa4bbd14c"
+  integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==
+
 "@vuemap/layer-3dtiles@^0.0.3":
   version "0.0.3"
   resolved "https://registry.npmjs.org/@vuemap/layer-3dtiles/-/layer-3dtiles-0.0.3.tgz"
@@ -3644,8 +3734,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.1.tgz#12fe9a193af14b859e1baf02fbd706a2be5b31cf"
-  integrity sha512-4hdEJUaKNMSIcmbn4qKcG8oK7h6VSYP3X3fCNndBm6WhHh+9ONf8f+3OSrUy1PvxdenmqO0VN2QdWV0KupByKQ==
+  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.1.tgz#d9e6f5bd9b98523fb4708269be9b4e9bba3437b9"
+  integrity sha512-P8ykIynH6ti9c4KndFfHu/dwewqiWm4Gjki4e+IlCJcwq1at2iokWAITOVm9UsBnEBqWhTQowpK6vlSyTlW+9g==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"

From db82ec462aca8c1cb4f0af94e7022d49df7c21be Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 2 Mar 2023 21:40:45 +0800
Subject: [PATCH 6/8] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E8=81=94=E5=8A=A8-=E8=A7=A6=E5=8F=91=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/Device/AddModal.vue            | 135 ++++++++++++++++--
 .../rule-engine/Scene/Save/Device/Product.vue |   2 +
 .../rule-engine/Scene/Save/Device/Type.vue    |  10 +-
 .../rule-engine/Scene/Save/Device/index.vue   |  10 +-
 .../Scene/Save/components/Timer/util.ts       |  43 ++++++
 .../Scene/Save/components/Title.vue           |  10 +-
 yarn.lock                                     |   8 +-
 7 files changed, 197 insertions(+), 21 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/Device/AddModal.vue b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
index 349266c3..2521b9a8 100644
--- a/src/views/rule-engine/Scene/Save/Device/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
@@ -19,7 +19,12 @@
     </a-steps>
     <a-divider style='margin-bottom: 0px' />
     <div class='steps-content'>
-      <Product v-if='addModel.stepNumber === 0' v-model:rowKey='addModel.productId' v-model:detail='addModel.productDetail' />
+      <Product
+        v-if='addModel.stepNumber === 0'
+        v-model:rowKey='addModel.productId'
+        v-model:detail='addModel.productDetail'
+        @change='productChange'
+      />
       <DeviceSelect
         v-else-if='addModel.stepNumber === 1'
         :productId='addModel.productId'
@@ -32,6 +37,7 @@
         ref='typeRef'
         v-else-if='addModel.stepNumber === 2'
         :metadata='addModel.metadata'
+        :operator='addModel.operator'
       />
     </div>
     <template #footer>
@@ -53,11 +59,11 @@ import { detail as deviceDetail  } from '@/api/device/instance'
 import Product from './Product.vue'
 import DeviceSelect from './DeviceSelect.vue'
 import Type from './Type.vue'
+import { continuousValue, timeUnitEnum } from '@/views/rule-engine/Scene/Save/components/Timer/util'
 
 type Emit = {
   (e: 'cancel'): void
-  (e: 'update:value', data: TriggerDevice): void
-  (e: 'update:options', data: any): void
+  (e: 'save', data: TriggerDevice, options: Record<string, any>): void
 }
 
 interface AddModelType extends Omit<TriggerDevice, 'selectorValues'> {
@@ -65,8 +71,9 @@ interface AddModelType extends Omit<TriggerDevice, 'selectorValues'> {
   deviceKeys: Array<{ label: string, value: string }>
   orgId: Array<{ label: string, value: string }>
   productDetail: any
-  selectorValues: Array<{ label: string, value: string }>
-  metadata: metadataType
+  selectorValues: Array<Record<string, any>>
+  metadata: metadataType,
+  operator: TriggerDeviceOptions
 }
 
 const emit = defineEmits<Emit>()
@@ -82,7 +89,7 @@ const props = defineProps({
     })
   },
   options: {
-    type: Object as PropType<any>,
+    type: Object as PropType<Record<string, any>>,
     default: () => ({})
   }
 })
@@ -95,13 +102,106 @@ const addModel = reactive<AddModelType>({
   deviceKeys: [],
   orgId: [],
   productDetail: {},
-  metadata: {}
+  metadata: {},
+  operator: {
+    operator: 'online'
+  }
 })
 
+const optionsCache = ref(props.options)
+
 Object.assign(addModel, props.value)
 
 const handleOptions = (data: TriggerDeviceOptions) => {
+  const typeIconMap = {
+    writeProperty: 'icon-bianji1',
+    invokeFunction: 'icon-widgets',
+    reportEvent: 'icon-shijian',
+    readProperty: 'icon-Group',
+  };
 
+  const _options: any = {
+    name: '', // 名称
+    extraName: '', // 拓展参数
+    onlyName: false,
+    type: '', // 触发类型
+    typeIcon: typeIconMap[data.operator],
+    productName: '',
+    selectorIcon: '',
+    time: undefined,
+    when: undefined,
+    extraTime: undefined,
+    action: optionsCache.value?.action,
+  };
+
+  if (addModel.selector === 'fixed') {
+    let isLimit = false;
+    let indexOf = 0;
+    const nameStr = addModel.selectorValues!.reduce((_prev, next, index) => {
+      if (_prev.length <= 30) {
+        indexOf = index;
+        return index === 0 ? next.name : _prev + '、' + next.name;
+      } else {
+        isLimit = true;
+      }
+      return _prev;
+    }, '');
+    // _options.name = TriggerDeviceModel.selectorValues?.map((item) => item.name).join('、');
+    _options.name = nameStr;
+    if (isLimit && addModel.selectorValues!.length > indexOf) {
+      _options.extraName = `等${addModel.selectorValues!.length}台设备`;
+    }
+    _options.selectorIcon = 'icon-shebei1';
+  } else if (addModel.selector === 'org') {
+    _options.name = addModel.selectorValues?.[0].name + '的';
+    _options.productName = addModel.productDetail.name; // 产品名称
+    _options.selectorIcon = 'icon-zuzhi';
+  } else {
+    _options.name = '所有的' + addModel.productDetail.name;
+  }
+
+  if (data.timer) {
+    const _timer = data.timer;
+    if (_timer.trigger === 'cron') {
+      _options.time = _timer.cron;
+    } else {
+      // console.log('continuousValue', continuousValue(_timer.when! || [], _timer!.trigger))
+      let whenStr = '每天';
+      if (_timer.when!.length) {
+        whenStr = _timer!.trigger === 'week' ? '每周' : '每月';
+        const whenStrArr = continuousValue(_timer.when! || [], _timer!.trigger);
+        const whenStrArr3 = whenStrArr.splice(0, 3);
+        whenStr += whenStrArr3.join('、');
+        whenStr += `等${_timer.when!.length}天`;
+      }
+      _options.when = whenStr;
+      if (_timer.once) {
+        _options.time = _timer.once.time + ' 执行1次';
+      } else if (_timer.period) {
+        _options.time = _timer.period.from + '-' + _timer.period.to;
+        _options.extraTime = `每${_timer.period.every}${timeUnitEnum[_timer.period.unit]}执行1次`;
+      }
+    }
+
+    if (data.operator === 'online') {
+      _options.type = '上线';
+      _options.action = '';
+      _options.typeIcon = 'icon-a-Group4713';
+    }
+
+    if (data.operator === 'offline') {
+      _options.type = '离线';
+      _options.action = '';
+      _options.typeIcon = 'icon-a-Group4892';
+    }
+
+    if (data.operator === 'reportProperty') {
+      _options.type = '属性上报';
+      _options.action = '';
+      _options.typeIcon = 'icon-file-upload-outline';
+    }
+    return _options;
+  }
 }
 
 const prev = () => {
@@ -120,6 +220,16 @@ const handleMetadata = (metadata?: string) => {
   }
 }
 
+const productChange = () => {
+  addModel.deviceKeys = []
+  addModel.orgId = []
+  addModel.selector = 'fixed'
+  addModel.operator = {
+    operator: 'online'
+  }
+  addModel.selectorValues = []
+}
+
 const save = async (step?: number) => {
   let _step = step !== undefined ? step : addModel.stepNumber
   if (_step === 0) {
@@ -139,9 +249,16 @@ const save = async (step?: number) => {
     addModel.stepNumber = 2
   } else {
     const typeData = await typeRef.value.vail()
-    console.log(typeData)
     if (typeData) {
-      const _options = handleOptions(typeData);
+      optionsCache.value.action = typeData.action
+      const _options = handleOptions(typeData.data);
+      const data = {
+        operator: typeData.data,
+        selector: addModel.selector,
+        selectorValues: addModel.selectorValues,
+        productId: addModel.productId
+      }
+      emit('save', data, _options)
     }
   }
 }
diff --git a/src/views/rule-engine/Scene/Save/Device/Product.vue b/src/views/rule-engine/Scene/Save/Device/Product.vue
index 7da92fdb..d8674a09 100644
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@@ -66,6 +66,7 @@ import { getImage } from '@/utils/comm'
 type Emit = {
   (e: 'update:rowKey', data: string): void
   (e: 'update:detail', data: string): void
+  (e: 'change', data: string): void
 }
 
 const actionRef = ref()
@@ -246,6 +247,7 @@ const productQuery = (p: any) => {
 const handleClick = (detail: any) => {
   emit('update:rowKey', detail.id)
   emit('update:detail', detail)
+  emit('change', detail)
 }
 
 </script>
diff --git a/src/views/rule-engine/Scene/Save/Device/Type.vue b/src/views/rule-engine/Scene/Save/Device/Type.vue
index 2f3a7096..fef6b620 100644
--- a/src/views/rule-engine/Scene/Save/Device/Type.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Type.vue
@@ -57,7 +57,7 @@
 import { filterSelectNode } from '@/utils/comm'
 import { TopCard, Timer } from '@/views/rule-engine/Scene/Save/components'
 import { getImage } from '@/utils/comm'
-import { metadataType } from '@/views/rule-engine/Scene/typings'
+import type { metadataType, TriggerDeviceOptions } from '@/views/rule-engine/Scene/typings'
 import type { PropType } from 'vue'
 import { TypeEnum } from '@/views/rule-engine/Scene/Save/Device/util'
 import ReadProperties from './ReadProperties.vue'
@@ -70,6 +70,10 @@ const props = defineProps({
   metadata: {
     type: Object as PropType<metadataType>,
     default: () => ({})
+  },
+  operator: {
+    type: Object as PropType<TriggerDeviceOptions>,
+    default: () => ({})
   }
 })
 
@@ -83,6 +87,8 @@ const formModel = reactive({
   functionParameters: []
 })
 
+Object.assign(formModel, props.operator)
+
 const optionCache = reactive({
   action: ''
 })
@@ -222,7 +228,7 @@ defineExpose({
         filterKey.push('writeProperties')
       }
 
-      resolve(omit(cloneModel, filterKey))
+      resolve({ data: omit(cloneModel, filterKey), action: optionCache.action })
     })
   }
 })
diff --git a/src/views/rule-engine/Scene/Save/Device/index.vue b/src/views/rule-engine/Scene/Save/Device/index.vue
index 96413d17..7f233e0b 100644
--- a/src/views/rule-engine/Scene/Save/Device/index.vue
+++ b/src/views/rule-engine/Scene/Save/Device/index.vue
@@ -14,7 +14,7 @@
         <Title :options='data.options.trigger' />
       </AddButton>
     </a-form-item>
-    <AddModel v-if='visible' @cancel='visible = false' v-model='data.device' v-model:options='data.options.trigger' />
+    <AddModel v-if='visible' @cancel='visible = false' @save='save' :value='data.trigger.device' :options='data.options.trigger' />
   </div>
 </template>
 
@@ -24,9 +24,10 @@ import { useSceneStore } from '@/store/scene'
 import AddModel from './AddModal.vue'
 import AddButton from '../components/AddButton.vue'
 import Title from '../components/Title.vue'
+import type { TriggerDevice } from '@/views/rule-engine/Scene/typings'
 
 const sceneStore = useSceneStore()
-const { data } = storeToRefs<any>(sceneStore)
+const { data } = storeToRefs(sceneStore)
 
 const visible = ref(false)
 
@@ -39,6 +40,11 @@ const rules = [{
   },
 }]
 
+const save = (device: TriggerDevice, options: Record<string, any>) => {
+  data.value.trigger!.device = device
+  data.value.options!.trigger = options
+}
+
 </script>
 
 <style scoped lang='less'>
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/util.ts b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
index 861859ba..369c160e 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
@@ -1,3 +1,4 @@
+import { isArray } from 'lodash-es'
 export const numberToString = {
   1: '星期一',
   2: '星期二',
@@ -6,4 +7,46 @@ export const numberToString = {
   5: '星期五',
   6: '星期六',
   7: '星期日',
+};
+
+export const timeUnitEnum = {
+  seconds: '秒',
+  minutes: '分',
+  hours: '小时',
+};
+
+type continuousValueFn = (data: (string | number)[], type: string) => (number | string)[];
+
+export const continuousValue: continuousValueFn = (data, type) => {
+  let start = 0;
+  const newArray: (number | string)[] = [];
+  const isWeek = type === 'week';
+  if (isArray(data)) {
+    data.forEach((item, index) => {
+      const _item = Number(item);
+      const nextValue = data[index + 1];
+      const previousValue = data[index - 1];
+      const nextItemValue = _item + 1;
+      const previousItemValue = _item - 1;
+      if (nextItemValue === nextValue && previousItemValue !== previousValue) {
+        start = _item;
+      } else if (previousItemValue === previousValue && nextItemValue !== nextValue) {
+        // 表示前start和item连续，并且item与nextValue不连续
+        if (_item - start >= 2) {
+          // 至少三位连续
+          newArray.push(
+            isWeek
+              ? `${numberToString[start]} - ${numberToString[_item]}`
+              : `${start} - ${_item}号`,
+          );
+        } else {
+          newArray.push(isWeek ? numberToString[start] : `${start}号`);
+          newArray.push(isWeek ? numberToString[_item] : `${_item}号`);
+        }
+      } else if (previousItemValue !== previousValue && nextItemValue !== nextValue) {
+        newArray.push(isWeek ? numberToString[_item] : `${_item}号`);
+      }
+    });
+  }
+  return newArray;
 };
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/Title.vue b/src/views/rule-engine/Scene/Save/components/Title.vue
index daa19758..b4a492d4 100644
--- a/src/views/rule-engine/Scene/Save/components/Title.vue
+++ b/src/views/rule-engine/Scene/Save/components/Title.vue
@@ -5,13 +5,13 @@
       <div class='center-item'>
         <AIcon v-if='options.selectorIcon' :type='options.selectorIcon' class='icon-padding-right' />
         <span class='trigger-options-name'>
-            <Ellipsis style='width: 310px'>
+            <Ellipsis style='max-width: 310px'>
               {{ options.name }}
             </Ellipsis>
-          </span>
+        </span>
         <span v-if='options.extraName'>{{ options.extraName }}</span>
       </div>
-      <template v-if='options.onlyName'>
+      <template v-if='!options.onlyName'>
         <div v-if='options.productName' class='center-item'>
           <AIcon type='icon-chanpin1' class='icon-padding-right' />
           <span className='trigger-options-type'>{{ options.productName }}</span>
@@ -28,7 +28,7 @@
         </div>
         <div v-if='options.action' class='center-item'>
           <AIcon :type='options.typeIcon' class='icon-padding-right' />
-          <span className='trigger-options-action'>{{ options.productName }}</span>
+          <span className='trigger-options-action'>{{ options.action }}</span>
         </div>
         <div v-if='options.type' class='center-item'>
           <AIcon :type='options.typeIcon' class='icon-padding-right' />
@@ -57,6 +57,8 @@ const isAdd = computed(() => {
 
 <style scoped lang='less'>
 .trigger-options-content {
+  display: inline-flex;
+  gap: 16px;
 
   .center-item {
     display: flex;
diff --git a/yarn.lock b/yarn.lock
index 135ad32f..41abd037 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3896,10 +3896,10 @@ jetlinks-store@^0.0.3:
   resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz"
   integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==
 
-jetlinks-ui-components@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.0.tgz#dca7bb82e53f464990b0851635e8f82be6c69db6"
-  integrity sha512-pgJ0Uiw4Dxc0AU2GqaOaVhNYun1VEmv78OtJcir2sq9rVSIuXCtTl1eHYMPiiPb6z1fG677KKs1gqvrpUwhguQ==
+jetlinks-ui-components@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.1.tgz#12fe9a193af14b859e1baf02fbd706a2be5b31cf"
+  integrity sha512-4hdEJUaKNMSIcmbn4qKcG8oK7h6VSYP3X3fCNndBm6WhHh+9ONf8f+3OSrUy1PvxdenmqO0VN2QdWV0KupByKQ==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"

From 9cb75775f10b19ee68b5d584c55fc2e3ac10388c Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Thu, 2 Mar 2023 21:49:43 +0800
Subject: [PATCH 7/8] =?UTF-8?q?update:=20=20JTable=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAj-pro-table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NotificationSubscription/index.vue        |  4 +-
 src/views/system/Apply/index.vue              |  4 +-
 .../system/DataSource/Management/index.vue    |  4 +-
 src/views/system/DataSource/index.vue         |  4 +-
 .../components/AddDeviceOrProductDialog.vue   |  5 +-
 src/views/system/Department/device/index.vue  |  4 +-
 src/views/system/Department/product/index.vue |  4 +-
 .../user/components/AddBindUserDialog.vue     |  2 +-
 src/views/system/Department/user/index.vue    |  4 +-
 src/views/system/Menu/Detail/ButtonMange.vue  |  4 +-
 src/views/system/Menu/index.vue               |  4 +-
 src/views/system/Permission/index.vue         |  4 +-
 .../Platforms/Api/components/ApiDoes.vue      | 12 ++--
 .../Platforms/Api/components/ChooseApi.vue    |  4 +-
 .../Platforms/Api/components/HomePage.vue     |  2 +-
 src/views/system/Relationship/index.vue       |  4 +-
 src/views/system/Role/Detail/User/index.vue   |  4 +-
 .../Role/Detail/components/AddUserDialog.vue  |  4 +-
 src/views/system/Role/index.vue               |  4 +-
 src/views/system/User/index.vue               | 60 +------------------
 20 files changed, 43 insertions(+), 98 deletions(-)

diff --git a/src/views/account/NotificationSubscription/index.vue b/src/views/account/NotificationSubscription/index.vue
index bee5dd42..ba131175 100644
--- a/src/views/account/NotificationSubscription/index.vue
+++ b/src/views/account/NotificationSubscription/index.vue
@@ -2,7 +2,7 @@
     <page-container>
         <div class="notification-subscription-container">
             <Search :columns="columns" @search="query.search" />
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="columns"
                 :request="getNoticeList_api"
@@ -87,7 +87,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <EditDialog
                 v-if="dialogVisible"
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 967e61de..60116290 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -3,7 +3,7 @@
         <div class="apply-container">
             <Search :columns="columns" @search="search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="columns"
                 :request="getApplyList_api"
@@ -158,7 +158,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
         </div>
         <div class="dialogs">
             <MenuDialog ref="dialogRef" mode="edit" />
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index c9d62113..900ff82f 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -45,7 +45,7 @@
                     >保存</a-button
                 >
             </div>
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 model="TABLE"
@@ -109,7 +109,7 @@
                         <AIcon type="DeleteOutlined" />
                     </PermissionButton>
                 </template>
-            </JTable>
+            </j-pro-table>
             <a-botton class="add-row" @click="table.addRow">
                 <AIcon type="PlusOutlined" /> 新增行
             </a-botton>
diff --git a/src/views/system/DataSource/index.vue b/src/views/system/DataSource/index.vue
index ac3c1d7b..035c5f6a 100644
--- a/src/views/system/DataSource/index.vue
+++ b/src/views/system/DataSource/index.vue
@@ -3,7 +3,7 @@
         <div class="data-source-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getDataSourceList_api"
@@ -122,7 +122,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <EditDialog ref="editDialogRef" @confirm="table.refresh" />
diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index 8f60be9a..ac1f2ad2 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -30,7 +30,7 @@
 
         <Search :columns="props.queryColumns" @search="query.search" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :request="table.requestFun"
             :gridColumn="2"
@@ -101,7 +101,7 @@
                     </template>
                 </CardBox>
             </template>
-        </JTable>
+        </j-pro-table>
     </a-modal>
 </template>
 
@@ -115,6 +115,7 @@ import {
     bindDeviceOrProductList_api,
 } from '@/api/system/department';
 import { message } from 'ant-design-vue';
+import { dictType } from '../typing';
 
 const emits = defineEmits(['confirm']);
 const props = defineProps<{
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index c29f60f7..cc474d9f 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="product-container">
         <Search :columns="query.columns" @search="query.search" />
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :request="table.requestFun"
             :gridColumn="2"
@@ -130,7 +130,7 @@
                     </template>
                 </CardBox>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddDeviceOrProductDialog
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index b69609d4..d7345663 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="product-container">
         <Search :columns="query.columns" @search="query.search" />
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :request="table.requestFun"
             :gridColumn="2"
@@ -130,7 +130,7 @@
                     </template>
                 </CardBox>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddDeviceOrProductDialog
diff --git a/src/views/system/Department/user/components/AddBindUserDialog.vue b/src/views/system/Department/user/components/AddBindUserDialog.vue
index b0521777..e6a894ff 100644
--- a/src/views/system/Department/user/components/AddBindUserDialog.vue
+++ b/src/views/system/Department/user/components/AddBindUserDialog.vue
@@ -12,7 +12,7 @@
     >
         <Search :columns="query.columns" @search="query.search" />
         <div class="table">
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="table.requestFun"
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index 53f582ca..857b02a1 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -2,7 +2,7 @@
     <div>
         <Search :columns="query.columns" @search="query.search" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             :request="table.requestFun"
@@ -58,7 +58,7 @@
                     </PermissionButton>
                 </a-space>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddBindUserDialog
diff --git a/src/views/system/Menu/Detail/ButtonMange.vue b/src/views/system/Menu/Detail/ButtonMange.vue
index ec2702c5..ebe8a14c 100644
--- a/src/views/system/Menu/Detail/ButtonMange.vue
+++ b/src/views/system/Menu/Detail/ButtonMange.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="button-mange-container">
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             model="TABLE"
@@ -47,7 +47,7 @@
                     </PermissionButton>
                 </a-space>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialog">
             <ButtonAddDialog
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index 9349c2eb..e58fb3e1 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -3,7 +3,7 @@
         <div class="menu-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="table.getList"
@@ -71,7 +71,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
         </div>
     </page-container>
 </template>
diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue
index 8d141adc..1f6bb14d 100644
--- a/src/views/system/Permission/index.vue
+++ b/src/views/system/Permission/index.vue
@@ -3,7 +3,7 @@
         <div class="permission-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getPermission_api"
@@ -115,7 +115,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <EditDialog ref="editDialogRef" @refresh="table.refresh" />
diff --git a/src/views/system/Platforms/Api/components/ApiDoes.vue b/src/views/system/Platforms/Api/components/ApiDoes.vue
index b7f8f8f3..b865a90a 100644
--- a/src/views/system/Platforms/Api/components/ApiDoes.vue
+++ b/src/views/system/Platforms/Api/components/ApiDoes.vue
@@ -21,7 +21,7 @@
         <div class="api-card">
             <h5>请求参数</h5>
             <div class="content">
-                <JTable
+                <j-pro-table
                     :columns="requestCard.columns"
                     :dataSource="requestCard.tableData"
                     noPagination
@@ -33,19 +33,19 @@
                     <template #type="slotProps">
                         <span>{{ slotProps.schema.type }}</span>
                     </template>
-                </JTable>
+                </j-pro-table>
             </div>
         </div>
         <div class="api-card">
             <h5>响应状态</h5>
             <div class="content">
-                <JTable
+                <j-pro-table
                     :columns="responseStatusCard.columns"
                     :dataSource="responseStatusCard.tableData"
                     noPagination
                     model="TABLE"
                 >
-                </JTable>
+                </j-pro-table>
 
                 <a-tabs v-model:activeKey="responseStatusCard.activeKey">
                     <a-tab-pane
@@ -60,13 +60,13 @@
         <div class="api-card">
             <h5>响应参数</h5>
             <div class="content">
-                <JTable
+                <j-pro-table
                     :columns="respParamsCard.columns"
                     :dataSource="respParamsCard.tableData"
                     noPagination
                     model="TABLE"
                 >
-                </JTable>
+                </j-pro-table>
             </div>
 
             <MonacoEditor
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index 675968e9..54b04158 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="choose-api-container">
-        <JTable
+        <j-pro-table
             :columns="columns"
             :dataSource="props.tableData"
             :rowSelection="props.mode !== 'home' ? rowSelection : undefined"
@@ -14,7 +14,7 @@
                     >{{ slotProps.url }}</span
                 >
             </template>
-        </JTable>
+        </j-pro-table>
 
         <a-button type="primary" @click="save" v-if="props.mode !== 'home'"
             >保存</a-button
diff --git a/src/views/system/Platforms/Api/components/HomePage.vue b/src/views/system/Platforms/Api/components/HomePage.vue
index 8576eb8d..eefcac13 100644
--- a/src/views/system/Platforms/Api/components/HomePage.vue
+++ b/src/views/system/Platforms/Api/components/HomePage.vue
@@ -60,7 +60,7 @@
             <div style="width: 50%">
                 <h3>示例数据</h3>
                 <div>
-                    <JTable
+                    <j-pro-table
                         :dataSource="data"
                         model="TABLE"
                         noPagination
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 96ae1579..3b527d8a 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -3,7 +3,7 @@
         <div class="relationship-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getRelationshipList_api"
@@ -49,7 +49,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <EditDialog ref="editDialogRef" @refresh="table.refresh" />
         </div>
diff --git a/src/views/system/Role/Detail/User/index.vue b/src/views/system/Role/Detail/User/index.vue
index ffe3b533..abb633d8 100644
--- a/src/views/system/Role/Detail/User/index.vue
+++ b/src/views/system/Role/Detail/User/index.vue
@@ -2,7 +2,7 @@
     <a-card class="role-user-container">
         <Search :columns="query.columns" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             :request="getUserByRole_api"
@@ -37,7 +37,7 @@
                     </a-popconfirm>
                 </a-space>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddUserDialog :open="dialog.openAdd" @refresh="table.refresh" />
diff --git a/src/views/system/Role/Detail/components/AddUserDialog.vue b/src/views/system/Role/Detail/components/AddUserDialog.vue
index 7a3a4ee3..e22e46ba 100644
--- a/src/views/system/Role/Detail/components/AddUserDialog.vue
+++ b/src/views/system/Role/Detail/components/AddUserDialog.vue
@@ -7,7 +7,7 @@
     >
         <Search :columns="query.columns" type="simple" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             :request="getUserByRole_api"
@@ -19,7 +19,7 @@
             }"
             @cancelSelect="table.cancelSelect"
         >
-        </JTable>
+        </j-pro-table>
 
         <template #footer>
             <a-button key="back" @click="dialog.visible = false">取消</a-button>
diff --git a/src/views/system/Role/index.vue b/src/views/system/Role/index.vue
index 19d798ec..72ee4749 100644
--- a/src/views/system/Role/index.vue
+++ b/src/views/system/Role/index.vue
@@ -3,7 +3,7 @@
         <a-card class="role-container">
             <Search :columns="query.columns" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getRoleList_api"
@@ -45,7 +45,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <AddDialog ref="addDialogRef" />
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 0ec9fe64..017106c0 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -3,7 +3,7 @@
         <div class="user-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getUserList_api"
@@ -43,62 +43,6 @@
                 </template>
                 <template #action="slotProps">
                     <a-space :size="16">
-                        <!-- <a-tooltip>
-                        <template #title>编辑</template>
-                        <a-button
-                            style="padding: 0"
-                            type="link"
-                            @click="table.openDialog('edit', slotProps)"
-                        >
-                            <AIcon type="EditOutlined" />
-                        </a-button>
-                    </a-tooltip> -->
-                        <!-- <a-popconfirm
-                        :title="`确定${slotProps.status ? '禁用' : '启用'}吗？`"
-                        ok-text="确定"
-                        cancel-text="取消"
-                        @confirm="table.changeStatus(slotProps)"
-                    >
-                        <a-tooltip>
-                            <template #title>{{
-                                slotProps.status ? '禁用' : '启用'
-                            }}</template>
-                            <a-button style="padding: 0" type="link">
-                                <stop-outlined v-if="slotProps.status" />
-                                <play-circle-outlined v-else />
-                            </a-button>
-                        </a-tooltip>
-                    </a-popconfirm> -->
-                        <!-- <a-tooltip>
-                        <template #title>重置密码</template>
-                        <a-button
-                            style="padding: 0"
-                            type="link"
-                            @click="table.openDialog('reset', slotProps)"
-                        >
-                            <AIcon type="icon-zhongzhimima" />
-                        </a-button>
-                    </a-tooltip> -->
-                        <!-- <a-popconfirm
-                        title="确认删除"
-                        ok-text="确定"
-                        cancel-text="取消"
-                        @confirm="table.clickDel(slotProps)"
-                        :disabled="slotProps.status"
-                    >
-                        <a-tooltip>
-                            <template #title>{{
-                                slotProps.status ? '请先禁用，再删除' : '删除'
-                            }}</template>
-                            <a-button
-                                style="padding: 0"
-                                type="link"
-                                :disabled="slotProps.status"
-                            >
-                                <AIcon type="DeleteOutlined" />
-                            </a-button>
-                        </a-tooltip>
-                    </a-popconfirm> -->
 
                         <PermissionButton
                             :uhasPermission="`${permission}:update`"
@@ -154,7 +98,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <EditUserDialog ref="editDialogRef" @confirm="table.refresh" />

From b3acf4f6dfbe3bdbfa39456b4a77e6aa4f30f69c Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 2 Mar 2023 21:51:44 +0800
Subject: [PATCH 8/8] update: yarn lock

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 41abd037..a0311d69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3896,10 +3896,10 @@ jetlinks-store@^0.0.3:
   resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz"
   integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==
 
-jetlinks-ui-components@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.1.tgz#12fe9a193af14b859e1baf02fbd706a2be5b31cf"
-  integrity sha512-4hdEJUaKNMSIcmbn4qKcG8oK7h6VSYP3X3fCNndBm6WhHh+9ONf8f+3OSrUy1PvxdenmqO0VN2QdWV0KupByKQ==
+jetlinks-ui-components@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.2.tgz#753507e4a84dee966c65d4ae33943507bd60cc9d"
+  integrity sha512-LXKetf75/uqzWP4XOobm+iUWTVEeMJNnwEk+GrNftQdcDzGvUxBaoFCoS+HBH06FnE2VBbh6rEwrpDhkLSNEow==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"