joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
2,263 Commits 20 Branches 0 Tags 448 MiB
f97bd74c39
Commit Graph

1455 Commits

Author SHA1 Message Date
fan
b87fa71979 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-04 11:29:46 +08:00
fan
d381ed6a88 西铁院title、logo修改，综合演练房间角色调整后，角色顺序不再变化 2019-11-04 11:29:35 +08:00
joylink_cuiweidong
075cdf5fd9 页面样式调整 
代码优化
 2019-11-04 10:59:50 +08:00
zyy
1c373822ee desc: 修改代码 2019-11-04 10:33:45 +08:00
zyy
645326bf6a Merge branch 'dev' into test 2019-11-01 18:09:17 +08:00
zyy
92b06df4b4 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 18:08:12 +08:00
zyy
bc332c1a9d desc: 调整国际化，高度问题 2019-11-01 18:08:05 +08:00
joylink_cuiweidong
96452b8dde 代码调整 2019-11-01 17:08:28 +08:00
zyy
a43f1bd2c9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 15:19:22 +08:00
zyy
a133abc1d4 desc: 修改代码 2019-11-01 15:19:15 +08:00
joylink_cuiweidong
f3298cdb83 页面调整 2019-11-01 15:12:00 +08:00
zyy
6d6e851449 Merge branch 'dev' into test 2019-11-01 13:51:26 +08:00
zyy
3bcb637d1c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 13:51:08 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
joylink_cuiweidong
0c938f5928 接口调整 2019-11-01 13:36:14 +08:00
joylink_cuiweidong
ccd71601d1 接口调整 2019-11-01 11:28:10 +08:00
joylink_cuiweidong
444d60ce2a 接口调整 2019-11-01 10:28:15 +08:00
joylink_cuiweidong
76e904455a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 10:07:00 +08:00
joylink_cuiweidong
d0608dd29e 接口调整 
文件位置调整
 2019-11-01 10:06:47 +08:00
zyy
90c8349a8f Merge branch 'dev' into test 2019-10-31 18:44:04 +08:00
zyy
dd23ca545d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 18:43:19 +08:00
zyy
53d4483081 desc: 修改代码 2019-10-31 18:43:05 +08:00
fan
cf39a8fa89 Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	src/router/index.js
 2019-10-31 17:49:20 +08:00
joylink_cuiweidong
8035833c1c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 17:45:28 +08:00
joylink_cuiweidong
cfdea6ea12 接口调整 2019-10-31 17:45:15 +08:00
zyy
7a0d40184f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 17:30:31 +08:00
zyy
7ec68a75e3 desc: 删除多余文件， 调整路径配置 2019-10-31 17:30:24 +08:00
fan
3ae1de5a23 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-31 16:56:31 +08:00
fan
7455fb17ea 发布地图管理国际化调整，添加ibp角色多人时disable为true 调整 2019-10-31 16:52:49 +08:00
joylink_cuiweidong
24a56a9695 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/router/index.js
#	src/views/lesson/lessoncategory/edit/lesson/index.vue
 2019-10-31 16:11:29 +08:00
fan
a250d54cb4 Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	src/router/index.js
 2019-10-31 16:04:57 +08:00
joylink_cuiweidong
ad97697406 接口调整 2019-10-31 15:56:07 +08:00
zyy
834d4e30cd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 15:44:51 +08:00
zyy
ff4829e037 desc: 调整路径 2019-10-31 15:44:43 +08:00
ival
6df897316b 移植system 2019-10-31 15:43:37 +08:00
ival
07ef079f1b 修改代码 2019-10-31 15:34:38 +08:00
ival
9ceacf7cef Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-10-31 15:22:13 +08:00
ival
1179c9acd6 移植system 2019-10-31 15:20:16 +08:00
zyy
dfd148897b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 14:47:20 +08:00
zyy
dc8524e52a desc: 调整试题高度 2019-10-31 14:47:05 +08:00
fan
b5db06f833 Merge remote-tracking branch 'origin/dev' into test 2019-10-31 14:40:14 +08:00
fan
547589331b 发布地图管理调整调整 2019-10-31 14:35:28 +08:00
fan
dceba96db0 Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	src/views/jlmap3d/drive/jl3ddrive.vue
 2019-10-31 14:00:42 +08:00
