Commit Graph

64 Commits

Author SHA1 Message Date
joylink_cuiweidong
db971bf591 产品分化运行图修改 2019-10-08 14:12:53 +08:00
joylink_cuiweidong
873fbcd686 超时登出处理 2019-10-08 09:51:13 +08:00
joylink_cuiweidong
35faeb8583 产品分化 设计平台 剧本修改 2019-09-30 18:13:24 +08:00
joylink_cuiweidong
a46f94f85e 产品分化 设计系统调整 2019-09-30 17:31:40 +08:00
fan
2be7de7527 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/api/designPlatform.js
2019-09-30 13:26:13 +08:00
fan
5d27847379 设计平台系统调整 2019-09-30 13:24:47 +08:00
joylink_cuiweidong
c7b5188d74 产品分化 设计平台调整 2019-09-30 10:46:29 +08:00
joylink_cuiweidong
8d4bf59c34 产品分化调整 2019-09-29 15:57:19 +08:00
fan
6c8a8574da 暂时提交 2019-09-29 14:27:58 +08:00
joylink_cuiweidong
2a9f7b38df Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/router/index.js
2019-09-27 18:20:10 +08:00
joylink_cuiweidong
1e95cae5e5 产品分化 设计系统界面调整 2019-09-27 18:16:27 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
fan
1fb0cf3e94 产品分化调整 2019-09-26 15:08:53 +08:00
zyy
1d26a9f1fb desc: 新增创建权限流程 2019-09-18 18:39:55 +08:00
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