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

526 Commits

Author SHA1 Message Date
ival
4816ca97b8 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	src/views/display/designIndex.vue
#	src/views/display/index.vue
 2019-11-08 18:20:56 +08:00
joylink_cuiweidong
ee600f8915 skinCode调整 2019-11-08 18:19:35 +08:00
joylink_cuiweidong
95ae0de627 skinCode调整 2019-11-08 16:12:23 +08:00
joylink_cuiweidong
0e674de983 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-08 13:02:28 +08:00
fan
f8d6a3eb9f 课程发布管理添加归属地图 2019-11-08 10:21:54 +08:00
joylink_cuiweidong
2f1cc475a1 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	src/i18n/langs/en/map.js
#	src/utils/baseUrl.js
 2019-11-08 09:41:33 +08:00
ival
a2a793d36d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/trainRoom/index.vue
 2019-11-08 09:03:28 +08:00
ival
b99f994541 修改代码 2019-11-08 09:02:18 +08:00
joylink_cuiweidong
2bef8e867b 剧本添加列车驾驶模式指令 2019-11-07 19:39:52 +08:00
zyy
42a5f7076a desc: 调整区段绘图逻辑优化 2019-11-07 15:20:39 +08:00
joylink_cuiweidong
5cb7fe51b9 skinCode处理 2019-11-07 10:25:34 +08:00
joylink_cuiweidong
9424dfb001 权限分发调整 2019-11-06 13:41:02 +08:00
fan
7ff1878389 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-06 09:33:08 +08:00
fan
24f313045b 国际化修正 2019-11-06 08:57:35 +08:00
joylink_cuiweidong
6a2a0b0b5e 代码调整 
权限分发国际化调整
 2019-11-05 19:03:20 +08:00
joylink_cuiweidong
94120489a4 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-11-05 17:22:03 +08:00
joylink_cuiweidong
2228b1f089 权限转增接口调整 2019-11-05 17:21:05 +08:00
joylink_cuiweidong
8d4964a304 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	src/i18n/langs/zh/router.js
 2019-11-05 16:59:25 +08:00
fan
1b3fc52f98 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-05 16:40:55 +08:00
fan
ce7ca4b9d8 添加系统通知功能 2019-11-05 16:40:36 +08:00
joylink_cuiweidong
1a13c9ad2c 权限分发接口调整 2019-11-05 13:20:27 +08:00
fan
1bd3debbde 西铁院登录页样式调整，测试问题调整 2019-11-04 18:41:58 +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
joylink_cuiweidong
ad48fb931c 国际化调整 2019-11-01 17:35:04 +08:00
joylink_cuiweidong
c361b639ad 国际化调整 2019-11-01 17:30:06 +08:00
joylink_cuiweidong
96452b8dde 代码调整 2019-11-01 17:08:28 +08:00
zyy
6d6e851449 Merge branch 'dev' into test 2019-11-01 13:51:26 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
zyy
90c8349a8f Merge branch 'dev' into test 2019-10-31 18:44:04 +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
fan
7455fb17ea 发布地图管理国际化调整，添加ibp角色多人时disable为true 调整 2019-10-31 16:52:49 +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
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
3996f03e55 实训首页样式调整和复制地图调整 2019-10-31 13:57:17 +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
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
6d37627e3d 发布地图管理调整 2019-10-31 09:09:43 +08:00
joylink_cuiweidong
de76904dfc 接口调整 2019-10-30 19:36:29 +08:00
joylink_cuiweidong
ce0230150b 接口调整 2019-10-30 18:07:09 +08:00
joylink_cuiweidong
81921a4a0d 国际化调整 2019-10-30 09:58:23 +08:00
fan
b9f4f15601 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-29 18:36:46 +08:00
fan
e2e1411b23 国际化调整 2019-10-29 18:36:16 +08:00
zyy
df8d104bd1 desc: 高度修改，登陆页面英文调整 2019-10-29 17:33:11 +08:00
joylink_cuiweidong
9fc78c18c3 课程设计内容排序调整 
运行图发布弹出提示调整
 2019-10-29 13:06:55 +08:00
zyy
178e49187d desc: 调整高度自适应， 调整地图绘制创建区段，道岔逻辑优化 2019-10-28 17:51:59 +08:00
joylink_cuiweidong
7ed9387731 更新发布课程信息 
地图预览bug调整
 2019-10-28 10:29:17 +08:00