fan
aefbd0f5e5 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-31 13:58:01 +08:00
fan
934b67fea3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-31 13:57:36 +08:00
fan
3996f03e55 实训首页样式调整和复制地图调整 2019-10-31 13:57:17 +08:00
joylink_cuiweidong
c031125e97 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 13:56:53 +08:00
joylink_cuiweidong
681ac5e886 路由调整 
接口调整
 2019-10-31 13:56:42 +08:00
sunzhenyu
3d9a458d42 修改三维数据接口,修改渲染范围 2019-10-31 13:26:40 +08:00
zyy
a87372ea2c desc: 发布高度调整 2019-10-31 13:24:45 +08:00
sunzhenyu
72988575eb Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test 2019-10-31 13:07:04 +08:00
joylink_cuiweidong
b5b08a0afd 接口调整 2019-10-31 11:03:19 +08:00
fan
ea219e6310 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/publish/publishMap/index.vue
#	src/views/publish/publishMap/project.vue
 2019-10-31 10:36:30 +08:00
fan
900abcbe36 添加复制地图和调整实训平台树节点key 2019-10-31 10:32:46 +08:00
zyy
c006a98f2e desc: 修改代码 2019-10-31 10:09:43 +08:00
fan
6d37627e3d 发布地图管理调整 2019-10-31 09:09:43 +08:00
joylink_cuiweidong
3636bd06b4 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 19:37:07 +08:00
joylink_cuiweidong
de76904dfc 接口调整 2019-10-30 19:36:29 +08:00
fan
00dcbdf7bd 任务管理调整 2019-10-30 19:36:26 +08:00
fan
6e6fe0bf59 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 19:05:20 +08:00
fan
3dff70d821 运行图调整 2019-10-30 19:04:21 +08:00
zyy
2d8547182b desc: 调整文件位置 2019-10-30 18:38:00 +08:00
zyy
75f9cf8a70 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/theme/chengdu_03/planSchedule/menuBar.vue
 2019-10-30 18:25:50 +08:00
zyy
10565fdd6b desc: 调整地图绘制高度问题 2019-10-30 18:25:13 +08:00
fan
0311e5ee4f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 18:18:32 +08:00
fan
1242c7e3d7 修改接口：/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId} 2019-10-30 18:18:09 +08:00
joylink_cuiweidong
2df4c5f8cb Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 18:07:45 +08:00
joylink_cuiweidong
ce0230150b 接口调整 2019-10-30 18:07:09 +08:00
fan
5bca5be2e4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-30 18:03:42 +08:00
fan
fa1fc4c3cf 删除接口：/api/mapPrd/tree 2019-10-30 18:03:30 +08:00
fan
e5c832aa00 修改接口：/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list 2019-10-30 17:41:29 +08:00
ival
a97c1945c0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 17:26:31 +08:00
ival
7d1d7758e4 增加时间北京颜色 2019-10-30 17:26:16 +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
85733f5f0a 接口调整 
无效文件删除
 2019-10-30 14:40:31 +08:00
joylink_cuiweidong
de1b8d579e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/map/runplan/index.vue
 2019-10-30 14:04:22 +08:00
joylink_cuiweidong
c80d2ed536 接口调整 
多余文件删除
 2019-10-30 14:00:50 +08:00
zyy
443051edc3 desc: 调整代码 2019-10-30 13:58:34 +08:00
fan
375773cceb 更换接口：/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:56:43 +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
fan
0489cf2fd3 删除接口：/api/map/{skinCode}/train 2019-10-30 11:18:41 +08:00
zyy
850f492b45 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-30 10:15:24 +08:00
zyy
6aa05c217f desc: 修改代码 2019-10-30 10:15:18 +08:00
joylink_cuiweidong
81921a4a0d 国际化调整 2019-10-30 09:58:23 +08:00
joylink_cuiweidong
e8cacb4a84 样式调整 2019-10-29 18:55:10 +08:00
zyy
3fa60b2e8b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/scripts/ConstDic.js
#	src/views/lesson/lessoncategory/edit/sorttree/index.vue
#	src/views/lesson/lessoncategory/index.vue
#	src/views/login/index.vue
 2019-10-29 17:36:48 +08:00
zyy
df8d104bd1 desc: 高度修改，登陆页面英文调整 2019-10-29 17:33:11 +08:00
joylink_cuiweidong
c45b991c22 代码调整 2019-10-29 16:49:48 +08:00
joylink_cuiweidong
462b0cfb6c 样式调整 2019-10-29 16:23:57 +08:00
joylink_cuiweidong
e3dccd58c8 地图设计样式调整 2019-10-29 15:48:38 +08:00
fan
a6b0caab34 西铁院调整 2019-10-29 15:06:15 +08:00
fan
27317bf24a 西铁院调整 2019-10-29 14:41:47 +08:00
fan
041d926b80 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/router/index.js
#	src/utils/baseUrl.js
 2019-10-29 14:16:49 +08:00
