ival
|
9230df4ed3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-26 14:30:21 +08:00 |
|
ival
|
0255a3250e
|
增加绘图的默认状态设置
|
2019-08-26 14:30:01 +08:00 |
|
fan
|
7757094ce3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-26 10:13:05 +08:00 |
|
fan
|
4b7873c2d7
|
ibp盘
|
2019-08-26 10:12:39 +08:00 |
|
zyy
|
b9b2fd5b77
|
desc: 调整地图绘制数据逻辑， 新增发布历史列表
|
2019-08-23 18:40:02 +08:00 |
|
zyy
|
7cf12c2c7e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 14:24:36 +08:00 |
|
zyy
|
2250bc970d
|
desc: 修改名称显示放到皮肤配置中
|
2019-08-23 14:24:30 +08:00 |
|
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 |
|
fan
|
0ca2235549
|
加载剧本是先清除地图状态
|
2019-08-22 14:12:16 +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
|
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 |
|
joylink_cuiweidong
|
1943f767c4
|
对话讲述人和接收人可以互换
|
2019-08-21 14:08:43 +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 |
|
ival
|
6aa82ce2d4
|
修改权限配置
|
2019-08-21 09:29:02 +08:00 |
|
fan
|
dc3f334a93
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-21 09:23:08 +08:00 |
|
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
|
7ef9abe5a9
|
国际化调整
|
2019-08-20 18:58:55 +08:00 |
|
fan
|
7334d282dd
|
调整: 剧本过滤角色调整
|
2019-08-20 18:57:14 +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
|
433360f979
|
增加回放的国际化
|
2019-08-20 17:22:45 +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
|
8172457cda
|
剧本编制模块样式调整
|
2019-08-20 15:55:32 +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
|
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
|
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 |
|
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 |
|