Commit Graph

400 Commits

Author SHA1 Message Date
zyy
c5c71253df desc: 调整信号机字段显示,调整创建权限逻辑 2019-09-16 17:31:12 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口,调整地图绘制优化 2019-09-06 14:21:01 +08:00
zyy
921ef7c03d desc: 调整接口请求次数 2019-09-04 19:06:55 +08:00
zyy
118ed1296c desc: 增加琏计划运行图修改 2019-09-04 16:32:41 +08:00
zyy
a037937627 desc: 调整运行图生成逻辑 2019-09-04 14:47:52 +08:00
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +08:00
ival
c97996fceb 设置冲突列颜色 2019-09-03 17:35:23 +08:00
zyy
27f05bdd0d desc: 增加缓存列表 2019-09-03 15:22:50 +08:00
zyy
7fbadc2bd3 desc: 修改权限编辑 2019-09-03 14:38:05 +08:00
zyy
d53661e6ed desc: 增加权限一键生成接口,调整显示位置,字段内容 2019-09-02 18:43:05 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口,修改显示字段内容 2019-09-02 17:05:53 +08:00
ival
9b9be66ea0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-30 17:12:52 +08:00
ival
36facbb67d 修改重新生成排班计划的页面 2019-08-30 17:12:39 +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
fd03ed6d59 修改每日运行图查询接口 2019-08-29 14:48:26 +08:00
ival
1616639f6f 修改运行图接口 2019-08-29 13:52:34 +08:00
zyy
2d906ef9be desc: 调整权限列表接口对接 2019-08-29 09:31:58 +08:00
zyy
b9b2fd5b77 desc: 调整地图绘制数据逻辑, 新增发布历史列表 2019-08-23 18:40:02 +08:00
joylink_cuiweidong
aab5bcc995 剧本录制添加成员角色 2019-08-21 18:45:16 +08:00
joylink_cuiweidong
7f2c741818 剧本列表页面 样式调整 2019-08-20 17:54:40 +08:00
joylink_cuiweidong
146be45957 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 18:25:58 +08:00
joylink_cuiweidong
4dbe34cf4f 剧本编制模块修改 2019-08-19 18:24:06 +08:00
ival
ae500285ba 修改实训加载顺序错误的问题 2019-08-19 15:59:04 +08:00
ival
94f3659cf3 修改国际化 2019-08-19 15:19:33 +08:00
joylink_cuiweidong
ecefa16f5e 剧本编制修改 2019-08-16 17:15: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
561c86ab72 首页数据统计 2019-08-15 18:04:23 +08:00
ival
d4ba56d31d 修该查询进路的接口 2019-08-15 14:28:31 +08:00
joylink_cuiweidong
2e53745790 剧本管理模块 2019-08-15 14:06:53 +08:00
ival
87e35cb38d 同步master代码以及修改交路的问题 2019-08-14 16:37:17 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
ival
b84f1fe553 运行图修改接口 2019-08-13 17:46:59 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
joylink_cuiweidong
e105327af6 加载剧本调整 2019-08-12 20:04:53 +08:00
joylink_cuiweidong
19d26919fc 处理录制剧本时地图不加载的问题 2019-08-12 17:35:55 +08:00
ival
66c599c0da 修改格式问题 2019-08-08 14:32:32 +08:00
joylink_cuiweidong
b166dbd769 剧本 任务录制模块提交 2019-08-08 10:31:46 +08:00
zyy
4cf032df11 desc: 增加区段折返箭头代码 2019-08-02 14:31:29 +08:00
zyy
ff9e69585d desc: 调整剧本加载,删除城市注释 2019-08-01 15:19:24 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00
zyy
75e3162d68 修改代码 2019-07-25 10:30:30 +08:00
ival
d8e5fe8f2b 修改代码 2019-07-10 16:29:07 +08:00
ival
3780ebefad 增加nclient工程 2019-07-02 16:29:52 +08:00