Commit Graph

39 Commits

Author SHA1 Message Date
joylink_cuiweidong
c9f7a72d0b 代码调整 2020-04-10 16:54:17 +08:00
joylink_cuiweidong
e3f5d5210b 代码调整 2020-04-10 16:00:38 +08:00
fan
5036229c47 操作定义老地图处理 2020-04-09 16:51:17 +08:00
zyy
ee10377b04 调整区段字段显示逻辑,道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
fan
507e28adde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:25:45 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +08:00
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00
zyy
6fd9276fe8 调整实训步骤,及地图加载状态 2020-04-03 13:30:04 +08:00
fan
dee1efe00f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 13:07:32 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
zyy
47519b7040 调整道岔生成默认状态,调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
#	src/views/designPlatform/demonList.vue
2020-03-27 13:55:00 +08:00
zyy
faf772712c 调整增加自动生成实训操作步骤 2020-03-27 11:24:47 +08:00
fan
3c1d038a81 实训仿真调整 2020-03-27 10:51:49 +08:00
fan
04ec094ded 样式调整 2019-11-11 13:34:35 +08:00
fan
daec7d5e4d bug 调整 2019-11-08 18:43:46 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
joylink_cuiweidong
5cb7fe51b9 skinCode处理 2019-11-07 10:25:34 +08:00
joylink_cuiweidong
0c938f5928 接口调整 2019-11-01 13:36:14 +08:00
joylink_cuiweidong
d0608dd29e 接口调整
文件位置调整
2019-11-01 10:06:47 +08:00
joylink_cuiweidong
cfdea6ea12 接口调整 2019-10-31 17:45:15 +08:00
joylink_cuiweidong
681ac5e886 路由调整
接口调整
2019-10-31 13:56:42 +08:00
joylink_cuiweidong
b5b08a0afd 接口调整 2019-10-31 11:03:19 +08:00
joylink_cuiweidong
de76904dfc 接口调整 2019-10-30 19:36:29 +08:00
joylink_cuiweidong
ce0230150b 接口调整 2019-10-30 18:07:09 +08:00
zyy
df8d104bd1 desc: 高度修改,登陆页面英文调整 2019-10-29 17:33:11 +08:00
zyy
c08e2afaaa desc: 调整高度样式 2019-10-29 13:15:57 +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
6d15a95b3f 产品分化运行图发布调整 2019-10-14 13:04:23 +08:00
fan
3381424f0d 产品分化调整 2019-10-10 09:33:56 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理, 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
fan
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
fan
5075e999b9 设计平台调整 2019-09-30 16:20:31 +08:00
zyy
01cb0a699b desc: 调整权限字段限制, 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
zyy
a0ee753bfd desc: 调整成都三号线自动生成课程配置,部分内容 (待调) 2019-09-24 15:06:45 +08:00
fan
436cd0418f 国际化调整 2019-09-11 17:11:51 +08:00
sunzhenyu
d7efef41e4 pull 2019-08-29 17:16:33 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00