sunzhenyu
|
7b65503938
|
修改编辑器兼容数据，适配西安一，成都一三，北京等数组自动初始化，修改三维页面加载方面区段和站台属性
|
2020-09-10 18:12:25 +08:00 |
|
fan
|
03d4a28ab6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 17:42:10 +08:00 |
|
fan
|
281bbc32f8
|
宁波三菜单调整&表单记录页数
|
2020-09-09 17:41:51 +08:00 |
|
zyy
|
07686019f4
|
Merge branch 'test'
|
2020-09-09 15:10:09 +08:00 |
|
fan
|
a802eff85f
|
Merge remote-tracking branch 'origin/test'
|
2020-09-09 14:46:06 +08:00 |
|
fan
|
06ecb8dd1a
|
宁波三菜单调整
|
2020-09-09 14:45:38 +08:00 |
|
zyy
|
273d3073de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 14:36:01 +08:00 |
|
zyy
|
d6fba202b4
|
字段调整
|
2020-09-09 14:35:48 +08:00 |
|
joylink_cuiweidong
|
5aa9d94071
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Switch/index.js
|
2020-09-09 14:02:15 +08:00 |
|
joylink_cuiweidong
|
ccf2228eeb
|
站台 绘图代码调整
|
2020-09-09 13:55:42 +08:00 |
|
zyy
|
620d7aba3c
|
调整目的码判断
|
2020-09-09 13:38:30 +08:00 |
|
zyy
|
d01f367e73
|
调整右键操作显示
|
2020-09-09 13:25:34 +08:00 |
|
zyy
|
3986185b1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 11:25:43 +08:00 |
|
zyy
|
85f4a5e1b0
|
增加系统通知流程
|
2020-09-09 11:25:31 +08:00 |
|
fan
|
d5c3227909
|
调整加载动画
|
2020-09-09 11:22:56 +08:00 |
|
fan
|
4df950f495
|
调整加载动画
|
2020-09-09 10:42:05 +08:00 |
|
fan
|
201252dbf9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 10:29:06 +08:00 |
|
fan
|
ff4072c6da
|
调整加载动画
|
2020-09-09 10:28:56 +08:00 |
|
zyy
|
83b1d16773
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 09:40:01 +08:00 |
|
zyy
|
fa70285ef9
|
调整西安二号线列车右键操作栏
|
2020-09-09 09:39:23 +08:00 |
|
fan
|
5ceaaed517
|
调整加载动画
|
2020-09-08 16:57:48 +08:00 |
|
fan
|
3a25327100
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 16:41:47 +08:00 |
|
fan
|
9d42aac8fa
|
调整宁波三菜单&调整加载动画
|
2020-09-08 16:41:38 +08:00 |
|
zyy
|
f9e8e10458
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 15:39:33 +08:00 |
|
zyy
|
7d826a4d59
|
调整鼠标事件
|
2020-09-08 15:39:23 +08:00 |
|
fan
|
c432c2f614
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 15:29:54 +08:00 |
|
fan
|
cbb00efdcb
|
一键生成课程、试卷响应调整
|
2020-09-08 15:29:45 +08:00 |
|
zyy
|
5ff71d3820
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 14:26:59 +08:00 |
|
zyy
|
f548a7495a
|
调整车站点击
|
2020-09-08 14:26:49 +08:00 |
|
fan
|
d3a7504c2a
|
一键生成课程、试卷参数调整
|
2020-09-08 14:20:01 +08:00 |
|
fan
|
dfb3fcac38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 14:14:38 +08:00 |
|
fan
|
ebcc73cb2d
|
宁波三号线菜单调整&增加一键生成课程、试卷
|
2020-09-08 14:14:20 +08:00 |
|
zyy
|
2d461041ca
|
调整状态
|
2020-09-08 13:15:09 +08:00 |
|
zyy
|
49d791428d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 11:19:19 +08:00 |
|
zyy
|
b8cfb1900e
|
调整道岔绘图状态
|
2020-09-08 11:19:06 +08:00 |
|
fan
|
4bfe76c9cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 09:49:57 +08:00 |
|
fan
|
fadcb630ab
|
宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整
|
2020-09-08 09:49:49 +08:00 |
|
zyy
|
d19ac59839
|
调整哈尔滨道岔状态显示
|
2020-09-07 17:47:04 +08:00 |
|
zyy
|
c3c5850bbf
|
调整仿真时间同步
|
2020-09-07 17:07:09 +08:00 |
|
zyy
|
b943ef0e55
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-07 16:41:07 +08:00 |
|
zyy
|
eafc37ce7c
|
调整流程
|
2020-09-07 16:40:50 +08:00 |
|
fan
|
878b62e494
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-07 16:03:03 +08:00 |
|
fan
|
c521f39b2a
|
设备登录增加退出方式
|
2020-09-07 16:02:53 +08:00 |
|
zyy
|
7f07fe898b
|
调整发送指令参数
|
2020-09-07 14:17:41 +08:00 |
|
zyy
|
7f434b2828
|
调整西安二号线列车右键显示
|
2020-09-07 14:04:44 +08:00 |
|
zyy
|
cd0128e940
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-07 13:51:36 +08:00 |
|
zyy
|
074d4677fe
|
调整考试系统判断
|
2020-09-07 13:51:25 +08:00 |
|
fan
|
b9747d1fa7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-07 13:22:03 +08:00 |
|
fan
|
40d33fb87b
|
控制项目展示loading
|
2020-09-07 13:21:45 +08:00 |
|
zyy
|
518bf2eeac
|
调整西安二号线右键操作
|
2020-09-07 13:17:11 +08:00 |
|