fan
973168970c 西铁院项目调整 2019-10-29 14:14:14 +08:00
joylink_cuiweidong
b1c3e10eb1 课程设计内容排序样式调整 2019-10-29 13:43:23 +08:00
zyy
0222dfe5c2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-29 13:16:04 +08:00
zyy
c08e2afaaa desc: 调整高度样式 2019-10-29 13:15:57 +08:00
joylink_cuiweidong
9fc78c18c3 课程设计内容排序调整 
运行图发布弹出提示调整
 2019-10-29 13:06:55 +08:00
joylink_cuiweidong
7246568801 代码调整 2019-10-28 19:16:07 +08:00
joylink_cuiweidong
b9111b8219 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/designPlatform/mapPreview.vue
 2019-10-28 19:14:49 +08:00
joylink_cuiweidong
b5a8b10e4e 剧本预览接口调整 2019-10-28 19:12:31 +08:00
zyy
60c58fe290 desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联 2019-10-28 18:42:31 +08:00
fan
b8834f5bb4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-28 18:36:26 +08:00
zyy
8e71ff7287 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/designPlatform/demonList.vue
 2019-10-28 17:53:39 +08:00
zyy
178e49187d desc: 调整高度自适应， 调整地图绘制创建区段，道岔逻辑优化 2019-10-28 17:51:59 +08:00
fan
42cdacbcd0 西铁院项目路由调整 2019-10-28 17:08:22 +08:00
joylink_cuiweidong
538e3e0697 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/designPlatform/demonList.vue
#	src/views/designPlatform/mapPreview.vue
 2019-10-28 15:12:08 +08:00
joylink_cuiweidong
7ee5cbcab3 代码调整 2019-10-28 15:00:50 +08:00
zyy
ab9d300e2e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/designPlatform/mapPreview.vue
 2019-10-28 11:08:50 +08:00
zyy
285b80ffb7 desc: 调整检测高度问题 2019-10-28 11:07:33 +08:00
joylink_cuiweidong
7ed9387731 更新发布课程信息 
地图预览bug调整
 2019-10-28 10:29:17 +08:00
fan
9c99b2f451 queryform 调整 2019-10-28 10:26:33 +08:00
sunzhenyu
300aa624df 更换threejs到109版本，修改路劲弧度，修改渲染注册，测试光效 2019-10-25 18:42:56 +08:00
fan
50f87895c6 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-25 18:30:45 +08:00
fan
78f9d58321 登录token存储修改 2019-10-25 18:30:23 +08:00
joylink_cuiweidong
0f39f495af 发布地图管理页面添加更新城市 2019-10-25 17:50:55 +08:00
fan
73e9c995c2 综合演练房间快速入口添加线路 2019-10-25 17:49:44 +08:00
fan
d5b6f172e9 Merge remote-tracking branch 'origin/test' into dev 2019-10-25 17:09:02 +08:00
fan
ceb7fa7e5e 西铁院运行图编制调整 2019-10-25 16:59:23 +08:00
fan
12d25d1643 运行图测试运行调整，西铁院登录页路由调整 2019-10-25 16:45:17 +08:00
joylink_cuiweidong
6df1eecfc3 代码调整 2019-10-25 16:33:35 +08:00
fan
0c5fb4c6f4 Merge remote-tracking branch 'origin/dev' into test 2019-10-25 14:43:00 +08:00
joylink_cuiweidong
5905f0ed63 国际化调整 2019-10-25 14:41:23 +08:00
zyy
32d3983d70 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-25 14:34:19 +08:00
zyy
bced191397 desc: 增加以link为基础删除区段及相关道岔 2019-10-25 14:34:10 +08:00
joylink_cuiweidong
dc1c69fe16 已发布地图剧本列表页面调整 2019-10-25 14:14:27 +08:00
joylink_cuiweidong
ba7583cd1c 综合演练进入房间 没有输入发送文字禁用 2019-10-25 13:47:25 +08:00
fan
ca736a93f3 登录过期不显示获取子系统信息失败 2019-10-25 13:16:07 +08:00
fan
2e49c6499f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-25 13:00:04 +08:00
fan
bfce5a2103 问题调整 2019-10-25 12:59:24 +08:00
joylink_cuiweidong
da7564402c 代码调整 2019-10-25 10:39:41 +08:00
zyy
6f4c8e02ba Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-24 18:28:15 +08:00
zyy
033c6f40fa desc: 调整高度 2019-10-24 18:28:06 +08:00
fan
0c67d2a077 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-24 18:19:28 +08:00
fan
6fa98a6585 代码调整 2019-10-24 18:19:06 +08:00
joylink_cuiweidong
7530489fa5 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-24 18:12:10 +08:00
joylink_cuiweidong
f597ce530f 已发布地图 地图预览 
管理员 课程设计可见
 2019-10-24 18:11:58 +08:00
