Commit Graph

88 Commits

Author SHA1 Message Date
joylink_cuiweidong
8f6f033870 剧本仿真切换仿真类型代码调整 2020-03-30 16:16:11 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
joylink_cuiweidong
93dc9a6983 新版剧本编制接口调整 2020-03-27 17:29:01 +08:00
joylink_cuiweidong
966bed109b 新版剧本代码调整 2020-03-27 11:31:40 +08:00
joylink_cuiweidong
f410a7be67 代码调整 2019-11-28 11:27:37 +08:00
joylink_cuiweidong
0c3c893a31 剧本bug调整 2019-11-19 15:34:45 +08:00
joylink_cuiweidong
133899b699 综合演练房间样式调整 2019-11-18 17:11:40 +08:00
joylink_cuiweidong
744bd60d9e 代码调整 2019-11-18 12:28:08 +08:00
joylink_cuiweidong
5ce2e1a5b7 仿真skinCode调整 2019-11-12 13:39:52 +08:00
fan
04ec094ded 样式调整 2019-11-11 13:34:35 +08:00
fan
be6bd12b52 代码调整 2019-11-11 09:56:11 +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
11226b84ab 运行图设计代码调整 2019-11-08 14:35:58 +08:00
joylink_cuiweidong
32f0006726 剧本录制调整 2019-11-08 13:01:41 +08:00
joylink_cuiweidong
84562c94dc 剧本代码调整 2019-11-08 10:59:56 +08:00
joylink_cuiweidong
2bef8e867b 剧本添加列车驾驶模式指令 2019-11-07 19:39:52 +08:00
fan
1bd3debbde 西铁院登录页样式调整,测试问题调整 2019-11-04 18:41:58 +08:00
zyy
bc332c1a9d desc: 调整国际化,高度问题 2019-11-01 18:08:05 +08:00
zyy
a133abc1d4 desc: 修改代码 2019-11-01 15:19:15 +08:00
joylink_cuiweidong
681ac5e886 路由调整
接口调整
2019-10-31 13:56:42 +08:00
joylink_cuiweidong
b5a8b10e4e 剧本预览接口调整 2019-10-28 19:12:31 +08:00
joylink_cuiweidong
dc1c69fe16 已发布地图剧本列表页面调整 2019-10-25 14:14:27 +08:00
joylink_cuiweidong
6dc74ac5c8 代码优化
实训平台横向滚动条处理
实训平台和设计平台跳转文字调整
2019-10-24 11:20:00 +08:00
joylink_cuiweidong
a1761fd2fc 添加copyRight 2019-10-23 19:15:02 +08:00
joylink_cuiweidong
02ea111c61 路由处理 2019-10-23 16:43:28 +08:00
joylink_cuiweidong
2bd13ad075 实训tree 样式调整 2019-10-22 18:19:18 +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
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
joylink_cuiweidong
9cd7234081 剧本列表页面调整 2019-10-17 13:54:41 +08:00
joylink_cuiweidong
a264ab51cb 已发布地图剧本列表页面调整 2019-10-17 10:06:52 +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
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
joylink_cuiweidong
232789ca73 产品分化路由处理 2019-10-15 11:05:30 +08:00
joylink_cuiweidong
bca95d4ca1 运行图增加计划和删除计划 更新运行图数据 2019-10-14 15:35:11 +08:00
joylink_cuiweidong
5e320978a9 产品分化剧本页面调整 2019-10-14 13:58:26 +08:00
joylink_cuiweidong
c60471023f 产品分化剧本管理调整 2019-10-14 13:10:36 +08:00
joylink_cuiweidong
12eed3629a 运行图 发布审核流程调整 2019-10-12 17:15:25 +08:00
joylink_cuiweidong
6adc8cdd5b 剧本国际化调整 2019-10-12 13:04:56 +08:00
joylink_cuiweidong
059a4134d5 产品分化路由调整以及剧本发布样式调整 2019-10-10 14:08:23 +08:00
joylink_cuiweidong
c7b5188d74 产品分化 设计平台调整 2019-09-30 10:46:29 +08:00