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 |
|
fan
|
07f13bc0ae
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-19 19:44:00 +08:00 |
|
fan
|
241d530132
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-19 19:43:02 +08:00 |
|
joylink_cuiweidong
|
d71e42a84d
|
剧本编制模块表单修改
|
2019-08-19 19:42:17 +08:00 |
|
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 |
|