fan
237d821f33 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-24 16:46:49 +08:00
fan
2c729abb01 网页title和图标调整 2019-10-24 16:46:34 +08:00
zyy
08067bb4e8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/layout/components/Entry.vue
 2019-10-24 15:32:40 +08:00
zyy
68560f0d37 desc: 增加修改个人信息弹窗 2019-10-24 15:31:29 +08:00
fan
62541373f1 导航栏右侧menu调整 2019-10-24 15:15:52 +08:00
joylink_cuiweidong
c0394657a8 代码调整 2019-10-24 14:13:20 +08:00
fan
4a0c04d98a Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-24 14:03:38 +08:00
fan
b6ffc55efd 登录页面整合 2019-10-24 14:03:19 +08:00
joylink_cuiweidong
6dc74ac5c8 代码优化 
实训平台横向滚动条处理
实训平台和设计平台跳转文字调整
 2019-10-24 11:20:00 +08:00
zyy
17626459f5 Merge branch 'dev' into test 2019-10-24 09:49:49 +08:00
zyy
dd89b94e64 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/layout/components/Logout.vue
 2019-10-24 09:47:57 +08:00
zyy
f24259c76d desc: 个人信息修改 2019-10-24 09:46:58 +08:00
joylink_cuiweidong
a1761fd2fc 添加copyRight 2019-10-23 19:15:02 +08:00
joylink_cuiweidong
5e798387d7 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-23 17:44:41 +08:00
fan
667b967c06 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 17:42:40 +08:00
fan
787580f964 路由调整调整 2019-10-23 17:41:50 +08:00
joylink_cuiweidong
f483a1c115 运行图审核接口调整 2019-10-23 17:41:24 +08:00
fan
a926ee4d64 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 17:20:45 +08:00
fan
c83e882f6a 国际化调整 2019-10-23 17:20:32 +08:00
joylink_cuiweidong
02ea111c61 路由处理 2019-10-23 16:43:28 +08:00
fan
0a39680f6c 综合演练真实设备调整 2019-10-23 16:39:16 +08:00
fan
16b2dbda05 综合演练真实设备调整 2019-10-23 16:33:23 +08:00
fan
dff5d96d4d Merge remote-tracking branch 'origin/dev' into test 2019-10-23 16:19:22 +08:00
fan
d6b677201e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 16:14:03 +08:00
fan
8710a6231a 综合演练房间调整 2019-10-23 16:13:36 +08:00
joylink_cuiweidong
1761fbdca8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-23 16:10:20 +08:00
joylink_cuiweidong
0b23a7f9a0 右上角用户昵称样式调整 2019-10-23 16:09:44 +08:00
fan
5abc54c522 合代码 2019-10-23 15:03:35 +08:00
fan
3119f4f308 设计平台课程设计调整 2019-10-23 15:01:25 +08:00
joylink_cuiweidong
b0c589cd2a 权限管理编辑权限样式调整 
设计平台添加跳转实训平台的链接
 2019-10-23 14:57:45 +08:00
zyy
15510a07cf desc: 修改区段点击bug 2019-10-23 14:43:25 +08:00
joylink_cuiweidong
2fa5966055 剧本审核通过bug调整 
登录全屏调整
 2019-10-23 14:33:45 +08:00
