diff --git a/rts-sim-testing-message b/rts-sim-testing-message
index b84f16b..f232ff6 160000
--- a/rts-sim-testing-message
+++ b/rts-sim-testing-message
@@ -1 +1 @@
-Subproject commit b84f16bc347d346c7a42b6152386457af53e090b
+Subproject commit f232ff605d44f4c989a823f2416215e4c3bb60b9
diff --git a/src/components/draw-app/dialogs/LianSuoBianHao.vue b/src/components/draw-app/dialogs/LianSuoBianHao.vue
new file mode 100644
index 0000000..f6eb861
--- /dev/null
+++ b/src/components/draw-app/dialogs/LianSuoBianHao.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts
index b5dfc18..32b1e1f 100644
--- a/src/configs/UrlManage.ts
+++ b/src/configs/UrlManage.ts
@@ -5,10 +5,10 @@ function getHost(): string {
return 'joylink.club/bjrtsts-server';
} else if (process.env.URL_ENV == 'local_test') {
return '192.168.33.233:9091';
- }else if(process.env.URL_ENV == 'local_pxf'){
+ } else if (process.env.URL_ENV == 'local_pxf') {
//北京现场
- return '172.29.5.168/bjrtss-server'
+ return '172.29.5.168/bjrtss-server';
}
// return '192.168.3.7:9091';
@@ -18,7 +18,7 @@ function getHost(): string {
// return '192.168.33.93:9091';
// return '192.168.3.37:9091'; //卫志宏
// return 'test.joylink.club/bjrtsts-service'; // 测试
- return '127.0.0.1:9091';
+ return '192.168.33.233:9091';
}
export function getHttpBase() {
@@ -31,7 +31,7 @@ export function getHttpBase() {
export function getWebsocketUrl() {
let protocol = 'ws';
- let host = '127.0.0.1';
+ let host = '192.168.33.233:9091';
// let host = 'test.joylink.club';
let port = '8083';
let url = `${protocol}://${host}:${port}`;
diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index be29fca..4e620b7 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -248,6 +248,7 @@ import { CategoryType } from 'src/components/CategoryType';
import { graphicData } from 'src/protos/stationLayoutGraphics';
import KilometerConvertList from 'src/components/draw-app/dialogs/KilometerConvertList.vue';
import LoadTransponderData from 'src/components/draw-app/dialogs/LoadTransponderData.vue';
+import LianSuoBianHao from 'src/components/draw-app/dialogs/LianSuoBianHao.vue';
import KilometerConvertConfig from 'src/components/draw-app/properties/KilometerConvertConfig.vue';
import SectionCodePointList from 'src/components/draw-app/dialogs/SectionCodePointList.vue';
import SectionCodePointConfig from 'src/components/draw-app/properties/SectionCodePointConfig.vue';
@@ -409,6 +410,10 @@ const dataManageConfig = [
label: '导入应答器报文',
click: uploadTransponderMessage,
},
+ {
+ label: '联锁编号映射数据',
+ click: lianSuoBianHao,
+ },
];
onMounted(() => {
@@ -1169,6 +1174,18 @@ function uploadTransponderMessage() {
});
}
+let lianSuoBianHaoDialog: DialogChainObject | null = null;
+function lianSuoBianHao() {
+ if (lianSuoBianHaoDialog) return;
+ lianSuoBianHaoDialog = $q
+ .dialog({
+ component: LianSuoBianHao,
+ })
+ .onCancel(() => {
+ lianSuoBianHaoDialog = null;
+ });
+}
+
let relateDeviceDialogInstance: DialogChainObject | null = null;
const relateDeviceConfigEdit =
ref>();