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 |
|
ival
|
be91b4f1c6
|
修改语言
|
2019-08-12 14:10:46 +08:00 |
|
fan
|
df1697e137
|
调整：代码修改
|
2019-08-12 14:08:16 +08:00 |
|
ival
|
0289ddf5d1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 14:05:12 +08:00 |
|
ival
|
ffd23c3adb
|
修改配置
|
2019-08-12 14:04:57 +08:00 |
|
sunzhenyu
|
46d776a642
|
pull
|
2019-08-12 13:43:40 +08:00 |
|
sunzhenyu
|
de7ee56d77
|
删除不用资源
|
2019-08-12 13:42:53 +08:00 |
|
fan
|
6f7d87b72c
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-12 13:40:55 +08:00 |
|
fan
|
0b5cfcc9a7
|
调整：代码修改
|
2019-08-12 13:40:34 +08:00 |
|
joylink_cuiweidong
|
47b2be3a8b
|
剧本创建修改查询接口调整
|
2019-08-12 11:31:43 +08:00 |
|
ival
|
914b5d4e0e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 11:01:13 +08:00 |
|
ival
|
0bc9d40ad1
|
修改打包配置
|
2019-08-12 11:01:00 +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 |
|
ival
|
21778c7f7c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 10:19:11 +08:00 |
|
ival
|
52e9b1f79f
|
增加国际化配置
|
2019-08-12 10:18:59 +08:00 |
|
fan
|
358b3cf6d0
|
调整：代码修改
|
2019-08-12 10:14:19 +08:00 |
|
ival
|
94e16353f3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 09:36:43 +08:00 |
|
ival
|
fc6279efdf
|
修改加载方式
|
2019-08-12 09:36:27 +08:00 |
|
joylink_cuiweidong
|
f1b3906973
|
任务目标模块国际化
|
2019-08-09 19:00:37 +08:00 |
|
ival
|
6d960f82e2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 18:29:26 +08:00 |
|
ival
|
763cff0a7c
|
修改页面不刷新的问题
|
2019-08-09 18:29:08 +08:00 |
|
joylink_cuiweidong
|
ddd282f5ca
|
国际化修改
|
2019-08-09 18:24:13 +08:00 |
|
joylink_cuiweidong
|
b82393366c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-09 18:20:34 +08:00 |
|
zyy
|
ff44562b2c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 17:41:20 +08:00 |
|
zyy
|
7cde547775
|
desc: 增加英文文件内容
|
2019-08-09 17:40:53 +08:00 |
|
fan
|
367edf0118
|
调整：代码修改
|
2019-08-09 17:38:20 +08:00 |
|
fan
|
19eb3314c8
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-09 17:37:24 +08:00 |
|
zyy
|
ca0cdeb7f9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/zh/index.js
|
2019-08-09 17:37:12 +08:00 |
|
zyy
|
374bf96525
|
desc: 增加规则，提示信息国际化
|
2019-08-09 17:36:20 +08:00 |
|
fan
|
a3b7ed0522
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2
|
2019-08-09 17:34:13 +08:00 |
|
joylink_cuiweidong
|
6951bf9f3a
|
页面样式修改
国际化添加
|
2019-08-09 17:26:33 +08:00 |
|
ival
|
bfddddf7e6
|
修改代码
|
2019-08-09 17:25:45 +08:00 |
|
ival
|
b208926795
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 16:57:28 +08:00 |
|
ival
|
6fad38621b
|
修改运行图编辑因为家在地图数据而报错的问题
|
2019-08-09 16:57:07 +08:00 |
|
fan
|
74f7785663
|
调整：限制仿真多次加载
|
2019-08-09 15:52:55 +08:00 |
|
zyy
|
fdd28f3c45
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-09 15:41:39 +08:00 |
|
zyy
|
de5ca5225a
|
desc: 配置地图国际化语言
|
2019-08-09 15:40:33 +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
|
05aa351a85
|
修改代码
|
2019-08-09 15:13:16 +08:00 |
|
ival
|
be0b7f7a2f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-09 15:10:28 +08:00 |
|
ival
|
7af324ab1e
|
国际化配置
|
2019-08-09 15:10:13 +08:00 |
|
joylink_cuiweidong
|
fe38c3dfb1
|
代码调整
|
2019-08-09 10:33:11 +08:00 |
|
ival
|
2db20932e1
|
精简配置
|
2019-08-09 10:10:26 +08:00 |
|
ival
|
66a13e6ede
|
修改运行图
|
2019-08-09 09:33:35 +08:00 |
|
ival
|
b89d99f2a5
|
修改i18n语言层次
|
2019-08-09 09:31:09 +08:00 |
|
joylink_cuiweidong
|
bf9a92d6b7
|
代码调整
|
2019-08-08 18:41:44 +08:00 |
|
joylink_cuiweidong
|
50c57837eb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:39:05 +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 |
|
joylink_cuiweidong
|
7abbadd603
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 17:33:18 +08:00 |
|
joylink_cuiweidong
|
ee136f8867
|
获取剧本的地图定位并设置
|
2019-08-08 17:32:38 +08:00 |
|
fan
|
212fce48bb
|
调整：代码调整
|
2019-08-08 17:26:50 +08:00 |
|
fan
|
a504f3cd90
|
调整：剧本加载页面位置跳转
|
2019-08-08 17:06:18 +08:00 |
|
joylink_cuiweidong
|
73a7780118
|
更新定位
|
2019-08-08 16:56:34 +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
|
4068555199
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 15:57:42 +08:00 |
|
zyy
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +08:00 |
|
joylink_cuiweidong
|
66c0939e6c
|
代码调整
|
2019-08-08 15:48:43 +08:00 |
|
zyy
|
b67a37bc33
|
desc: 修改查询问题
|
2019-08-08 15:27:30 +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 |
|
fan
|
33844220d3
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 14:37:39 +08:00 |
|
fan
|
289bffb435
|
调整：代码迁移(暂时注释掉位置跳转)
|
2019-08-08 14:36:57 +08:00 |
|
ival
|
842c7f9df2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:32:47 +08:00 |
|
ival
|
66c599c0da
|
修改格式问题
|
2019-08-08 14:32:32 +08:00 |
|
sunzhenyu
|
f95b9eb1b7
|
merge
|
2019-08-08 14:20:00 +08:00 |
|
sunzhenyu
|
2aa7bfd759
|
修改js挂载
|
2019-08-08 14:19:03 +08:00 |
|
zyy
|
debecfba5a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 14:08:09 +08:00 |
|
zyy
|
ea67901aa1
|
修改格式
|
2019-08-08 14:08:02 +08:00 |
|
fan
|
6b21fefaeb
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-08 13:47:39 +08:00 |
|
fan
|
bcf73c78c2
|
调整：代码迁移+列车调整
|
2019-08-08 13:47:30 +08:00 |
|
ival
|
dbc3cbf482
|
修改运行图编辑工具报错bug
|
2019-08-08 13:36:53 +08:00 |
|
ival
|
45295404c3
|
1. 修改福州线，取消扣车被禁用的问题
2. 修改i18n的获取当前语言的函数
|
2019-08-08 13:23:54 +08:00 |
|
ival
|
7a41260bae
|
增加国际化配置
|
2019-08-08 11:33:06 +08:00 |
|
ival
|
b15a7feb23
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/main.js
|
2019-08-08 11:31:36 +08:00 |
|
ival
|
c66d72a049
|
增加i18n国际化配置
|
2019-08-08 11:29:03 +08:00 |
|
zyy
|
577aaab9b9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 11:11:38 +08:00 |
|
zyy
|
0a010eca04
|
修改格式
|
2019-08-08 11:11:32 +08:00 |
|
sunzhenyu
|
b326cbf73f
|
push
|
2019-08-08 10:53:19 +08:00 |
|
sunzhenyu
|
6da9552dc7
|
pull
|
2019-08-08 10:52:43 +08:00 |
|
sunzhenyu
|
9f9236361a
|
修改threejs挂载
|
2019-08-08 10:52:06 +08:00 |
|
joylink_cuiweidong
|
b166dbd769
|
剧本 任务录制模块提交
|
2019-08-08 10:31:46 +08:00 |
|
zyy
|
d014007d25
|
desc: 修改仿真系统，教学系统，考试系统默认首页设置
|
2019-08-08 10:16:14 +08:00 |
|
zyy
|
af61917dbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/factory.js
|
2019-08-08 09:48:14 +08:00 |
|
zyy
|
f231ffd6f1
|
desc: 增加成都四号线地图配置
|
2019-08-08 09:47:39 +08:00 |
|
ival
|
9ffce4d702
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 09:37:46 +08:00 |
|
ival
|
c855925ae3
|
修改配置
|
2019-08-08 09:37:35 +08:00 |
|
fan
|
05e4fd73bb
|
调整：列车调整
|
2019-08-08 09:35:28 +08:00 |
|
zyy
|
fe9b59e2de
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 16:23:11 +08:00 |
|
zyy
|
d70953a130
|
desc: 增加成都四号线模型， 修改地图删除逻辑
|
2019-08-07 16:23:04 +08:00 |
|
ival
|
0cbe7901c7
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 15:32:50 +08:00 |
|
ival
|
7feea79e44
|
成都三号线运行图解析
|
2019-08-07 15:32:35 +08:00 |
|
sunzhenyu
|
e86be938f3
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-07 11:29:03 +08:00 |
|
sunzhenyu
|
5899fe1347
|
修改界面自适应
|
2019-08-07 11:28:46 +08:00 |
|
zyy
|
83faa429fe
|
修改列车详情显示问题
|
2019-08-07 11:22:33 +08:00 |
|
zyy
|
f492d38c47
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-07 10:24:21 +08:00 |
|
zyy
|
e3a8d5c525
|
desc: 修改代码
|
2019-08-07 10:24:13 +08:00 |
|
ival
|
3751748979
|
修改lz zc 等鼠标事件统一接口处理
|
2019-08-07 09:16:55 +08:00 |
|
ival
|
a02a948f17
|
修改bug
|
2019-08-06 18:42:18 +08:00 |
|
ival
|
165362dfcb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 17:46:55 +08:00 |
|
ival
|
b6baa2e420
|
修改 设置设备名称的设置方法
|
2019-08-06 17:46:41 +08:00 |
|
sunzhenyu
|
7edaf938c7
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-06 17:28:17 +08:00 |
|
zyy
|
888756dc35
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section/EMouse.js
|
2019-08-06 17:02:32 +08:00 |
|
zyy
|
37c13f6672
|
调整代码格式，福州线状态处理
|
2019-08-06 17:02:04 +08:00 |
|
ival
|
167e483b10
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 17:00:36 +08:00 |
|
ival
|
f85139b4ae
|
修改鼠标关联操作
|
2019-08-06 17:00:24 +08:00 |
|
sunzhenyu
|
c27aed050f
|
挂载threejs，添加静态文件插件
|
2019-08-06 14:10:21 +08:00 |
|
zyy
|
e4364c600e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 13:56:48 +08:00 |
|
zyy
|
8fe358896e
|
desc: 修改车次窗菜单BUG
|
2019-08-06 13:56:42 +08:00 |
|
ival
|
86c5a5f58f
|
抽离车次窗配置
|
2019-08-06 13:19:30 +08:00 |
|
ival
|
7573e30a31
|
修改皮肤配置
|
2019-08-06 13:09:11 +08:00 |
|
ival
|
d4b995675d
|
提出字体粗细配置
|
2019-08-06 13:02:55 +08:00 |
|
zyy
|
e71c68f7bc
|
修改signal 状态管理
|
2019-08-06 10:54:22 +08:00 |
|
zyy
|
71381ff174
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 10:11:43 +08:00 |
|
zyy
|
98a0533b20
|
修改代码格式
|
2019-08-06 10:11:32 +08:00 |
|
ival
|
ea0a3b9d16
|
修改默认选中状态，无未选中
|
2019-08-06 09:32:55 +08:00 |
|
ival
|
2ee8e24897
|
增加鼠标操作
|
2019-08-06 09:27:12 +08:00 |
|
ival
|
3ae415d6e9
|
修改背景线，鼠标特效
|
2019-08-05 18:42:37 +08:00 |
|
ival
|
530a1c473e
|
修改 代码接口名称
|
2019-08-05 17:46:41 +08:00 |
|
ival
|
44481b2cbb
|
修改代码bug
|
2019-08-05 17:36:16 +08:00 |
|
ival
|
fb33bde94c
|
设置状态时，无需关注model变化，render时，model已经引用到view上
|
2019-08-05 17:24:20 +08:00 |
|
ival
|
78e7e344aa
|
修改操作问题
|
2019-08-05 17:09:16 +08:00 |
|
ival
|
79bd163d8f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:55:47 +08:00 |
|
ival
|
d2887ee34e
|
调整道岔名称的y轴设置
|
2019-08-05 16:55:36 +08:00 |
|
zyy
|
d7a80d3bc3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:43:59 +08:00 |
|
zyy
|
87177a347b
|
desc: 修改代码
|
2019-08-05 16:43:52 +08:00 |
|
ival
|
b8fb7fc210
|
修改代码
|
2019-08-05 16:21:43 +08:00 |
|
ival
|
1e5ad7e522
|
修改bug
|
2019-08-05 16:17:46 +08:00 |
|
ival
|
efa91ae5a0
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 16:14:53 +08:00 |
|
ival
|
7c526a94c6
|
修改代码
|
2019-08-05 16:14:40 +08:00 |
|
fan
|
6bc62094ba
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
|
2019-08-05 15:20:04 +08:00 |
|
fan
|
dbc16a1172
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-05 15:19:32 +08:00 |
|
fan
|
a55ab7b57e
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-05 15:18:40 +08:00 |
|
fan
|
fd8b2402ad
|
调整：列车成都线调整
|
2019-08-05 15:13:49 +08:00 |
|
ival
|
9792a2547a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:13:41 +08:00 |
|
ival
|
6f73920532
|
增加信号机变现变化处理
|
2019-08-05 15:13:31 +08:00 |
|
zyy
|
386f79128a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:12:13 +08:00 |
|
zyy
|
d45c154fe0
|
修改代码
|
2019-08-05 15:12:06 +08:00 |
|
ival
|
555664aaeb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 15:01:03 +08:00 |
|
ival
|
042e6c0e59
|
修改区段名称的问题
|
2019-08-05 15:00:51 +08:00 |
|
fan
|
824c6ed834
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整
|
2019-08-05 13:36:14 +08:00 |
|
fan
|
15d0ea03e5
|
调整：列车调整
|
2019-08-05 13:36:00 +08:00 |
|
zyy
|
6b5c1790c6
|
修改代码
|
2019-08-05 10:36:41 +08:00 |
|
zyy
|
f37f441d33
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/skinStyle/bejing_01.js
# src/jmap/config/skinStyle/fuzhou_01.js
|
2019-08-05 10:36:28 +08:00 |
|
zyy
|
5134feec56
|
desc: 修改代码
|
2019-08-05 10:33:31 +08:00 |
|
ival
|
5e8f1899ff
|
修改代码
|
2019-08-05 09:59:08 +08:00 |
|
ival
|
dd9c8220b1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-05 09:58:45 +08:00 |
|
ival
|
711534599f
|
修改代码
|
2019-08-05 09:58:33 +08:00 |
|
fan
|
072495709a
|
调整：列车配置项结构调整
|
2019-08-05 09:36:15 +08:00 |
|
fan
|
ee16c35aaa
|
调整：standControl调整
|
2019-08-05 08:42:45 +08:00 |
|
ival
|
1e6a5510ac
|
修改格式
|
2019-08-02 18:09:25 +08:00 |
|
ival
|
ad6e98da39
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-02 18:05:17 +08:00 |
|
ival
|
77db948f68
|
修改皮肤配置
|
2019-08-02 18:05:08 +08:00 |
|
fan
|
9c51e10ec1
|
调整：皮肤调整
|
2019-08-02 17:57:14 +08:00 |
|
fan
|
e385704360
|
调整：代码修改
|
2019-08-02 17:41:12 +08:00 |
|
fan
|
7dec924ac4
|
调整：代码修改
|
2019-08-02 17:38:21 +08:00 |
|
fan
|
ce5600c173
|
调整：代码修改
|
2019-08-02 17:22:23 +08:00 |
|
fan
|
b7e021d737
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-02 17:14:21 +08:00 |
|
fan
|
af0fd392d1
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/skinStyle/chengdu_03.js
|
2019-08-02 17:14:02 +08:00 |
|
fan
|
44a1d197cb
|
调整：代码调整
|
2019-08-02 17:06:37 +08:00 |
|
ival
|
803dd3f823
|
修改皮肤配置
|
2019-08-02 17:02:43 +08:00 |
|
fan
|
33c71a20f6
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-02 16:31:49 +08:00 |
|
ival
|
347db0d6eb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-02 14:55:02 +08:00 |
|
ival
|
e64a26f621
|
修改eventBus大小问题
|
2019-08-02 14:54:51 +08:00 |
|
fan
|
3ad9becbd8
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-02 14:38:27 +08:00 |
|
fan
|
02ba15964c
|
调整：代码调整
|
2019-08-02 14:38:05 +08:00 |
|
zyy
|
0b93d7ef16
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/utils/baseUrl.js
# src/views/map/runplan/manage/operateMenu.vue
|
2019-08-02 14:32:42 +08:00 |
|
zyy
|
4cf032df11
|
desc: 增加区段折返箭头代码
|
2019-08-02 14:31:29 +08:00 |
|
fan
|
0abe6e61e6
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-08-02 14:29:43 +08:00 |
|