fan
7a073334d5 去除添加plc真实设备限制 2019-10-23 13:50:04 +08:00
fan
abd4fbbf64 开放plc真实设备 2019-10-23 13:41:33 +08:00
joylink_cuiweidong
51bf37e9c7 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-10-23 13:36:19 +08:00
fan
d55f740065 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 13:33:40 +08:00
fan
89d71ed661 发现问题调整 2019-10-23 13:33:09 +08:00
joylink_cuiweidong
1c38f16199 回车登录调整 2019-10-23 13:32:00 +08:00
joylink_cuiweidong
16d2b61d0f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-23 11:03:20 +08:00
joylink_cuiweidong
f5dc8818fe 登录页面添加键盘回车登录 2019-10-23 11:02:44 +08:00
fan
f8b149fa5a 同一个标签切换平台404问题 2019-10-23 10:43:29 +08:00
fan
cf5f902a45 代码调整 2019-10-23 10:18:28 +08:00
joylink_cuiweidong
bca8c68b65 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-10-23 10:05:41 +08:00
fan
c843e25094 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 09:59:39 +08:00
fan
43d900747a 增加地图发布仅管理员可见 2019-10-23 09:59:28 +08:00
joylink_cuiweidong
aa6cb458de 登录修改 2019-10-23 09:58:05 +08:00
joylink_cuiweidong
e854c32390 Merge branch 'dev' into test 2019-10-22 20:10:05 +08:00
joylink_cuiweidong
7550d82f2b 登录修改 2019-10-22 20:09:29 +08:00
fan
48fafacdc2 获取上次用户登录系统 2019-10-22 20:01:03 +08:00
fan
01cf337b63 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 19:49:59 +08:00
fan
21510d9464 创建章节修改 2019-10-22 19:49:37 +08:00
program-walker
6fa2b2e636 登陆逻辑修改 2019-10-22 19:47:36 +08:00
fan
5c5c2412fd 章节下添加创建章节 2019-10-22 19:23:01 +08:00
fan
ff37fe128e 问题调整 2019-10-22 18:49:46 +08:00
fan
4bd232bd67 地图系统结构调整 2019-10-22 18:34:05 +08:00
fan
4f14075072 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 18:20:10 +08:00
joylink_cuiweidong
2bd13ad075 实训tree 样式调整 2019-10-22 18:19:18 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
fan
6760cdc7e3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 17:24:51 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
joylink_cuiweidong
bddddedbf2 Merge branch 'dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-22 16:13:13 +08:00
joylink_cuiweidong
2282f27239 设计系统运行图样式调整 2019-10-22 16:10:39 +08:00
fan
6f314ba150 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 16:06:20 +08:00
fan
0e23a62b39 调整代码 2019-10-22 16:05:58 +08:00
joylink_cuiweidong
c08064faa0 Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-10-22 15:14:54 +08:00
joylink_cuiweidong
b26ab2fc15 删除地图系统接口调整以及西铁院系统tree接口调整 2019-10-22 15:13:58 +08:00
joylink_cuiweidong
df4113ff29 代码结构整理 
修改 退出系统仍然自动登录的bug
子系统生成接口调整
 2019-10-22 14:43:27 +08:00
fan
e89211a873 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 14:28:41 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
zyy
a61f917f4a desc: 调整站台扣车状态显示 2019-10-22 14:07:20 +08:00
zyy
ac0fafebc0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 13:41:29 +08:00
zyy
0c6de0e011 desc: 修改代码 2019-10-22 13:41:23 +08:00
fan
b7a16a9074 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 13:40:55 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
joylink_cuiweidong
7785b9a9af 设计平台 系统管理 子系统 修改接口以及国际化 2019-10-22 11:20:43 +08:00
joylink_cuiweidong
c04abcc67a 设计平台 系统管理 子系统 创建子系统接口调整 2019-10-22 09:36:37 +08:00
joylink_cuiweidong
9fcdda5d60 设计平台 系统管理 子系统 创建子系统接口 2019-10-21 18:03:13 +08:00
joylink_cuiweidong
343372d83a 设计平台地图三维路径调整 2019-10-21 16:12:03 +08:00
fan
04bebc8201 Merge remote-tracking branch 'origin/dev' into test 2019-10-21 16:08:07 +08:00
fan
81edd3c5c2 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-21 16:07:28 +08:00
fan
b68dd99bde 仿真路由调整 2019-10-21 16:07:15 +08:00
joylink_cuiweidong
1a046c2b7f 设计平台系统管理子系统生成页面调整 2019-10-21 15:50:15 +08:00
joylink_cuiweidong
c9ad0a8be5 自动登录页面处理 2019-10-21 14:14:22 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +08:00
fan
7e7fc2256c Merge remote-tracking branch 'origin/dev' into test 2019-10-21 13:17:30 +08:00
fan
4b41c9fd27 考试路由调整 2019-10-21 13:16:49 +08:00
fan
be2bbc67cd 接口参数调整 2019-10-21 11:15:15 +08:00
fan
9ed65095cc 接口参数调整 2019-10-21 10:50:31 +08:00
fan
9d072c4a6c 产品分化调整 2019-10-21 10:02:49 +08:00
fan
34a8cbf270 接口调整 2019-10-21 08:59:27 +08:00
fan
77d024c08c Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/designPlatform/demonList.vue
 2019-10-21 08:58:17 +08:00
