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 |
|