ival
|
554db95dd6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 13:44:56 +08:00 |
|
ival
|
0fe2f1a043
|
1.修改代码字典首字母大写导致select选项不出来的问题
|
2019-08-23 13:44:43 +08:00 |
|
zyy
|
f30084539a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 09:14:27 +08:00 |
|
zyy
|
6a6bb3a405
|
desc: 修改地图绘制样式，逻辑调整
|
2019-08-23 09:14:21 +08:00 |
|
joylink_cuiweidong
|
2abda64836
|
剧本录制模块页面结构调整
|
2019-08-22 18:13:55 +08:00 |
|
program-walker
|
252ad5b593
|
修改仿真类型数据字典
|
2019-08-22 13:31:58 +08:00 |
|
zyy
|
69d4d2be72
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-22 10:25:29 +08:00 |
|
zyy
|
fde4d41727
|
desc: 修改样式，地图更新坐标
|
2019-08-22 10:25:23 +08:00 |
|
fan
|
b5a157fecd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-22 10:12:55 +08:00 |
|
fan
|
d068a74a6e
|
加载剧本前列车视图
|
2019-08-22 10:12:35 +08:00 |
|
ival
|
52bacce3a3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-22 09:45:31 +08:00 |
|
ival
|
977b47892f
|
增加综合仿真获取系统暂停状态的代码以及增加右侧偏移量的设置
|
2019-08-22 09:45:21 +08:00 |
|
fan
|
64ca6af5d6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-22 09:15:06 +08:00 |
|
fan
|
3d5bc7c600
|
国际化调整
|
2019-08-22 09:14:26 +08:00 |
|
fan
|
b41c85b78e
|
合并代码
|
2019-08-22 09:12:29 +08:00 |
|
joylink_cuiweidong
|
1212d30677
|
调整剧本不能修改问题
|
2019-08-22 09:09:35 +08:00 |
|
fan
|
614aae8be0
|
国际化调整
|
2019-08-22 09:06:48 +08:00 |
|
program-walker
|
cdb7ca645a
|
修改剧本编制界面样式
|
2019-08-21 20:40:02 +08:00 |
|
program-walker
|
c9dfbb0749
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/scriptManage/scriptRecord/addRole.vue
|
2019-08-21 20:34:47 +08:00 |
|
joylink_cuiweidong
|
8318fc6349
|
剧本编制 重置剧本调整 取消剧本角色处理
|
2019-08-21 20:32:37 +08:00 |
|
program-walker
|
22f83008e8
|
修改剧本编制界面样式
|
2019-08-21 20:16:47 +08:00 |
|
joylink_cuiweidong
|
005cb8ba78
|
剧本编制 成员角色调整
|
2019-08-21 20:11:16 +08:00 |
|
zyy
|
895841164e
|
desc: 保存字段新增
|
2019-08-21 18:51:16 +08:00 |
|
zyy
|
4d6776e6f9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 18:49:46 +08:00 |
|
zyy
|
5f5fc61b68
|
desc: 修改地图更改坐标，调整绘制样式
|
2019-08-21 18:49:39 +08:00 |
|
joylink_cuiweidong
|
aab5bcc995
|
剧本录制添加成员角色
|
2019-08-21 18:45:16 +08:00 |
|
zyy
|
6d42719731
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 17:34:15 +08:00 |
|
zyy
|
6712d1cd5b
|
desc: 修改地图编辑样式
|
2019-08-21 17:34:08 +08:00 |
|
ival
|
1eea945778
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 15:34:18 +08:00 |
|
ival
|
1ade3d38ca
|
添加列车模型重复名称数据提示
|
2019-08-21 15:34:01 +08:00 |
|
zyy
|
e89eb2ecf8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/tip.js
|
2019-08-21 15:15:37 +08:00 |
|
zyy
|
e4a5d77f20
|
desc: 支付组件国际化， 调整地图加载位置
|
2019-08-21 15:15:08 +08:00 |
|
ival
|
1993de8548
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 15:01:13 +08:00 |
|
ival
|
242e082dc7
|
修改列车操作
|
2019-08-21 15:00:58 +08:00 |
|
joylink_cuiweidong
|
52c4106a75
|
背景只能保存一次
|
2019-08-21 14:28:34 +08:00 |
|
fan
|
8553a9dcdc
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-21 14:20:42 +08:00 |
|
fan
|
919314e959
|
国际化调整
|
2019-08-21 14:20:32 +08:00 |
|
joylink_cuiweidong
|
1943f767c4
|
对话讲述人和接收人可以互换
|
2019-08-21 14:08:43 +08:00 |
|
fan
|
1245dc3fab
|
国际化调整
|
2019-08-21 14:05:21 +08:00 |
|
fan
|
7bb5aa785d
|
合并冲突
|
2019-08-21 14:04:22 +08:00 |
|
fan
|
9a480393f5
|
国际化调整+loading调整
|
2019-08-21 13:54:53 +08:00 |
|
ival
|
6bbfd49150
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 13:48:24 +08:00 |
|
ival
|
b5a93f7ce1
|
修改国际化
|
2019-08-21 13:48:06 +08:00 |
|
zyy
|
1132e5fb4c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/global.js
# src/i18n/langs/zh/index.js
# src/i18n/langs/zh/rules.js
# src/views/map/runplan/manage/create.vue
|
2019-08-21 13:47:40 +08:00 |
|
zyy
|
c22d97b944
|
desc: 教学系统国际化
|
2019-08-21 13:46:36 +08:00 |
|
joylink_cuiweidong
|
300ed72365
|
指令文字为红色，隐藏修改按钮
指令和对话添加后原内容不清除
|
2019-08-21 12:03:01 +08:00 |
|
ival
|
09af43a690
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 11:29:13 +08:00 |
|
ival
|
4270053326
|
修改国际化
|
2019-08-21 11:28:56 +08:00 |
|
joylink_cuiweidong
|
51dcc5e904
|
剧本编制样式调整
|
2019-08-21 10:24:55 +08:00 |
|
ival
|
63e8232f8e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-21 09:29:12 +08:00 |
|