fan
902b1a494b 接口调整 2019-10-18 18:36:45 +08:00
joylink_cuiweidong
fd4df4f178 设计平台地图列表页面调整 2019-10-18 18:35:17 +08:00
ival
94288eaecc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 18:31:29 +08:00
ival
36950a331e 修改比例 2019-10-18 18:31:14 +08:00
joylink_cuiweidong
170c7bcc9e 课程设计界面参数调整 2019-10-18 18:13:54 +08:00
ival
0864369b35 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-18 17:54:10 +08:00
ival
9a14de60ef 修改电子显示屏 2019-10-18 17:53:57 +08:00
joylink_cuiweidong
ecef9a4c74 设计平台地图列表接口调整 2019-10-18 17:45:08 +08:00
fan
b23bff36f0 打开实训录制按钮 2019-10-18 17:32:14 +08:00
fan
911b8a9057 接口调整 2019-10-18 17:23:25 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
joylink_cuiweidong
1b342fee6e 地图列表获取城市列表样式调整 2019-10-18 16:57:40 +08:00
ival
5e83d06250 修改计时组件样式 2019-10-18 15:35:48 +08:00
sunzhenyu
a7e7988754 修复路径判断 2019-10-18 15:29:17 +08:00
joylink_cuiweidong
3f82e45fcb 登录页面 密码隐藏显示 2019-10-18 14:36:14 +08:00
joylink_cuiweidong
c80c9d467c 剧本列表预览调整 2019-10-18 11:26:11 +08:00
joylink_cuiweidong
b96ca27907 Merge branch 'dev_product' into dev 2019-10-17 19:20:12 +08:00
joylink_cuiweidong
b14e2d18f4 剧本预览页面调整 2019-10-17 18:59:46 +08:00
sunzhenyu
f78d9865a2 Merge branch '3dtest' into test 2019-10-17 18:56:56 +08:00
zyy
140d84bf56 desc: 调整登陆页面样式 2019-10-17 18:55:46 +08:00
sunzhenyu
f847629b92 修改文字显示，行车路径，行车计算 2019-10-17 18:48:36 +08:00
zyy
7b5255c3eb desc: 调整格式化，样式 2019-10-17 18:27:49 +08:00
fan
0ebab6201f Merge remote-tracking branch 'origin/dev_product' into dev 
# Conflicts:
#	src/views/scriptManage/home.vue
 2019-10-17 18:09:02 +08:00
fan
f6e8375bf8 实训管理调整 2019-10-17 18:06:49 +08:00
joylink_cuiweidong
99b2cfc05b 剧本预览页面调整 2019-10-17 18:06:04 +08:00
fan
ab815ec493 实训管理调整 2019-10-17 17:56:25 +08:00
fan
534fa388e8 添加子系统生成页面 2019-10-17 17:11:15 +08:00
fan
fa4c7a6599 样式微调 2019-10-17 16:26:36 +08:00
fan
0fd879dd5d 样式微调 2019-10-17 16:23:14 +08:00
fan
ee62ceb0e5 产品分化调整 2019-10-17 16:04:07 +08:00
fan
6e139bcdbb Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger 
# Conflicts:
#	src/router/index.js
 2019-10-17 14:39:08 +08:00
zyy
6ca619b71f desc: 修改格式化 2019-10-17 14:35:10 +08:00
fan
05530e1568 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger 2019-10-17 14:33:19 +08:00
fan
00c4415fcc 代码整合调整 2019-10-17 14:31:59 +08:00
joylink_cuiweidong
9cd7234081 剧本列表页面调整 2019-10-17 13:54:41 +08:00
zyy
5d13162c6b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-17 11:21:01 +08:00
zyy
5d7f736873 desc: 调整考试系统英文名称 2019-10-17 11:20:09 +08:00
fan
11190ef66f 代码整合调整 2019-10-17 10:13:08 +08:00
joylink_cuiweidong
a264ab51cb 已发布地图剧本列表页面调整 2019-10-17 10:06:52 +08:00
fan
ece8f0cf21 Merge remote-tracking branch 'origin/dev_product' into dev_merger 
# Conflicts:
#	src/router/index.js
#	src/scripts/ConstDic.js
 2019-10-17 09:36:32 +08:00
