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 |
|
sunzhenyu
|
14a2db04f7
|
Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient
|
2019-08-15 16:28:32 +08:00 |
|
sunzhenyu
|
bdec482bae
|
pull准备
|
2019-08-15 16:28:21 +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 |
|