Commit Graph

1324 Commits

Author SHA1 Message Date
zyy
3b8da62bf2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-11 18:40:37 +08:00
zyy
5e8089cacd desc: 修改权限字段 2019-10-11 18:40:32 +08:00
fan
862f251adb Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-11 17:45:36 +08:00
fan
de7909cad1 ibp微调 2019-10-11 17:45:13 +08:00
fan
3326f1c917 ibp调整 2019-10-11 17:17:05 +08:00
zyy
1e3486efc6 desc: 增加权限分发列表【设置失效】功能 2019-10-11 16:09:15 +08:00
zyy
3b7605f996 desc: 调整正式上国际版仿真报错 2019-10-11 16:01:26 +08:00
zyy
aa0199754a desc: 调整创建权限流程,创建字段修改 2019-10-11 15:27:14 +08:00
zyy
8b05776895 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-10 18:05:36 +08:00
zyy
f7cf33a5e2 desc: 调整登陆页面样式 2019-10-10 18:05:26 +08:00
joylink_cuiweidong
ca2aced01a ibp盘调整 2019-10-10 14:17:54 +08:00
fan
bf9c6959ab Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-10 10:22:24 +08:00
fan
e1b4633409 错别字修改 2019-10-10 10:22:05 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理, 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
fan
ff9364382c ibp盘调整车站一 2019-10-09 10:07:43 +08:00
joylink_cuiweidong
121a86d6be ibp 盘调整 2019-10-09 09:22:12 +08:00
zyy
88c1212af0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-08 16:08:19 +08:00
zyy
df43ef4cc3 desc: 调整登陆界面显示 2019-10-08 16:08:13 +08:00
joylink_cuiweidong
672c075ada ibp 车站名称以及上下行车站名称修改 2019-10-08 15:51:19 +08:00
joylink_cuiweidong
88cead3f28 ibp盘触摸屏的拖拽事件添加 2019-10-08 14:55:40 +08:00
zyy
95877f344e desc: 提示国际化修改逻辑 2019-09-30 16:13:59 +08:00
zyy
25cb199850 desc: 调整登陆页面样式 2019-09-29 19:20:10 +08:00
zyy
6dfdc0ccfc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-29 16:09:48 +08:00
zyy
64a601c967 desc: 调整登陆页面样式 2019-09-29 16:09:40 +08:00
sunzhenyu
c1d20befc1 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-29 14:06:02 +08:00
sunzhenyu
aace4f9337 修改列车进站和转换区段速度 2019-09-29 14:05:33 +08:00
zyy
a8302b610e desc: 注释多余代码 2019-09-29 11:09:02 +08:00
zyy
f74ce907b8 desc: 调整获取二维码登陆接口 2019-09-27 15:29:25 +08:00
zyy
f334814012 desc: 增加琏计划心跳接口 2019-09-27 10:53:48 +08:00
zyy
2d2cc343a8 desc: 调整白名单顺序 2019-09-27 10:25:48 +08:00
zyy
f712c93622 desc: 调整权限分发 组织结构配置 2019-09-27 10:06:46 +08:00
zyy
5c973ba468 desc: 调整英文版登陆窗口, 登陆样式调整 2019-09-26 18:40:38 +08:00
zyy
31a024b9ea desc: 调整国际化 2019-09-26 18:13:31 +08:00
zyy
91a93da574 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-26 17:42:32 +08:00
zyy
01cb0a699b desc: 调整权限字段限制, 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
fan
bc68f1adc9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-26 15:43:56 +08:00
fan
2ce7cde8cb 调整icon导致x替换问题 2019-09-26 15:43:19 +08:00
joylink_cuiweidong
293cee8d2f 剧本管理bug修改 2019-09-26 11:07:30 +08:00
joylink_cuiweidong
5964baeea1 国际化调整 2019-09-26 10:59:38 +08:00
zyy
bf085f5de6 Merge branch 'master' into dev 2019-09-26 10:06:27 +08:00
zyy
7ae79fd7e4 desc: 调整二维码字段 2019-09-26 10:03:20 +08:00
zyy
488ec91f23 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-26 09:23:09 +08:00
zyy
0b1ae44c19 desc: 调整三号线现地操作 2019-09-26 09:23:02 +08:00
sunzhenyu
f5c362ff0b Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-25 14:55:34 +08:00
sunzhenyu
4faceb5bd0 修改样式 2019-09-25 14:55:29 +08:00
zyy
df670c63c3 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-25 10:46:41 +08:00
zyy
b3830f2cc5 desc: 新增现地 自动生成课程 2019-09-25 10:46:35 +08:00
fan
8d11f5858d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-25 09:39:14 +08:00
fan
a73ae082a8 elementUI图标替换英文X 2019-09-25 09:39:04 +08:00
joylink_cuiweidong
1e4deb2353 国际化调整 2019-09-24 17:02:29 +08:00