sunzhenyu
300aa624df 更换threejs到109版本，修改路劲弧度，修改渲染注册，测试光效 2019-10-25 18:42:56 +08:00
zyy
700ae4ad84 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-25 18:20:32 +08:00
zyy
18ad9e1faa desc: 调整个人信息 2019-10-25 18:20:24 +08:00
joylink_cuiweidong
0f39f495af 发布地图管理页面添加更新城市 2019-10-25 17:50:55 +08:00
fan
73e9c995c2 综合演练房间快速入口添加线路 2019-10-25 17:49:44 +08:00
fan
ceb7fa7e5e 西铁院运行图编制调整 2019-10-25 16:59:23 +08:00
fan
12d25d1643 运行图测试运行调整，西铁院登录页路由调整 2019-10-25 16:45:17 +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
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
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
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
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
joylink_cuiweidong
f483a1c115 运行图审核接口调整 2019-10-23 17:41:24 +08:00
fan
c83e882f6a 国际化调整 2019-10-23 17:20:32 +08:00
fan
dff5d96d4d Merge remote-tracking branch 'origin/dev' into test 2019-10-23 16:19:22 +08:00
fan
3119f4f308 设计平台课程设计调整 2019-10-23 15:01:25 +08:00
joylink_cuiweidong
51bf37e9c7 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-10-23 13:36:19 +08:00
fan
89d71ed661 发现问题调整 2019-10-23 13:33:09 +08:00
joylink_cuiweidong
e854c32390 Merge branch 'dev' into test 2019-10-22 20:10:05 +08:00
fan
4bd232bd67 地图系统结构调整 2019-10-22 18:34:05 +08:00
joylink_cuiweidong
bddddedbf2 Merge branch 'dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-22 16:13:13 +08:00
zyy
8f01ed2e57 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 15:24:43 +08:00
zyy
3c67e18350 desc: 修改代码 2019-10-22 15:24:36 +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
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
sunzhenyu
bd683656a8 Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test 2019-10-21 16:51:09 +08:00
joylink_cuiweidong
1a046c2b7f 设计平台系统管理子系统生成页面调整 2019-10-21 15:50:15 +08:00
sunzhenyu
ca36aa478d 增加三维编辑 2019-10-21 14:29:45 +08:00
fan
b23bff36f0 打开实训录制按钮 2019-10-18 17:32:14 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +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
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
zyy
6ca619b71f desc: 修改格式化 2019-10-17 14:35:10 +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
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
joylink_cuiweidong
35eacb299c 剧本预览页面调整 2019-10-16 16:36:25 +08:00
fan
f0bf595b60 国际化添加左、右 2019-10-16 14:16:48 +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
089290e979 剧本国际化调整以及剧本增加语言参数 2019-10-15 16:18:25 +08:00
fan
0640586712 西铁院暂存 2019-10-15 13:04:28 +08:00
joylink_cuiweidong
aba4efe129 运行图页面调整 2019-10-14 17:03:54 +08:00
joylink_cuiweidong
5e320978a9 产品分化剧本页面调整 2019-10-14 13:58:26 +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
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
joylink_cuiweidong
6adc8cdd5b 剧本国际化调整 2019-10-12 13:04:56 +08:00
joylink_cuiweidong
bf66b2c9e0 剧本发布申请页面调整 2019-10-12 11:11:34 +08:00
zyy
aa0199754a desc: 调整创建权限流程，创建字段修改 2019-10-11 15:27:14 +08:00
joylink_cuiweidong
059a4134d5 产品分化路由调整以及剧本发布样式调整 2019-10-10 14:08:23 +08:00
fan
c9f9aa6869 产品分化调整 2019-10-10 13:02:43 +08:00
fan
f7e85b493c 添加发布申请路由 2019-10-10 10:32:57 +08:00
fan
e1b4633409 错别字修改 2019-10-10 10:22:05 +08:00
fan
0a36fee338 产品分化调整 2019-10-10 10:21:22 +08:00
fan
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
joylink_cuiweidong
a502d0a118 产品分化 设计平台页面调整以及接口调整 2019-09-29 14:21:06 +08:00
joylink_cuiweidong
1e95cae5e5 产品分化 设计系统界面调整 2019-09-27 18:16:27 +08:00
zyy
f712c93622 desc: 调整权限分发 组织结构配置 2019-09-27 10:06:46 +08:00
zyy
5c973ba468 desc: 调整英文版登陆窗口， 登陆样式调整 2019-09-26 18:40:38 +08:00
zyy
31a024b9ea desc: 调整国际化 2019-09-26 18:13:31 +08:00
zyy
01cb0a699b desc: 调整权限字段限制， 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
joylink_cuiweidong
6664d33ed2 产品分化剧本设计调整 2019-09-26 13:21:15 +08:00
joylink_cuiweidong
0bb8e6ba0b 产品分化剧本修改 2019-09-26 10:54:07 +08:00
joylink_cuiweidong
1e4deb2353 国际化调整 2019-09-24 17:02:29 +08:00
fan
5a65547d9b 删除多余标点 2019-09-24 15:30:54 +08:00
fan
d863e61b33 Revert "revert 01c97f45aea75ec8db5a0726c82a2e83fa14750e" 
This reverts commit 6ad0eebb2e.
 2019-09-24 13:32:28 +08:00
