Commit Graph

287 Commits

Author SHA1 Message Date
zyy
44f9da4383 desc: 调整绘图进路数据,调整权限修改逻辑,调整设置link中心点BUG 2019-11-22 15:28:02 +08:00
zyy
4144621be8 desc: 修改代码 2019-11-19 13:00:36 +08:00
zyy
7018b4c308 desc: 修改代码 2019-11-12 13:36:21 +08:00
zyy
6e29cec983 desc: 修改代码 2019-11-11 19:24:30 +08:00
zyy
7a359e5f6e desc: 修改代码 2019-11-08 14:36:41 +08:00
zyy
18fb36b1b9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/jmap/config/skinCode/fuzhou_01.js
#	src/jmap/map.js
2019-11-06 18:38:50 +08:00
zyy
9f1f02bf0e desc: 增加绘图撤销,重做 2019-11-06 18:37:32 +08:00
ival
5fc745b799 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-05 14:16:09 +08:00
ival
37fdeec4e3 修改代码 2019-11-05 14:15:55 +08:00
fan
1bd3debbde 西铁院登录页样式调整,测试问题调整 2019-11-04 18:41:58 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
zyy
a61f917f4a desc: 调整站台扣车状态显示 2019-10-22 14:07:20 +08:00
joylink_cuiweidong
664435bdd7 剧本国际化调整 2019-10-16 17:05:38 +08:00
joylink_cuiweidong
df5a76ea41 剧本管理英文版英文用词修改 2019-10-16 11:20:36 +08:00
zyy
99edd29aea desc: 调整格式化问题, 调整列车详情国际化 2019-10-12 13:25:47 +08:00
zyy
0b1ae44c19 desc: 调整三号线现地操作 2019-09-26 09:23:02 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
fan
80ce4e19a8 ibp调整 2019-09-09 16:11:43 +08:00
fan
6eb3fecc4b 信号机调整 2019-09-09 10:41:14 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口,调整地图绘制优化 2019-09-06 14:21:01 +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
3da74652c5 增加派班计划 2019-08-30 09:00:36 +08:00
ival
30e590afc7 封装车次窗鼠标事件以及车次窗操作 2019-08-29 11:26:05 +08:00
zyy
498f093866 desc: 新增按钮类型 2019-08-27 18:32:26 +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
e4a5d77f20 desc: 支付组件国际化, 调整地图加载位置 2019-08-21 15:15:08 +08:00
fan
c5ecf86107 调整: 国际化+成都三号线人工车显示 2019-08-19 18:31:13 +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
f5152e5807 修改:根据包围盒去计算识别号位置 2019-08-16 16:00:49 +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
fan
0b5cfcc9a7 调整:代码修改 2019-08-12 13:40:34 +08:00
fan
358b3cf6d0 调整:代码修改 2019-08-12 10:14:19 +08:00
fan
40b71c5a4d 调整:代码修改 2019-08-09 15:17:19 +08:00
ival
4f9478d495 修改代码格式 2019-08-08 18:09:10 +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
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