joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
9,608 Commits 20 Branches 0 Tags 448 MiB
cbedee3c3b
Commit Graph

9362 Commits

Author SHA1 Message Date
joylink_cuiweidong
f3c5feefcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 15:01:30 +08:00
joylink_cuiweidong
d4a6aa1cb2 demo 代码调整 2021-03-18 15:01:13 +08:00
fan
700928ed22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:21:17 +08:00
fan
23d8feb8b7 按钮顺序调整 2021-03-18 11:21:00 +08:00
joylink_cuiweidong
816fa77d79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:13:01 +08:00
joylink_cuiweidong
5336a1899e demo 修改 2021-03-18 11:12:31 +08:00
fan
36aee735a8 设备检测登录调整 2021-03-18 10:57:33 +08:00
fan
12698a808b 设备检测登录调整 2021-03-18 10:25:41 +08:00
fan
52898a24ac 仿真按钮样式调整 2021-03-18 09:35:45 +08:00
fan
e875fa92fc 教学管理暂提 2021-03-18 09:03:15 +08:00
ival
b4bf5114c6 demo 2021-03-17 18:07:49 +08:00
ival
43b6ebaa37 demo 2021-03-17 18:06:45 +08:00
ival
520c95a00c 增加demo 2021-03-17 17:51:22 +08:00
ival
666ad3f7d9 增加demo 2021-03-17 17:50:17 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
ival
94bb1a0395 修改运行图代码代码 2021-03-17 10:15:21 +08:00
joylink_cuiweidong
df2ff455d3 运行图代码调整 2021-03-17 09:36:00 +08:00
joylink_cuiweidong
f21d270cf5 地图数据 交路预览页面调整 2021-03-17 09:33:19 +08:00
ival
e38bca7ff8 运行图 任务修改弹窗，显示描述的问题 2021-03-17 09:13:19 +08:00
ival
01d166a9c9 修改定位偏差的问题 2021-03-17 09:05:28 +08:00
fan
7da708858d 教学管理暂提 2021-03-16 19:06:25 +08:00
ival
64f38e7091 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-16 18:24:08 +08:00
ival
2480a8b110 迁移以前的运行图到同济新版 2021-03-16 18:23:56 +08:00
joylink_cuiweidong
e5047e1e16 运行图代码调整 2021-03-16 18:06:31 +08:00
joylink_cuiweidong
553ec75fd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-16 17:43:44 +08:00
joylink_cuiweidong
76dcd271d9 代码调整 2021-03-16 17:43:22 +08:00
ival
0985a6f1df 修改运行图表单名称 2021-03-16 11:14:52 +08:00
ival
1ad9ea0cb7 修改运行图菜单名称 2021-03-16 09:55:28 +08:00
ival
b678416593 修改 隐藏 2021-03-16 09:52:45 +08:00
ival
72281db3a8 隐藏 生成仅环路计划 2021-03-16 09:28:00 +08:00
ival
c11568348f 优化代码 2021-03-15 21:15:03 +08:00
ival
c44c2a0e0c 暂存文件 2021-03-15 19:23:33 +08:00
ival
13f3302cfc 修改新版运行图显示的问题 2021-03-15 17:32:12 +08:00
ival
d5d9b91cb4 创建运行图 出库数据，环路数据，进库数据页面操作时，过滤显示的问题 2021-03-15 17:31:47 +08:00
ival
1cc4cebb27 任务：运行图编辑工具 
问题：优化生成计划的操作以及menubar的页面描述
 2021-03-15 14:34:24 +08:00
sunzhenyu
ab6acbc7d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-15 10:56:45 +08:00
sunzhenyu
b2b669df66 修改三维客流 2021-03-15 10:56:37 +08:00
ival
fa73c7c365 修改进路 控制显示的条件 2021-03-15 10:43:08 +08:00
ival
b400f78fe5 线路：新版运行图编辑功能部分接口和界面调整 2021-03-15 09:59:52 +08:00
walker-sheng
37e98a7d57 89版本问题 2021-03-13 00:20:59 +08:00
walker-sheng
b92c8cafdc Revert "清除chrome89版本 windowopen 的noopener参数打不开的问题" 
This reverts commit 2e442e6e8c.

# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
#	src/views/newMap/jlmapNew/index.vue
 2021-03-13 00:15:32 +08:00