fan
6ad0eebb2e revert 01c97f45ae 2019-09-24 13:23:50 +08:00
fan
d063625c45 产品分化调整 2019-09-23 17:49:04 +08:00
zyy
2d60c78a74 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
 2019-09-23 13:37:59 +08:00
zyy
01c97f45ae desc: 调整琏计划导入excel, 样式， 流程 2019-09-23 13:37:11 +08:00
fan
517ddbcff0 国际化调整 2019-09-23 09:48:13 +08:00
fan
dc5edddde0 国际化调整 2019-09-19 18:53:28 +08:00
fan
a182d7d0b2 国际化调整 2019-09-19 18:51:57 +08:00
joylink_cuiweidong
d798439a26 链计划 国际化调整 2019-09-19 17:32:33 +08:00
joylink_cuiweidong
4f4912fcbc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-19 17:31:02 +08:00
zyy
b5b9f4c1ff Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/tip.js
#	src/views/planMonitor/editTool/menuBar.vue
#	src/views/planMonitor/editTool/menus/createEmptyPlan.vue
#	src/views/planMonitor/editTool/menus/editPlanName.vue
#	src/views/planMonitor/editTool/menus/modifyingTask.vue
#	src/views/planMonitor/editTool/menus/openRunPlan.vue
 2019-09-19 17:28:31 +08:00
zyy
48ea44a980 desc: 调整权限国际化，调整琏计划导入运行图逻辑 2019-09-19 17:22:48 +08:00
joylink_cuiweidong
33caa49dcf 国际化提交 2019-09-19 17:15:30 +08:00
joylink_cuiweidong
98054a93ff Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-19 17:11:11 +08:00
joylink_cuiweidong
706a9502d8 国际化调整 2019-09-19 17:11:00 +08:00
fan
9b40afa4ea Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-19 16:12:22 +08:00
fan
676fc71ee5 国际化调整 2019-09-19 16:12:05 +08:00
joylink_cuiweidong
94eeeb0916 国际化调整 2019-09-19 14:58:41 +08:00
fan
607abd877f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-19 14:15:22 +08:00
fan
cf8f562a48 国际化调整 2019-09-19 14:14:49 +08:00
joylink_cuiweidong
0e7fdb354c 国际化调整 2019-09-19 13:19:35 +08:00
zyy
591110ddec Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/zh/orderAuthor.js
#	src/i18n/langs/zh/permission.js
#	src/views/orderauthor/permission/create/order.vue
 2019-09-18 18:41:46 +08:00
