Commit Graph

114 Commits

Author SHA1 Message Date
joylink_cuiweidong
5ac012fc79 运行图代码调整 2019-11-21 09:34:55 +08:00
joylink_cuiweidong
f68cb84648 代码调整 2019-11-18 15:42:05 +08:00
joylink_cuiweidong
98b32d1eae 代码修改 2019-11-18 15:07:22 +08:00
joylink_cuiweidong
a1ff86bd05 代码调整 2019-11-18 14:01:06 +08:00
joylink_cuiweidong
744bd60d9e 代码调整 2019-11-18 12:28:08 +08:00
joylink_cuiweidong
a6797dbe85 运行图设计样式调整 2019-11-15 15:45:40 +08:00
joylink_cuiweidong
62599dd838 运行图设计点击车次号高亮调整 2019-11-15 14:33:03 +08:00
zyy
cb7d7de930 desc: 修改代码 2019-11-14 18:53:52 +08:00
zyy
63d89a71b1 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/planMonitor/editTool/schedule.vue
2019-11-14 17:06:53 +08:00
zyy
b189b64650 修改element版本 调整高度样式 2019-11-14 17:06:00 +08:00
joylink_cuiweidong
950ca18082 代码调整 2019-11-14 17:03:44 +08:00
joylink_cuiweidong
fe23a03e69 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/store/modules/permission.js
2019-11-14 15:59:32 +08:00
joylink_cuiweidong
595747be2a 代码调整 2019-11-14 15:54:58 +08:00
joylink_cuiweidong
6fcba825f2 运行图设计代码调整 2019-11-14 10:50:11 +08:00
zyy
0cb102186f desc: 修改echarts加载方式 2019-11-12 17:20:23 +08:00
joylink_cuiweidong
4c0f965a47 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-11 15:54:15 +08:00
joylink_cuiweidong
e8c8e491f5 skinCode调整 2019-11-11 15:54:04 +08:00
fan
907d95879e 代码调整 2019-11-11 13:22:22 +08:00
fan
56d11976db 设计平台剧本课程运行图统一风格样式 2019-11-11 13:10:36 +08:00
joylink_cuiweidong
ee600f8915 skinCode调整 2019-11-08 18:19:35 +08:00
fan
75a871265e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-08 16:22:32 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
joylink_cuiweidong
b923fa2a6b 代码调整 2019-11-08 15:17:04 +08:00
zyy
4483ee9253 desc: 导入运行图增加提示 2019-11-08 14:56:39 +08:00
joylink_cuiweidong
11226b84ab 运行图设计代码调整 2019-11-08 14:35:58 +08:00
joylink_cuiweidong
713f411ffc 运行图设计调整 2019-11-08 13:47:51 +08:00
fan
c203f7b839 skinCode 调整 2019-11-08 10:08:28 +08:00
joylink_cuiweidong
1a13c9ad2c 权限分发接口调整 2019-11-05 13:20:27 +08:00
fan
d54ed0329b Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-04 18:42:07 +08:00
fan
1bd3debbde 西铁院登录页样式调整,测试问题调整 2019-11-04 18:41:58 +08:00
joylink_cuiweidong
cf69d44833 代码优化
系统管理用户实训统计接口调整
2019-11-04 14:05:55 +08:00
zyy
1c373822ee desc: 修改代码 2019-11-04 10:33:45 +08:00
joylink_cuiweidong
f3298cdb83 页面调整 2019-11-01 15:12:00 +08:00
zyy
7ec68a75e3 desc: 删除多余文件, 调整路径配置 2019-10-31 17:30:24 +08:00
fan
3dff70d821 运行图调整 2019-10-30 19:04:21 +08:00
fan
36c33ed416 修改接口:/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list 2019-10-30 17:21:32 +08:00
fan
6d0edb2370 合并代码 2019-10-30 16:57:01 +08:00
fan
4918c78204 删除接口:/api/runPlan/draft/station/{skinCode}/bySkin 2019-10-30 16:50:35 +08:00
joylink_cuiweidong
c80d2ed536 接口调整
多余文件删除
2019-10-30 14:00:50 +08:00
fan
b6f11064da Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 13:07:27 +08:00
fan
2107549d72 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:07:07 +08:00
joylink_cuiweidong
81921a4a0d 国际化调整 2019-10-30 09:58:23 +08:00
joylink_cuiweidong
462b0cfb6c 样式调整 2019-10-29 16:23:57 +08:00
fan
78f9d58321 登录token存储修改 2019-10-25 18:30:23 +08:00
fan
d5b6f172e9 Merge remote-tracking branch 'origin/test' into dev 2019-10-25 17:09:02 +08:00
fan
12d25d1643 运行图测试运行调整,西铁院登录页路由调整 2019-10-25 16:45:17 +08:00
joylink_cuiweidong
6df1eecfc3 代码调整 2019-10-25 16:33:35 +08:00
zyy
033c6f40fa desc: 调整高度 2019-10-24 18:28:06 +08:00
joylink_cuiweidong
a1761fd2fc 添加copyRight 2019-10-23 19:15:02 +08:00
joylink_cuiweidong
2282f27239 设计系统运行图样式调整 2019-10-22 16:10:39 +08:00