fan
1ece7eb215 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-17 09:30:02 +08:00
fan
5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev 
# Conflicts:
#	src/components/QueryListPage/QueryForm.vue
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/scriptRecord.js
#	src/i18n/langs/zh/lesson.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/scriptRecord.js
#	src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
#	src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
#	src/permission.js
#	src/router/index.js
#	src/utils/baseUrl.js
#	src/views/demonstration/detail/index.vue
#	src/views/display/tipExamList.vue
#	src/views/lesson/lessoncategory/edit/lesson/publish.vue
#	src/views/lesson/taskmanage/createTask.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/planMonitor/editTool/statusBar.vue
#	src/views/scriptManage/home.vue
#	src/views/teach/category/tree.vue
#	src/views/trainRoom/index.vue
 2019-10-17 09:16:40 +08:00
fan
25c4cf957d 西铁院项目调整 2019-10-16 17:37:03 +08:00
fan
355e06ae2e 注释plc相关接口 2019-10-16 17:03:21 +08:00
fan
54b078792c 西铁院暂存 2019-10-16 16:58:40 +08:00
joylink_cuiweidong
35eacb299c 剧本预览页面调整 2019-10-16 16:36:25 +08:00
fan
f4fc3d0b0b 暂存 2019-10-16 15:43:07 +08:00
fan
126886e1ce 西铁院暂存 2019-10-16 15:28:29 +08:00
fan
f0bf595b60 国际化添加左、右 2019-10-16 14:16:48 +08:00
fan
dd8c1e07f4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-16 14:01:40 +08:00
fan
1caad290e5 ibp盘添加扣车关联 2019-10-16 14:00:30 +08:00
joylink_cuiweidong
df5a76ea41 剧本管理英文版英文用词修改 2019-10-16 11:20:36 +08:00
joylink_cuiweidong
571e221413 用户剧本预览页面调整 2019-10-16 09:18:26 +08:00
joylink_cuiweidong
c2479d2f68 剧本国际化调整 2019-10-15 16:46:32 +08:00
joylink_cuiweidong
a33c44dfea Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/scriptManage/scriptRecord/addAction.vue
 2019-10-15 16:30:45 +08:00
joylink_cuiweidong
089290e979 剧本国际化调整以及剧本增加语言参数 2019-10-15 16:18:25 +08:00
zyy
6faa018c71 desc: 新增剧本编辑页面可拖拽宽度 2019-10-15 15:24:41 +08:00
joylink_cuiweidong
ec16767772 剧本预览调整 2019-10-15 13:41:23 +08:00
fan
0640586712 西铁院暂存 2019-10-15 13:04:28 +08:00
fan
1ec45e2c19 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-15 11:06:16 +08:00
joylink_cuiweidong
232789ca73 产品分化路由处理 2019-10-15 11:05:30 +08:00
fan
0fc9db098c Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-15 11:04:43 +08:00
fan
729be7ec69 西铁院暂存 2019-10-15 09:39:01 +08:00
joylink_cuiweidong
aba4efe129 运行图页面调整 2019-10-14 17:03:54 +08:00
joylink_cuiweidong
bca95d4ca1 运行图增加计划和删除计划 更新运行图数据 2019-10-14 15:35:11 +08:00
joylink_cuiweidong
5e320978a9 产品分化剧本页面调整 2019-10-14 13:58:26 +08:00
fan
d6dbb01bba Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-14 13:54:45 +08:00
fan
0a1ec28511 产品分化调整 2019-10-14 13:54:19 +08:00
joylink_cuiweidong
a622effdde Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/api/designPlatform.js
#	src/i18n/langs/en/approval.js
#	src/i18n/langs/zh/approval.js
 2019-10-14 13:12:30 +08:00
joylink_cuiweidong
c60471023f 产品分化剧本管理调整 2019-10-14 13:10:36 +08:00
fan
6d15a95b3f 产品分化运行图发布调整 2019-10-14 13:04:23 +08:00
fan
38f4dc1093 产品分化调整 2019-10-12 18:43:41 +08:00
fan
5af0c7e4c9 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-12 17:16:09 +08:00
fan
8366f9a788 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/api/designPlatform.js
#	src/router/index.js
 2019-10-12 17:15:48 +08:00
