Commit 9e064ce07d1ad7833479cfa900608abe2286e060

Authored by fengwotao
1 parent 61286ec0

fix: DEFECT-1246 数据流转中,选择产品和设备时,设备回显错误

... ... @@ -8,10 +8,21 @@ VITE_GLOB_PUBLIC_PATH = /
8 8 # Please note that no line breaks
9 9
10 10 # 本地
11   -VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
  11 +# VITE_PROXY = [["/api","http://localhost:8080/api"]]
  12 +
  13 +# 线上演示环境
  14 +# VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
  15 +# 线上测试环境
  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/"],["/large-designer", "http://localhost:5555/large-designer/"]]
  18 +# VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
  19 +# VITE_PROXY = [["/api","http://192.168.10.114:8080/api"],["/thingskit-drawio","http://192.168.10.125:8080/api"],["/large-designer", "http://localhost:5555/large-designer/"]]
12 20
13 21 # 实时数据的ws地址
14   -VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
  22 +# VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
  23 +# VITE_WEB_SOCKET = ws://44.99.141.212:8080/api/ws/plugins/telemetry?token=
  24 +VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:48080/api/ws/plugins/telemetry?token=
  25 +# VITE_WEB_SOCKET = ws://121.37.251.8:8080/api/ws/plugins/telemetry?token=
15 26
16 27 # Delete console
17 28 VITE_GLOB_DROP_CONSOLE = true
... ... @@ -26,7 +37,7 @@ VITE_GLOB_UPLOAD_URL=/api/yt/oss/upload
26 37 VITE_GLOB_API_URL_PREFIX=/yt
27 38
28 39 #configuration
29   -VITE_GLOB_CONFIGURATION = /thingskit-scada
  40 +VITE_GLOB_CONFIGURATION = /thingskit-drawio
30 41
31 42 # 大屏设计器
32 43 VITE_GLOB_LARGE_DESIGNER = /large-designer
... ...
... ... @@ -408,7 +408,7 @@
408 408 :key="item.value"
409 409 >
410 410 <span>
411   - {{ item.label }}
  411 + {{ item.alias + '/' + item.name }}
412 412 </span>
413 413 </Tag>
414 414 <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">
... ...
... ... @@ -123,10 +123,10 @@ const deviceTableColumn: BasicColumn[] = [
123 123 {
124 124 title: '设备名称/设备SN',
125 125 dataIndex: 'name',
126   - customRender: ({ text, record }) => {
  126 + customRender: ({ record }) => {
127 127 return h('div', [
128   - h('div', text),
129   - h('div', { class: 'text-blue-400 truncate', title: record.sn }, record.sn),
  128 + h('div', `${record.alias}/${record.name}`),
  129 + // h('div', { class: 'text-blue-400 truncate', title: record.sn }, record.sn),
130 130 ]);
131 131 },
132 132 },
... ...