sunleking
7fa30c1a30 merge 2021-03-13 00:13:08 +08:00
sunleking
608d8b03f5 merge 2021-03-13 00:11:48 +08:00
sunleking
2e442e6e8c 清除chrome89版本 windowopen 的noopener参数打不开的问题 2021-03-13 00:10:55 +08:00
fan
e97a5a88a1 教学管理暂提 2021-03-12 18:44:43 +08:00
ival
a2103b0486 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 18:23:43 +08:00
ival
fa2c7c8297 线路：同济大学版本运行图功能样式调整 2021-03-12 18:23:32 +08:00
joylink_cuiweidong
80b67e7f94 运行图 代码调整 2021-03-12 17:18:02 +08:00
joylink_cuiweidong
40f6314b85 运行图编制 代码调整 2021-03-12 16:37:32 +08:00
joylink_cuiweidong
c3fec625e2 运行图编制 代码调整 2021-03-12 16:16:51 +08:00
joylink_cuiweidong
905e59c869 运行图编制 生成仅环路计划 代码调整 2021-03-12 16:00:23 +08:00
joylink_cuiweidong
8c05faab0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 13:45:47 +08:00
joylink_cuiweidong
866b661c4f 南京二号线 岔心 绘图 代码调整 2021-03-12 13:45:14 +08:00
ival
150eeaaaba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 11:31:21 +08:00
ival
ef0915ea98 线路：宁波3 
问题：调整实训流程
 2021-03-12 11:31:11 +08:00
joylink_cuiweidong
83781ac67d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 10:43:17 +08:00
joylink_cuiweidong
6cac5cdf51 运行图编制 导入公共进路代码调整 2021-03-12 10:42:55 +08:00
ival
62c0bd160f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:31:01 +08:00
ival
50c206cad3 调整宁波3道岔封锁实训 2021-03-11 18:30:43 +08:00
fan
757c5d62df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:11:27 +08:00
fan
330e15c993 南京二号线menuBar放开 2021-03-11 18:11:08 +08:00
fan
32e7155fb0 教学管理暂提 2021-03-11 18:09:26 +08:00
sunzhenyu
1de6eda1a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 17:11:03 +08:00
sunzhenyu
9434928436 新版三维车站客流管理代码修改(未实装) 2021-03-11 17:10:50 +08:00
ival
8481e2d927 删除宁波3 无用文件 2021-03-11 15:35:41 +08:00
ival
1a1745d49c 增加宁波3 状态逻辑判断 2021-03-11 15:33:43 +08:00
ival
13c1cc6819 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:27:38 +08:00
ival
0f0b95cafb 增加 宁波3 menuBar operation定义 
修改加载当日运行图界面没有显示运行图名称的问题
 2021-03-11 15:27:30 +08:00
joylink_cuiweidong
29a4dfac76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:01:28 +08:00
joylink_cuiweidong
05ff67f546 南京二号线 岔心 通信车占用状态/非通信车占用状态 代码调整 2021-03-11 15:00:52 +08:00
ival
6c19a3ad2c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 13:44:50 +08:00
ival
414bd05d0c 优化实训过程中，点击空白menuBar被关掉的问题 2021-03-11 13:44:40 +08:00
fan
b620e0f3a3 iscs报错修改 2021-03-11 10:58:03 +08:00
ival
4d8f116f4d 优化 2021-03-11 09:27:46 +08:00
ival
dc8c74632d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 09:22:41 +08:00
ival
3fff0da60d 修改 数据库名称 为后端baseUrl的域名关键字 2021-03-11 09:22:30 +08:00
fan
8631b66be9 岔芯预复位报错调整 2021-03-11 09:17:57 +08:00
fan
659054f1fa 岔芯添加parentCode 2021-03-10 19:03:04 +08:00
fan
661adb9add Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 18:14:34 +08:00
fan
605d60b06c 岔芯添加parentCode 2021-03-10 18:14:12 +08:00
ival
81aa4d12c4 修改电子屏样式 2021-03-10 18:06:25 +08:00
ival
1ee6c29666 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:44:30 +08:00
ival
cfe979fce4 线路：宁波3 
问题：调整页面样式
 2021-03-10 17:40:43 +08:00
fan
b05ab63bc6 关联岔芯参数可删除 2021-03-10 17:28:09 +08:00
fan
56c6cebbfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:18:51 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
joylink_cuiweidong
c986e22d53 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
 2021-03-10 16:50:43 +08:00
ival
9991bf605d 增加确实窗口 2021-03-10 16:48:57 +08:00
joylink_cuiweidong
e8c7fbdfff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
 2021-03-10 16:48:26 +08:00
joylink_cuiweidong
96eef9053e 宁波三号线 菜单操作 代码调整 2021-03-10 16:39:53 +08:00
ival
3759386e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 15:09:24 +08:00
ival
90bdb12e57 线路：宁波3 
问题：优化初始化操作的事件模型
 2021-03-10 15:09:15 +08:00
fan
0b361fd0fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 13:19:39 +08:00
fan
0bf5e348a0 岔芯不生成车次窗 2021-03-10 13:19:17 +08:00
fan
f9c9e25d08 登录路径错误调整 2021-03-10 10:31:16 +08:00
joylink_cuiweidong
4edb42bbbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 10:25:39 +08:00
joylink_cuiweidong
2146b28b9a 宁波三号线 运行线 代码调整 2021-03-10 10:25:05 +08:00
ival
1aa009075f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 18:37:31 +08:00
ival
0c98c06440 线路：宁波3 
任务：修改带初始化的界面操作
 2021-03-09 18:37:20 +08:00
joylink_cuiweidong
b434824d97 运行图编制 删除重复的页面 2021-03-09 17:11:58 +08:00