joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: joylink:master
Branches Tags
joylink:master
joylink:develop
joylink:local-test
joylink:test
joylink:zhengxiong
joylink:tes_0308
joylink:thailand
joylink:test_client
joylink:test_revert5.6
joylink:test-newChat
joylink:test_dispaly
joylink:test_0110
joylink:master_0109
joylink:test_eg2d
joylink:test_switch
joylink:test_conflictRoute
joylink:test_initData
joylink:test_thirdLogin
joylink:iscs
joylink:3dtest
...
pull from: joylink:local-test
Branches Tags
joylink:develop
joylink:local-test
joylink:master
joylink:test
joylink:zhengxiong
joylink:tes_0308
joylink:thailand
joylink:test_client
joylink:test_revert5.6
joylink:test-newChat
joylink:test_dispaly
joylink:test_0110
joylink:master_0109
joylink:test_eg2d
joylink:test_switch
joylink:test_conflictRoute
joylink:test_initData
joylink:test_thirdLogin
joylink:iscs
joylink:3dtest

38 Commits
master ... local-test

Author SHA1 Message Date
joylink_fanyuhong
b8175b0d7c Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 9m22s
Details
2024-10-12 17:39:11 +08:00
joylink_fanyuhong
c8a49e3d31 新增线路配置项 2024-10-12 17:38:30 +08:00
joylink_fanyuhong
92a782de6b 画面管理处理设备map为空
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 9m49s
Details
2024-09-29 14:07:51 +08:00
joylink_fanyuhong
447a0e589c 成都三号线折返进路办理调整
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 2m35s
Details
2024-09-29 11:12:15 +08:00
joylink_fanyuhong
a2928a50b8 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 6m48s
Details
2024-09-27 11:04:34 +08:00
joylink_fanyuhong
17f6234b1f Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m24s
Details
2024-09-26 19:49:17 +08:00
joylink_fanyuhong
b2ffd068ea Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 8m1s
Details
2024-09-24 13:12:42 +08:00
joylink_fanyuhong
e2e7e9d564 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 7m40s
Details
2024-09-24 10:59:32 +08:00
joylink_fanyuhong
9a0c8e5794 实训测验统计得分调整
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m0s
Details
2024-09-18 13:59:05 +08:00
joylink_fanyuhong
a556f17312 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 10m14s
Details
2024-09-18 13:30:56 +08:00
joylink_fanyuhong
a192c71555 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 10m48s
Details
2024-09-14 13:50:57 +08:00
joylink_fanyuhong
47a0eceebb Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 10m57s
Details
2024-09-14 11:30:53 +08:00
joylink_fanyuhong
a3afdc027d Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 10m29s
Details
2024-09-11 13:45:09 +08:00
joylink_fanyuhong
7091605874 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 9m24s
Details
2024-09-11 11:18:45 +08:00
joylink_fanyuhong
41aaef0586 成工院大铁标准线实训测验模式结束后弹出的结果优化
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 6m56s
Details
2024-09-11 09:33:02 +08:00
joylink_fanyuhong
b85e8c0074 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m36s
Details
2024-09-10 16:21:30 +08:00
joylink_fanyuhong
0212e1af47 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 3m46s
Details
2024-09-10 12:15:53 +08:00
joylink_fanyuhong
f6d4cfb665 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m8s
Details
2024-09-10 10:38:22 +08:00
joylink_fanyuhong
bb4d6ef7e9 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 14m47s
Details
2024-08-20 15:17:57 +08:00
joylink_fanyuhong
3590705238 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 9m45s
Details
2024-08-16 23:09:55 +08:00
joylink_fanyuhong
4a424cfb7f Merge branch 'develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m36s
Details
2024-08-15 15:37:10 +08:00
joylink_fanyuhong
26301345e7 Revert "成都工院统计页面"
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 12m41s
Details 
This reverts commit 399fb47f
 2024-08-15 13:37:23 +08:00
joylink_fanyuhong
399fb47f67 成都工院统计页面
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Has been cancelled
Details
2024-08-15 13:34:38 +08:00
joylink_fanyuhong
25f94a4a57 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 3m5s
Details
2024-06-28 14:04:50 +08:00
joylink_fanyuhong
d2e6fe2d52 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m49s
Details
2024-06-25 10:02:50 +08:00
joylink_fanyuhong
74b08651a2 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 6m59s
Details
2024-06-18 15:37:41 +08:00
joylink_fanyuhong
1909e9397c 成都工业学院登录调整
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 4m2s
Details
2024-06-04 11:14:54 +08:00
joylink_zhaoerwei
1b0ddc2740 Squashed commit of the following:
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m33s
Details 
commit cef55a4c6b
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 17:09:01 2024 +0800

    三维url调整

commit 869c86b94d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 16:57:01 2024 +0800

    更改三维地址

commit dc2165733e
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 16:33:48 2024 +0800

    场景添加三维场景，实训中可根据url打开三维场景（待测试）
 2024-05-27 17:39:39 +08:00
joylink_fanyuhong
7d774db362 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m20s
Details
2024-05-21 16:48:35 +08:00
joylink_fanyuhong
b66515ebad Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 2m37s
Details
2024-04-24 11:01:32 +08:00
joylink_fanyuhong
5cf57c4d2f Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m14s
Details
2024-04-22 17:16:40 +08:00
joylink_fanyuhong
5ca4f2be8d Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m24s
Details
2024-04-22 16:10:23 +08:00
joylink_fanyuhong
66a3762987 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 4m58s
Details
2024-04-22 15:53:54 +08:00
joylink_fanyuhong
9dab09e4d0 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m1s
Details
2024-04-22 09:33:42 +08:00
joylink_fanyuhong
b8f90509eb Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 4m9s
Details
2024-04-21 17:51:33 +08:00
joylink_fanyuhong
26d9cc892f Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 12m39s
Details
2024-04-19 22:27:07 +08:00
fan
ce8d3f4531 iscs退出仿真调整&iscs绘制地图调整
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Has been cancelled
Details
2024-04-19 22:25:43 +08:00
fan
98662ec177 实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m17s
Details
2024-04-19 18:25:09 +08:00
1 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

9
src/views/system/configLine/config.vue
View File

@ -120,7 +120,8 @@ export default {
'SFUCanOnlyApplyForFaultLockSection', 'SFUCanOnlyApplyForFaultLockSection',
'signalBolckOptReflectSignal', 'signalBolckOptReflectSignal',
'routeCanSetWhenSwitchFault', 'routeCanSetWhenSwitchFault',
'manualTrainDefaultStop' 'manualTrainDefaultStop',
'guideDelayCloseWhenFirstSectionOccupied'
], ],
selectList: ['runMode', 'singleApproachLockCancelRoute'], selectList: ['runMode', 'singleApproachLockCancelRoute'],
generalConfig: [ generalConfig: [
@ -174,7 +175,8 @@ export default {
'SFUCanOnlyApplyForFaultLockSection', 'SFUCanOnlyApplyForFaultLockSection',
'signalBolckOptReflectSignal', 'signalBolckOptReflectSignal',
'routeCanSetWhenSwitchFault', 'routeCanSetWhenSwitchFault',
'manualTrainDefaultStop' 'manualTrainDefaultStop',
'guideDelayCloseWhenFirstSectionOccupied'
], ],
rangeList: ['noParkingSM', 'parkingSM'], rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'], speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -234,7 +236,8 @@ export default {
SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段', SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段',
signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示', signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示',
routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）', routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）',
manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态' manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态',
guideDelayCloseWhenFirstSectionOccupied: '办理引导进路时，如果进路首区段占用，引导信号15秒后关闭'
} }
}; };
}, },