zyy
1d26a9f1fb desc: 新增创建权限流程 2019-09-18 18:39:55 +08:00
joylink_cuiweidong
5f4412dd40 国际化调整 2019-09-18 17:28:24 +08:00
joylink_cuiweidong
9ace0842a5 发布内容管理 国际化 2019-09-18 16:04:34 +08:00
joylink_cuiweidong
ae68018734 发布内容管理 国际化 2019-09-18 13:36:57 +08:00
joylink_cuiweidong
9bc06e4f59 地图绘制国际化调整 2019-09-18 11:11:23 +08:00
joylink_cuiweidong
3059b7006d 国际化调整 2019-09-17 18:39:32 +08:00
joylink_cuiweidong
f8a872b40c 国际化调整 2019-09-17 17:53:42 +08:00
joylink_cuiweidong
ffdba3dc22 国际化调整 2019-09-17 16:08:11 +08:00
joylink_cuiweidong
021132ba0d 国际化调整 2019-09-17 14:14:29 +08:00
joylink_cuiweidong
a116539d80 国际化调整 2019-09-17 13:54:10 +08:00
joylink_cuiweidong
2c7f48fb28 课程模块国际化调整 2019-09-17 13:19:43 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
zyy
607024c551 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-16 17:31:17 +08:00
zyy
c5c71253df desc: 调整信号机字段显示，调整创建权限逻辑 2019-09-16 17:31:12 +08:00
joylink_cuiweidong
25402786f8 国际化调整 2019-09-16 16:08:55 +08:00
zyy
7abab1ba28 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-16 16:00:09 +08:00
zyy
ab9a02e232 desc: 调整琏计划运行图样式 2019-09-16 15:59:53 +08:00
joylink_cuiweidong
382b81b94e 国际化调整 2019-09-16 13:55:18 +08:00
joylink_cuiweidong
87637e89ae 弹出层国际化调整 2019-09-16 11:17:42 +08:00
joylink_cuiweidong
711f3195e3 国际化调整 2019-09-16 10:25:39 +08:00
fan
836aa798dd 国际化调整 2019-09-16 09:06:19 +08:00
fan
6e44740fe2 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/menu.js
#	src/i18n/langs/zh/menu.js
 2019-09-16 09:05:33 +08:00
fan
126fc80ea4 国际化调整菜单 2019-09-16 08:56:37 +08:00
joylink_cuiweidong
3f772f0cd5 地图右键菜单国际化 2019-09-12 18:37:42 +08:00
joylink_cuiweidong
88d96ace7d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-12 17:38:17 +08:00
joylink_cuiweidong
24bbeda269 地图右键菜单国际化 2019-09-12 17:38:04 +08:00
fan
a362e629c7 国际化调整 2019-09-12 17:34:40 +08:00
fan
60522271fc Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/menu.js
#	src/i18n/langs/zh/menu.js
 2019-09-12 17:34:17 +08:00
fan
d9b8f1e8fd 国际化菜单调整调整 2019-09-12 17:28:02 +08:00
zyy
c777b3dbcc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/zh/rules.js
 2019-09-12 16:31:35 +08:00
zyy
f48a513df0 desc: 调整绘图逻辑，流程，字段显示 2019-09-12 16:30:42 +08:00
joylink_cuiweidong
6d03379cb0 地图右键菜单国际化 2019-09-12 16:03:03 +08:00
joylink_cuiweidong
b08cddc237 地图菜单国际化 2019-09-12 15:14:13 +08:00
joylink_cuiweidong
71a0f2d921 仿真国际化 2019-09-12 13:35:25 +08:00
fan
cf45174dad Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-12 13:22:40 +08:00
fan
2dffe78baf 国际化调整 2019-09-12 13:22:30 +08:00
joylink_cuiweidong
22a77b63fd 仿真 国际化调整 2019-09-12 09:37:40 +08:00
fan
7a284fea4a 国际化调整 2019-09-12 09:25:33 +08:00
fan
b06f4d1ad4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 17:12:00 +08:00
fan
436cd0418f 国际化调整 2019-09-11 17:11:51 +08:00
joylink_cuiweidong
76335c8d12 仿真购买 国际化调整 2019-09-11 16:23:14 +08:00
joylink_cuiweidong
1830952064 仿真 国际化调整 2019-09-11 15:33:00 +08:00
joylink_cuiweidong
37f1631585 仿真国际化调整 2019-09-11 14:35:26 +08:00
fan
fd4c2de338 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/index.js
 2019-09-11 14:31:32 +08:00
