Commit 8df058963b1b38bec5b9f95c98d3d01e8fb5fb49

Authored by ww
1 parent 6c8c6634

fix: DEFECT-870 configruation center button name repeat

... ... @@ -14,9 +14,9 @@ VITE_PUBLIC_PATH = /
14 14 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
15 15 # 线上测试环境
16 16 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
17   -# VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
  17 +VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
18 18 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
19   -VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
  19 +# VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
20 20
21 21 # 实时数据的ws地址
22 22 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
... ...
... ... @@ -230,7 +230,7 @@
230 230 <Dropdown
231 231 :dropMenuList="[
232 232 {
233   - text: '设计',
  233 + text: '编辑',
234 234 auth: 'api:yt:configuration:center:update',
235 235 icon: 'clarity:note-edit-line',
236 236 onClick: handleCreateOrUpdate.bind(null, item),
... ...
... ... @@ -219,7 +219,6 @@
219 219 });
220 220 send(sendValue);
221 221 send(sendValue1);
222   - console.log('建立连接了');
223 222 },
224 223 onMessage(_, e) {
225 224 const { data, update } = JSON.parse(e.data);
... ... @@ -471,14 +470,17 @@
471 470 justify-content: center;
472 471 font-size: 16px;
473 472 }
  473 +
474 474 .active {
475 475 color: #0960bd;
476 476 font-weight: 500;
477 477 }
  478 +
478 479 .extra-date {
479 480 display: flex;
480 481 align-items: center;
481 482 justify-content: space-between;
  483 +
482 484 span {
483 485 margin-right: 20px;
484 486 cursor: pointer;
... ...
... ... @@ -63,7 +63,6 @@
63 63 watch(
64 64 () => props.alarmList,
65 65 (newValue) => {
66   - console.log({ newValue, props });
67 66 let alarmTotal = 0;
68 67 for (const item of props.alarmList) {
69 68 alarmTotal += Number(item[1]);
... ...
... ... @@ -13,6 +13,9 @@
13 13 <div class="absolute w-full h-full top-0 cursor-not-allowed"></div>
14 14 </div>
15 15 </Tabs.TabPane>
  16 + <Tabs.TabPane key="topic" tab="Topic">
  17 + <TopicPanel />
  18 + </Tabs.TabPane>
16 19 <Tabs.TabPane key="modelOfMatter" tab="物模型管理">
17 20 <PhysicalModelManagementStep :record="record" />
18 21 </Tabs.TabPane>
... ... @@ -28,10 +31,11 @@
28 31 import { ref, unref } from 'vue';
29 32 import { deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
30 33 import { DeviceRecord } from '/@/api/device/model/deviceModel';
  34 + import TopicPanel from './step/TopicPanel.vue';
31 35
32 36 defineEmits(['register']);
33 37
34   - type ActiveKey = 'product' | 'transport' | 'modelOfMatter';
  38 + type ActiveKey = 'product' | 'transport' | 'modelOfMatter' | 'topic';
35 39
36 40 const activeKey = ref<ActiveKey>('modelOfMatter');
37 41
... ...
... ... @@ -439,3 +439,26 @@ export const formSchema: FormSchema[] = [
439 439 },
440 440 },
441 441 ];
  442 +
  443 +export const topicTableColumn: BasicColumn[] = [
  444 + {
  445 + title: '功能',
  446 + dataIndex: 'function',
  447 + width: 100,
  448 + },
  449 + {
  450 + title: 'Topic类',
  451 + dataIndex: 'class',
  452 + width: 100,
  453 + },
  454 + {
  455 + title: '操作权限',
  456 + dataIndex: 'access',
  457 + width: 100,
  458 + },
  459 + {
  460 + title: '描述',
  461 + dataIndex: 'description',
  462 + width: 100,
  463 + },
  464 +];
... ...
  1 +<script lang="ts" setup>
  2 + import { topicTableColumn } from '../device.profile.data';
  3 + import { BasicTable, useTable } from '/@/components/Table';
  4 + const [register] = useTable({
  5 + title: 'Topic',
  6 + columns: topicTableColumn,
  7 + bordered: true,
  8 + showTableSetting: true,
  9 + });
  10 +</script>
  11 +
  12 +<template>
  13 + <section class="bg-gray-100 p-4 dark:bg-dark-900 w-full h-full">
  14 + <BasicTable @register="register" />
  15 + </section>
  16 +</template>
... ...