zyy
|
2c5bb4bea7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 17:58:29 +08:00 |
|
zyy
|
741af50a2a
|
desc: 地图绘制显示车站公里标，
|
2019-08-30 17:58:15 +08:00 |
|
ival
|
ae84e1ba4e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-08-30 17:53:37 +08:00 |
|
fan
|
bf23362b2b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-30 17:43:50 +08:00 |
|
fan
|
8fa43ce797
|
ibp盘调整
|
2019-08-30 17:43:17 +08:00 |
|
ival
|
9b9be66ea0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 17:12:52 +08:00 |
|
ival
|
36facbb67d
|
修改重新生成排班计划的页面
|
2019-08-30 17:12:39 +08:00 |
|
zyy
|
abf1afcdf2
|
desc: 修改逻辑顺序
|
2019-08-30 17:09:31 +08:00 |
|
zyy
|
22beeffc53
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
# src/views/screenMonitor/list/demonList.vue
|
2019-08-30 17:03:51 +08:00 |
|
zyy
|
0398179e0d
|
desc: 用户权限流程修改，接口对接
|
2019-08-30 17:00:18 +08:00 |
|
ival
|
d3ff24c4f8
|
设置时间组件为可清空组件
|
2019-08-30 16:41:55 +08:00 |
|
ival
|
ff94ade817
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 16:35:24 +08:00 |
|
ival
|
1dabf22fd6
|
修改数据显示
|
2019-08-30 16:35:13 +08:00 |
|
fan
|
ed3f31972d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-30 16:22:21 +08:00 |
|
fan
|
0503afb4c9
|
ibp盘调整
|
2019-08-30 16:22:10 +08:00 |
|
ival
|
5574df0e9d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-30 15:46:23 +08:00 |
|
ival
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
fan
|
b2b28f8c9d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAlarm.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpAppendageBox.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpArrow.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpButton.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
|
2019-08-30 15:06:08 +08:00 |
|
fan
|
755754ebd3
|
ibp调整
|
2019-08-30 15:01:37 +08:00 |
|
joylink_cuiweidong
|
dec0da6c1a
|
电话端子添加到页面中
|
2019-08-30 14:15:10 +08:00 |
|
joylink_cuiweidong
|
9cea1f91a9
|
ibp盘右侧样式调整
|
2019-08-30 13:32:56 +08:00 |
|
joylink_cuiweidong
|
911d269562
|
钥匙层级调整
|
2019-08-30 11:21:34 +08:00 |
|
joylink_cuiweidong
|
e865e6de3b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/alarm.js
|
2019-08-30 10:59:14 +08:00 |
|
joylink_cuiweidong
|
64c939c8be
|
钥匙组件添加到页面
|
2019-08-30 10:55:34 +08:00 |
|
fan
|
f1a762556c
|
关闭ibp入口
|
2019-08-30 10:36:03 +08:00 |
|
fan
|
240268a65f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/button.js
|
2019-08-30 10:34:25 +08:00 |
|
fan
|
5350e6ad39
|
ibp盘提交
|
2019-08-30 10:31:56 +08:00 |
|
joylink_cuiweidong
|
1a479b0ed7
|
电梯组件调整
|
2019-08-30 10:14:49 +08:00 |
|
joylink_cuiweidong
|
45e626d53b
|
钥匙组件添加
|
2019-08-30 09:38:19 +08:00 |
|
ival
|
eb5f71febd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/utils/baseUrl.js
# static/model/suidao/suidao.FBX
|
2019-08-30 09:23:40 +08:00 |
|
ival
|
3da74652c5
|
增加派班计划
|
2019-08-30 09:00:36 +08:00 |
|
joylink_cuiweidong
|
c9937ffc48
|
电梯组件添加到页面中
|
2019-08-29 18:45:20 +08:00 |
|
sunzhenyu
|
6c325be953
|
修改模型地址
|
2019-08-29 17:15:13 +08:00 |
|
ival
|
fd03ed6d59
|
修改每日运行图查询接口
|
2019-08-29 14:48:26 +08:00 |
|
ival
|
dce9903175
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 13:52:48 +08:00 |
|
ival
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
joylink_cuiweidong
|
225747ac57
|
电梯组件调整
|
2019-08-29 13:25:02 +08:00 |
|
joylink_cuiweidong
|
eaec6c4446
|
修复 剧本修改时候重置剧本的bug
|
2019-08-29 13:05:30 +08:00 |
|
ival
|
30e590afc7
|
封装车次窗鼠标事件以及车次窗操作
|
2019-08-29 11:26:05 +08:00 |
|
sunzhenyu
|
02fb10040c
|
修改资源地址
|
2019-08-29 11:16:22 +08:00 |
|
sunzhenyu
|
9cbee21abd
|
pull merge
|
2019-08-29 11:15:41 +08:00 |
|
sunzhenyu
|
0f462ac0c1
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-08-29 11:14:45 +08:00 |
|
sunzhenyu
|
7862af3284
|
减少列车刷新
|
2019-08-29 11:12:02 +08:00 |
|
sunzhenyu
|
164572fb02
|
更新
|
2019-08-29 11:11:15 +08:00 |
|
sunzhenyu
|
06c29a97c4
|
修改驾驶中相机对象引用错误
|
2019-08-29 11:04:10 +08:00 |
|
ival
|
c14e0c6055
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/display/index.vue
|
2019-08-29 10:35:55 +08:00 |
|
ival
|
cc54830f01
|
修改代码格式以及操作的bug
|
2019-08-29 10:33:50 +08:00 |
|
zyy
|
791655a50a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:33:48 +08:00 |
|
zyy
|
32cc251ef6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/display/index.vue
# src/views/display/menuDemon.vue
|
2019-08-29 09:33:42 +08:00 |
|
ival
|
1aac4ee929
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:32:12 +08:00 |
|
ival
|
faf772a2bb
|
修改
|
2019-08-29 09:32:01 +08:00 |
|
zyy
|
2d906ef9be
|
desc: 调整权限列表接口对接
|
2019-08-29 09:31:58 +08:00 |
|
ival
|
c2f6cf4656
|
移除jlmap中的地图原始数据
|
2019-08-29 09:30:52 +08:00 |
|
fan
|
be04a992c0
|
关闭ibp盘开关
|
2019-08-29 09:30:09 +08:00 |
|
fan
|
094476bdb5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-29 09:26:27 +08:00 |
|
fan
|
453a909f01
|
ibp盘
|
2019-08-29 09:26:14 +08:00 |
|
fan
|
94f803072f
|
ibp盘提交
|
2019-08-29 09:25:06 +08:00 |
|
joylink_cuiweidong
|
2cee3cb6fc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:03:09 +08:00 |
|
joylink_cuiweidong
|
73e9e0985e
|
电梯模块封装
|
2019-08-29 09:02:55 +08:00 |
|
ival
|
287f5512b5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-29 09:02:25 +08:00 |
|
ival
|
0954312cac
|
修改用户emgail国际化的问题和保存规则提示的问题
|
2019-08-29 09:02:02 +08:00 |
|
sunzhenyu
|
ddb608d7e7
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-28 18:21:00 +08:00 |
|
sunzhenyu
|
0a30f6b5f7
|
减少行车循环中的无用判断，修改fbx模型加载，增加双面效果
|
2019-08-28 18:20:49 +08:00 |
|
joylink_cuiweidong
|
9de6b0ff12
|
扶梯子模块封装
|
2019-08-28 16:58:53 +08:00 |
|
joylink_cuiweidong
|
0e569358b0
|
电话端子模块提交
|
2019-08-28 13:36:46 +08:00 |
|
joylink_cuiweidong
|
a960fcd1a8
|
允许联动 提示 图片调整
|
2019-08-28 13:27:42 +08:00 |
|
fan
|
3393a65f0d
|
代码调整：ibp盘
|
2019-08-28 13:22:17 +08:00 |
|
joylink_cuiweidong
|
446f8d684a
|
按钮组件调整 图片调整
|
2019-08-28 13:19:45 +08:00 |
|
ival
|
b4a189a002
|
修改router配置
|
2019-08-28 10:07:19 +08:00 |
|
fan
|
f0f7ac1111
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
# src/views/ibp/ibpDraft/ibpEdit/index.vue
|
2019-08-28 10:02:42 +08:00 |
|
fan
|
6a0d41f09a
|
调整代码： ibp
|
2019-08-28 09:57:32 +08:00 |
|
ival
|
0fa4d4c204
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-28 09:55:55 +08:00 |
|
ival
|
a3b43e1e43
|
限制平局拖动范围
|
2019-08-28 09:55:40 +08:00 |
|
jade
|
066bf6e13b
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-28 08:59:05 +08:00 |
|
sunzhenyu
|
539f006e1e
|
修改下行轨道初始同步位置
|
2019-08-27 18:47:25 +08:00 |
|
joylink_cuiweidong
|
feac5e0e79
|
联动允许禁止提示 组件
|
2019-08-27 18:35:10 +08:00 |
|
zyy
|
01a2b42912
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 18:32:32 +08:00 |
|
zyy
|
498f093866
|
desc: 新增按钮类型
|
2019-08-27 18:32:26 +08:00 |
|
sunzhenyu
|
ba1e83f821
|
修改站台数据读取
|
2019-08-27 18:17:58 +08:00 |
|
sunzhenyu
|
3e570560c6
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-27 18:15:29 +08:00 |
|
sunzhenyu
|
b405494785
|
修改初始坐标
|
2019-08-27 18:14:10 +08:00 |
|
joylink_cuiweidong
|
8997d318f1
|
修改 箭头组件 调整其他组件的拖拽
|
2019-08-27 17:59:03 +08:00 |
|
fan
|
12b6535254
|
调整代码： 关闭ibp入口
|
2019-08-27 17:07:32 +08:00 |
|
sunzhenyu
|
7239983b84
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-27 17:07:30 +08:00 |
|
sunzhenyu
|
2ceb795114
|
修改站台加载
|
2019-08-27 17:07:17 +08:00 |
|
fan
|
846b267e64
|
调整代码： ibp盘宽高显示
|
2019-08-27 16:45:43 +08:00 |
|
fan
|
8b67b34df8
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-27 16:37:41 +08:00 |
|
fan
|
044f66d9d9
|
调整代码： ibp盘
|
2019-08-27 16:37:33 +08:00 |
|
fan
|
1f2d2a1794
|
调整代码： ibp盘
|
2019-08-27 16:35:41 +08:00 |
|
joylink_cuiweidong
|
dc80bec6d8
|
报警按钮封装 以及按钮组件代码调整
|
2019-08-27 16:17:55 +08:00 |
|
fan
|
5f5e701074
|
合并代码
|
2019-08-27 15:23:14 +08:00 |
|
fan
|
75a6b2ee58
|
合并
|
2019-08-27 15:22:55 +08:00 |
|
fan
|
68898a3861
|
ibp盘
|
2019-08-27 15:19:50 +08:00 |
|
zyy
|
1908954ca8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 15:03:01 +08:00 |
|
zyy
|
02aa4a5b65
|
desc: 道岔创建字段补充，修改字段名称，描述
|
2019-08-27 15:02:55 +08:00 |
|
joylink_cuiweidong
|
95353c7c31
|
ibp 盘 button组件 代码优化
|
2019-08-27 14:56:07 +08:00 |
|
fan
|
7eafd16896
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-27 14:18:22 +08:00 |
|
fan
|
b2eb2076b0
|
ibp
|
2019-08-27 14:17:36 +08:00 |
|
joylink_cuiweidong
|
aeb424514f
|
ibp盘 按钮组件封装调整
|
2019-08-27 13:55:48 +08:00 |
|
ival
|
1888ae855a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 10:28:37 +08:00 |
|
ival
|
5fdc80855d
|
修改规则编辑的问题
|
2019-08-27 10:28:24 +08:00 |
|
zyy
|
e34d3abff4
|
desc: 修改主页扫码显示逻辑
|
2019-08-27 09:46:44 +08:00 |
|
zyy
|
33c025aefa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 09:36:34 +08:00 |
|
zyy
|
72355448a1
|
desc: 修改地图绘制显示问题
|
2019-08-27 09:36:22 +08:00 |
|
joylink_cuiweidong
|
4235afd00f
|
ibp盘按钮组件封装
|
2019-08-26 19:18:03 +08:00 |
|
sunzhenyu
|
f2f89d2be2
|
修改初始位置因为角度偏移问题
|
2019-08-26 18:56:46 +08:00 |
|
ival
|
a4d06b7743
|
修改试题编辑页面的bug
|
2019-08-26 15:30:36 +08:00 |
|
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
|
7fd73dbf37
|
ibp盘
|
2019-08-26 11:15:40 +08:00 |
|
fan
|
bc9180d814
|
ibp盘
|
2019-08-26 10:28:28 +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 |
|
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 |
|
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 |
|
fan
|
75d4337043
|
国际化调整
|
2019-08-21 09:22:39 +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
|
72f1c63e22
|
修改设置仿真状态
|
2019-08-20 18:46:51 +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
|
0afda8953a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-20 17:24:25 +08:00 |
|
ival
|
433360f979
|
增加回放的国际化
|
2019-08-20 17:22:45 +08:00 |
|
fan
|
520f1ef356
|
调整: 国际化创建连计划
|
2019-08-20 17:10:08 +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 |
|
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
|
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
|
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 |
|
ival
|
c99394ea51
|
修改主页配置
|
2019-08-16 18:59:19 +08:00 |
|
sunzhenyu
|
d5aa08dd72
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-08-16 18:38:44 +08:00 |
|
sunzhenyu
|
ab23d7932a
|
修改mmi接收操作模拟器消息
|
2019-08-16 18:38:35 +08:00 |
|
zyy
|
049ed8f0dd
|
desc: 调整样式
|
2019-08-16 18:23:36 +08:00 |
|
ival
|
9648263a88
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
2019-08-16 18:18:38 +08:00 |
|
ival
|
b0aade5fa2
|
修改首页显示
|
2019-08-16 18:16:19 +08:00 |
|
zyy
|
382e63c6c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 18:02:56 +08:00 |
|
zyy
|
bb1a98507b
|
desc: 地图编辑区分绘图数据，地图数据
|
2019-08-16 18:02:50 +08:00 |
|
fan
|
04baa2756e
|
修改：代码调整
|
2019-08-16 17:50:57 +08:00 |
|
fan
|
eb75c2bc3d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 17:16:10 +08:00 |
|
fan
|
8e401afe36
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 17:15:36 +08:00 |
|
fan
|
3143251d33
|
修改：配置调整
|
2019-08-16 17:15:25 +08:00 |
|
joylink_cuiweidong
|
ecefa16f5e
|
剧本编制修改
|
2019-08-16 17:15:20 +08:00 |
|
zyy
|
50e847ec57
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 17:13:18 +08:00 |
|
zyy
|
e08a400b06
|
desc: 修改琏计划运行图创建加载
|
2019-08-16 17:13:12 +08:00 |
|
ival
|
6065853adc
|
删除测试代码
|
2019-08-16 16:57:14 +08:00 |
|
ival
|
483f7ac12b
|
修改主页界面
|
2019-08-16 16:55:16 +08:00 |
|
ival
|
25e3cb19a4
|
删除运行图创建
|
2019-08-16 16:42:26 +08:00 |
|
ival
|
b2d6faa7ba
|
修改导入没有loading的问题
|
2019-08-16 16:40:02 +08:00 |
|
zyy
|
75da1291ce
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 16:34:14 +08:00 |
|
zyy
|
25493993d9
|
desc: 修改路由监听
|
2019-08-16 16:33:59 +08:00 |
|
ival
|
850b0cf248
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 16:28:22 +08:00 |
|
ival
|
8e431bade1
|
修改地图导入导出
|
2019-08-16 16:28:11 +08:00 |
|
zyy
|
e6f83a7998
|
desc: 修改地图绘制点击事件
|
2019-08-16 16:27:38 +08:00 |
|
zyy
|
7b22ab377e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 16:19:14 +08:00 |
|
zyy
|
44d021a6ec
|
desc: 修改地图绘制加载问题
|
2019-08-16 16:19:08 +08:00 |
|
fan
|
49f8ebe630
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 16:01:33 +08:00 |
|
fan
|
f5152e5807
|
修改：根据包围盒去计算识别号位置
|
2019-08-16 16:00:49 +08:00 |
|
ival
|
216b8ceab1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 15:41:45 +08:00 |
|
ival
|
7596e980f4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 15:41:30 +08:00 |
|
fan
|
84f388b2d8
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 15:41:27 +08:00 |
|
ival
|
836c6d383a
|
修改格式，以及修改综合演练设置车站的stationCode为deviceCode
|
2019-08-16 15:41:20 +08:00 |
|
fan
|
7833208222
|
修改：列车识别号宽高比调整
|
2019-08-16 15:41:03 +08:00 |
|
zyy
|
cf84618fd4
|
desc: 修改地图点击事件问题
|
2019-08-16 15:24:41 +08:00 |
|
zyy
|
2e7715ea0a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/mapdraft/mapedit/index.vue
# src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
|
2019-08-16 15:13:58 +08:00 |
|
zyy
|
b84b6ea500
|
desc: 修改地图编辑页面逻辑
|
2019-08-16 15:12:03 +08:00 |
|
fan
|
df1994ecfb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-16 15:03:11 +08:00 |
|
fan
|
5f2fc257f5
|
修改：剧本调整
|
2019-08-16 15:02:34 +08:00 |
|
ival
|
37390ff549
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 14:40:52 +08:00 |
|
ival
|
5612c9b1e4
|
修改主页参数
|
2019-08-16 14:40:42 +08:00 |
|
joylink_cuiweidong
|
14901a50f2
|
修改 创建剧本的跳转逻辑
编制剧本的表单重置
|
2019-08-16 14:37:42 +08:00 |
|
ival
|
aae4d4d162
|
修改车次窗的问题
|
2019-08-16 14:33:36 +08:00 |
|
ival
|
c154ab28fe
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-08-16 14:25:56 +08:00 |
|
ival
|
e152829561
|
修改车次窗不能创建的问题
|
2019-08-16 14:25:20 +08:00 |
|
fan
|
d16ecfd83c
|
修改：剧本调整
|
2019-08-16 14:15:43 +08:00 |
|
joylink_cuiweidong
|
b73baebbb8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-16 13:50:51 +08:00 |
|
joylink_cuiweidong
|
2598087dac
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/en/map.js
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/map.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/tip.js
# src/utils/baseUrl.js
# src/views/map/mapdraft/mapedit/routingoperate/detail.vue
# src/views/map/mapdraft/mapedit/routingoperate/route.vue
# src/views/map/mapdraft/mapedit/switchoperate/detail.vue
|
2019-08-16 13:45:49 +08:00 |
|
fan
|
50e9549260
|
剧本接口调整
|
2019-08-16 13:43:46 +08:00 |
|
joylink_cuiweidong
|
f722a0bc27
|
录制剧本模块修改
|
2019-08-16 09:25:12 +08:00 |
|
ival
|
05db53a606
|
修改echarts配置
|
2019-08-15 18:44:06 +08:00 |
|
ival
|
561c86ab72
|
首页数据统计
|
2019-08-15 18:04:23 +08:00 |
|
ival
|
1720e5e19d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 16:19:23 +08:00 |
|
ival
|
4917108e3e
|
修改绘图card被撑开的问题
|
2019-08-15 16:19:03 +08:00 |
|
zyy
|
300d1f9638
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 16:11:16 +08:00 |
|
zyy
|
ecc9806d61
|
desc: 修改地图配置
|
2019-08-15 16:11:09 +08:00 |
|
ival
|
0d8770e9e1
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/views/demonstration/deomonList/index.vue
|
2019-08-15 16:10:13 +08:00 |
|
ival
|
7a08dabc30
|
修改jenkinsfile-test
|
2019-08-15 16:06:08 +08:00 |
|
ival
|
11658a283e
|
修改主页
|
2019-08-15 15:53:11 +08:00 |
|
fan
|
0b3ad87bc3
|
创建仿真失败时关闭loading
|
2019-08-15 15:21:28 +08:00 |
|
ival
|
4519d753e3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 14:28:47 +08:00 |
|
ival
|
d4ba56d31d
|
修该查询进路的接口
|
2019-08-15 14:28:31 +08:00 |
|
joylink_cuiweidong
|
2e53745790
|
剧本管理模块
|
2019-08-15 14:06:53 +08:00 |
|
fan
|
9787c8aaeb
|
调整：国际化
|
2019-08-15 10:47:59 +08:00 |
|
fan
|
1b42eec5e3
|
调整：国际化
|
2019-08-15 10:37:47 +08:00 |
|
fan
|
951fdd9719
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/map.js
# src/i18n/langs/zh/tip.js
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
|
2019-08-15 10:34:31 +08:00 |
|
zyy
|
7cabec1c1f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-15 10:26:37 +08:00 |
|
zyy
|
fad339f977
|
desc: 调整地图绘制国际化
|
2019-08-15 10:26:29 +08:00 |
|
fan
|
414000331e
|
调整：国际化
|
2019-08-15 09:45:31 +08:00 |
|
joylink_cuiweidong
|
ca7b21e61e
|
修改剧本管理界面
|
2019-08-15 09:04:17 +08:00 |
|
ival
|
68c8757dad
|
修改配置
|
2019-08-15 08:58:21 +08:00 |
|
ival
|
fd2b66e984
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/rules.js
# src/views/trainRoom/index.vue
|
2019-08-14 16:50:50 +08:00 |
|
zyy
|
7fdedec00f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 16:48:03 +08:00 |
|
zyy
|
62674f84ff
|
desc: 修改快速入口提示问题
|
2019-08-14 16:47:54 +08:00 |
|
ival
|
b1fd1f43e9
|
删除返回主页的错误
|
2019-08-14 16:46:44 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
zyy
|
eef2fed8a2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 16:15:50 +08:00 |
|
zyy
|
ed8b14dac2
|
desc: 修改综合演练，socket创建
|
2019-08-14 16:15:44 +08:00 |
|
ival
|
3bb449080f
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/tip.js
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/views/components/pay/index.vue
# src/views/demonstration/detail/index.vue
# src/views/display/index.vue
# src/views/exam/detail/courseDetail.vue
# src/views/exam/detail/examDetail.vue
# src/views/exam/detail/questionDetail.vue
# src/views/jlmap3d/drive/jl3ddrive.vue
# src/views/jlmap3d/simulation/jl3dsimulation.vue
# src/views/jointTraining/index.vue
# src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
# src/views/map/mapdraft/mapedit/mapoperate/section.vue
# src/views/map/mapdraft/mapedit/mapoperate/signal.vue
# src/views/map/mapdraft/mapedit/mapoperate/station.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
# src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
# src/views/map/mapdraft/mapedit/mapoperate/switch.vue
# src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
# src/views/map/mapdraft/mapedit/routeoperate/preview.vue
# src/views/map/mapdraft/mapedit/routeoperate/related.vue
# src/views/map/mapdraft/mapedit/routeoperate/route.vue
# src/views/map/mapdraft/mapmanage/operateMenu.vue
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
# src/views/planMonitor/detail.vue
# src/views/planMonitor/editTool/index.vue
# src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
# src/views/planMonitor/editTool/schedule.vue
# src/views/teach/detail/index.vue
# src/views/teach/practical/index.vue
|
2019-08-14 15:57:52 +08:00 |
|
ival
|
6ea6c8a2e9
|
修改代码
|
2019-08-14 15:28:15 +08:00 |
|
ival
|
230d118d30
|
修改name错误的问题
|
2019-08-14 15:25:01 +08:00 |
|
ival
|
4886587d2d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
|
2019-08-14 15:21:06 +08:00 |
|
ival
|
72d3a5f475
|
修改进路查询方式
|
2019-08-14 15:19:11 +08:00 |
|
zyy
|
c304af4811
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 15:03:47 +08:00 |
|
zyy
|
3dd56879a4
|
desc: 修改国际化，调整角色显示
|
2019-08-14 15:03:41 +08:00 |
|
ival
|
4a224b630f
|
增加首先显示
|
2019-08-14 14:52:21 +08:00 |
|
ival
|
6343a79f81
|
修改接口
|
2019-08-14 14:01:28 +08:00 |
|
ival
|
72c1f1d4ca
|
修改搜索
|
2019-08-14 13:48:06 +08:00 |
|
ival
|
c61a673513
|
修改添加
|
2019-08-14 13:42:35 +08:00 |
|
ival
|
ed05cb123e
|
修改类车添加功能
|
2019-08-14 13:38:28 +08:00 |
|
ival
|
576ac7eacb
|
修改导航配置
|
2019-08-14 10:36:55 +08:00 |
|
ival
|
25479392ff
|
修改配置
|
2019-08-14 10:12:51 +08:00 |
|
ival
|
d8480207aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-14 09:35:52 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
4e88c02363
|
修改目录结构
|
2019-08-14 09:33:24 +08:00 |
|
zyy
|
9a4e982c08
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-13 18:43:40 +08:00 |
|
zyy
|
aa63be299b
|
desc: 增加地图编辑 国际化
|
2019-08-13 18:43:34 +08:00 |
|
fan
|
8c799d7ee6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:32:48 +08:00 |
|
fan
|
3a0202a1e9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:27:09 +08:00 |
|
ival
|
e0d76d03c5
|
修改运行图右键菜单
|
2019-08-13 18:26:36 +08:00 |
|
ival
|
45417f0072
|
修改代码
|
2019-08-13 18:14:19 +08:00 |
|
fan
|
2ab09d664f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:12:14 +08:00 |
|
fan
|
a3ecc1dfc6
|
调整：国际化
|
2019-08-13 18:11:58 +08:00 |
|
ival
|
b84f1fe553
|
运行图修改接口
|
2019-08-13 17:46:59 +08:00 |
|
ival
|
fc4cf549b2
|
切换系统语言
|
2019-08-13 17:33:46 +08:00 |
|
ival
|
db109f2a9e
|
调整地图进路相关的接口
|
2019-08-13 16:59:38 +08:00 |
|
sunzhenyu
|
49c3c19c83
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-13 16:23:52 +08:00 |
|
sunzhenyu
|
39002937e1
|
调整文件结构
|
2019-08-13 16:23:46 +08:00 |
|
zyy
|
c817cdea7a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-13 15:54:32 +08:00 |
|
zyy
|
9049d793cc
|
desc: 修改琏计划界面样式，修改界面交互
|
2019-08-13 15:54:26 +08:00 |
|
ival
|
cf66728bc7
|
修改切换route报错的问题
|
2019-08-13 13:34:39 +08:00 |
|
ival
|
346459e43a
|
修改配置
|
2019-08-13 11:15:39 +08:00 |
|
ival
|
d14d3b3221
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/error.js
# src/i18n/langs/en/global.js
# src/i18n/langs/zh/error.js
# src/i18n/langs/zh/global.js
|
2019-08-13 11:13:27 +08:00 |
|
ival
|
0eaa4dbe1f
|
修改国际化配置
|
2019-08-13 11:10:55 +08:00 |
|
sunzhenyu
|
8749644fa8
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-13 09:49:46 +08:00 |
|
fan
|
819c46789b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 09:20:59 +08:00 |
|
fan
|
8725104c7b
|
调整：国际化
|
2019-08-13 09:20:49 +08:00 |
|
ival
|
61fe3c2b2d
|
调整回放界面布局
|
2019-08-13 09:09:10 +08:00 |
|
fan
|
e0b7994b80
|
Merge branch 'master_loading2' into dev
# Conflicts:
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/tip.js
|
2019-08-13 09:02:46 +08:00 |
|
fan
|
e1c6d00a18
|
Merge branch 'master' into dev
|
2019-08-12 20:17:53 +08:00 |
|
fan
|
e1bd3c8b22
|
剧本调整
|
2019-08-12 20:11:23 +08:00 |
|
joylink_cuiweidong
|
e105327af6
|
加载剧本调整
|
2019-08-12 20:04:53 +08:00 |
|
joylink_cuiweidong
|
45d0cb0a12
|
加载剧本列表数据显示修改
|
2019-08-12 19:30:50 +08:00 |
|
ival
|
5cd6150c16
|
修改required未定义的问题
|
2019-08-12 19:02:38 +08:00 |
|
fan
|
13d7e5df8b
|
调整：国际化
|
2019-08-12 18:54:32 +08:00 |
|
sunzhenyu
|
74527e79fe
|
修改三维view文件结构
|
2019-08-12 18:37:43 +08:00 |
|
ival
|
a779d6ad29
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2019-08-12 18:30:33 +08:00 |
|
ival
|
6785738122
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 18:22:29 +08:00 |
|
ival
|
dc0b5301e0
|
增加导出部分地图数据
|
2019-08-12 18:22:14 +08:00 |
|
joylink_cuiweidong
|
19d26919fc
|
处理录制剧本时地图不加载的问题
|
2019-08-12 17:35:55 +08:00 |
|
ival
|
bce66f2f22
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 15:39:44 +08:00 |
|
ival
|
dbd1193679
|
修改登录涟计划以及大屏等其他系统时，主系统也跳转的问题
|
2019-08-12 15:39:29 +08:00 |
|
zyy
|
e7d1f478be
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 15:19:33 +08:00 |
|
zyy
|
fcb6076d64
|
desc: 增加地图编辑国际化
|
2019-08-12 15:19:26 +08:00 |
|
joylink_cuiweidong
|
1b01141b88
|
修改剧本编辑 字段名称
|
2019-08-12 14:21:32 +08:00 |
|
sunzhenyu
|
2cbf0f0452
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-12 14:12:16 +08:00 |
|
sunzhenyu
|
da5bc03838
|
修改错误引用
|
2019-08-12 14:12:12 +08:00 |
|
ival
|
9c51afb419
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 14:10:57 +08:00 |
|