From 0d749d68671c1b953de67dba64b42951e6dd9ca7 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Mon, 13 Mar 2023 14:00:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?update:=20=E9=87=87=E9=9B=86=E5=99=A8=20?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=8D=A1=E7=89=87=E6=96=B0=E5=A2=9Ewebsocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 .../Collector/Point/Scan/Table.vue            |  12 +-
 .../DataCollect/Collector/Point/Scan/Tree.vue |  14 +-
 .../Collector/Point/Scan/index.vue            |   1 -
 .../DataCollect/Collector/Point/index.vue     | 154 +++++++++++++-----
 src/views/DataCollect/Collector/data.ts       |   1 -
 6 files changed, 127 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index e01c7da6..8e4954cc 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "event-source-polyfill": "^1.0.31",
     "global": "^4.4.0",
     "jetlinks-store": "^0.0.3",
-    "jetlinks-ui-components": "^1.0.4",
+    "jetlinks-ui-components": "^1.0.5",
     "js-cookie": "^3.0.1",
     "less": "^4.1.3",
     "less-loader": "^11.1.0",
diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index 9e2de6dc..ee1d144b 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -3,7 +3,7 @@
         <j-table
             :dataSource="modelRef.dataSource"
             :columns="FormTableColumns"
-            :scroll="{ x: 1100, y: 500 }"
+            :scroll="{ x: 1100, y: 550 }"
         >
             <template #bodyCell="{ column: { dataIndex }, record, index }">
                 <template v-if="dataIndex === 'name'">
@@ -151,14 +151,14 @@
                 </template>
 
                 <template v-if="dataIndex === 'action'">
-                    <a-tooltip title="删除">
-                        <a-popconfirm
+                    <j-tooltip title="删除">
+                        <j-popconfirm
                             title="确认删除"
                             @confirm="clickDelete(record.id)"
                         >
-                            <AIcon type="DeleteOutlined" />
-                        </a-popconfirm>
-                    </a-tooltip>
+                            <a><AIcon type="DeleteOutlined" /></a>
+                        </j-popconfirm>
+                    </j-tooltip>
                 </template>
             </template>
         </j-table>
diff --git a/src/views/DataCollect/Collector/Point/Scan/Tree.vue b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
index b6228e67..b925af7f 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Tree.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
@@ -5,21 +5,15 @@
             <j-checkbox v-model:checked="isSelected">隐藏已有节点</j-checkbox>
         </div>
         <j-spin :spinning="spinning">
+    
             <a-tree
-                v-model:checkedKeys="checkedKeys"
-                :tree-data="treeData"
-                default-expand-all
-                checkable
-                @check="onCheck"
-                :height="600"
-            >
-                <!-- <a-tree
                 :load-data="onLoadData"
                 :tree-data="treeData"
                 v-model:checkedKeys="checkedKeys"
                 checkable
                 @check="onCheck"
-            > -->
+                :height="650"
+            >
                 <template #title="{ name, key }">
                     <span
                         :class="[
@@ -57,7 +51,7 @@ const props = defineProps({
 const emits = defineEmits(['change']);
 
 // const channelId = '1610517801347788800'; //测试
-const channelId = props.data?.channelId; 
+const channelId = props.data?.channelId;
 
 const checkedKeys = ref<string[]>([]);
 const selectKeys = ref<string[]>([]);
diff --git a/src/views/DataCollect/Collector/Point/Scan/index.vue b/src/views/DataCollect/Collector/Point/Scan/index.vue
index 93a81a92..4922d4c7 100644
--- a/src/views/DataCollect/Collector/Point/Scan/index.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/index.vue
@@ -71,7 +71,6 @@ const handleOk = async () => {
             accessModes: item.accessModes?.value || [],
         };
     });
