joylink_cuiweidong
|
6b6ea5d741
|
代码调整
|
2022-09-23 10:39:50 +08:00 |
|
fan
|
55570dbc03
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-09-23 09:41:08 +08:00 |
|
joylink_cuiweidong
|
a4a009b808
|
代码调整
|
2022-09-22 16:43:25 +08:00 |
|
joylink_cuiweidong
|
e9256df83b
|
代码调整
|
2022-09-22 13:11:34 +08:00 |
|
fan
|
d68008ad83
|
代码调整
|
2022-09-22 09:04:32 +08:00 |
|
fan
|
77cbbea8e2
|
暂提
|
2022-09-21 14:12:32 +08:00 |
|
joylink_cuiweidong
|
c7001e1946
|
代码调整
|
2022-09-21 13:20:40 +08:00 |
|
fan
|
a15c916719
|
暂提
|
2022-09-21 10:17:36 +08:00 |
|
fan
|
d184687860
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
Conflicts:
src/views/newMap/display/simulationMenu.vue
|
2022-09-21 09:16:40 +08:00 |
|
joylink_cuiweidong
|
b82a1c535a
|
代码调整
|
2022-09-20 18:05:02 +08:00 |
|
fan
|
198c8fb170
|
暂提
|
2022-09-20 17:21:01 +08:00 |
|
joylink_cuiweidong
|
5c948ea596
|
北交大 项目 菜单代码调整
|
2022-09-20 16:17:02 +08:00 |
|
fan
|
91c04e97b1
|
暂提
|
2022-09-20 14:22:44 +08:00 |
|
Yuan
|
3266a7478d
|
Merge branch 'yly' into test
|
2022-09-19 18:02:23 +08:00 |
|
Yuan
|
9b9f0ebfa9
|
仿真时间修改统一
|
2022-09-19 18:01:57 +08:00 |
|
fan
|
62d864d996
|
代码调整
|
2022-09-19 16:58:18 +08:00 |
|
dong
|
62904d9056
|
添加设置调度台数据界面
|
2022-09-19 15:39:55 +08:00 |
|
joylink_cuiweidong
|
b79202c70e
|
代码调整
|
2022-09-16 15:28:44 +08:00 |
|
joylink_cuiweidong
|
9657620d15
|
大铁线路 终端切换代码调整
|
2022-09-16 14:47:15 +08:00 |
|
joylink_cuiweidong
|
bf4b376d04
|
代码调整
|
2022-09-15 18:04:30 +08:00 |
|
fan
|
e766d714b7
|
实训调整
|
2022-09-15 17:43:11 +08:00 |
|
joylink_cuiweidong
|
b72736813a
|
代码调整
|
2022-09-15 10:20:45 +08:00 |
|
joylink_cuiweidong
|
67bc0ba2db
|
代码调整
|
2022-09-14 16:45:08 +08:00 |
|
joylink_cuiweidong
|
bab3449b9a
|
代码调整
|
2022-09-14 16:16:20 +08:00 |
|
joylink_cuiweidong
|
cd9db0aa12
|
代码调整
|
2022-09-14 16:12:23 +08:00 |
|
joylink_cuiweidong
|
af30f5d08c
|
代码调整
|
2022-09-13 17:56:59 +08:00 |
|
joylink_cuiweidong
|
90554bd2be
|
代码调整
|
2022-09-13 17:37:26 +08:00 |
|
joylink_cuiweidong
|
96411d34b7
|
代码调整
|
2022-09-13 17:04:08 +08:00 |
|
joylink_cuiweidong
|
289f02ac0f
|
教学系统 课程 现地 切换实训 地图显示代码调整
|
2022-09-13 13:35:14 +08:00 |
|
joylink_cuiweidong
|
d9a51cbcec
|
代码调整
|
2022-09-13 10:41:01 +08:00 |
|
Yuan
|
8bf8b0b742
|
Merge branch 'yly' into test
|
2022-09-09 13:47:46 +08:00 |
|
Yuan
|
f00756f2c2
|
由公里标批量计算区段实际长度
|
2022-09-09 13:47:26 +08:00 |
|
dong
|
18937861c4
|
添加会话domId
|
2022-09-08 17:12:16 +08:00 |
|
fan
|
802cc70bfc
|
区段增加最大最小公里标
|
2022-09-05 15:47:14 +08:00 |
|
fan
|
678dcc3043
|
红河财经CCTV调整
|
2022-09-01 16:09:49 +08:00 |
|
joylink_cuiweidong
|
ca677c232e
|
代码调整
|
2022-08-26 17:37:42 +08:00 |
|
joylink_cuiweidong
|
fd87d9b27f
|
代码调整
|
2022-08-26 17:32:59 +08:00 |
|
Yuan
|
5f4be2eb18
|
Merge branch 'yly' into test
|
2022-08-25 18:24:56 +08:00 |
|
Yuan
|
fed6ac91d6
|
区域批量操作
|
2022-08-25 18:22:07 +08:00 |
|
fan
|
c411d7237b
|
大屏显示调整
|
2022-08-25 15:16:08 +08:00 |
|
joylink_cuiweidong
|
b3244ce77e
|
大铁线路 出入口增加 属性ioDirection(出入口类型)
|
2022-08-22 15:53:28 +08:00 |
|
fan
|
dd43337d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-22 10:44:42 +08:00 |
|
fan
|
1bf1776be7
|
卡斯柯显示调整
|
2022-08-22 10:44:26 +08:00 |
|
joylink_cuiweidong
|
718953a8f7
|
大铁项目 车务管理终端 获取股道列表 代码调整
|
2022-08-22 10:32:49 +08:00 |
|
fan
|
b1638adeec
|
调整画面管理
|
2022-08-18 09:36:45 +08:00 |
|
fan
|
da5f1a3fcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-17 15:47:10 +08:00 |
|
fan
|
0c553124dc
|
代码调整
|
2022-08-17 15:46:55 +08:00 |
|
joylink_cuiweidong
|
d76532bd2c
|
大铁线路代码调整
|
2022-08-17 15:24:35 +08:00 |
|
joylink_cuiweidong
|
b3da3ca56a
|
大铁线路 添加 车务终端管理界面
|
2022-08-17 13:47:23 +08:00 |
|
joylink_cuiweidong
|
0719a2031e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-17 11:29:34 +08:00 |
|
joylink_cuiweidong
|
c34ecffd04
|
大铁线路 区段添加停车点偏移坐标
|
2022-08-17 11:29:13 +08:00 |
|
fan
|
4822e0fa00
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-17 09:53:57 +08:00 |
|
fan
|
954f388c3a
|
卡斯柯线路调整
|
2022-08-16 17:31:21 +08:00 |
|
dong
|
4ffda4f614
|
添加实训设计和语音
|
2022-08-16 17:17:27 +08:00 |
|
fan
|
66230e8cbf
|
画面管理问题调整
|
2022-08-15 15:09:40 +08:00 |
|
fan
|
5ea947776d
|
画面显示位置调整
|
2022-08-15 13:24:30 +08:00 |
|
fan
|
61cb3a9957
|
卡斯柯大铁线路调整
|
2022-08-15 13:23:48 +08:00 |
|
fan
|
9d64437c03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
Conflicts:
src/jmapNew/shape/graph/SignalButton/index.js
|
2022-08-11 11:29:16 +08:00 |
|
fan
|
61e517e317
|
综合演练页面行值刷新显示错误调整
|
2022-08-11 11:17:14 +08:00 |
|
dong
|
6ea8aca49a
|
区段占用与信号
|
2022-08-10 15:16:06 +08:00 |
|
fan
|
7096511b46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-10 11:22:41 +08:00 |
|
fan
|
8b573304e6
|
bug:初始化按钮不显示调整
|
2022-08-10 09:30:10 +08:00 |
|
fan
|
6a79626a34
|
指令转操作
|
2022-08-09 13:59:23 +08:00 |
|
joylink_cuiweidong
|
9bbe93590c
|
代码调整
|
2022-08-09 11:03:00 +08:00 |
|
joylink_cuiweidong
|
874cc248eb
|
剧本提示 代码调整
|
2022-08-09 10:02:52 +08:00 |
|
joylink_cuiweidong
|
52a9aa7b61
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-08 11:13:36 +08:00 |
|
joylink_cuiweidong
|
ac77a2fd36
|
代码调整
|
2022-08-08 11:12:11 +08:00 |
|
fan
|
808ae31174
|
走画面管理没有设置集中站调整
|
2022-08-05 10:16:14 +08:00 |
|
fan
|
082e296e38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-04 17:26:50 +08:00 |
|
fan
|
55d4ff6e69
|
画面新建 bug调整
|
2022-08-04 17:26:38 +08:00 |
|
joylink_cuiweidong
|
9341b3f807
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-04 17:25:54 +08:00 |
|
joylink_cuiweidong
|
9480cd310b
|
代码调整
|
2022-08-04 17:25:34 +08:00 |
|
fan
|
5344ea5788
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-04 16:05:10 +08:00 |
|
fan
|
78aeeddee0
|
簿册 施工 交接班注释
|
2022-08-04 16:04:58 +08:00 |
|
fan
|
22c0b57624
|
簿册剧本编制显示调整
|
2022-08-04 16:03:09 +08:00 |
|
joylink_cuiweidong
|
425a350d07
|
去掉断点
|
2022-08-04 15:50:39 +08:00 |
|
joylink_cuiweidong
|
3d0782952c
|
剧本提示代码调整
|
2022-08-04 15:39:58 +08:00 |
|
joylink_cuiweidong
|
e6ffe9d087
|
代码调整
|
2022-08-04 15:14:08 +08:00 |
|
joylink_cuiweidong
|
85f7844788
|
代码调整
|
2022-08-04 14:50:32 +08:00 |
|
joylink_cuiweidong
|
130703e0c5
|
代码调整
|
2022-08-04 14:32:00 +08:00 |
|
fan
|
e20e212536
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-04 11:05:04 +08:00 |
|
fan
|
8c7cd5d495
|
簿册暂提
|
2022-08-04 11:04:47 +08:00 |
|
fan
|
8262b24698
|
车次窗批量生成时可调整距离
|
2022-08-04 10:34:42 +08:00 |
|
joylink_cuiweidong
|
2fb83cd34e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-03 15:41:07 +08:00 |
|
joylink_cuiweidong
|
6cb94046c8
|
代码调整
|
2022-08-03 15:40:51 +08:00 |
|
dong
|
ae5d53e9e0
|
代码调整
|
2022-08-03 15:33:03 +08:00 |
|
fan
|
d115c4975d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-03 14:38:12 +08:00 |
|
fan
|
5c63dafaa4
|
簿册显示调整
|
2022-08-03 14:37:59 +08:00 |
|
dong
|
5a072c7236
|
修改进路
|
2022-08-03 14:13:14 +08:00 |
|
dong
|
71480564f7
|
修改进路
|
2022-08-03 13:31:07 +08:00 |
|
fan
|
f3a1e22e65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-03 11:22:04 +08:00 |
|
fan
|
024f1c8963
|
接受会话后同账户清除响铃
|
2022-08-03 11:21:52 +08:00 |
|
joylink_cuiweidong
|
ecb9287adf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-03 11:00:48 +08:00 |
|
joylink_cuiweidong
|
f1dc88be33
|
场景编辑代码调整
|
2022-08-03 11:00:31 +08:00 |
|
fan
|
6360e26c89
|
簿册车站传递调整
|
2022-08-03 10:04:31 +08:00 |
|
fan
|
c5d11595cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-03 09:23:58 +08:00 |
|
Yuan
|
d1680c32e5
|
Merge branch 'yly' into test
|
2022-08-02 18:12:34 +08:00 |
|
Yuan
|
df174615ba
|
jd1A调整,信号按钮调整
|
2022-08-02 18:12:03 +08:00 |
|
fan
|
3e105c3f8b
|
代码调整
|
2022-08-02 18:01:42 +08:00 |
|
dong
|
f81e76fa20
|
代码调整
|
2022-08-02 16:36:20 +08:00 |
|