joylink_cuiweidong
ef5d425942 考试 仿真国际化调整 2019-09-11 13:40:46 +08:00
fan
9c5f1f7633 国际化调整 2019-09-11 13:20:03 +08:00
joylink_cuiweidong
b13638803a 教学 仿真 国际化调整 2019-09-11 11:32:31 +08:00
joylink_cuiweidong
5c184755e2 教学仿真 国际化调整 2019-09-11 11:30:44 +08:00
joylink_cuiweidong
d31f4e8493 教学和考试的仿真 国际化调整 2019-09-11 11:02:18 +08:00
fan
5c2e2cebe8 权限分发调整 2019-09-11 10:35:34 +08:00
joylink_cuiweidong
1ced2a4911 国际化调整 2019-09-11 09:34:12 +08:00
fan
7bb4ac4a06 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 09:26:38 +08:00
fan
3e1bd3fcd7 国际化考试系统大屏统计系统 2019-09-11 09:25:16 +08:00
joylink_cuiweidong
e1378c0961 国际化调整 2019-09-10 19:08:48 +08:00
joylink_cuiweidong
875d5d6c64 国际化调整 2019-09-10 17:32:41 +08:00
joylink_cuiweidong
4b8a3acca8 国际化调整以及ibp盘调整 2019-09-10 16:14:54 +08:00
fan
4cbdf38845 代码调整 2019-09-04 13:08:51 +08:00
joylink_cuiweidong
969fe6ac5a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/ibp/shape/background.js
 2019-09-04 11:02:02 +08:00
zyy
27f05bdd0d desc: 增加缓存列表 2019-09-03 15:22:50 +08:00
zyy
0388b2a1df desc: 修改权限列表显示字段内容，逻辑流程 2019-09-02 14:43:16 +08:00
ival
55166e7aea 修改elementUi切换中英文不成功的问题 2019-08-30 18:20:07 +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
fd03ed6d59 修改每日运行图查询接口 2019-08-29 14:48:26 +08:00
zyy
2d906ef9be desc: 调整权限列表接口对接 2019-08-29 09:31:58 +08:00
zyy
01a2b42912 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-27 18:32:32 +08:00
zyy
498f093866 desc: 新增按钮类型 2019-08-27 18:32:26 +08:00
fan
75a6b2ee58 合并 2019-08-27 15:22:55 +08:00
zyy
02aa4a5b65 desc: 道岔创建字段补充，修改字段名称，描述 2019-08-27 15:02:55 +08:00
fan
b2eb2076b0 ibp 2019-08-27 14:17:36 +08:00
zyy
b9b2fd5b77 desc: 调整地图绘制数据逻辑， 新增发布历史列表 2019-08-23 18:40:02 +08:00
zyy
6a6bb3a405 desc: 修改地图绘制样式，逻辑调整 2019-08-23 09:14:21 +08:00
fan
3d5bc7c600 国际化调整 2019-08-22 09:14:26 +08:00
fan
b41c85b78e 合并代码 2019-08-22 09:12:29 +08:00
fan
614aae8be0 国际化调整 2019-08-22 09:06:48 +08:00
zyy
5f5fc61b68 desc: 修改地图更改坐标，调整绘制样式 2019-08-21 18:49:39 +08:00
zyy
6d42719731 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 17:34:15 +08:00
zyy
6712d1cd5b desc: 修改地图编辑样式 2019-08-21 17:34:08 +08:00
ival
1eea945778 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 15:34:18 +08:00
ival
1ade3d38ca 添加列车模型重复名称数据提示 2019-08-21 15:34:01 +08:00
zyy
e89eb2ecf8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/zh/tip.js
 2019-08-21 15:15:37 +08:00
zyy
e4a5d77f20 desc: 支付组件国际化， 调整地图加载位置 2019-08-21 15:15:08 +08:00
ival
1993de8548 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 15:01:13 +08:00
ival
242e082dc7 修改列车操作 2019-08-21 15:00:58 +08:00
fan
919314e959 国际化调整 2019-08-21 14:20:32 +08:00
fan
1245dc3fab 国际化调整 2019-08-21 14:05:21 +08:00
fan
7bb5aa785d 合并冲突 2019-08-21 14:04:22 +08:00
fan
9a480393f5 国际化调整+loading调整 2019-08-21 13:54:53 +08:00
ival
6bbfd49150 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-21 13:48:24 +08:00
ival
b5a93f7ce1 修改国际化 2019-08-21 13:48:06 +08:00
zyy
1132e5fb4c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/global.js
#	src/i18n/langs/zh/index.js
#	src/i18n/langs/zh/rules.js
#	src/views/map/runplan/manage/create.vue
 2019-08-21 13:47:40 +08:00