-    console.log(1112, props.data, data, list);
     const resp = await savePointBatch([...list]);
     if (resp.status === 200) {
         emit('change', true);
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 0b00f255..6320d2df 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -98,18 +98,14 @@
                     </template>
                     <template #action>
                         <div class="card-box-action">
-                            <a>
-                                <j-popconfirm
-                                    title="确定删除？"
-                                    @confirm="handlDelete(slotProps.id)"
-                                >
-                                    <AIcon type="DeleteOutlined" />
-                                </j-popconfirm>
-                            </a>
-                            <a
-                                ><AIcon
-                                    @click="handlEdit(slotProps)"
-                                    type="FormOutlined"
+                            <j-popconfirm
+                                title="确定删除？"
+                                @confirm="handlDelete(slotProps.id)"
+                            >
+                                <a><AIcon type="DeleteOutlined" /></a>
+                            </j-popconfirm>
+                            <a @click="handlEdit(slotProps)"
+                                ><AIcon type="FormOutlined"
                             /></a>
                         </div>
                     </template>
@@ -125,28 +121,63 @@
                     <template #content>
                         <div class="card-box-content">
                             <div class="card-box-content-left">
-                                <span>--</span>
-                                <a
-                                    v-if="
-                                        getAccessModes(slotProps).includes(
-                                            'write',
-                                        )
-                                    "
-                                    ><AIcon
+                                <div class="card-box-content-left-1">
+                                    <div
+                                        class="ard-box-content-left-1-title"
+                                        v-if="propertyValue.has(slotProps.id)"
+                                    >
+                                        <j-ellipsis style="max-width: 150px">
+                                            {{
+                                                propertyValue.get(slotProps.id)
+                                                    ?.parseData[0] || 0
+                                            }}({{
+                                                propertyValue.get(slotProps.id)
+                                                    ?.dataType
+                                            }})
+                                        </j-ellipsis>
+                                    </div>
+
+                                    <span v-else>--</span>
+                                    <a
+                                        v-if="
+                                            getAccessModes(slotProps).includes(
+                                                'write',
+                                            )
+                                        "
                                         @click.stop="clickEdit(slotProps)"
-                                        type="EditOutlined"
-                                /></a>
-                                <a
-                                    v-if="
-                                        getAccessModes(slotProps).includes(
-                                            'read',
-                                        )
-                                    "
-                                    ><AIcon
+                                        ><AIcon type="EditOutlined"
+                                    /></a>
+                                    <a
+                                        v-if="
+                                            getAccessModes(slotProps).includes(
+                                                'read',
+                                            )
+                                        "
                                         @click.stop="clickRedo(slotProps)"
-                                        type="RedoOutlined"
-                                /></a>
+                                        ><AIcon type="RedoOutlined"
+                                    /></a>
+                                </div>
+                                <div
+                                    v-if="propertyValue.has(slotProps.id)"
+                                    class="card-box-content-right-2"
+                                >
+                                    <p>
+                                        {{
+                                            propertyValue.get(slotProps.id)
+                                                ?.hex || ''
+                                        }}
+                                    </p>
+                                    <p>
+                                        {{
+                                            moment(
+                                                propertyValue.get(slotProps.id)
+                                                    ?.timestamp,
+                                            ).format('YYYY-MM-DD HH:mm:ss')
+                                        }}
+                                    </p>
+                                </div>
                             </div>
+
                             <div class="card-box-content-right">
                                 <div
                                     v-if="getRight1(slotProps)"
@@ -207,6 +238,9 @@ import SaveOPCUA from './Save/SaveOPCUA.vue';
 import Scan from './Scan/index.vue';
 import { colorMap, getState } from '../data.ts';
 import { cloneDeep } from 'lodash-es';
+import { getWebSocket } from '@/utils/websocket';
+import { map } from 'rxjs/operators';
+import moment from 'moment';
 
 const props = defineProps({
     data: {
@@ -215,7 +249,6 @@ const props = defineProps({
     },
 });
 
-const menuStory = useMenuStore();
 const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 const opcImage = getImage('/DataCollect/device-opcua.png');
@@ -242,7 +275,6 @@ const defaultParams = ref({
                 {
                     column: 'collectorId',
                     value: collectorId.value,
-                    // value: '1610517928766550016', //测试
                 },
             ],
         },
@@ -332,6 +364,9 @@ const columns = [
     },
 ];
 
+const subRef = ref();
+const propertyValue = ref(new Map());
+
 const handlAdd = () => {
     visible.saveModBus = true;
     current.value = {
@@ -431,6 +466,7 @@ const cancelSelect = () => {
 };
 
 const handleClick = (dt: any) => {
+    if (props.data?.provider !== 'OPC_UA') return;
     if (_selectedRowKeys.value.includes(dt.id)) {
         const _index = _selectedRowKeys.value.findIndex((i) => i === dt.id);
         _selectedRowKeys.value.splice(_index, 1);
@@ -439,6 +475,32 @@ const handleClick = (dt: any) => {
     }
 };
 
+const subscribeProperty = (value: any) => {
+    const list = value.map((item: any) => item.id);
+    const id = `collector-${props.data?.channelId || 'channel'}-${
+        props.data?.id || 'point'
+    }-data-${list.join('-')}`;
+    const topic = `/collector/${props.data?.channelId || '*'}/${
+        props.data?.id || '*'
+    }/data`;
+    subRef.value = getWebSocket(id, topic, {
+        pointId: list.join(','),
+    })
+        ?.pipe(map((res) => res.payload))
+        .subscribe((payload: any) => {
+            propertyValue.value.set(payload.pointId, payload);
+        });
+};
+
+watch(
+    () => tableRef?.value?._dataSource,
+    (value) => {
+        if (value.length !== 0) {
+            subscribeProperty(value);
+        }
+    },
+);
+
 watch(
     () => props.data,
     (value) => {
@@ -451,13 +513,19 @@ watch(
                           value: 'subscribe',
                       });
             defaultParams.value.terms[0].terms[0].value = value.id;
-            // defaultParams.value.terms[0].terms[0].value = '1610517928766550016'; //测试
             tableRef?.value?.reload && tableRef?.value?.reload();
+            cancelSelect();
         }
     },
     { immediate: true, deep: true },
 );
 
+onUnmounted(() => {
+    if (subRef.value) {
+        subRef.value?.unsubscribe();
+    }
+});
+
 /**
  * 搜索
  * @param params
@@ -492,12 +560,22 @@ const handleSearch = (e: any) => {
         margin-top: 10px;
         display: flex;
         .card-box-content-left {
-            flex: 0.2;
+            // flex: 0.2;
+            max-width: 220px;
             border-right: 1px solid #e0e4e8;
             height: 68px;
-            padding-right: 20px;
-            display: flex;
-            justify-content: flex-start;
+            padding-right: 10px;
+            .card-box-content-left-1 {
+                display: flex;
+                justify-content: flex-start;
+                .card-box-content-left-1-title {
+                    color: #000;
+                    font-size: 20px;
+                    opacity: 0.85;
+                }
+            }
+
+            // justify-content: space-between;
             a {
                 margin-left: 10px;
             }
diff --git a/src/views/DataCollect/Collector/data.ts b/src/views/DataCollect/Collector/data.ts
index 75c218a2..b349f2a1 100644
--- a/src/views/DataCollect/Collector/data.ts
+++ b/src/views/DataCollect/Collector/data.ts
@@ -174,7 +174,6 @@ export const FormTableColumns = [
         title: '操作',
         key: 'action',
         dataIndex: 'action',
-
         fixed: 'right',
         width: 80,
     },

From 8b86084d824f31b3eee5199abdbac4b0e3175805 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Tue, 14 Mar 2023 17:13:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?update:=20=E5=9B=BE=E6=A0=87=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AddDeviceOrProductDialog.vue   |  3 +--
 .../system/Department/components/LeftTree.vue |  3 +--
 src/views/system/Menu/Setting/index.vue       | 27 +++++++++----------
 src/views/system/User/index.vue               | 10 ++++---
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index ba10925c..c477b5b9 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -9,7 +9,7 @@
         visible
     >
         <h5 class="row">
-            <exclamation-circle-outlined style="margin-right: 6px" />
+            <AIcon type="ExclamationCircleOutlined" style="margin-right: 6px" />
             只能分配有“共享”权限的资产数据
         </h5>
 
@@ -132,7 +132,6 @@
 </template>
 
 <script setup lang="ts">
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { getImage } from '@/utils/comm';
 import { uniq, intersection } from 'lodash-es';
 import {
diff --git a/src/views/system/Department/components/LeftTree.vue b/src/views/system/Department/components/LeftTree.vue
index c4ed99ca..aa741a5c 100644
--- a/src/views/system/Department/components/LeftTree.vue
+++ b/src/views/system/Department/components/LeftTree.vue
@@ -7,7 +7,7 @@
             class="search-input"
         >
             <template #suffix>
-                <search-outlined />
+                <AIcon type="SearchOutlined" />
             </template>
         </j-input>
         <div class="add-btn">
@@ -89,7 +89,6 @@ import { debounce, cloneDeep, omit } from 'lodash-es';
 import { ArrayToTree } from '@/utils/utils';
 import EditDepartmentDialog from './EditDepartmentDialog.vue';
 
-import { SearchOutlined } from '@ant-design/icons-vue';
 import { message } from 'ant-design-vue';
 
 const permission = 'system/Department';
diff --git a/src/views/system/Menu/Setting/index.vue b/src/views/system/Menu/Setting/index.vue
index 4e74a953..c1904ac7 100644
--- a/src/views/system/Menu/Setting/index.vue
+++ b/src/views/system/Menu/Setting/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="setting-container">
         <h5 class="top">
-            <exclamation-circle-outlined />
+            <AIcon type="ExclamationCircleOutlined" />
             <span style="padding-left: 12px"
                 >基于系统源代码中的菜单数据，配置系统菜单。</span
             >
@@ -17,7 +17,7 @@
                             <template #title
                                 >根据系统代码自动读取的菜单数据</template
                             >
-                            <question-circle-outlined />
+                            <AIcon type="QuestionCircleOutlined" />
                         </j-tooltip>
                     </div>
                     <div class="title-func">
@@ -36,7 +36,10 @@
                         placeholder="请输入菜单名称"
                     >
                         <template #prefix>
-                            <search-outlined style="color: #b3b3b3" />
+                            <AIcon
+                                type="SearchOutlined"
+                                style="color: #b3b3b3"
+                            />
                         </template>
                     </j-input>
                     <j-tree
@@ -63,7 +66,7 @@
                             <template #title
                                 >菜单管理页面配置的菜单数据</template
                             >
-                            <question-circle-outlined />
+                            <AIcon type="QuestionCircleOutlined" />
                         </j-tooltip>
                     </div>
                 </div>
@@ -74,7 +77,10 @@
                         placeholder="请输入菜单名称"
                     >
                         <template #prefix>
-                            <search-outlined style="color: #b3b3b3" />
+                            <AIcon
+                                type="SearchOutlined"
+                                style="color: #b3b3b3"
+                            />
                         </template>
                     </j-input>
                     <j-tree
@@ -103,7 +109,7 @@
                                             style="padding: 0"
                                             type="link"
                                         >
-                                            <close-outlined />
+                                            <AIcon type="CloseOutlined" />
                                         </j-button>
                                     </j-tooltip>
                                 </j-popconfirm>
@@ -114,7 +120,7 @@
             </div>
         </div>
 
-        <j-button type="primary" style="margin-top: 24px;">保存</j-button>
+        <j-button type="primary" style="margin-top: 24px">保存</j-button>
 
         <div class="dialogs">
             <j-modal
@@ -131,13 +137,6 @@
 </template>
 
 <script setup lang="ts" name="MenuSetting">
-import {
-    ExclamationCircleOutlined,
-    QuestionCircleOutlined,
-    SearchOutlined,
-    CloseOutlined,
-} from '@ant-design/icons-vue';
-
 import { getMenuTree_api } from '@/api/system/menu';
 import { getSystemPermission as getSystemPermission_api } from '@/api/initHome';
 import { filterMenu, getKeys, loop } from './utils';
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index bd66e022..cf9c8007 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -64,8 +64,13 @@
                                 onConfirm: () => table.changeStatus(slotProps),
                             }"
                         >
-                            <stop-outlined v-if="slotProps.status" />
-                            <play-circle-outlined v-else />
+                            <AIcon
+                                :type="
+                                    slotProps.status
+                                        ? 'StopOutlined'
+                                        : 'PlayCircleOutlined'
+                                "
+                            />
                         </PermissionButton>
                         <PermissionButton
                             :hasPermission="`${permission}:update`"
@@ -117,7 +122,6 @@ import {
     changeUserStatus_api,
     deleteUser_api,
 } from '@/api/system/user';
-import { StopOutlined, PlayCircleOutlined } from '@ant-design/icons-vue';
 import { message } from 'ant-design-vue';
 
 const permission = 'system/User';

From ea5761846e335f4e5c7dbd8df657ecccb924f877 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Tue, 14 Mar 2023 17:48:24 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=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/device/Product/ChooseCard/index.vue | 12 +++---
 .../device/Product/Detail/BasicInfo/indev.vue | 40 +++++++++----------
 src/views/device/Product/DialogTips/index.vue |  6 +--
 src/views/device/Product/index.vue            |  4 +-
 src/views/init-home/Basic/index.vue           | 12 +++---
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/views/device/Product/ChooseCard/index.vue b/src/views/device/Product/ChooseCard/index.vue
index a60c1753..60ac8c44 100644
--- a/src/views/device/Product/ChooseCard/index.vue
+++ b/src/views/device/Product/ChooseCard/index.vue
@@ -6,18 +6,18 @@
             @click="handleClick"
         >
             <div class="card-content">
-                <a-row :gutter="20">
-                    <a-col :span="10">
+                <j-row :gutter="20">
+                    <j-col :span="10">
                         <!-- 图片 -->
                         <div class="card-item-avatar">
                             <slot name="img"> </slot>
                         </div>
-                    </a-col>
-                    <a-col :span="14">
+                    </j-col>
+                    <j-col :span="14">
                         <!-- 内容 -->
                         <slot name="content"></slot>
-                    </a-col>
-                </a-row>
+                    </j-col>
+                </j-row>
 
                 <!-- 勾选 -->
                 <div v-if="active" class="checked-icon">
diff --git a/src/views/device/Product/Detail/BasicInfo/indev.vue b/src/views/device/Product/Detail/BasicInfo/indev.vue
index 6ef5107f..ed0a99af 100644
--- a/src/views/device/Product/Detail/BasicInfo/indev.vue
+++ b/src/views/device/Product/Detail/BasicInfo/indev.vue
@@ -1,7 +1,7 @@
 <!-- 配置信息 -->
 <template>
-    <a-card style="min-height: 100%">
-        <a-descriptions bordered>
+    <j-card style="min-height: 100%">
+        <j-descriptions bordered>
             <template #title>
                 <div style="display: flex">
                     <h3>配置信息</h3>
@@ -11,35 +11,35 @@
                 </div>
             </template>
 
-            <a-descriptions-item label="ID">{{
+            <j-descriptions-item label="ID">{{
                 productStore.current.id
-            }}</a-descriptions-item>
-            <a-descriptions-item label="产品分类">{{
+            }}</j-descriptions-item>
+            <j-descriptions-item label="产品分类">{{
                 productStore.current.classifiedName
-            }}</a-descriptions-item>
-            <a-descriptions-item label="设备类型">{{
+            }}</j-descriptions-item>
+            <j-descriptions-item label="设备类型">{{
                 productStore.current.deviceType?.text
-            }}</a-descriptions-item>
+            }}</j-descriptions-item>
 
-            <a-descriptions-item label="接入方式">
-                <a-button type="link" @click="changeTables">{{
+            <j-descriptions-item label="接入方式">
+                <j-button type="link" @click="changeTables">{{
                     productStore.current.accessName
                         ? productStore.current.accessName
                         : '配置接入方式'
-                }}</a-button>
-            </a-descriptions-item>
-            <a-descriptions-item label="创建时间">{{
+                }}</j-button>
+            </j-descriptions-item>
+            <j-descriptions-item label="创建时间">{{
                 moment(productStore.current.createTime).format('YYYY-MM-DD HH:mm:ss')
-            }}</a-descriptions-item>
-            <a-descriptions-item label="更新时间">{{
+            }}</j-descriptions-item>
+            <j-descriptions-item label="更新时间">{{
                 moment(productStore.current.modifyTime).format('YYYY-MM-DD HH:mm:ss')
-            }}</a-descriptions-item>
+            }}</j-descriptions-item>
 
-            <a-descriptions-item label="说明" :span="3">
+            <j-descriptions-item label="说明" :span="3">
                 {{ productStore.current.describe }}
-            </a-descriptions-item>
-        </a-descriptions>
-    </a-card>
+            </j-descriptions-item>
+        </j-descriptions>
+    </j-card>
     <!-- 编辑 -->
     <Save ref="saveRef" :isAdd="isAdd" :title="title" />
 </template>
diff --git a/src/views/device/Product/DialogTips/index.vue b/src/views/device/Product/DialogTips/index.vue
index e2f00d96..72928eb9 100644
--- a/src/views/device/Product/DialogTips/index.vue
+++ b/src/views/device/Product/DialogTips/index.vue
@@ -1,6 +1,6 @@
 <!-- 产品保存成功后的提示框 -->
 <template>
-    <a-modal
+    <j-modal
         :maskClosable="false"
         destroy-on-close
         v-model:visible="visible"
@@ -12,7 +12,7 @@
             <span>产品创建成功</span>
         </template>
         <template #footer>
-            <a-button @click="cancel">关闭</a-button>
+            <j-button @click="cancel">关闭</j-button>
         </template>
         <div class="product-tips">
             <div style="display: flex">
@@ -43,7 +43,7 @@
                 进入设备列表页面，点击批量导入设备，批量添加同一产品下的设备
             </div>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 <script lang="ts" setup name="DialogTips">
 import { getImage } from '@/utils/comm.ts';
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 9a803ab0..1277a802 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -24,7 +24,7 @@
                         <template #icon><AIcon type="PlusOutlined" /></template>
                         新增
                     </PermissionButton>
-                    <a-upload
+                    <j-upload
                         name="file"
                         accept=".json"
                         :showUploadList="false"
@@ -33,7 +33,7 @@
                         <PermissionButton hasPermission="device/Product:import"
                             >导入</PermissionButton
                         >
-                    </a-upload>
+                    </j-upload>
                 </j-space>
             </template>
             <template #deviceType="slotProps">
diff --git a/src/views/init-home/Basic/index.vue b/src/views/init-home/Basic/index.vue
index 27a96359..96ef8a75 100644
--- a/src/views/init-home/Basic/index.vue
+++ b/src/views/init-home/Basic/index.vue
@@ -59,7 +59,7 @@
                         <j-form-item label="系统logo">
                             <div class="upload-image-warp-logo">
                                 <div class="upload-image-border-logo">
-                                    <a-upload
+                                    <j-upload
                                         name="file"
                                         :action="FILE_UPLOAD"
                                         :headers="headers"
@@ -109,7 +109,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </a-upload>
+                                    </j-upload>
                                     <div v-if="logoLoading">
                                         <div class="upload-loading-mask">
                                             <LoadingOutlined
@@ -138,7 +138,7 @@
                             </template>
                             <div class="upload-image-warp-logo">
                                 <div class="upload-image-border-logo">
-                                    <a-upload
+                                    <j-upload
                                         name="file"
                                         :action="FILE_UPLOAD"
                                         :headers="headers"
@@ -183,7 +183,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </a-upload>
+                                    </j-upload>
                                 </div>
                             </div>
 
@@ -197,7 +197,7 @@
                 <j-form-item label="登录背景图">
                     <div class="upload-image-warp-back">
                         <div class="upload-image-border-back">
-                            <a-upload
+                            <j-upload
                                 name="file"
                                 :action="FILE_UPLOAD"
                                 :headers="headers"
@@ -242,7 +242,7 @@
                                         </div>
                                     </div>
                                 </div>
-                            </a-upload>
+                            </j-upload>
                         </div>
                     </div>
                     <div class="upload-tips">支持4M以内的图片:支持jpg、png</div>

From fa5e34a77e3c38189bf4ab4aa92001af4e5b5733 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Tue, 14 Mar 2023 17:51:51 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=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

---
 .../DashBoard/components/TimeSelect.vue       | 12 +++----
 .../device/DashBoard/components/TopCard.vue   |  6 ++--
 src/views/device/DashBoard/index.vue          | 36 +++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/views/device/DashBoard/components/TimeSelect.vue b/src/views/device/DashBoard/components/TimeSelect.vue
index eaa86387..7cfd8595 100644
--- a/src/views/device/DashBoard/components/TimeSelect.vue
+++ b/src/views/device/DashBoard/components/TimeSelect.vue
@@ -1,21 +1,21 @@
 <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>
-        <a-range-picker
+            </j-radio-button>
+        </j-radio-group>
+        <j-range-picker
             format="YYYY-MM-DD HH:mm:ss"
             valueFormat="YYYY-MM-DD HH:mm:ss"
             style="margin-left: 12px"
@@ -23,7 +23,7 @@
             v-model:value="rangeVal"
             :allowClear="false"
         >
-        </a-range-picker>
+        </j-range-picker>
     </div>
 </template>
 
diff --git a/src/views/device/DashBoard/components/TopCard.vue b/src/views/device/DashBoard/components/TopCard.vue
index 13c5fcac..a8d07992 100644
--- a/src/views/device/DashBoard/components/TopCard.vue
+++ b/src/views/device/DashBoard/components/TopCard.vue
@@ -4,12 +4,12 @@
             <div class="content-left">
                 <div class="content-left-title">
                     <span>{{ title }}</span>
-                    <a-tooltip placement="top" v-if="tooltip">
+                    <j-tooltip placement="top" v-if="tooltip">
                         <template #title>
                             <span>{{ tooltip }}</span>
                         </template>
                         <AIcon type="QuestionCircleOutlined" />
-                    </a-tooltip>
+                    </j-tooltip>
                 </div>
                 <div class="content-left-value">{{ value }}</div>
             </div>
@@ -23,7 +23,7 @@
         <div class="top-card-footer">
             <template v-for="(item, index) in footer" :key="index">
                 <span v-if="!item.status">{{ item.title }}</span>
-                <a-badge v-else :text="item.title" :status="item.status" />
+                <j-badge v-else :text="item.title" :status="item.status" />
                 <div class="footer-item-value">{{ item.value }}</div>
             </template>
         </div>
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index db1777ad..09e1584a 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -1,24 +1,24 @@
 <template>
     <page-container>
         <div class="DashBoardBox">
-            <a-row :gutter="24">
-                <a-col :span="6">
+            <j-row :gutter="24">
+                <j-col :span="6">
                     <TopCard
                         title="产品数量"
                         :img="getImage('/device/device-product.png')"
                         :footer="productFooter"
                         :value="productTotal"
                     ></TopCard>
-                </a-col>
-                <a-col :span="6">
+                </j-col>
+                <j-col :span="6">
                     <TopCard
                         title="设备数量"
                         :img="getImage('/device/device-number.png')"
                         :footer="deviceFooter"
                         :value="deviceTotal"
                     ></TopCard
-                ></a-col>
-                <a-col :span="6"
+                ></j-col>
+                <j-col :span="6"
                     ><TopCard
                         title="当前在线"
                         :footer="onlineFooter"
@@ -29,18 +29,18 @@
                             :chartYData="barChartYData"
                         ></BarChart>  -->
                         <Charts :options="onlineOptions"></Charts> </TopCard
-                ></a-col>
-                <a-col :span="6"
+                ></j-col>
+                <j-col :span="6"
                     ><TopCard
                         title="今日设备信息量"
                         :footer="messageFooter"
                         :value="dayMessage"
                     >
                         <Charts :options="TodayDevOptions"></Charts> </TopCard
-                ></a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
+                ></j-col>
+            </j-row>
+            <j-row :gutter="24">
+                <j-col :span="24">
                     <div class="message-card">
                         <Guide title="设备消息">
                             <template #extra>
@@ -56,18 +56,18 @@
                             <Charts :options="devMegOptions"></Charts>
                         </div>
                     </div>
-                </a-col>
-            </a-row>
-            <a-row :span="24">
-                <a-col :span="24">
+                </j-col>
+            </j-row>
+            <j-row :span="24">
+                <j-col :span="24">
                     <div class="device-position">
                         <Guide title="设备分布"></Guide>
                         <div class="device-map">
                             <Amap></Amap>
                         </div>
                     </div>
-                </a-col>
-            </a-row>
+                </j-col>
+            </j-row>
         </div>
     </page-container>
 </template>

From dcf6aef0e683c283f25c230eb3df0c0ea652869a Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 15 Mar 2023 09:38:32 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=20=E6=9B=B4=E6=8D=A2=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DataCollect/Channel/Save/index.vue  |  92 ++++++-------
 src/views/DataCollect/Channel/data.ts         |  80 ++++++++++-
 src/views/DataCollect/Channel/index.vue       |   7 +-
 .../Collector/Point/Save/SaveModBus.vue       |  97 ++++++--------
 .../Collector/Point/Save/SaveOPCUA.vue        |  34 ++---
 .../Collector/Point/Scan/Table.vue            |  37 ++++--
 .../DataCollect/Collector/Point/Scan/Tree.vue |  45 +++----
 .../Collector/Point/Scan/index.vue            |  12 +-
 .../Point/components/BatchUpdate/index.vue    |  35 +++--
 .../Point/components/PointCardBox/index.vue   |  10 +-
 .../Point/components/WritePoint/index.vue     |  15 +--
 .../DataCollect/Collector/Point/index.vue     |  84 ++++++++----
 .../DataCollect/Collector/Tree/Save/index.vue | 124 ++++++++----------
 .../DataCollect/Collector/Tree/index.vue      |  28 ++--
 src/views/DataCollect/Collector/data.ts       |  31 ++++-
 src/views/DataCollect/Collector/index.vue     |   8 +-
 .../DataCollect/Dashboard/components/Card.vue |  13 +-
 .../Dashboard/components/TopCard.vue          |   1 -
 src/views/DataCollect/Dashboard/index.vue     |   6 +-
 src/views/DataCollect/Dashboard/tool.ts       |   9 +-
 src/views/DataCollect/Dashboard/typings.d.ts  |  10 --
 src/views/device/Firmware/index.vue           |   2 +-
 src/views/media/Stream/index.vue              |   2 +-
 23 files changed, 437 insertions(+), 345 deletions(-)

diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index 0a83c55c..8e01b54e 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -37,16 +37,15 @@
                 :name="['configuration', 'host']"
                 :rules="FormValidate.host"
             >
-                <div class="form-label">
+                <template #label>
                     Modbus主机IP
-                    <span class="form-label-required">*</span>
-                    <j-tooltip>
-                        <template #title>
-                            <p>支持ipv4、ipv6、域名</p>
-                        </template>
-                        <AIcon type="QuestionCircleOutlined" />
+                    <j-tooltip title="支持ipv4、ipv6、域名">
+                        <AIcon
+                            type="QuestionCircleOutlined"
+                            style="margin-left: 2px"
+                        />
                     </j-tooltip>
-                </div>
+                </template>
                 <j-input
                     placeholder="请输入Modbus主机IP"
                     v-model:value="formData.configuration.host"
@@ -62,7 +61,7 @@
                     style="width: 100%"
                     placeholder="请输入端口"
                     v-model:value="formData.configuration.port"
-                    :min="1"
+                    :min="0"
                     :max="65535"
                 />
             </j-form-item>
@@ -80,7 +79,7 @@
             <j-form-item
                 v-if="formData.provider === 'OPC_UA'"
                 label="安全策略"
-                :name="['configuration.securityPolicy']"
+                :name="['configuration', 'securityPolicy']"
                 :rules="FormValidate.securityPolicy"
             >
                 <j-select
@@ -96,7 +95,7 @@
             <j-form-item
                 v-if="formData.provider === 'OPC_UA'"
                 label="安全模式"
-                :name="['configuration.securityMode']"
+                :name="['configuration', 'securityMode']"
                 :rules="FormValidate.securityMode"
             >
                 <j-select
@@ -115,7 +114,7 @@
                     formData.configuration.securityMode === 'Sign'
                 "
                 label="证书"
-                :name="['configuration.certificate']"
+                :name="['configuration', 'certificate']"
                 :rules="FormValidate.certificate"
             >
                 <j-select
@@ -131,20 +130,20 @@
             <j-form-item
                 v-if="formData.provider === 'OPC_UA'"
                 label="权限认证"
-                :name="['configuration.authType']"
+                :name="['configuration', 'authType']"
                 :rules="FormValidate.authType"
             >
-                <RadioCard
-                    layout="horizontal"
-                    :checkStyle="true"
+                <j-card-select
+                    :showImage="false"
+                    v-model:value="formData.configuration.authType"
                     :options="Options['auth-types']"
-                    v-model="formData.configuration.authType"
+                    @change="changeAuthType"
                 />
             </j-form-item>
             <j-form-item
                 v-if="formData.configuration.authType === 'username'"
                 label="用户名"
-                :name="['configuration.username']"
+                :name="['configuration', 'username']"
                 :rules="FormValidate.username"
             >
                 <j-input
@@ -153,9 +152,12 @@
                 />
             </j-form-item>
             <j-form-item
-                v-if="formData.configuration.authType === 'username'"
+                v-if="
+                    formData.configuration.authType === 'username' ||
+                    formData.configuration.authType === ['username']
+                "
                 label="密码"
-                :name="['configuration.password']"
+                :name="['configuration', 'password']"
                 :rules="FormValidate.password"
             >
                 <j-input-password
@@ -226,11 +228,9 @@ const handleOk = async () => {
     const params = await formRef.value?.validate();
     loading.value = true;
     const response = !id
-        ? await save(params)
-        : await update(id, { ...props.data, ...params });
-    if (response.status === 200) {
-        emit('change', true);
-    }
+        ? await save(params).catch(() => {})
+        : await update(id, { ...props.data, ...params }).catch(() => {});
+    emit('change', response?.status === 200);
     loading.value = false;
     formRef.value?.resetFields();
 };
@@ -240,29 +240,33 @@ const handleCancel = () => {
     formRef.value?.resetFields();
 };
 
+const changeAuthType = (value: Array<string>) => {
+    formData.value.configuration.authType = value[0];
+};
+
 const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
 
 const getOptionsList = async () => {
     for (let key in Options.value) {
-        const res = await queryOptionsList(key);
-        Options.value[key] = res.result.map((item) => ({
+        const res: any = await queryOptionsList(key);
+        Options.value[key] = res.result.map((item: any) => ({
             label: item?.text || item,
             value: item?.value || item,
         }));
     }
 };
 const getCertificateList = async () => {
-    const res = await queryCertificateList();
-    certificateList.value = res.result.map((item) => ({
+    const res: any = await queryCertificateList();
+    certificateList.value = res.result.map((item: any) => ({
         value: item.id,
         label: item.name,
     }));
 };
 
 const getProvidersList = async () => {
-    const resp = await getProviders();
+    const resp: any = await getProviders();
     if (resp.status === 200) {
         const list = [
             { label: 'OPC UA', value: 'OPC_UA' },
@@ -273,7 +277,9 @@ const getProvidersList = async () => {
                 (item: any) => item.id === 'modbus-tcp' || item.id === 'opc-ua',
             )
             .map((it: any) => (it?.id === 'opc-ua' ? 'OPC_UA' : 'MODBUS_TCP'));
-        const providers = list.filter((item: any) => arr.includes(item.value));
+        const providers: any = list.filter((item: any) =>
+            arr.includes(item.value),
+        );
         providersList.value = providers;
         if (arr.includes('OPC_UA')) {
             getOptionsList();
@@ -286,30 +292,10 @@ getCertificateList();
 watch(
     () => props.data,
     (value) => {
-        if (value.id) formData.value = value;
+        if (value.id) formData.value = value as FormDataType;
     },
     { immediate: true, deep: true },
 );
 </script>
 
-<style lang="less" scoped>
-.form {
-    .form-radio-button {
-        width: 148px;
-        height: 80px;
-        padding: 0;
-        img {
-            width: 100%;
-            height: 100%;
-        }
-    }
-}
-.form-label {
-    height: 30px;
-    padding-bottom: 8px;
-    .form-label-required {
-        color: red;
-        margin: 0 4px 0 -2px;
-    }
-}
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/DataCollect/Channel/data.ts b/src/views/DataCollect/Channel/data.ts
index 27c3d759..c5fba7be 100644
--- a/src/views/DataCollect/Channel/data.ts
+++ b/src/views/DataCollect/Channel/data.ts
@@ -1,5 +1,6 @@
 import { validateField } from '@/api/data-collect/channel';
 import { FormDataType } from './type.d';
+import type { Rule } from 'ant-design-vue/lib/form';
 
 export const FormState: FormDataType = {
     name: '',
@@ -44,7 +45,7 @@ export const TiTlePermissionButtonStyle = {
     overflow: 'hidden',
     'text-overflow': 'ellipsis',
     'white-space': 'nowrap',
-    width: 'calc(100%-100px)',
+    width: 'calc(100%-150px)',
     // width: '60%',
 };
 
@@ -61,10 +62,8 @@ export const regDomain = new RegExp(
 );
 export const checkEndpoint = (_rule: Rule, value: string): Promise<any> =>
     new Promise(async (resolve, reject) => {
-        if (value) {
-            const res = await validateField(value);
-            return res.result.passed ? resolve('') : reject(res.result.reason);
-        }
+        const res = await validateField(value);
+        return res.result.passed ? resolve('') : reject(res.result.reason);
     });
 export const FormValidate = {
     name: [
@@ -89,7 +88,7 @@ export const FormValidate = {
         },
         {
             pattern: regOnlyNumber,
-            message: '请输入1-65535之间的正整数',
+            message: '请输入0-65535之间的正整数',
         },
     ],
 
@@ -100,7 +99,7 @@ export const FormValidate = {
         },
         {
             validator: checkEndpoint,
-            trigger: 'blur',
+            // trigger: 'blur',
         },
     ],
 
@@ -139,3 +138,70 @@ export const FormValidate = {
 
     description: [{ max: 200, message: '最多可输入200个字符' }],
 };
+export const columns = [
+    {
+        title: '通道名称',
+        dataIndex: 'name',
+        key: 'name',
+        ellipsis: true,
+        fixed: 'left',
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '通讯协议',
+        dataIndex: 'provider',
+        key: 'provider',
+        ellipsis: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: 'OPC_UA', value: 'OPC_UA' },
+                { label: 'MODBUS_TCP', value: 'MODBUS_TCP' },
+            ],
+        },
+    },
+    {
+        title: '状态',
+        dataIndex: 'state',
+        key: 'state',
+        ellipsis: true,
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '正常', value: 'enabled' },
+                { label: '禁用', value: 'disabled' },
+            ],
+        },
+    },
+    {
+        title: '运行状态',
+        dataIndex: 'runningState',
+        key: 'runningState',
+        ellipsis: true,
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                { label: '运行中', value: 'running' },
+                { label: '部分错误', value: 'partialError' },
+                { label: '错误', value: 'failed' },
+            ],
+        },
+    },
+    {
+        title: '说明',
+        dataIndex: 'description',
+        key: 'description',
+        ellipsis: true,
+    },
+    {
+        title: '操作',
+        key: 'action',
+        fixed: 'right',
+        width: 200,
+        scopedSlots: true,
+    },
+];
diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue
index c6123771..41d4ab31 100644
--- a/src/views/DataCollect/Channel/index.vue
+++ b/src/views/DataCollect/Channel/index.vue
@@ -1,7 +1,11 @@
 <template>
     <page-container>
         <div>
-            <Search :columns="columns" target="search" @search="handleSearch" />
+            <pro-search
+                :columns="columns"
+                target="search"
+                @search="handleSearch"
+            />
 
             <j-pro-table
                 ref="tableRef"
@@ -134,7 +138,6 @@ import _ from 'lodash';
 const menuStory = useMenuStore();
 const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
-const options = ref([]);
 const visible = ref(false);
 const current = ref({});
 
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 1dd31cfd..185dda6b 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -37,6 +37,7 @@
                     allowClear
                     show-search
                     :filter-option="filterOption"
+                    @change="changeFunction"
                 />
             </j-form-item>
             <j-form-item
@@ -69,6 +70,7 @@
                     v-model:value="formData.configuration.parameter.quantity"
                     :min="1"
                     :max="255"
+                    @blur="changeQuantity"
                 />
             </j-form-item>
             <j-form-item
@@ -112,16 +114,9 @@
                 />
             </j-form-item>
             <j-form-item label="访问类型" name="accessModes">
-                <!-- <RadioCard
-                    layout="horizontal"
-                    :checkStyle="true"
-                    :options="[
-                        { label: '读', value: 'read' },
-                        { label: '写', value: 'write' },
-                    ]"
-                    v-model="formData.accessModes"
-                /> -->
-                <j-checkbox-group
+                <j-card-select
+                    multiple
+                    :showImage="false"
                     v-model:value="formData.accessModes"
                     :options="[
                         { label: '读', value: 'read' },
@@ -129,7 +124,6 @@
                     ]"
                 />
             </j-form-item>
-
             <j-form-item
                 :name="['nspwc']"
                 v-if="
@@ -140,7 +134,6 @@
                 <span style="margin-right: 10px">非标准协议写入配置</span>
                 <j-switch v-model:checked="formData.nspwc" />
             </j-form-item>
-
             <j-form-item
                 v-if="
                     !!formData.nspwc &&
@@ -151,14 +144,16 @@
                 :name="['configuration', 'parameter', 'writeByteCount']"
                 :rules="ModBusRules.writeByteCount"
             >
-                <RadioCard
-                    layout="horizontal"
-                    :checkStyle="true"
+                <j-card-select
+                    :showImage="false"
+                    v-model:value="
+                        formData.configuration.parameter.writeByteCount
+                    "
                     :options="[
                         { label: '是', value: true },
                         { label: '否', value: false },
                     ]"
-                    v-model="formData.configuration.parameter.writeByteCount"
+                    @change="changeWriteByteCount"
                 />
             </j-form-item>
             <j-form-item
@@ -187,11 +182,10 @@
                     },
                 ]"
             >
-                <j-input-number
+                <j-input
                     style="width: 100%"
                     placeholder="请输入采集频率"
                     v-model:value="formData.configuration.interval"
-                    :min="1"
                     addon-after="ms"
                 />
             </j-form-item>
@@ -240,8 +234,8 @@ import {
 } from '@/api/data-collect/collector';
 import { ModBusRules, checkProviderData } from '../../data.ts';
 import type { FormInstance } from 'ant-design-vue';
-import { Rule } from 'ant-design-vue/lib/form';
-import { cloneDeep, isArray } from 'lodash-es';
+import type { Rule } from 'ant-design-vue/lib/form';
+import { cloneDeep } from 'lodash-es';
 
 const props = defineProps({
     data: {
@@ -285,9 +279,8 @@ const formData = ref({
     description: '',
 });
 
-const onSubmit = async () => {
+const handleOk = async () => {
     const data = await formRef.value?.validate();
-
     delete data?.nspwc;
     const { codec } = data?.configuration;
 
@@ -309,21 +302,29 @@ const onSubmit = async () => {
 
     loading.value = true;
     const response = !id
-        ? await savePointBatch(params)
-        : await updatePoint(id, { ...props.data, ...params });
-    if (response.status === 200) {
-        emit('change', true);
-    }
+        ? await savePointBatch(params).catch(() => {})
+        : await updatePoint(id, { ...props.data, ...params }).catch(() => {});
+    emit('change', response?.status === 200);
     loading.value = false;
 };
 
-const handleOk = () => {
-    onSubmit();
-};
 const handleCancel = () => {
     emit('change', false);
 };
 
+const changeQuantity = () => {
+    if (formData.value.configuration.function === 'HoldingRegisters') {
+        formRef.value?.validate();
+    }
+};
+const changeWriteByteCount = (value: Array<string>) => {
+    formData.value.configuration.parameter.writeByteCount = value[0];
+};
+const changeFunction = (value: string) => {
+    formData.value.accessModes =
+        value === 'DiscreteInputs' ? ['read'] : ['read', 'write'];
+};
+
 const checkLength = (_rule: Rule, value: string): Promise<any> =>
     new Promise(async (resolve, reject) => {
         if (value) {
@@ -347,10 +348,10 @@ const checkPointKey = (_rule: Rule, value: string): Promise<any> =>
     new Promise(async (resolve, reject) => {
         if (value) {
             if (Number(oldPointKey) === Number(value)) return resolve('');
-            const res = await _validateField(collectorId, {
+            const res: any = await _validateField(collectorId, {
                 pointKey: value,
             });
-            return res.result.passed ? resolve('') : reject(res.result.reason);
+            return res.result?.passed ? resolve('') : reject(res.result.reason);
         }
     });
 
@@ -359,10 +360,10 @@ const filterOption = (input: string, option: any) => {
 };
 
 const getProviderList = async () => {
-    const res = await queryCodecProvider();
+    const res: any = await queryCodecProvider();
     providerList.value = res.result
-        .filter((i) => i.id !== 'property')
-        .map((item) => ({
+        .filter((i: any) => i.id !== 'property')
+        .map((item: any) => ({
             value: item.id,
             label: item.name,
         }));
@@ -386,11 +387,13 @@ watch(
             formData.value = _value;
             if (!!_value.accessModes[0]?.value) {
                 formData.value.accessModes = value.accessModes.map(
-                    (i) => i.value,
+                    (i: any) => i.value,
                 );
             }
             if (!!_value.features[0]?.value) {
-                formData.value.features = value.features.map((i) => i.value);
+                formData.value.features = value.features.map(
+                    (i: any) => i.value,
+                );
             }
             formData.value.nspwc = !!writeByteCount || !!byteCount;
         }
@@ -399,22 +402,4 @@ watch(
 );
 </script>
 
-<style lang="less" scoped>
-.form {
-    .form-radio-button {
-        width: 148px;
-        height: 80px;
-        padding: 0;
-        img {
-            width: 100%;
-            height: 100%;
-        }
-    }
-    .form-upload-button {
-        margin-top: 10px;
-    }
-    .form-submit {
-        background-color: @primary-color !important;
-    }
-}
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue b/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
index dff16730..08fe3c4d 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
@@ -34,7 +34,9 @@
             </j-form-item>
 
             <j-form-item label="访问类型" name="accessModes">
-                <j-checkbox-group
+                <j-card-select
+                    multiple
+                    :showImage="false"
                     v-model:value="formData.accessModes"
                     :options="[
                         { label: '读', value: 'read' },
@@ -54,15 +56,13 @@
                     },
                 ]"
             >
-                <j-input-number
+                <j-input
                     style="width: 100%"
                     placeholder="请输入采集频率"
                     v-model:value="formData.configuration.interval"
-                    :min="1"
                     addon-after="ms"
                 />
             </j-form-item>
-
             <a-form-item label="" :name="['features']">
                 <a-checkbox-group v-model:value="formData.features">
                     <a-checkbox value="changedOnly" name="type"
@@ -70,7 +70,6 @@
                     >
                 </a-checkbox-group>
             </a-form-item>
-
             <j-form-item label="说明" :name="['description']">
                 <j-textarea
                     placeholder="请输入说明"
@@ -104,7 +103,7 @@ import {
     updatePoint,
     _validateField,
 } from '@/api/data-collect/collector';
-import { OPCUARules, checkProviderData } from '../../data.ts';
+import { OPCUARules } from '../../data.ts';
 import type { FormInstance } from 'ant-design-vue';
 import { Rule } from 'ant-design-vue/lib/form';
 import { cloneDeep } from 'lodash-es';
@@ -118,7 +117,6 @@ const props = defineProps({
 
 const emit = defineEmits(['change']);
 const loading = ref(false);
-const providerList = ref([]);
 const formRef = ref<FormInstance>();
 
 const id = props.data.id;
@@ -136,9 +134,8 @@ const formData = ref({
     description: '',
 });
 
-const onSubmit = async () => {
+const handleOk = async () => {
     const data = await formRef.value?.validate();
-
     const params = {
         ...props.data,
         ...data,
@@ -148,17 +145,12 @@ const onSubmit = async () => {
 
     loading.value = true;
     const response = !id
-        ? await savePoint(params)
-        : await updatePoint(id, { ...props.data, ...params });
-    if (response.status === 200) {
-        emit('change', true);
-    }
+        ? await savePoint(params).catch(() => {})
+        : await updatePoint(id, { ...props.data, ...params }).catch(() => {});
+    emit('change', response?.status === 200);
     loading.value = false;
 };
 
-const handleOk = () => {
-    onSubmit();
-};
 const handleCancel = () => {
     emit('change', false);
 };
@@ -180,15 +172,17 @@ watch(
     () => props.data,
     (value) => {
         if (value.id && value.provider === 'OPC_UA') {
-            const _value = cloneDeep(value);
+            const _value: any = cloneDeep(value);
             formData.value = _value;
             if (!!_value.accessModes[0]?.value) {
                 formData.value.accessModes = value.accessModes.map(
-                    (i) => i.value,
+                    (i: any) => i.value,
                 );
             }
             if (!!_value.features[0]?.value) {
-                formData.value.features = value.features.map((i) => i.value);
+                formData.value.features = value.features.map(
+                    (i: any) => i.value,
+                );
             }
         }
     },
diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index ee1d144b..9db4a2f3 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -1,9 +1,9 @@
 <template>
-    <j-form style="width: 80%" ref="formTableRef" :model="modelRef">
+    <j-form class="table" ref="formTableRef" :model="modelRef">
         <j-table
             :dataSource="modelRef.dataSource"
             :columns="FormTableColumns"
-            :scroll="{ x: 1100, y: 550 }"
+            :scroll="{ x: 1000, y: 550 }"
         >
             <template #bodyCell="{ column: { dataIndex }, record, index }">
                 <template v-if="dataIndex === 'name'">
@@ -25,8 +25,11 @@
                 </template>
                 <template v-if="dataIndex === 'id'">
                     <a-form-item :name="['dataSource', index, 'id']">
-                        <j-input v-model:value="record[dataIndex]" disabled>
-                        </j-input>
+                        <j-input
+                            v-model:value="record[dataIndex]"
+                            disabled
+                            :bordered="false"
+                        ></j-input>
                     </a-form-item>
                 </template>
 
@@ -78,8 +81,12 @@
                         ]"
                         :rules="[
                             {
-                                required: true,
-                                message: '请输入',
+                                pattern: regOnlyNumber,
+                                message: '请输入0或者正整数',
+                            },
+                            {
+                                validator: checkLength,
+                                trigger: 'change',
                             },
                         ]"
                     >
@@ -98,7 +105,7 @@
                             @blur="changeValue(index, dataIndex)"
                         ></j-input>
                         <j-checkbox
-                            style="margin-left: 5px"
+                            style="margin-left: 5px; margin-top: 5px"
                             v-show="index !== 0"
                             v-model:checked="
                                 record.configuration[dataIndex].check
@@ -166,7 +173,9 @@
 </template>
 
 <script lang="ts" setup>
-import { FormTableColumns } from '../../data';
+import { FormTableColumns, regOnlyNumber } from '../../data';
+import { Rule } from 'ant-design-vue/lib/form';
+
 const props = defineProps({
     data: {
         type: Array,
@@ -177,10 +186,19 @@ const emits = defineEmits(['change']);
 
 const formTableRef = ref();
 const defaultType = ['accessModes', 'interval', 'features'];
-const modelRef = reactive({
+const modelRef: any = reactive({
     dataSource: [],
 });
 
+const checkLength = (_rule: Rule, value: string): Promise<any> =>
+    new Promise(async (resolve, reject) => {
+        if (value) {
+            return String(value).length > 64
+                ? reject('最多可输入64个字符')
+                : resolve('');
+        }
+    });
+
 const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
@@ -268,6 +286,7 @@ watch(
 </script>
 
 <style lang="less" scoped>
+.table {}
 .form-item {
     display: flex;
 }
diff --git a/src/views/DataCollect/Collector/Point/Scan/Tree.vue b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
index b925af7f..f61cd208 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Tree.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
@@ -5,14 +5,14 @@
             <j-checkbox v-model:checked="isSelected">隐藏已有节点</j-checkbox>
         </div>
         <j-spin :spinning="spinning">
-    
             <a-tree
+                v-if="!!treeData"
                 :load-data="onLoadData"
                 :tree-data="treeData"
                 v-model:checkedKeys="checkedKeys"
                 checkable
                 @check="onCheck"
-                :height="650"
+                :height="600"
             >
                 <template #title="{ name, key }">
                     <span
@@ -26,6 +26,7 @@
                     </span>
                 </template>
             </a-tree>
+            <j-empty v-else />
         </j-spin>
     </div>
 </template>
@@ -50,7 +51,6 @@ const props = defineProps({
 });
 const emits = defineEmits(['change']);
 
-// const channelId = '1610517801347788800'; //测试
 const channelId = props.data?.channelId;
 
 const checkedKeys = ref<string[]>([]);
@@ -67,12 +67,12 @@ const onLoadData = (node: any) =>
             resolve();
             return;
         }
-        const resp = await scanOpcUAList({
+        const resp: any = await scanOpcUAList({
             id: channelId,
             nodeId: node.key,
         });
         if (resp.status === 200) {
-            const list = resp.result.map((item: any) => {
+            const list: any = resp.result.map((item: any) => {
                 return {
                     ...item,
                     key: item.id,
@@ -91,13 +91,13 @@ const onLoadData = (node: any) =>
         resolve();
     });
 
-const handleData = (arr: any[]): any[] => {
-    const data = arr.filter((item) => {
+const handleData = (arr: any): any[] => {
+    const data = arr.filter((item: any) => {
         return (
             (isSelected && !selectKeys.value.includes(item.id)) || !isSelected
         );
     });
-    return data.map((item) => {
+    return data.map((item: any) => {
         if (item.children && item.children?.length) {
             return {
                 ...item,
@@ -109,7 +109,7 @@ const handleData = (arr: any[]): any[] => {
     });
 };
 
-const onCheck = (checkedKeys, info) => {
+const onCheck = (checkedKeys: any, info: any) => {
     const one: any = { ...info.node };
     const list: any = [];
     const last: any = list.length ? list[list.length - 1] : undefined;
@@ -143,8 +143,8 @@ const onCheck = (checkedKeys, info) => {
     emits('change', item, info.checked);
 };
 
-const updateTreeData = (list: any[], key: string, children: any[]): any[] => {
-    const arr = list.map((node) => {
+const updateTreeData = (list: any, key: string, children: any[]): any[] => {
+    const arr = list.map((node: any) => {
         if (node.key === key) {
             return {
                 ...node,
@@ -164,44 +164,41 @@ const updateTreeData = (list: any[], key: string, children: any[]): any[] => {
 
 const getPoint = async () => {
     spinning.value = true;
-    const res = await queryPointNoPaging();
+    const res: any = await queryPointNoPaging();
     if (res.status === 200) {
         selectKeys.value = res.result.map((item: any) => item.pointKey);
     }
+    getScanOpcUAList();
     spinning.value = false;
 };
 getPoint();
 
 const getScanOpcUAList = async () => {
-    const res = await scanOpcUAList({ id: channelId });
+    spinning.value = true;
+    const res: any = await scanOpcUAList({ id: channelId });
     treeAllData.value = res.result.map((item: any) => ({
         ...item,
         key: item.id,
         title: item.name,
         disabled: item?.folder || false,
     }));
+    spinning.value = false;
 };
-getScanOpcUAList();
+// getScanOpcUAList();
 
 watch(
     () => isSelected.value,
     (value) => {
-        if (value) {
-            treeData.value = handleData(treeAllData.value);
-        } else {
-            treeData.value = treeAllData.value;
-        }
+        treeData.value = value
+            ? handleData(treeAllData.value)
+            : treeAllData.value;
     },
     { deep: true },
 );
 watch(
     () => treeAllData.value,
     (value) => {
-        if (isSelected.value) {
-            treeData.value = handleData(value);
-        } else {
-            treeData.value = value;
-        }
+        treeData.value = isSelected.value ? handleData(value) : value;
     },
     { deep: true },
 );
diff --git a/src/views/DataCollect/Collector/Point/Scan/index.vue b/src/views/DataCollect/Collector/Point/Scan/index.vue
index 4922d4c7..80ea130c 100644
--- a/src/views/DataCollect/Collector/Point/Scan/index.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/index.vue
@@ -33,7 +33,6 @@
 import type { FormInstance } from 'ant-design-vue';
 import { savePointBatch } from '@/api/data-collect/collector';
 import { Rule } from 'ant-design-vue/lib/form';
-import { cloneDeep } from 'lodash';
 
 import Table from './Table.vue';
 import Tree from './Tree.vue';
@@ -55,8 +54,8 @@ const tableDataMap = new Map();
 const unSelectKeys = ref();
 
 const handleOk = async () => {
-    loading.value = true;
-    const data = await formTableRef.value?.validate();
+    const data: any = await formTableRef.value?.validate().catch(() => {});
+    if (!data) return;
     const list = data.map((item: any) => {
         return {
             name: item.name,
@@ -71,10 +70,9 @@ const handleOk = async () => {
             accessModes: item.accessModes?.value || [],
         };
     });
-    const resp = await savePointBatch([...list]);
-    if (resp.status === 200) {
-        emit('change', true);
-    }
+    loading.value = true;
+    const resp = await savePointBatch([...list]).catch(() => {});
+    emit('change', resp?.status === 200);
     loading.value = false;
 };
 const handleCancel = () => {
diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
index d6863202..6d2502fa 100644
--- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
@@ -19,7 +19,9 @@
             ref="formRef"
         >
             <j-form-item label="访问类型" name="accessModes">
-                <j-checkbox-group
+                <j-card-select
+                    multiple
+                    :showImage="false"
                     v-model:value="formData.accessModes"
                     :options="[
                         { label: '读', value: 'read' },
@@ -28,7 +30,19 @@
                     ]"
                 />
             </j-form-item>
-            <j-form-item :name="['interval']">
+            <j-form-item
+                :name="['interval']"
+                :rules="[
+                    {
+                        pattern: regOnlyNumber,
+                        message: '请输入0或者正整数',
+                    },
+                    {
+                        validator: checkLength,
+                        trigger: 'change',
+                    },
+                ]"
+            >
                 <template #label>
                     <span>
                         采集频率
@@ -40,11 +54,10 @@
                         </j-tooltip>
                     </span>
                 </template>
-                <j-input-number
+                <j-input
                     style="width: 100%"
                     placeholder="请输入采集频率"
                     v-model:value="formData.interval"
-                    :min="1"
                     addon-after="ms"
                 />
             </j-form-item>
@@ -77,6 +90,7 @@ import type { FormInstance } from 'ant-design-vue';
 import { savePointBatch } from '@/api/data-collect/collector';
 import { Rule } from 'ant-design-vue/lib/form';
 import { cloneDeep } from 'lodash';
+import { regOnlyNumber } from '../../../data';
 
 const props = defineProps({
     data: {
@@ -104,8 +118,8 @@ const checkLength = (_rule: Rule, value: string): Promise<any> =>
         }
     });
 
-const onSubmit = async () => {
-    const data = await formRef.value?.validate();
+const handleOk = async () => {
+    const data: any = await formRef.value?.validate();
     const { accessModes, features, interval } = data;
     const ischange =
         accessModes.length !== 0 || features.length !== 0 || !!interval;
@@ -123,19 +137,14 @@ const onSubmit = async () => {
             }
         });
         loading.value = true;
-        const response = await savePointBatch(params);
-        if (response.status === 200) {
-            emit('change', true);
-        }
+        const response = await savePointBatch(params).catch(() => {});
+        emit('change', response?.status === 200);
         loading.value = false;
     } else {
         emit('change', true);
     }
 };
 
-const handleOk = () => {
-    onSubmit();
-};
 const handleCancel = () => {
     emit('change', false);
 };
diff --git a/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue b/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue
index 31341aa5..5112664e 100644
--- a/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue
@@ -78,8 +78,7 @@
 </template>
 
 <script setup lang="ts">
-import BadgeStatus from '@/components/BadgeStatus/index.vue';
-import type { ActionsType } from '@/components/Table/index.vue';
+import type { ActionsType } from '@/components/Table/index';
 import { PropType } from 'vue';
 
 type EmitProps = {
@@ -146,19 +145,20 @@ const handleClick = () => {
         width: 44px;
         height: 44px;
         color: #fff;
-        background-color: red;
         background-color: #2f54eb;
         transform: rotate(-45deg);
 
         > div {
             position: relative;
             height: 100%;
+            right: -2px;
+            bottom: -4px;
             transform: rotate(45deg);
 
             > span {
                 position: absolute;
-                top: 6px;
-                left: 6px;
+                // top: 6px;
+                // left: 6px;
                 font-size: 12px;
             }
         }
diff --git a/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue b/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue
index 67610a8d..ac56f2bd 100644
--- a/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue
@@ -130,7 +130,7 @@ const loading = ref(false);
 const formRef = ref<FormInstance>();
 
 const collectorId = props.data.collectorId;
-const pointId = props.data.id;
+const pointId: string = props.data.id;
 
 const formData = ref({
     value: '',
@@ -140,23 +140,18 @@ const onChange = (value: Dayjs, dateString: string) => {
     formData.value.value = dateString;
 };
 
-const onSubmit = async () => {
+const handleOk = async () => {
     const data = await formRef.value?.validate();
-    const params = {
+    const params: any = {
         ...data,
         pointId,
     };
     loading.value = true;
-    const response = await writePoint(collectorId, [params]);
-    if (response.status === 200) {
-        emit('change', true);
-    }
+    const response = await writePoint(collectorId, [params]).catch(() => {});
+    emit('change', response?.status === 200);
     loading.value = false;
 };
 
-const handleOk = () => {
-    onSubmit();
-};
 const handleCancel = () => {
     emit('change', false);
 };
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 6320d2df..7018e109 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -1,11 +1,6 @@
 <template>
     <j-spin :spinning="spinning">
-        <j-advanced-search
-            :columns="columns"
-            target="search"
-            @search="handleSearch"
-        />
-
+        <pro-search :columns="columns" target="search" @search="handleSearch" />
         <j-pro-table
             ref="tableRef"
             model="CARD"
@@ -77,6 +72,16 @@
                         </template>
                     </j-dropdown>
                 </j-space>
+                <div
+                    v-if="data?.provider === 'OPC_UA'"
+                    style="margin-top: 15px"
+                >
+                    <j-checkbox
+                        v-model:checked="checkAll"
+                        @change="onCheckAllChange"
+                        >全选</j-checkbox
+                    >
+                </div>
             </template>
             <template #card="slotProps">
                 <PointCardBox
@@ -136,7 +141,6 @@
                                             }})
                                         </j-ellipsis>
                                     </div>
-
                                     <span v-else>--</span>
                                     <a
                                         v-if="
@@ -229,7 +233,6 @@ import {
     readPoint,
 } from '@/api/data-collect/collector';
 import { message } from 'ant-design-vue';
-import { useMenuStore } from 'store/menu';
 import PointCardBox from './components/PointCardBox/index.vue';
 import WritePoint from './components/WritePoint/index.vue';
 import BatchUpdate from './components/BatchUpdate/index.vue';
@@ -260,10 +263,10 @@ const visible = reactive({
     batchUpdate: false,
     scan: false,
 });
-const current = ref({});
+const current: any = ref({});
 const accessModesOption = ref();
 const _selectedRowKeys = ref<string[]>([]);
-
+const checkAll = ref(false);
 const spinning = ref(false);
 const collectorId = ref(props.data.id);
 
@@ -374,7 +377,7 @@ const handlAdd = () => {
         provider: props.data?.provider || 'MODBUS_TCP',
     };
 };
-const handlEdit = (data: Object) => {
+const handlEdit = (data: any) => {
     if (data?.provider === 'OPC_UA') {
         visible.saveOPCUA = true;
     } else {
@@ -382,12 +385,12 @@ const handlEdit = (data: Object) => {
     }
     current.value = cloneDeep(data);
 };
-const handlDelete = async (data: string | undefined = undefined) => {
+const handlDelete = async (id: string | undefined = undefined) => {
     spinning.value = true;
-    const res = !data
-        ? await batchDeletePoint(_selectedRowKeys.value)
-        : await removePoint(data as string);
-    if (res.status === 200) {
+    const res = !id
+        ? await batchDeletePoint(_selectedRowKeys.value).catch(() => {})
+        : await removePoint(id as string).catch(() => {});
+    if (res?.status === 200) {
         cancelSelect();
         tableRef.value?.reload();
         message.success('操作成功');
@@ -395,9 +398,13 @@ const handlDelete = async (data: string | undefined = undefined) => {
     spinning.value = false;
 };
 const handlBatchUpdate = () => {
+    if (_selectedRowKeys.value.length === 0) {
+        message.warn('请先选择');
+        return;
+    }
     const dataSet = new Set(_selectedRowKeys.value);
     const dataMap = new Map();
-    tableRef?.value?._dataSource.forEach((i) => {
+    tableRef?.value?._dataSource.forEach((i: any) => {
         dataSet.has(i.id) && dataMap.set(i.id, i);
     });
     current.value = [...dataMap.values()];
@@ -411,7 +418,7 @@ const clickEdit = async (data: object) => {
     visible.writePoint = true;
     current.value = cloneDeep(data);
 };
-const clickRedo = async (data: object) => {
+const clickRedo = async (data: any) => {
     const res = await readPoint(data?.collectorId, [data?.id]);
     if (res.status === 200) {
         cancelSelect();
@@ -436,14 +443,14 @@ const getRight1 = (item: Partial<Record<string, any>>) => {
     return !!getQuantity(item) || getAddress(item) || getScaleFactor(item);
 };
 const getText = (item: Partial<Record<string, any>>) => {
-    return (item?.accessModes || []).map((i) => i?.text).join(',');
+    return (item?.accessModes || []).map((i: any) => i?.text).join(',');
 };
 const getInterval = (item: Partial<Record<string, any>>) => {
     const { interval } = item.configuration || '';
     return !!interval ? '采集频率' + interval + 'ms' : '';
 };
 const getAccessModes = (item: Partial<Record<string, any>>) => {
-    return item?.accessModes?.map((i) => i?.value);
+    return item?.accessModes?.map((i: any) => i?.value);
 };
 
 const saveChange = (value: object) => {
@@ -470,8 +477,14 @@ const handleClick = (dt: any) => {
     if (_selectedRowKeys.value.includes(dt.id)) {
         const _index = _selectedRowKeys.value.findIndex((i) => i === dt.id);
         _selectedRowKeys.value.splice(_index, 1);
+        checkAll.value = false;
     } else {
         _selectedRowKeys.value = [..._selectedRowKeys.value, dt.id];
+        if (
+            _selectedRowKeys.value.length === tableRef.value?._dataSource.length
+        ) {
+            checkAll.value = true;
+        }
     }
 };
 
@@ -486,18 +499,39 @@ const subscribeProperty = (value: any) => {
     subRef.value = getWebSocket(id, topic, {
         pointId: list.join(','),
     })
-        ?.pipe(map((res) => res.payload))
+        ?.pipe(map((res: any) => res.payload))
         .subscribe((payload: any) => {
             propertyValue.value.set(payload.pointId, payload);
         });
 };
 
+const onCheckAllChange = (e: any) => {
+    if (e.target.checked) {
+        _selectedRowKeys.value = [
+            ...tableRef.value?._dataSource.map((i: any) => i.id),
+        ];
+    } else {
+        cancelSelect();
+        checkAll.value = false;
+    }
+};
+
 watch(
     () => tableRef?.value?._dataSource,
     (value) => {
         if (value.length !== 0) {
             subscribeProperty(value);
         }
+        cancelSelect();
+        checkAll.value = false;
+    },
+);
+watch(
+    () => _selectedRowKeys.value,
+    (value) => {
+        if (value.length === 0) {
+            checkAll.value = false;
+        }
     },
 );
 
@@ -506,7 +540,7 @@ watch(
     (value) => {
         if (!!value) {
             accessModesOption.value =
-                value.provider === 'MODBUS_TCP'
+                value?.provider === 'MODBUS_TCP'
                     ? accessModesMODBUS_TCP
                     : accessModesMODBUS_TCP.concat({
                           label: '订阅',
@@ -515,6 +549,7 @@ watch(
             defaultParams.value.terms[0].terms[0].value = value.id;
             tableRef?.value?.reload && tableRef?.value?.reload();
             cancelSelect();
+            checkAll.value = false;
         }
     },
     { immediate: true, deep: true },
@@ -557,10 +592,9 @@ const handleSearch = (e: any) => {
         font-size: 20px;
     }
     .card-box-content {
-        margin-top: 10px;
+        margin-top: 20px;
         display: flex;
         .card-box-content-left {
-            // flex: 0.2;
             max-width: 220px;
             border-right: 1px solid #e0e4e8;
             height: 68px;
@@ -574,8 +608,6 @@ const handleSearch = (e: any) => {
                     opacity: 0.85;
                 }
             }
-
-            // justify-content: space-between;
             a {
                 margin-left: 10px;
             }
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 94885efd..b821a575 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -11,8 +11,13 @@
             :model="formData"
             name="basic"
             autocomplete="off"
+            ref="formRef"
         >
-            <j-form-item label="所属通道" v-bind="validateInfos.channelId">
+            <j-form-item
+                label="所属通道"
+                name="channelId"
+                :rules="LeftTreeRules.channelId"
+            >
                 <j-select
                     style="width: 100%"
                     v-model:value="formData.channelId"
@@ -24,7 +29,11 @@
                     :disabled="!!id"
                 />
             </j-form-item>
-            <j-form-item label="采集器名称" v-bind="validateInfos.name">
+            <j-form-item
+                label="采集器名称"
+                name="name"
+                :rules="LeftTreeRules.name"
+            >
                 <j-input
                     placeholder="请输入采集器名称"
                     v-model:value="formData.name"
@@ -32,8 +41,9 @@
             </j-form-item>
             <j-form-item
                 label="从机地址"
-                v-bind="validateInfos['configuration.unitId']"
+                :name="['configuration', 'unitId']"
                 v-if="visibleUnitId"
+                :rules="LeftTreeRules.unitId"
             >
                 <j-input-number
                     style="width: 100%"
@@ -43,8 +53,10 @@
                     :max="255"
                 />
             </j-form-item>
-
-            <j-form-item v-bind="validateInfos['circuitBreaker.type']">
+            <j-form-item
+                :name="['circuitBreaker', 'type']"
+                :rules="LeftTreeRules.type"
+            >
                 <template #label>
                     <span>
                         故障处理
@@ -60,20 +72,21 @@
                         </j-tooltip>
                     </span>
                 </template>
-                <RadioCard
-                    layout="horizontal"
-                    :checkStyle="true"
+                <j-card-select
+                    :showImage="false"
+                    v-model:value="formData.circuitBreaker.type"
                     :options="[
                         { label: '降频', value: 'LowerFrequency' },
                         { label: '熔断', value: 'Break' },
                         { label: '忽略', value: 'Ignore' },
                     ]"
-                    v-model="formData.circuitBreaker.type"
+                    @change="changeCardSelectType"
                 />
             </j-form-item>
             <j-form-item
-                v-bind="validateInfos['configuration.endian']"
+                :name="['configuration', 'endian']"
                 v-if="visibleEndian"
+                :rules="LeftTreeRules.endian"
             >
                 <template #label>
                     <span>
@@ -86,17 +99,17 @@
                         </j-tooltip>
                     </span>
                 </template>
-                <RadioCard
-                    layout="horizontal"
-                    :checkStyle="true"
+                <j-card-select
+                    :showImage="false"
+                    v-model:value="formData.configuration.endian"
                     :options="[
                         { label: 'AB', value: 'BIG' },
                         { label: 'BA', value: 'LITTLE' },
                     ]"
-                    v-model="formData.configuration.endian"
+                    @change="changeCardSelectEndian"
                 />
             </j-form-item>
-            <j-form-item label="说明" v-bind="validateInfos.description">
+            <j-form-item label="说明" name="description">
                 <j-textarea
                     placeholder="请输入说明"
                     v-model:value="formData.description"
@@ -127,6 +140,9 @@
 import { Form } from 'ant-design-vue';
 import { save, update } from '@/api/data-collect/collector';
 import { Store } from 'jetlinks-store';
+import { cloneDeep } from 'lodash';
+import { LeftTreeRules } from '../../data';
+import type { FormInstance } from 'ant-design-vue';
 
 const loading = ref(false);
 const useForm = Form.useForm;
@@ -145,6 +161,7 @@ const props = defineProps({
 const emit = defineEmits(['change']);
 
 const id = props.data.id;
+const formRef = ref<FormInstance>();
 
 const formData = ref({
     channelId: undefined,
@@ -160,58 +177,26 @@ const formData = ref({
     description: '',
 });
 
-const regOnlyNumber = new RegExp(/^\d+$/);
+const handleOk = async () => {
+    const data = await formRef.value?.validate();
 
-const { resetFields, validate, validateInfos } = useForm(
-    formData,
-    reactive({
-        channelId: [
-            { required: true, message: '请选择所属通道', trigger: 'blur' },
-        ],
-        name: [
-            { required: true, message: '请输入采集器名称', trigger: 'blur' },
-            { max: 64, message: '最多可输入64个字符' },
-        ],
-        'configuration.unitId': [
-            { required: true, message: '请输入从机地址', trigger: 'blur' },
-            {
-                pattern: regOnlyNumber,
-                message: '请输入0-255之间的正整数',
-            },
-        ],
-        'circuitBreaker.type': [
-            { required: true, message: '请选择处理方式', trigger: 'blur' },
-        ],
-        'configuration.endian': [
-            { required: true, message: '请选择高低位切换', trigger: 'blur' },
-        ],
-        description: [{ max: 200, message: '最多可输入200个字符' }],
-    }),
-);
-const onSubmit = () => {
-    validate()
-        .then(async (res) => {
-            const { provider, name } = channelListAll.value.find(
-                (item) => item.id === formData.value.channelId,
-            );
-            const params = {
-                ...toRaw(formData.value),
-                provider,
-                channelName: name,
-            };
+    const { provider, name } = channelListAll.value.find(
+        (item: any) => item.id === formData.value.channelId,
+    );
+    const params = {
+        ...data,
+        provider,
+        channelName: name,
+    };
 
-            loading.value = true;
-            const response = !id
-                ? await save(params)
-                : await update(id, { ...props.data, ...params });
-            if (response.status === 200) {
-                emit('change', true);
-            }
-            loading.value = false;
-        })
-        .catch((err) => {
-            loading.value = false;
-        });
+    loading.value = true;
+    const response = !id
+        ? await save(params)
+        : await update(id, { ...props.data, ...params });
+    if (response.status === 200) {
+        emit('change', true);
+    }
+    loading.value = false;
 };
 
 const getTypeTooltip = (value: string) =>
@@ -221,13 +206,16 @@ const getTypeTooltip = (value: string) =>
         ? '连续10分钟异常，停止采集数据进入熔断状态，设备重新启用后恢复采集状态'
         : '忽略异常，保持原采集频率超时时间为5s';
 
-const handleOk = () => {
-    onSubmit();
-};
 const handleCancel = () => {
     emit('change', false);
 };
 
+const changeCardSelectType = (value: Array<string>) => {
+    formData.value.circuitBreaker.type = value[0];
+};
+const changeCardSelectEndian = (value: Array<string>) => {
+    formData.value.configuration.endian = value[0];
+};
 const getChannelNoPaging = async () => {
     channelListAll.value = Store.get('channelListAll');
     channelList.value = channelListAll.value.map((item) => ({
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index ce1c8b67..f0e87011 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -20,12 +20,13 @@
             </PermissionButton>
         </div>
         <j-spin :spinning="spinning">
-            <a-tree
+            <j-tree
                 :tree-data="defualtDataSource"
                 v-model:selected-keys="selectedKeys"
                 :fieldNames="{ key: 'id' }"
                 v-if="defualtDataSource[0].children.length !== 0"
                 :height="600"
+                defaultExpandAll
             >
                 <template #title="{ name, data }">
                     <Ellipsis class="tree-left-title">
@@ -90,7 +91,7 @@
                         </PermissionButton>
                     </span>
                 </template>
-            </a-tree>
+            </j-tree>
             <j-empty v-else description="暂无数据" />
         </j-spin>
         <Save v-if="visible" :data="current" @change="saveChange" />
@@ -121,13 +122,13 @@ const emits = defineEmits(['change']);
 const route = useRoute();
 const channelId = route.query?.channelId;
 const spinning = ref(false);
-const selectedKeys = ref([]);
+const selectedKeys: any = ref([]);
 const searchValue = ref();
 const visible = ref(false);
 const current = ref({});
 const collectorAll = ref();
 
-const defualtDataSource = ref([
+const defualtDataSource: any = ref([
     {
         id: '*',
         name: '全部',
@@ -164,7 +165,7 @@ const handlEdit = (data: object) => {
     visible.value = true;
 };
 
-const handlUpdate = async (data: object) => {
+const handlUpdate = async (data: any) => {
     const state = data?.state?.value;
     const resp = await update(data?.id, {
         state: state !== 'disabled' ? 'disabled' : 'enabled',
@@ -210,7 +211,7 @@ const handleSearch = async (value: string) => {
         !!value && (params.value = value);
     }
     spinning.value = true;
-    const res = await queryCollector(params.value);
+    const res: any = await queryCollector(params.value);
     if (res.status === 200) {
         defualtDataSource.value[0].children = res.result;
         collectorAll.value = res.result;
@@ -232,11 +233,14 @@ onMounted(() => {
     getChannelNoPaging();
 });
 
-watch(selectedKeys, (n) => {
-    const key = _.isArray(n) ? n[0] : n;
-    const row = collectorAll.value.find((i) => i.id === key);
-    emits('change', row);
-});
+watch(
+    () => selectedKeys.value,
+    (n) => {
+        const key = _.isArray(n) ? n[0] : n;
+        const row = collectorAll.value.find((i: any) => i.id === key);
+        emits('change', row);
+    },
+);
 
 watch(
     () => searchValue.value,
@@ -249,7 +253,7 @@ watch(
 <style lang="less" scoped>
 .tree-container {
     padding-right: 24px;
-
+    width: 300px;
     .add-btn {
         margin: 10px 0;
 
diff --git a/src/views/DataCollect/Collector/data.ts b/src/views/DataCollect/Collector/data.ts
index b349f2a1..7d0cd214 100644
--- a/src/views/DataCollect/Collector/data.ts
+++ b/src/views/DataCollect/Collector/data.ts
@@ -17,7 +17,7 @@ export const getState = (record: any) => {
     }
 };
 
-const regOnlyNumber = new RegExp(/^\d+$/);
+export const regOnlyNumber = new RegExp(/^\d+$/);
 
 export const checkProviderData = {
     int8: 1,
@@ -93,7 +93,7 @@ export const ModBusRules = {
     byteCount: [
         {
             required: true,
-            message: '请输入自定义数据区长度（byte）',
+            message: '请输入自定义数据区长度(byte)',
         },
     ],
     interval: [
@@ -101,6 +101,10 @@ export const ModBusRules = {
             required: true,
             message: '请输入采集频率',
         },
+        {
+            pattern: regOnlyNumber,
+            message: '请输入0或者正整数',
+        },
     ],
 
     description: [{ max: 200, message: '最多可输入200个字符' }],
@@ -134,10 +138,31 @@ export const OPCUARules = {
             required: true,
             message: '请输入采集频率',
         },
+        {
+            pattern: regOnlyNumber,
+            message: '请输入0或者正整数',
+        },
     ],
     description: [{ max: 200, message: '最多可输入200个字符' }],
 };
 
+export const LeftTreeRules = {
+    channelId: [{ required: true, message: '请选择所属通道', trigger: 'blur' }],
+    name: [
+        { required: true, message: '请输入采集器名称', trigger: 'blur' },
+        { max: 64, message: '最多可输入64个字符' },
+    ],
+    unitId: [
+        { required: true, message: '请输入从机地址', trigger: 'blur' },
+        {
+            pattern: regOnlyNumber,
+            message: '请输入0-255之间的正整数',
+        },
+    ],
+    type: [{ required: true, message: '请选择处理方式', trigger: 'blur' }],
+    endian: [{ required: true, message: '请选择高低位切换', trigger: 'blur' }],
+};
+
 export const FormTableColumns = [
     {
         title: '名称',
@@ -162,7 +187,7 @@ export const FormTableColumns = [
         title: '采集频率',
         key: 'interval',
         dataIndex: 'interval',
-        width: 280,
+        width: 260,
     },
     {
         title: '只推送变化的数据',
diff --git a/src/views/DataCollect/Collector/index.vue b/src/views/DataCollect/Collector/index.vue
index 993fbf1f..f15da240 100644
--- a/src/views/DataCollect/Collector/index.vue
+++ b/src/views/DataCollect/Collector/index.vue
@@ -5,7 +5,10 @@
                 <Tree @change="changeTree" />
             </div>
             <div class="right">
-                <Point v-if="!!data" :data="data" />
+                <j-spin :spinning="spinning">
+                    <Point v-if="!!data" :data="data" />
+                    <j-empty style="margin-top: 20%" v-else />
+                </j-spin>
             </div>
         </div>
     </page-container>
@@ -16,9 +19,11 @@ import Tree from './Tree/index.vue';
 import Point from './Point/index.vue';
 
 const data = ref();
+const spinning = ref(true);
 
 const changeTree = (row: any) => {
     data.value = row;
+    spinning.value = false;
 };
 </script>
 
@@ -29,6 +34,7 @@ const changeTree = (row: any) => {
     padding: 14px;
     display: flex;
     min-height: calc(100vh - 180px);
+    width: 100%;
     .left {
         width: 300px;
         border-right: 1px #eeeeee solid;
diff --git a/src/views/DataCollect/Dashboard/components/Card.vue b/src/views/DataCollect/Dashboard/components/Card.vue
index 0576fda8..b317d297 100644
--- a/src/views/DataCollect/Dashboard/components/Card.vue
+++ b/src/views/DataCollect/Dashboard/components/Card.vue
@@ -7,7 +7,6 @@
                 </div>
                 <div class="right">
                     <j-radio-group
-                        default-value="a"
                         button-style="solid"
                         style="margin-right: 10px"
                         v-model:value="data.time.type"
@@ -31,9 +30,7 @@
                     </j-range-picker>
                 </div>
             </div>
-            <div>
-                <div ref="chartRef" style="width: 100%; height: 350px"></div>
-            </div>
+            <div ref="chartRef" style="width: 100%; height: 350px"></div>
         </div>
     </j-spin>
 </template>
@@ -63,9 +60,9 @@ const pickerTimeChange = (
     data.value.time.type = undefined;
 };
 
-const getEcharts = async (val) => {
+const getEcharts = async (val: any) => {
     loading.value = true;
-    const resp = await dashboard(pointParams(val));
+    const resp: any = await dashboard(pointParams(val));
     if (resp.success) {
         const x = resp.result
             .map((item: any) => item.data.timeString)
@@ -79,7 +76,7 @@ const getEcharts = async (val) => {
 };
 
 const handleOptions = (x = [], y = []) => {
-    const chart = chartRef.value;
+    const chart: any = chartRef.value;
     if (chart) {
         const myChart = echarts.init(chart);
         const options = {
@@ -117,7 +114,7 @@ const handleOptions = (x = [], y = []) => {
 watch(
     () => data.value.time.type,
     (value) => {
-        data.value.time.end = Date.parse(new Date());
+        data.value.time.end = Date.parse(Date());
         data.value.time.start = Date.parse(getTimeByType(value));
     },
     { immediate: true, deep: true },
diff --git a/src/views/DataCollect/Dashboard/components/TopCard.vue b/src/views/DataCollect/Dashboard/components/TopCard.vue
index 19dddd92..4f84aaed 100644
--- a/src/views/DataCollect/Dashboard/components/TopCard.vue
+++ b/src/views/DataCollect/Dashboard/components/TopCard.vue
@@ -44,7 +44,6 @@ const props = defineProps({
 .top-card {
     display: flex;
     flex-direction: column;
-    // height: 200px;
     padding: 24px;
     background-color: #fff;
     border: 1px solid #e0e4e8;
diff --git a/src/views/DataCollect/Dashboard/index.vue b/src/views/DataCollect/Dashboard/index.vue
index 34ee3454..16db78a9 100644
--- a/src/views/DataCollect/Dashboard/index.vue
+++ b/src/views/DataCollect/Dashboard/index.vue
@@ -28,11 +28,11 @@ import { queryCount } from '@/api/data-collect/dashboard';
 import { defaultParams, statusData } from './tool';
 
 const getNumberData = () => {
-    statusData.value.forEach(async (item) => {
+    statusData.forEach(async (item: any) => {
         const res = await queryCount(item[0].type, {});
         const resp = await queryCount(item[0].type, defaultParams);
-        item[0].total = res.result || 0;
-        item[0].value = resp.result || 0;
+        item[0].total = res?.result || 0;
+        item[0].value = resp?.result || 0;
     });
 };
 getNumberData();
diff --git a/src/views/DataCollect/Dashboard/tool.ts b/src/views/DataCollect/Dashboard/tool.ts
index 076c6947..727e1fc4 100644
--- a/src/views/DataCollect/Dashboard/tool.ts
+++ b/src/views/DataCollect/Dashboard/tool.ts
@@ -1,5 +1,4 @@
 import moment from 'moment';
-import * as echarts from 'echarts';
 
 const getParams = (dt: any) => {
     switch (dt.type) {
@@ -54,7 +53,7 @@ const getParams = (dt: any) => {
     }
 };
 
-export const getTimeByType = (type) => {
+export const getTimeByType = (type: string) => {
     switch (type) {
         case 'hour':
             return moment().subtract(1, 'hours');
@@ -69,7 +68,7 @@ export const getTimeByType = (type) => {
     }
 };
 
-export const pointParams = (data) => [
+export const pointParams = (data: any) => [
     {
         dashboard: 'collector',
         object: 'pointData',
@@ -121,7 +120,7 @@ export const defaultParams = {
     ],
 };
 
-export const statusData = ref([
+export const statusData = [
     [
         {
             type: 'channel',
@@ -152,4 +151,4 @@ export const statusData = ref([
             total: 0,
         },
     ],
-]);
+];
diff --git a/src/views/DataCollect/Dashboard/typings.d.ts b/src/views/DataCollect/Dashboard/typings.d.ts
index dd0a9484..47430475 100644
--- a/src/views/DataCollect/Dashboard/typings.d.ts
+++ b/src/views/DataCollect/Dashboard/typings.d.ts
@@ -1,13 +1,3 @@
-export type Agg = {
-    duration: number;
-    total: number;
-};
-
-export type AggPlaying = {
-    playerTotal: number;
-    playingTotal: number;
-};
-
 export type Footer = {
     title: string;
     value: number | string;
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index 77435ded..03020c95 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -62,7 +62,7 @@
     </page-container>
 </template>
 <script lang="ts" setup name="FirmwarePage">
-import type { ActionsType } from '@/components/Table/index.vue';
+import type { ActionsType } from '@/components/Table/index';
 import { query, queryProduct, remove } from '@/api/device/firmware';
 import { message } from 'ant-design-vue';
 import moment from 'moment';
diff --git a/src/views/media/Stream/index.vue b/src/views/media/Stream/index.vue
index 769c973f..6148648d 100644
--- a/src/views/media/Stream/index.vue
+++ b/src/views/media/Stream/index.vue
@@ -137,7 +137,7 @@
     </page-container>
 </template>
 <script lang="ts" setup name="StreamPage">
-import type { ActionsType } from '@/components/Table/index.vue';
+import type { ActionsType } from '@/components/Table/index';
 import { getImage } from '@/utils/comm';
 import { query, remove, disable, enalbe } from '@/api/media/stream';
 import { message } from 'ant-design-vue';