joylink_cuiweidong
12eed3629a 运行图 发布审核流程调整 2019-10-12 17:15:25 +08:00
fan
722596cdf4 产品分化调整 2019-10-12 17:14:03 +08:00
joylink_cuiweidong
af2c431511 运行图剧本 审核流程调整 2019-10-12 16:47:54 +08:00
sunzhenyu
b32b03bc81 修改link为主轨迹运行 2019-10-12 16:36:51 +08:00
zyy
842f29e5d9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/jointTraining/index.vue
 2019-10-12 13:35:56 +08:00
zyy
99edd29aea desc: 调整格式化问题， 调整列车详情国际化 2019-10-12 13:25:47 +08:00
joylink_cuiweidong
6adc8cdd5b 剧本国际化调整 2019-10-12 13:04:56 +08:00
joylink_cuiweidong
bf66b2c9e0 剧本发布申请页面调整 2019-10-12 11:11:34 +08:00
fan
a24603aedf 综合仿真页面跳转调整 2019-10-12 11:03:15 +08:00
zyy
e03aefd80d desc: 调整字段 2019-10-11 19:10:27 +08:00
zyy
ef3f909a2d desc: 调整字段显示 2019-10-11 19:02:12 +08:00
zyy
3b8da62bf2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-11 18:40:37 +08:00
zyy
5e8089cacd desc: 修改权限字段 2019-10-11 18:40:32 +08:00
fan
862f251adb Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-11 17:45:36 +08:00
fan
3326f1c917 ibp调整 2019-10-11 17:17:05 +08:00
zyy
1e3486efc6 desc: 增加权限分发列表【设置失效】功能 2019-10-11 16:09:15 +08:00
zyy
aa0199754a desc: 调整创建权限流程，创建字段修改 2019-10-11 15:27:14 +08:00
fan
a4ccfee26d Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 
# Conflicts:
#	src/router/index.js
 2019-10-11 08:57:38 +08:00
fan
5a21420a18 课程发布审批流程暂存 2019-10-11 08:55:02 +08:00
zyy
f7cf33a5e2 desc: 调整登陆页面样式 2019-10-10 18:05:26 +08:00
joylink_cuiweidong
2a4bb6dba2 剧本发布申请页面 2019-10-10 17:37:07 +08:00
joylink_cuiweidong
e31bd2730f Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-10-10 16:18:43 +08:00
joylink_cuiweidong
17ed79b2dd 产品分化课程设计页面调整 
刷新页面菜单栏选中状态调整
 2019-10-10 16:18:31 +08:00
fan
f2d614d5af Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-10 16:12:47 +08:00
fan
977a6d8b47 产品分化调整 2019-10-10 16:07:13 +08:00
joylink_cuiweidong
059a4134d5 产品分化路由调整以及剧本发布样式调整 2019-10-10 14:08:23 +08:00
fan
758eccd074 产品分化调整 2019-10-10 13:56:33 +08:00
fan
95a6103575 产品分化调整 2019-10-10 13:16:00 +08:00
fan
c9f9aa6869 产品分化调整 2019-10-10 13:02:43 +08:00
fan
3381424f0d 产品分化调整 2019-10-10 09:33:56 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
fan
e27a189952 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-10-09 15:14:21 +08:00
fan
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
joylink_cuiweidong
28ca25b822 处理设计平台菜单栏显示的问题 2019-10-09 14:56:32 +08:00
joylink_cuiweidong
bb9cfc965d 产品分化 实训平台加载剧本接口修改 2019-10-09 14:01:02 +08:00
joylink_cuiweidong
62621b77a0 产品分化 设计平台页面调整 2019-10-09 11:28:11 +08:00
joylink_cuiweidong
b7cb2a36db 产品分化 剧本接口调整 2019-10-09 10:14:30 +08:00
joylink_cuiweidong
2d1f13299e 产品分化运行图接口调整 2019-10-08 18:35:02 +08:00
joylink_cuiweidong
ec4e78548f 产品分化页面调整 2019-10-08 16:09:18 +08:00
zyy
88c1212af0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-08 16:08:19 +08:00
zyy
df43ef4cc3 desc: 调整登陆界面显示 2019-10-08 16:08:13 +08:00
joylink_cuiweidong
672c075ada ibp 车站名称以及上下行车站名称修改 2019-10-08 15:51:19 +08:00
joylink_cuiweidong
db971bf591 产品分化运行图修改 2019-10-08 14:12:53 +08:00
fan
ca413e3331 设计平台运行图调整 2019-09-30 18:11:31 +08:00
fan
641345e801 设计平台调整 2019-09-30 17:56:16 +08:00