fan
|
cb5799d14c
|
南京二号线现地实操加载时清除登录状态
|
2022-12-26 10:34:12 +08:00 |
|
fan
|
63a09a7abc
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-26 10:04:06 +08:00 |
|
dong
|
1d5846b6f4
|
成都1道岔提示问题
|
2022-12-23 15:11:39 +08:00 |
|
dong
|
7f6e0daa9c
|
仿真路由跳转问题
|
2022-12-23 14:44:32 +08:00 |
|
dong
|
1f556824f8
|
成都一信号机操作调整
|
2022-12-22 18:18:23 +08:00 |
|
dong
|
960eabe6cf
|
代码调整
|
2022-12-22 15:48:50 +08:00 |
|
dong
|
94ebd81292
|
代码调整
|
2022-12-22 15:16:45 +08:00 |
|
dong
|
9353c2b2c0
|
控制模式转换调整
|
2022-12-22 14:43:09 +08:00 |
|
dong
|
50b1f562c2
|
路由权限调整
|
2022-12-22 13:21:18 +08:00 |
|
dong
|
75a5440922
|
代码调整
|
2022-12-21 17:29:25 +08:00 |
|
dong
|
d4ccd57d76
|
帮助菜单展示
|
2022-12-21 13:10:55 +08:00 |
|
joylink_cuiweidong
|
2973f32f37
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-21 11:09:07 +08:00 |
|
joylink_cuiweidong
|
2031f30666
|
设备登录代码调整
|
2022-12-21 10:56:23 +08:00 |
|
dong
|
8fa00227ff
|
路由权限调整
|
2022-12-21 10:35:55 +08:00 |
|
dong
|
70fe1b27cb
|
代码调整
|
2022-12-19 23:57:11 +08:00 |
|
fan
|
f799a1e59c
|
实训客户端切换定位问题调整
|
2022-12-19 17:12:03 +08:00 |
|
fan
|
6513dac16e
|
南京二实训客户端调整
|
2022-12-19 14:53:38 +08:00 |
|
fan
|
d4f0306e18
|
【南京二号线】现地登录的实训无法生成操作
|
2022-12-19 11:15:25 +08:00 |
|
fan
|
50db10c43f
|
强制站控告警信息调整
|
2022-12-19 10:47:52 +08:00 |
|
fan
|
b98efabc7f
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-19 09:58:57 +08:00 |
|
fan
|
0a89376967
|
【南京二号线】实训时无法排列进路
|
2022-12-19 09:58:41 +08:00 |
|
dong
|
38e91e8202
|
宁波一区域选择弹窗按钮添加domId
|
2022-12-16 22:29:55 +08:00 |
|
dong
|
2c66d6aadf
|
代码调整
|
2022-12-16 17:25:44 +08:00 |
|
dong
|
75d2ea8aed
|
代码调整
|
2022-12-16 17:05:44 +08:00 |
|
fan
|
e2bdc4d5ed
|
南京二调整
|
2022-12-16 16:04:56 +08:00 |
|
fan
|
cbcd66a9ab
|
线路调整
|
2022-12-16 15:56:30 +08:00 |
|
fan
|
81811cb0db
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-16 10:23:44 +08:00 |
|
fan
|
687ffa563a
|
【北京一号线】这个提示位置修改下，11G是那个圆弧
|
2022-12-16 10:23:31 +08:00 |
|
dong
|
18ecffd06a
|
代码调整
|
2022-12-15 22:48:55 +08:00 |
|
fan
|
66153cc09d
|
哈尔滨一号线CR1或CR2未及时操作时清除operations
|
2022-12-15 16:23:36 +08:00 |
|
fan
|
39a2e0cdc3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-15 14:58:06 +08:00 |
|
fan
|
0f2a40b6cb
|
【标准一号线】强制站控提示位置有问题
|
2022-12-15 14:47:40 +08:00 |
|
joylink_cuiweidong
|
c4d21c6e24
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-14 16:23:54 +08:00 |
|
joylink_cuiweidong
|
43120ef0a9
|
注册代码调整
|
2022-12-14 16:23:39 +08:00 |
|
dong
|
e8a8f12db1
|
代码调整
|
2022-12-14 15:44:48 +08:00 |
|
joylink_cuiweidong
|
c2b9c3c2aa
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-14 15:23:05 +08:00 |
|
joylink_cuiweidong
|
c0f9ce0572
|
注册 添加拼图 人机验证
|
2022-12-14 15:22:47 +08:00 |
|
fan
|
2339cbc8c7
|
【系统管理-线路功能】实训室配置了成员管理，但登录教员机后没有显示
|
2022-12-14 13:58:56 +08:00 |
|
fan
|
261b1296bb
|
【哈尔滨一号线】哈尔滨轨区设限选择速度的步骤没有生成操作
|
2022-12-14 13:50:11 +08:00 |
|
fan
|
294e9d61fe
|
subType调整
|
2022-12-14 13:25:43 +08:00 |
|
fan
|
7e2ce3c8b0
|
前端配置项trainingType为空串时删除
|
2022-12-14 10:22:27 +08:00 |
|
fan
|
3fd4aa63f4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-14 09:43:35 +08:00 |
|
fan
|
0cf34a6aeb
|
【【哈尔滨一号线】这里原本的步骤是点击字母E，现在点了站台门也触发下一步了，会导致实训无法继续】需重新进路录制
|
2022-12-14 09:36:33 +08:00 |
|
joylink_cuiweidong
|
4985423186
|
代码调整
|
2022-12-13 17:28:57 +08:00 |
|
joylink_cuiweidong
|
6a89850696
|
代码调整
|
2022-12-13 17:20:52 +08:00 |
|
joylink_cuiweidong
|
7c1691d774
|
注册接口 调整
|
2022-12-13 17:12:19 +08:00 |
|
joylink_cuiweidong
|
4ec18c3731
|
代码调整
|
2022-12-13 15:59:42 +08:00 |
|
fan
|
684199abd1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-13 15:50:44 +08:00 |
|
fan
|
83d1342110
|
监管仿真增加进入仿真
|
2022-12-13 15:50:27 +08:00 |
|
joylink_cuiweidong
|
81152cb252
|
用户注册 代码调整
|
2022-12-13 15:32:32 +08:00 |
|
joylink_cuiweidong
|
8e498c45f6
|
代码调整
|
2022-12-13 14:06:58 +08:00 |
|
joylink_cuiweidong
|
ef8fab3f7b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-13 14:01:04 +08:00 |
|
joylink_cuiweidong
|
8233ea0568
|
佛山线路代码调整
|
2022-12-13 14:00:43 +08:00 |
|
dong
|
2f0b44fb06
|
代码调整
|
2022-12-13 13:59:47 +08:00 |
|
fan
|
15226a3406
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-13 13:57:20 +08:00 |
|
fan
|
8fbe18c9a4
|
【【哈尔滨一号线】实训结束的文字提示这个层级需要调一下，被遮住了】&客户端初始值设置调整
|
2022-12-13 13:57:09 +08:00 |
|
joylink_cuiweidong
|
d1e41fe25c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-13 13:49:19 +08:00 |
|
joylink_cuiweidong
|
03ef312683
|
删除微信二维码登录，添加注册功能
|
2022-12-13 13:49:02 +08:00 |
|
dong
|
c1128f992b
|
代码调整
|
2022-12-13 13:41:10 +08:00 |
|
dong
|
fe4b04fb70
|
代码调整
|
2022-12-13 13:09:14 +08:00 |
|
fan
|
8850460a0f
|
设计控制台组织冒泡
|
2022-12-13 11:13:23 +08:00 |
|
fan
|
5aaf79eeb7
|
北京站遥控清除数据
|
2022-12-13 10:56:31 +08:00 |
|
fan
|
8c8772c3d9
|
【【哈尔滨一号线】关区信号实训提示位置需要调整】
|
2022-12-13 10:41:26 +08:00 |
|
fan
|
b0453fda2d
|
是否综合演练isJoint => joint
|
2022-12-13 10:15:33 +08:00 |
|
fan
|
4fbc45780c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-13 09:31:46 +08:00 |
|
fan
|
3ab928d7df
|
【标准一号线】，车站勾选错误再重新选择后，强制站控按钮就无法点击了&清除日志
|
2022-12-13 09:31:34 +08:00 |
|
dong
|
611e3902e5
|
代码调整
|
2022-12-12 17:56:36 +08:00 |
|
fan
|
f6cdf07b06
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 17:00:38 +08:00 |
|
fan
|
1fbd8b5824
|
【【北京一号线】站控时，车站应无法操作设备】&创建实训校验调整
|
2022-12-12 17:00:23 +08:00 |
|
dong
|
c814592f73
|
ningbo_03组件拆分
|
2022-12-12 16:38:34 +08:00 |
|
fan
|
a3791a0cbf
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 16:27:40 +08:00 |
|
fan
|
19c6087141
|
【【哈尔滨一号线】点击车站名无法切换车站】&&切换实训是因角色变化导致定位丢失问题处理
|
2022-12-12 16:27:28 +08:00 |
|
joylink_cuiweidong
|
132de532a9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-12 15:42:26 +08:00 |
|
joylink_cuiweidong
|
addecd294f
|
代码调整
|
2022-12-12 15:42:09 +08:00 |
|
fan
|
9c9ac662c8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 15:23:53 +08:00 |
|
fan
|
37f149446d
|
南京二客户端调整
|
2022-12-12 15:23:42 +08:00 |
|
joylink_cuiweidong
|
f06ba54b56
|
代码调整
|
2022-12-12 14:48:59 +08:00 |
|
joylink_cuiweidong
|
8db9f95ade
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-12 13:18:05 +08:00 |
|
joylink_cuiweidong
|
7a3a3db7b4
|
代码调整
|
2022-12-12 13:17:08 +08:00 |
|
fan
|
abf2aef82d
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 11:16:57 +08:00 |
|
fan
|
1b7ecb0aad
|
实训调整
|
2022-12-12 11:16:07 +08:00 |
|
dong
|
e0bee230d9
|
代码调整
|
2022-12-12 11:04:13 +08:00 |
|
dong
|
835ff2219f
|
代码调整
|
2022-12-12 09:53:00 +08:00 |
|
dong
|
7dbf9e5374
|
ningbo_01组件拆分
|
2022-12-12 09:30:46 +08:00 |
|
joylink_cuiweidong
|
3235f801a8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-09 17:27:21 +08:00 |
|
joylink_cuiweidong
|
c359db3ac3
|
代码调整
|
2022-12-09 17:27:01 +08:00 |
|
dong
|
cb236000e1
|
代码调整
|
2022-12-09 16:54:58 +08:00 |
|
fan
|
2589141b4b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-09 16:45:18 +08:00 |
|
fan
|
5f0816c2d6
|
南京二号线菜单调整
|
2022-12-09 16:44:58 +08:00 |
|
joylink_cuiweidong
|
5eeb655b39
|
代码调整
|
2022-12-09 16:40:32 +08:00 |
|
joylink_cuiweidong
|
ce983bc448
|
代码调整
|
2022-12-09 16:27:47 +08:00 |
|
joylink_cuiweidong
|
1832e71264
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-09 15:39:49 +08:00 |
|
joylink_cuiweidong
|
2e0105c390
|
代码调整
|
2022-12-09 15:39:30 +08:00 |
|
Yuan
|
9370621c62
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-12-09 15:12:02 +08:00 |
|
dong
|
1f5a6bce26
|
代码调整
|
2022-12-09 15:12:33 +08:00 |
|
Yuan
|
0fce737944
|
考试管理 - 成绩查询&成绩统计
|
2022-12-09 15:11:59 +08:00 |
|
dong
|
071506619b
|
代码调整
|
2022-12-09 11:18:10 +08:00 |
|
dong
|
ec2d7e7d5c
|
代码调整
|
2022-12-09 10:23:54 +08:00 |
|
dong
|
0f8643591c
|
代码调整
|
2022-12-09 09:52:51 +08:00 |
|
dong
|
bae7270755
|
代码调整
|
2022-12-09 09:44:50 +08:00 |
|
dong
|
68dd872c41
|
chengdou_01拆分
|
2022-12-08 18:43:00 +08:00 |
|
Yuan
|
388803eed5
|
成绩统计改为柱状图
|
2022-12-08 18:39:02 +08:00 |
|
dong
|
8ca90b1003
|
代码调整
|
2022-12-08 18:06:24 +08:00 |
|
joylink_cuiweidong
|
99e6065ba7
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-08 17:24:06 +08:00 |
|
joylink_cuiweidong
|
1555c0ccd5
|
代码调整
|
2022-12-08 17:23:53 +08:00 |
|
fan
|
3f4da53695
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-08 17:19:46 +08:00 |
|
fan
|
9cbfd0068b
|
个人信息显示组织
|
2022-12-08 17:19:36 +08:00 |
|
joylink_cuiweidong
|
f6145d9ad8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-08 17:04:10 +08:00 |
|
joylink_cuiweidong
|
bd5b154883
|
代码调整
|
2022-12-08 17:03:55 +08:00 |
|
dong
|
801d2186cc
|
代码调整
|
2022-12-08 16:40:42 +08:00 |
|
fan
|
a4b77f0e86
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-08 16:37:11 +08:00 |
|
fan
|
c44053ec54
|
北京一问题调整
|
2022-12-08 16:37:00 +08:00 |
|
joylink_cuiweidong
|
65af81491c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-08 16:28:39 +08:00 |
|
joylink_cuiweidong
|
bbcf5b3fec
|
代码调整
|
2022-12-08 16:28:22 +08:00 |
|
Yuan
|
e621200bca
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-12-08 16:16:36 +08:00 |
|
Yuan
|
e9f4d286d1
|
bugfix 考试管理封存试卷未确认
|
2022-12-08 16:16:32 +08:00 |
|
dong
|
ea6ebc0bc3
|
代码调整
|
2022-12-08 16:14:01 +08:00 |
|
fan
|
63f5bac82a
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-08 16:09:16 +08:00 |
|
fan
|
c222cf19a8
|
南京二调整
|
2022-12-08 16:08:58 +08:00 |
|
fan
|
f96368b2ec
|
北京一调整
|
2022-12-08 16:07:58 +08:00 |
|
joylink_cuiweidong
|
d06d0eec15
|
代码调整
|
2022-12-08 16:01:28 +08:00 |
|
joylink_cuiweidong
|
cf693b6d59
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-08 15:51:45 +08:00 |
|
joylink_cuiweidong
|
a1fd19f78f
|
成都三号线 代码调整
|
2022-12-08 15:51:30 +08:00 |
|
fan
|
47ee96f339
|
0级报警信息关闭未接入操作调整&福州一添加0级报警信息
|
2022-12-08 15:29:49 +08:00 |
|
dong
|
013ecae2e3
|
代码调整
|
2022-12-08 14:44:56 +08:00 |
|
joylink_cuiweidong
|
f45b1b9b05
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-08 14:28:41 +08:00 |
|
joylink_cuiweidong
|
0346f672bf
|
成都三号线 站台代码调整
|
2022-12-08 14:28:19 +08:00 |
|
fan
|
7029394ea8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
Conflicts:
src/jmapNew/theme/factory.js
|
2022-12-08 14:17:38 +08:00 |
|
fan
|
1018592080
|
哈尔滨一号线菜单调整
|
2022-12-08 14:16:36 +08:00 |
|
dong
|
88c2ab5047
|
代码调整
|
2022-12-08 11:24:42 +08:00 |
|
joylink_cuiweidong
|
865a770141
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-08 11:15:06 +08:00 |
|
joylink_cuiweidong
|
6e986d51bb
|
代码调整
|
2022-12-08 11:14:32 +08:00 |
|
dong
|
05e7798454
|
代码调整
|
2022-12-08 10:33:32 +08:00 |
|
joylink_cuiweidong
|
14f0113b3b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/jmapNew/theme/factory.js
|
2022-12-08 10:03:54 +08:00 |
|
fan
|
361d6d9c43
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
Conflicts:
src/jmapNew/theme/factory.js
|
2022-12-08 09:58:02 +08:00 |
|
joylink_cuiweidong
|
76096647fb
|
代码调整
|
2022-12-08 09:57:56 +08:00 |
|
fan
|
2a593facb1
|
北京一号线菜单调整&线路页面调整
|
2022-12-08 09:56:53 +08:00 |
|
dong
|
9b1dac9b2b
|
xian_02拆分
|
2022-12-07 18:37:44 +08:00 |
|
joylink_cuiweidong
|
825d1a1e15
|
佛山有轨电车 代码调整
|
2022-12-07 18:09:22 +08:00 |
|
joylink_cuiweidong
|
cd282093b6
|
代码调整
|
2022-12-07 17:30:48 +08:00 |
|
joylink_cuiweidong
|
27c3dd3517
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-07 16:57:47 +08:00 |
|
joylink_cuiweidong
|
2b52da78bf
|
代码调整
|
2022-12-07 16:57:30 +08:00 |
|
fan
|
80af34fee0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-07 16:37:17 +08:00 |
|
fan
|
ffb47289e7
|
北京一号线菜单调整
|
2022-12-07 16:36:55 +08:00 |
|
Yuan
|
60cf75f3c0
|
考试管理标签bug修改 && 试卷状态改动
|
2022-12-07 16:28:35 +08:00 |
|
joylink_cuiweidong
|
d7962674cd
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-07 15:19:00 +08:00 |
|
joylink_cuiweidong
|
e5869a3ce0
|
佛山有轨电车 信号机代码调整
|
2022-12-07 15:18:44 +08:00 |
|
fan
|
cf02840100
|
控制权判断调整1
|
2022-12-07 14:38:53 +08:00 |
|
fan
|
16ee7692b2
|
控制权判断调整
|
2022-12-07 14:37:46 +08:00 |
|
fan
|
57b4eedfe6
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-07 14:02:43 +08:00 |
|