|
|
b73395f840
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/jmapNew/config/skinCode/datie_02.js
# src/jmapNew/constant/deviceRender.js
# src/jmapNew/constant/deviceType.js
# src/jmapNew/parser/parser-graph.js
# src/jmapNew/shape/graph/SaidLamp/EPickOrDepartArrow.js
# src/jmapNew/shape/graph/SaidLamp/index.js
# src/jmapNew/shape/graph/SignalButton/index.js
# src/jmapNew/shape/graph/Station/index.js
# src/jmapNew/shape/graph/index.js
# src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
# src/jmapNew/theme/datie_02/menus/index.vue
# src/jmapNew/theme/datie_02/menus/menuButton.vue
# src/jmapNew/theme/datie_02/menus/menuSection.vue
# src/jmapNew/theme/datie_02/menus/menuSignal.vue
# src/jmapNew/theme/datie_02/menus/menuStation.vue
# src/jmapNew/theme/datie_02/menus/menuStationStand.vue
# src/jmapNew/theme/datie_02/menus/menuSwitch.vue
# src/jmapNew/theme/datie_02/menus/menuTrain.vue
# src/jmapNew/theme/factory.js
# src/scripts/cmdPlugin/OperationHandler.js
# src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
# src/views/newMap/newMapdraft/mapoperate/models.js
# src/views/newMap/newMapdraft/mapoperate/signalButton.vue
|
2022-05-20 18:24:17 +08:00 |
|
joylink_cuiweidong
|
e6876ee7f4
|
代码调整
|
2022-05-19 14:29:16 +08:00 |
|
joylink_cuiweidong
|
6dc2afe158
|
大铁线路 分路不良 指令代码调整
|
2022-05-19 14:23:46 +08:00 |
|
joylink_cuiweidong
|
ca534acac6
|
大铁项目 分路不良 弹窗页面调整
|
2022-05-19 13:33:21 +08:00 |
|
joylink_cuiweidong
|
fc8359273d
|
分路不良 界面代码调整
|
2022-05-18 17:42:16 +08:00 |
|
joylink_cuiweidong
|
90e26a800c
|
大铁线路 添加 上电解锁操作
|
2022-05-18 17:09:51 +08:00 |
|
joylink_cuiweidong
|
4da6ce092d
|
大铁项目 添加 非常站控 指令
允许自律 状态代码调整
|
2022-05-17 16:32:39 +08:00 |
|
joylink_cuiweidong
|
8b2bb77c12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-17 10:12:31 +08:00 |
|
joylink_cuiweidong
|
81cdaafa58
|
大铁线路 列车 车次号显示 调整
|
2022-05-17 10:10:06 +08:00 |
|
fan
|
0253210cf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-17 09:24:34 +08:00 |
|
fan
|
45975a34ee
|
大铁调整 n4
|
2022-05-17 09:23:34 +08:00 |
|
joylink_cuiweidong
|
6e9ca25459
|
代码调整
|
2022-05-16 18:23:44 +08:00 |
|
joylink_cuiweidong
|
9a3a4242fc
|
代码调整
|
2022-05-16 18:15:47 +08:00 |
|
joylink_cuiweidong
|
0353d4dfa2
|
代码调整
|
2022-05-16 17:47:49 +08:00 |
|
joylink_cuiweidong
|
5fa8169d43
|
代码调整
|
2022-05-16 17:41:55 +08:00 |
|
joylink_cuiweidong
|
fe71d218a9
|
代码调整
|
2022-05-16 17:39:43 +08:00 |
|
joylink_cuiweidong
|
62c2a3dbda
|
大铁项目 添加 模拟车次输入 操作、
大铁小敏 车身显示车次号
|
2022-05-16 17:35:31 +08:00 |
|
joylink_cuiweidong
|
e0f39c9f3d
|
大铁线路 列车添加发车指令
|
2022-05-16 15:07:25 +08:00 |
|
Yuan
|
53a2a1478d
|
信号机灯状态增加RW
|
2022-05-12 11:29:55 +08:00 |
|
|
|
0cb4088f6c
|
Merge remote-tracking branch 'origin/master'
|
2022-05-12 11:08:12 +08:00 |
|
joylink_cuiweidong
|
7677fa4607
|
代码调整
|
2022-05-12 11:03:35 +08:00 |
|
joylink_cuiweidong
|
226744e7f7
|
代码调整
|
2022-05-12 11:01:33 +08:00 |
|
joylink_cuiweidong
|
ad47f33d16
|
代码调整
|
2022-05-12 11:01:31 +08:00 |
|
joylink_cuiweidong
|
bf1886a534
|
代码调整
|
2022-05-12 11:01:31 +08:00 |
|
joylink_cuiweidong
|
f61785fc5e
|
代码调整
|
2022-05-12 11:01:30 +08:00 |
|
joylink_cuiweidong
|
d82ab8f93c
|
代码调整
|
2022-05-12 11:01:29 +08:00 |
|
joylink_cuiweidong
|
62be008849
|
代码调整
|
2022-05-12 11:01:28 +08:00 |
|
joylink_cuiweidong
|
25c8ddd667
|
代码调整
|
2022-05-12 11:01:27 +08:00 |
|
joylink_cuiweidong
|
62e0f34ef6
|
代码调整
|
2022-05-12 10:58:58 +08:00 |
|
joylink_cuiweidong
|
03611598e1
|
成绩统计代码调整
|
2022-05-12 10:57:23 +08:00 |
|
joylink_cuiweidong
|
fc9c148753
|
学生统计信息代码调整
|
2022-05-12 10:56:12 +08:00 |
|
joylink_cuiweidong
|
87dc324d74
|
代码调整
|
2022-05-12 10:55:50 +08:00 |
|
joylink_cuiweidong
|
e5240b10ca
|
代码调整
|
2022-05-12 10:54:35 +08:00 |
|
joylink_cuiweidong
|
f876c33603
|
学生统计页面添加
|
2022-05-12 10:54:08 +08:00 |
|
joylink_cuiweidong
|
a56505a3d0
|
成绩统计 代码调整
|
2022-05-12 10:52:48 +08:00 |
|
joylink_cuiweidong
|
ecb4c2569e
|
学生单次考试成绩 页面添加
|
2022-05-12 10:50:33 +08:00 |
|
fan
|
a69e27f434
|
大铁调整 n3
|
2022-05-11 16:10:54 +08:00 |
|
fan
|
3f35cfab91
|
大铁调整 n2
|
2022-05-11 16:02:14 +08:00 |
|
fan
|
54d73107cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-11 14:56:20 +08:00 |
|
fan
|
85fd48f700
|
大铁调整 n1
|
2022-05-11 14:56:08 +08:00 |
|
joylink_cuiweidong
|
6b28de5174
|
闭塞、还原的口令验证删除
事故的pressDown删除
|
2022-05-11 14:29:35 +08:00 |
|
fan
|
2612a71b08
|
大铁调整 列车显示问题调整1
|
2022-05-10 15:30:55 +08:00 |
|
fan
|
5057180826
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-10 14:18:54 +08:00 |
|
fan
|
4a98985e75
|
大铁调整 列车显示问题调整
|
2022-05-10 14:18:32 +08:00 |
|
joylink_cuiweidong
|
f07ce67081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-09 11:27:15 +08:00 |
|
joylink_cuiweidong
|
2499d6139d
|
添加 事故指令
|
2022-05-09 11:26:52 +08:00 |
|
fan
|
88b21fc723
|
信号机增加类型
|
2022-05-09 09:12:48 +08:00 |
|
fan
|
4552ac568b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-07 10:26:23 +08:00 |
|
fan
|
cca1c4f5e1
|
大铁线路调整35
|
2022-05-07 10:25:55 +08:00 |
|
joylink_cuiweidong
|
3d4b2eeec1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 18:08:58 +08:00 |
|
