joylink_cuiweidong
|
21e32aa823
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 19:38:17 +08:00 |
|
joylink_cuiweidong
|
d7bf9a172c
|
剧本编制模块修改
|
2019-08-19 19:37:52 +08:00 |
|
fan
|
442b3fd686
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 19:32:23 +08:00 |
|
fan
|
3e0282784b
|
调整: 加载剧本button 文字调整
|
2019-08-19 19:32:08 +08:00 |
|
ival
|
8ca232549f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/orderauthor/order/draft.vue
|
2019-08-19 18:51:17 +08:00 |
|
ival
|
67cf6f5a29
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/orderAuthor.js
# src/i18n/langs/en/rules.js
# src/i18n/langs/zh/orderAuthor.js
# src/i18n/langs/zh/rules.js
# src/views/orderauthor/commodity/index.vue
# src/views/orderauthor/order/draft.vue
|
2019-08-19 18:49:40 +08:00 |
|
fan
|
25bdd09388
|
调整: 国际化样式调整
|
2019-08-19 18:44:50 +08:00 |
|
ival
|
68e7eaeeb6
|
修改字典菜单的国际化
|
2019-08-19 18:42:53 +08:00 |
|
fan
|
b78e6ad278
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 18:31:41 +08:00 |
|
fan
|
c5ecf86107
|
调整: 国际化+成都三号线人工车显示
|
2019-08-19 18:31:13 +08:00 |
|
joylink_cuiweidong
|
146be45957
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 18:25:58 +08:00 |
|
joylink_cuiweidong
|
4dbe34cf4f
|
剧本编制模块修改
|
2019-08-19 18:24:06 +08:00 |
|
fan
|
cdf021cca9
|
调整： 处理冲突
|
2019-08-19 16:39:48 +08:00 |
|
fan
|
dd11b6fed6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
|
2019-08-19 16:39:20 +08:00 |
|
fan
|
c91a4efdcc
|
修改：国际化调整
|
2019-08-19 16:35:27 +08:00 |
|
ival
|
70e1236099
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 15:59:16 +08:00 |
|
ival
|
ae500285ba
|
修改实训加载顺序错误的问题
|
2019-08-19 15:59:04 +08:00 |
|
zyy
|
921f67938e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
# src/i18n/langs/zh/rules.js
|
2019-08-19 15:54:53 +08:00 |
|
zyy
|
a6b8d8a21a
|
desc: 删除重复的国际化标识， 国际化翻译
|
2019-08-19 15:53:14 +08:00 |
|
fan
|
30433bfcd0
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 15:47:07 +08:00 |
|
fan
|
d0f7bd46a9
|
修改：国际化调整
|
2019-08-19 15:46:52 +08:00 |
|
ival
|
2d8f94f47a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 15:19:50 +08:00 |
|
ival
|
94f3659cf3
|
修改国际化
|
2019-08-19 15:19:33 +08:00 |
|
zyy
|
91b2674de4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 15:06:53 +08:00 |
|
zyy
|
fdfa413567
|
desc: 调整国际化翻译
|
2019-08-19 15:06:47 +08:00 |
|
fan
|
9969ade4de
|
Merge branch 'dev' into test
|
2019-08-19 14:13:06 +08:00 |
|
fan
|
ecc4885ad0
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-19 14:09:54 +08:00 |
|
fan
|
2115c952cc
|
修改：loading调整
|
2019-08-19 14:09:37 +08:00 |
|
joylink_cuiweidong
|
43dfc04281
|
定时保存数据
剧本编制页面修改
|
2019-08-19 14:09:08 +08:00 |
|
ival
|
17c4564237
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-08-19 14:03:26 +08:00 |
|
ival
|
9ca049157c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 14:02:32 +08:00 |
|
ival
|
d87a4fff22
|
国际化处理
|
2019-08-19 14:02:20 +08:00 |
|
zyy
|
7a7690e898
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 14:01:51 +08:00 |
|
zyy
|
fd5ab1f30d
|
desc: 地图绘制 逻辑修改
|
2019-08-19 14:01:45 +08:00 |
|
fan
|
a669d093b1
|
修改：删除全局loading
|
2019-08-19 13:27:15 +08:00 |
|
fan
|
3fe9ffd451
|
修改：列车信息调整，人工车显示调整
|
2019-08-19 13:21:29 +08:00 |
|
zyy
|
b025c78d67
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-19 11:18:57 +08:00 |
|
zyy
|
138dfe5e06
|
desc: 修改地图绘制图层配置， 调整道岔时间显示
|
2019-08-19 11:18:46 +08:00 |
|
ival
|
4da9dc977b
|
修改右键菜单，文字颜色
|
2019-08-19 11:16:29 +08:00 |
|
ival
|
068dbdbbde
|
修改代码
|
2019-08-19 10:58:14 +08:00 |
|
ival
|
d083482b10
|
修改代码
|
2019-08-19 10:31:11 +08:00 |
|
ival
|
00f0fd84a3
|
修改车站公里表隐藏的问题
|
2019-08-19 09:38:11 +08:00 |
|
ival
|
54425befb2
|
界面调整
|
2019-08-19 09:15:25 +08:00 |
|
ival
|
44aa6442f0
|
权限条形图分类
|
2019-08-18 21:12:38 +08:00 |
|
joylink_cuiweidong
|
f7736543a5
|
修改剧本动作的样式
|
2019-08-16 20:06:14 +08:00 |
|
joylink_cuiweidong
|
08d00d3f93
|
修改 动作列表展现
|
2019-08-16 19:33:40 +08:00 |
|
fan
|
8f1755162b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 19:28:09 +08:00 |
|
fan
|
5f3237dbc3
|
修改：代码调整
|
2019-08-16 19:27:01 +08:00 |
|
ival
|
e0a7a5d0fc
|
修改权限配置
|
2019-08-16 19:09:44 +08:00 |
|
ival
|
01c9ac1c20
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 18:59:30 +08:00 |
|