Merge branch 'main' into ft_local_dev

@@ -14,9 +14,9 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-# VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
+# VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
 
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -230,7 +230,7 @@
                 <Dropdown
                   :dropMenuList="[
                     {
-                      text: '设计',
+                      text: '编辑',
                       auth: 'api:yt:configuration:center:update',
                       icon: 'clarity:note-edit-line',
                       onClick: handleCreateOrUpdate.bind(null, item),

@@ -219,7 +219,6 @@
       });
       send(sendValue);
       send(sendValue1);
-      console.log('建立连接了');
     },
     onMessage(_, e) {
       const { data, update } = JSON.parse(e.data);
@@ -471,14 +470,17 @@
     justify-content: center;
     font-size: 16px;
   }
+
   .active {
     color: #0960bd;
     font-weight: 500;
   }
+
   .extra-date {
     display: flex;
     align-items: center;
     justify-content: space-between;
+
     span {
       margin-right: 20px;
       cursor: pointer;

@@ -63,7 +63,6 @@
   watch(
     () => props.alarmList,
     (newValue) => {
-      console.log({ newValue, props });
       let alarmTotal = 0;
       for (const item of props.alarmList) {
         alarmTotal += Number(item[1]);

@@ -49,6 +49,12 @@ export const step1Schemas: FormSchema[] = [
     show: false,
   },
   {
+    field: 'deviceProfileId',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: 'profileId',
     label: '所属产品',
     required: true,
@@ -59,9 +65,12 @@ export const step1Schemas: FormSchema[] = [
         api: deviceProfile,
         labelField: 'name',
         valueField: 'tbProfileId',
-        onChange(_value: string, option: { deviceType: string; transportType: string }) {
-          const { deviceType, transportType } = option;
-          setFieldsValue({ deviceType: deviceType, transportType });
+        onChange(
+          _value: string,
+          option: { deviceType: string; transportType: string; id: string }
+        ) {
+          const { deviceType, transportType, id } = option;
+          setFieldsValue({ deviceType: deviceType, transportType, deviceProfileId: id });
         },
       };
     },

@@ -32,7 +32,7 @@
   }
 
   const props = defineProps<{
-    deviceDetail: Record<'tbDeviceId' | 'profileId' | 'id', string>;
+    deviceDetail: Record<'tbDeviceId' | 'profileId' | 'id' | 'deviceProfileId', string>;
   }>();
 
   const grid = {
@@ -137,8 +137,8 @@
 
   const { send, close, data } = useWebSocket(socketInfo.origin, {
     async onConnected() {
-      const { id, profileId } = props.deviceDetail;
-      const value = await getDeviceAttrs(profileId, id);
+      const { id, deviceProfileId } = props.deviceDetail;
+      const value = await getDeviceAttrs(deviceProfileId, id);
       socketInfo.attrKeys = value;
       send(JSON.stringify(unref(getSendValue)));
     },

@@ -28,7 +28,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'profileId',
+    field: 'deviceProfileId',
     label: '',
     component: 'ApiSelect',
     componentProps: {

@@ -13,6 +13,9 @@
           <div class="absolute w-full h-full top-0 cursor-not-allowed"></div>
         </div>
       </Tabs.TabPane>
+      <Tabs.TabPane key="topic" tab="Topic">
+        <TopicPanel />
+      </Tabs.TabPane>
       <Tabs.TabPane key="modelOfMatter" tab="物模型管理">
         <PhysicalModelManagementStep :record="record" />
       </Tabs.TabPane>
@@ -28,10 +31,11 @@
   import { ref, unref } from 'vue';
   import { deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import TopicPanel from './step/TopicPanel.vue';
 
   defineEmits(['register']);
 
-  type ActiveKey = 'product' | 'transport' | 'modelOfMatter';
+  type ActiveKey = 'product' | 'transport' | 'modelOfMatter' | 'topic';
 
   const activeKey = ref<ActiveKey>('modelOfMatter');
 

@@ -439,3 +439,26 @@ export const formSchema: FormSchema[] = [
     },
   },
 ];
+
+export const topicTableColumn: BasicColumn[] = [
+  {
+    title: '功能',
+    dataIndex: 'function',
+    width: 100,
+  },
+  {
+    title: 'Topic类',
+    dataIndex: 'class',
+    width: 100,
+  },
+  {
+    title: '操作权限',
+    dataIndex: 'access',
+    width: 100,
+  },
+  {
+    title: '描述',
+    dataIndex: 'description',
+    width: 100,
+  },
+];

+<script lang="ts" setup>
+  import { topicTableColumn } from '../device.profile.data';
+  import { BasicTable, useTable } from '/@/components/Table';
+  const [register] = useTable({
+    title: 'Topic',
+    columns: topicTableColumn,
+    bordered: true,
+    showTableSetting: true,
+  });
+</script>
+
+<template>
+  <section class="bg-gray-100 p-4 dark:bg-dark-900 w-full h-full">
+    <BasicTable @register="register" />
+  </section>
+</template>