Commit Graph

69 Commits

Author SHA1 Message Date
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00
zyy
28cc15fd10 调整综合监控数据,调整系统右键菜单样式 2020-06-15 17:16:26 +08:00
fan
d69e155e91 贵州装备添加联锁角色&&项目配置规整(未完) 2020-04-16 15:52:56 +08:00
fan
4ab462ed5d 合并代码 2020-03-16 15:32:00 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
1745bfbcf1 ibp盘绘制更新保存流程调整完成 2020-03-16 14:47:59 +08:00
fan
d9c15d961e 连接真实设备按钮仅车站值班员可见 2020-01-19 11:17:51 +08:00
joylink_cuiweidong
e0824e33a0 房间的订阅代码调整 2020-01-15 13:20:48 +08:00
fan
1f88b03322 连接真实设备-国际化提示调整 2020-01-07 13:50:09 +08:00
fan
2554ed1135 代码调整 2020-01-06 14:43:08 +08:00
fan
68a7171495 国际化调整 2020-01-06 11:25:07 +08:00
fan
79aaba36da 连接真实设备添加连接状态 2020-01-03 18:42:08 +08:00
fan
673df154b4 国际化和连接真实设备调整 2020-01-03 17:00:33 +08:00
fan
b43d04a238 取消真实设备接口写死 2020-01-03 11:32:27 +08:00
fan
e022b00a00 项目设备综合演练调整 2020-01-03 11:18:18 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
lVAL
a5bb60cf68 删除跳转页面中无用的subSystem参数 2019-11-25 18:12:34 +08:00
sunzhenyu
f7b909f85d 修改连接 2019-11-15 17:24:13 +08:00
ival
6ce30aaee2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
#	src/permission.js
#	src/views/display/demon/chartView.vue
#	src/views/display/demon/chatBox.vue
#	src/views/exam/detail/courseDetail.vue
2019-11-14 14:03:41 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
fan
e41d324c27 删除实训平台运行图编辑,修改综合演练值班员角色调整问题 2019-11-14 11:30:32 +08:00
joylink_cuiweidong
a5a2d79e64 综合演练ibp盘返回代码调整 2019-11-13 14:16:59 +08:00
ival
0c3a91319d 修改代码 2019-11-13 11:10:15 +08:00
ival
dfa6c7bf37 修改代码 2019-11-12 09:30:31 +08:00
joylink_cuiweidong
e8c8e491f5 skinCode调整 2019-11-11 15:54:04 +08:00
ival
8855bb6c27 修改代码 2019-11-08 20:03:33 +08:00
ival
0776d08053 修改仿真房间代码 2019-11-08 18:15:52 +08:00
ival
6df897316b 移植system 2019-10-31 15:43:37 +08:00
fan
4918c78204 删除接口:/api/runPlan/draft/station/{skinCode}/bySkin 2019-10-30 16:50:35 +08:00
fan
2107549d72 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:07:07 +08:00
fan
bfce5a2103 问题调整 2019-10-25 12:59:24 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +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
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
fan
a24603aedf 综合仿真页面跳转调整 2019-10-12 11:03:15 +08:00
fan
3326f1c917 ibp调整 2019-10-11 17:17:05 +08:00
zyy
b3830f2cc5 desc: 新增现地 自动生成课程 2019-09-25 10:46:35 +08:00
zyy
a0ee753bfd desc: 调整成都三号线自动生成课程配置,部分内容 (待调) 2019-09-24 15:06:45 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
fan
436cd0418f 国际化调整 2019-09-11 17:11:51 +08:00
fan
9c5f1f7633 国际化调整 2019-09-11 13:20:03 +08:00
fan
ceccbbc825 ibp盘调整 2019-09-06 14:48:06 +08:00
ival
02fc21e544 增加仿真的大屏角色以及IBP角色 2019-09-04 19:00:22 +08:00
ival
df839856d9 修改IBP盘角色修改 2019-09-04 10:13:26 +08:00
ival
dfcdb5628f 优化IBP盘代码 2019-09-03 15:46:16 +08:00
ival
ca1b07595e 修改IBP界面尺寸的问题 2019-09-03 14:04:25 +08:00
ival
19634821ba 删除无用注释代码 2019-09-03 13:04:19 +08:00
ival
d60c989405 增加IBP盘操作 2019-09-03 11:12:48 +08:00
fan
e86c1b025c Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/router/index.js
#	src/views/ibp/index.vue
2019-09-03 09:03:00 +08:00