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

@@ -8,10 +8,21 @@ VITE_GLOB_PUBLIC_PATH = /
 # Please note that no line breaks
 # Please note that no line breaks
 
 
 # 本地
 # 本地
-VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
+# VITE_PROXY = [["/api","http://localhost:8080/api"]]
+
+# 线上演示环境
+# 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/"],["/large-designer", "http://localhost:5555/large-designer/"]]
+# VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# 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/"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
+# VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
+# VITE_WEB_SOCKET = ws://44.99.141.212:8080/api/ws/plugins/telemetry?token=
+VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:48080/api/ws/plugins/telemetry?token=
+# VITE_WEB_SOCKET = ws://121.37.251.8:8080/api/ws/plugins/telemetry?token=
 
 
 # Delete console
 # Delete console
 VITE_GLOB_DROP_CONSOLE = true
 VITE_GLOB_DROP_CONSOLE = true
@@ -26,7 +37,7 @@ VITE_GLOB_UPLOAD_URL=/api/yt/oss/upload
 VITE_GLOB_API_URL_PREFIX=/yt
 VITE_GLOB_API_URL_PREFIX=/yt
 
 
 #configuration
 #configuration
-VITE_GLOB_CONFIGURATION = /thingskit-scada
+VITE_GLOB_CONFIGURATION = /thingskit-drawio
 
 
 # 大屏设计器
 # 大屏设计器
 VITE_GLOB_LARGE_DESIGNER = /large-designer
 VITE_GLOB_LARGE_DESIGNER = /large-designer

@@ -408,7 +408,7 @@
           :key="item.value"
           :key="item.value"
         >
         >
           <span>
           <span>
-            {{ item.label }}
+            {{ item.alias + '/' + item.name }}
           </span>
           </span>
         </Tag>
         </Tag>
         <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">
         <Tag class="!px-2 !py-1 !bg-gray-50 !border-gray-100" v-if="getSurplusOptionsLength">

@@ -123,10 +123,10 @@ const deviceTableColumn: BasicColumn[] = [
   {
   {
     title: '设备名称/设备SN',
     title: '设备名称/设备SN',
     dataIndex: 'name',
     dataIndex: 'name',
-    customRender: ({ text, record }) => {
+    customRender: ({ record }) => {
       return h('div', [
       return h('div', [
-        h('div', text),
-        h('div', { class: 'text-blue-400 truncate', title: record.sn }, record.sn),
+        h('div', `${record.alias}/${record.name}`),
+        // h('div', { class: 'text-blue-400 truncate', title: record.sn }, record.sn),
       ]);
       ]);
     },
     },
   },
   },