ival
|
5273554ba0
|
饼形图增加个数显示
|
2019-08-21 09:20:40 +08:00 |
|
ival
|
82222027c0
|
调整坐标布局
|
2019-08-21 09:18:52 +08:00 |
|
ival
|
73d5b4c4fa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 09:15:04 +08:00 |
|
ival
|
d8e7965ffd
|
修改主页表信息
|
2019-08-21 09:14:54 +08:00 |
|
fan
|
30eea97bdf
|
Merge remote-tracking branch 'origin/dev'
|
2019-08-20 19:00:10 +08:00 |
|
fan
|
d9bbbac879
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-20 18:59:22 +08:00 |
|
fan
|
7ef9abe5a9
|
国际化调整
|
2019-08-20 18:58:55 +08:00 |
|
fan
|
7334d282dd
|
调整: 剧本过滤角色调整
|
2019-08-20 18:57:14 +08:00 |
|
ival
|
72f1c63e22
|
修改设置仿真状态
|
2019-08-20 18:46:51 +08:00 |
|
ival
|
474b1fff18
|
修改仿真暂停字段归属文件
|
2019-08-20 18:44:02 +08:00 |
|
ival
|
0191158f87
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 18:35:59 +08:00 |
|
ival
|
de0fd028ed
|
设置时间暂停
|
2019-08-20 18:35:42 +08:00 |
|
joylink_cuiweidong
|
6e6a56903f
|
剧本编制样式调整
|
2019-08-20 18:31:48 +08:00 |
|
sunzhenyu
|
0e7805121a
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-20 18:30:23 +08:00 |
|
sunzhenyu
|
1fb6353f98
|
增加测试版车载cctv
|
2019-08-20 18:30:17 +08:00 |
|
joylink_cuiweidong
|
7f2c741818
|
剧本列表页面 样式调整
|
2019-08-20 17:54:40 +08:00 |
|
ival
|
0afda8953a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-20 17:24:25 +08:00 |
|
ival
|
433360f979
|
增加回放的国际化
|
2019-08-20 17:22:45 +08:00 |
|
fan
|
520f1ef356
|
调整: 国际化创建连计划
|
2019-08-20 17:10:08 +08:00 |
|
ival
|
402e0537bf
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 17:01:20 +08:00 |
|
ival
|
8259b24f6c
|
增加国际化配置
|
2019-08-20 17:01:09 +08:00 |
|
joylink_cuiweidong
|
a57cb68b4c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 15:55:52 +08:00 |
|
joylink_cuiweidong
|
8172457cda
|
剧本编制模块样式调整
|
2019-08-20 15:55:32 +08:00 |
|
ival
|
08587fb377
|
修改忽略 baseUrl文件的提交
|
2019-08-20 15:52:23 +08:00 |
|
joylink_cuiweidong
|
4830864424
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 15:45:15 +08:00 |
|
ival
|
d1417983cc
|
修改国际化
|
2019-08-20 15:44:16 +08:00 |
|
joylink_cuiweidong
|
c6b8ba6794
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 15:42:15 +08:00 |
|
joylink_cuiweidong
|
2727309402
|
剧本录制样式修改
|
2019-08-20 15:41:54 +08:00 |
|
ival
|
dc594d7d4b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-08-20 14:22:16 +08:00 |
|
ival
|
3c11c5fd47
|
增加交路目的地码
|
2019-08-20 14:17:53 +08:00 |
|
ival
|
febfddfc15
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 14:03:11 +08:00 |
|
ival
|
03eec83e9c
|
增加交路目的地码的展示
|
2019-08-20 14:02:55 +08:00 |
|
joylink_cuiweidong
|
2cf92690ec
|
剧本编制页面布局调整
|
2019-08-20 13:27:07 +08:00 |
|
joylink_cuiweidong
|
7f907cc6ba
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/display/tipScriptRecord.vue
|
2019-08-20 13:22:51 +08:00 |
|
joylink_cuiweidong
|
0db73aba5f
|
剧本编制页面结构调整
|
2019-08-20 13:21:38 +08:00 |
|
zyy
|
e376b141cf
|
desc: 国际化
|
2019-08-20 13:14:02 +08:00 |
|
ival
|
468e624383
|
修改页面布局问题
|
2019-08-20 13:03:39 +08:00 |
|
ival
|
424482dd4b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 12:47:53 +08:00 |
|
ival
|
21a0110966
|
增加录制脚本页面布局
|
2019-08-20 12:47:39 +08:00 |
|
zyy
|
3783eedeb7
|
desc: 删除多余列车模型
|
2019-08-20 11:18:59 +08:00 |
|
zyy
|
2f0519488f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
|
2019-08-20 11:17:50 +08:00 |
|
zyy
|
74fea0b56e
|
desc: 调整地图绘制样式
|
2019-08-20 11:17:08 +08:00 |
|
ival
|
adc6828060
|
修改跳转路由后，页面不加载的问题
|
2019-08-20 10:34:41 +08:00 |
|
ival
|
c718ea2f41
|
修改综合演练加入房间未加载地图的问题
|
2019-08-20 10:23:59 +08:00 |
|
ival
|
28c6e05c41
|
修改获取列车数据没有刷新，导致加载的问题
|
2019-08-20 09:55:49 +08:00 |
|
ival
|
0926e6e2d2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-20 09:13:16 +08:00 |
|
ival
|
8c4efb83db
|
修改国际化导致的界面布局问题
|
2019-08-20 09:12:54 +08:00 |
|
fan
|
de3b0ca897
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-19 20:28:14 +08:00 |
|
fan
|
969bb89192
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 20:27:43 +08:00 |
|
fan
|
36a1f8e878
|
调整: 快速入口调整
|
2019-08-19 20:27:23 +08:00 |
|