fan
|
41b70bc477
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-11 13:20:30 +08:00 |
|
fan
|
80ce4e19a8
|
ibp调整
|
2019-09-09 16:11:43 +08:00 |
|
fan
|
6eb3fecc4b
|
信号机调整
|
2019-09-09 10:41:14 +08:00 |
|
fan
|
6472afe009
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 18:46:54 +08:00 |
|
ival
|
1918a634b1
|
修改变量
|
2019-09-06 17:55:18 +08:00 |
|
fan
|
c3a98567a3
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:03:07 +08:00 |
|
ival
|
f774edd652
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 16:11:46 +08:00 |
|
ival
|
7c5d453c29
|
修改绘制地图同步数据逻辑
|
2019-09-06 16:11:28 +08:00 |
|
zyy
|
0cfc1dc972
|
Merge branch 'dev' into test
|
2019-09-06 15:55:06 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
ival
|
664fbb8f7f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-04 19:04:58 +08:00 |
|
ival
|
99ffd6d36c
|
删除注释
|
2019-09-04 19:03:04 +08:00 |
|
ival
|
33c4a3afc2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:00:38 +08:00 |
|
ival
|
02fc21e544
|
增加仿真的大屏角色以及IBP角色
|
2019-09-04 19:00:22 +08:00 |
|
zyy
|
509e5218a7
|
desc: 调整引用问题
|
2019-09-04 17:58:22 +08:00 |
|
ival
|
4e7db47748
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-04 17:16:00 +08:00 |
|
ival
|
c97996fceb
|
设置冲突列颜色
|
2019-09-03 17:35:23 +08:00 |
|
ival
|
dfcdb5628f
|
优化IBP盘代码
|
2019-09-03 15:46:16 +08:00 |
|
ival
|
ca1b07595e
|
修改IBP界面尺寸的问题
|
2019-09-03 14:04:25 +08:00 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|
zyy
|
741af50a2a
|
desc: 地图绘制显示车站公里标，
|
2019-08-30 17:58:15 +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
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
ival
|
3da74652c5
|
增加派班计划
|
2019-08-30 09:00:36 +08:00 |
|
ival
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
ival
|
30e590afc7
|
封装车次窗鼠标事件以及车次窗操作
|
2019-08-29 11:26:05 +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
|
2d906ef9be
|
desc: 调整权限列表接口对接
|
2019-08-29 09:31:58 +08:00 |
|
ival
|
c2f6cf4656
|
移除jlmap中的地图原始数据
|
2019-08-29 09:30:52 +08:00 |
|
zyy
|
498f093866
|
desc: 新增按钮类型
|
2019-08-27 18:32:26 +08:00 |
|
zyy
|
72355448a1
|
desc: 修改地图绘制显示问题
|
2019-08-27 09:36:22 +08:00 |
|
zyy
|
b9b2fd5b77
|
desc: 调整地图绘制数据逻辑， 新增发布历史列表
|
2019-08-23 18:40:02 +08:00 |
|
zyy
|
2250bc970d
|
desc: 修改名称显示放到皮肤配置中
|
2019-08-23 14:24:30 +08:00 |
|
zyy
|
6a6bb3a405
|
desc: 修改地图绘制样式，逻辑调整
|
2019-08-23 09:14:21 +08:00 |
|
zyy
|
fde4d41727
|
desc: 修改样式，地图更新坐标
|
2019-08-22 10:25:23 +08:00 |
|
zyy
|
6712d1cd5b
|
desc: 修改地图编辑样式
|
2019-08-21 17:34:08 +08:00 |
|
zyy
|
e4a5d77f20
|
desc: 支付组件国际化， 调整地图加载位置
|
2019-08-21 15:15:08 +08:00 |
|
ival
|
28c6e05c41
|
修改获取列车数据没有刷新，导致加载的问题
|
2019-08-20 09:55:49 +08:00 |
|
fan
|
c5ecf86107
|
调整: 国际化+成都三号线人工车显示
|
2019-08-19 18:31:13 +08:00 |
|
ival
|
ae500285ba
|
修改实训加载顺序错误的问题
|
2019-08-19 15:59:04 +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
|
00f0fd84a3
|
修改车站公里表隐藏的问题
|
2019-08-19 09:38:11 +08:00 |
|
fan
|
5f3237dbc3
|
修改：代码调整
|
2019-08-16 19:27:01 +08:00 |
|
fan
|
3143251d33
|
修改：配置调整
|
2019-08-16 17:15:25 +08:00 |
|
fan
|
f5152e5807
|
修改：根据包围盒去计算识别号位置
|
2019-08-16 16:00:49 +08:00 |
|
fan
|
7833208222
|
修改：列车识别号宽高比调整
|
2019-08-16 15:41:03 +08:00 |
|
ival
|
4917108e3e
|
修改绘图card被撑开的问题
|
2019-08-15 16:19:03 +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 |
|
fan
|
414000331e
|
调整：国际化
|
2019-08-15 09:45:31 +08:00 |
|
ival
|
68c8757dad
|
修改配置
|
2019-08-15 08:58:21 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +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
|
4a224b630f
|
增加首先显示
|
2019-08-14 14:52:21 +08:00 |
|
ival
|
ed05cb123e
|
修改类车添加功能
|
2019-08-14 13:38:28 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
4e88c02363
|
修改目录结构
|
2019-08-14 09:33:24 +08:00 |
|
ival
|
db109f2a9e
|
调整地图进路相关的接口
|
2019-08-13 16:59:38 +08:00 |
|
zyy
|
9049d793cc
|
desc: 修改琏计划界面样式，修改界面交互
|
2019-08-13 15:54:26 +08:00 |
|
ival
|
a779d6ad29
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2019-08-12 18:30:33 +08:00 |
|
fan
|
0b5cfcc9a7
|
调整：代码修改
|
2019-08-12 13:40:34 +08:00 |
|
fan
|
9623c98994
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-12 10:59:28 +08:00 |
|
fan
|
a9d00b042e
|
调整：代码修改
|
2019-08-12 10:57:38 +08:00 |
|
ival
|
98e6755aba
|
修改解析错误的问题
|
2019-08-12 10:41:24 +08:00 |
|
fan
|
358b3cf6d0
|
调整：代码修改
|
2019-08-12 10:14:19 +08:00 |
|
fan
|
367edf0118
|
调整：代码修改
|
2019-08-09 17:38:20 +08:00 |
|
ival
|
bfddddf7e6
|
修改代码
|
2019-08-09 17:25:45 +08:00 |
|
ival
|
6fad38621b
|
修改运行图编辑因为家在地图数据而报错的问题
|
2019-08-09 16:57:07 +08:00 |
|
ival
|
378be47db0
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2019-08-09 15:24:05 +08:00 |
|
ival
|
e466d49036
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 15:23:14 +08:00 |
|
ival
|
32a75526ee
|
修改导入
|
2019-08-09 15:23:01 +08:00 |
|
fan
|
40b71c5a4d
|
调整：代码修改
|
2019-08-09 15:17:19 +08:00 |
|
ival
|
66a13e6ede
|
修改运行图
|
2019-08-09 09:33:35 +08:00 |
|
zyy
|
a288a21456
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:34:41 +08:00 |
|
zyy
|
b20686c0fa
|
desc: 修改 订阅综合演练房间号发送判断，修改代码格式
|
2019-08-08 18:34:35 +08:00 |
|
ival
|
c89c781735
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:09:52 +08:00 |
|
ival
|
4f9478d495
|
修改代码格式
|
2019-08-08 18:09:10 +08:00 |
|
fan
|
62d9b6fc5d
|
调整：title修改
|
2019-08-08 18:00:30 +08:00 |
|
fan
|
212fce48bb
|
调整：代码调整
|
2019-08-08 17:26:50 +08:00 |
|
fan
|
a504f3cd90
|
调整：剧本加载页面位置跳转
|
2019-08-08 17:06:18 +08:00 |
|
zyy
|
399006e31f
|
desc: 修改传入select默认值
|
2019-08-08 16:54:49 +08:00 |
|
zyy
|
40ab6b247b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/beijing_01/menus/index.vue
|
2019-08-08 16:48:06 +08:00 |
|
zyy
|
6c5469ec90
|
修改代码格式
|
2019-08-08 16:47:34 +08:00 |
|
fan
|
6c7c08483f
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 16:45:37 +08:00 |
|
fan
|
aac75df8f7
|
调整：控制模式模式跳转disable状态调整
|
2019-08-08 16:45:22 +08:00 |
|
ival
|
01b871fa77
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 16:37:31 +08:00 |
|
ival
|
3adc1aafb1
|
修改界面菜单栏加载后出发 缩放按钮重新调整位置
删除代码中的无用代码
|
2019-08-08 16:37:15 +08:00 |
|
fan
|
b7679a6337
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 16:26:54 +08:00 |
|
fan
|
e379696f46
|
调整：位置跳转测试
|
2019-08-08 16:26:34 +08:00 |
|
zyy
|
a250833772
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 16:03:15 +08:00 |
|
zyy
|
ff101dd603
|
删除debugger
|
2019-08-08 16:02:58 +08:00 |
|
fan
|
503991a758
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 15:59:17 +08:00 |
|
fan
|
4a36ed4d3e
|
调整：修改修改列车识别号操作
|
2019-08-08 15:59:07 +08:00 |
|
zyy
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +08:00 |
|
zyy
|
837ba489b6
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:47:39 +08:00 |
|
zyy
|
2443fd102c
|
desc: 调整站台字段
|
2019-08-08 14:47:34 +08:00 |
|