Commit Graph

210 Commits

Author SHA1 Message Date
joylink_cuiweidong
08991c8694 剧本代码调整 2020-05-19 09:45:15 +08:00
joylink_cuiweidong
cc8b700328 剧本录制代码调整
退出剧本代码调整
2020-05-18 15:18:57 +08:00
joylink_cuiweidong
be4da83dcd 剧本代码调整 2020-05-18 10:31:55 +08:00
zyy
399111c682 调整列表字段显示 2020-05-15 14:59:53 +08:00
joylink_cuiweidong
d3df0afc94 剧本代码调整 2020-05-15 13:16:55 +08:00
joylink_cuiweidong
fab4e149c8 代码调整 2020-05-14 19:42:49 +08:00
joylink_cuiweidong
bd730d5946 代码调整 2020-05-14 19:42:08 +08:00
joylink_cuiweidong
8f0129a742 代码调整 2020-05-14 19:34:22 +08:00
joylink_cuiweidong
8ff8356d28 代码调整 2020-05-14 19:33:48 +08:00
joylink_cuiweidong
70f06409df 综合演练 语音聊天接口调整
剧本预览 代码调整
2020-05-14 14:36:15 +08:00
joylink_cuiweidong
2b8757a074 实训平台 综合演练 聊天代码调整 2020-05-13 18:05:48 +08:00
joylink_cuiweidong
078252b6ac 剧本代码调整 2020-05-11 15:43:36 +08:00
joylink_cuiweidong
7b00dac9be 剧本代码调整 2020-05-11 14:38:23 +08:00
joylink_cuiweidong
46f40bd381 剧本代码调整 2020-05-11 14:32:40 +08:00
joylink_cuiweidong
2bc45b075e 剧本代码调整 2020-05-11 13:58:53 +08:00
joylink_cuiweidong
c8f858214c 剧本代码调整 2020-05-11 11:31:55 +08:00
joylink_cuiweidong
e5dca0b15b 新版剧本 代码调整 2020-05-11 10:44:00 +08:00
joylink_cuiweidong
3da6d9c538 删除没有用的接口 2020-04-21 10:07:26 +08:00
joylink_cuiweidong
1554803dd4 代码调整 2020-04-08 15:27:55 +08:00
joylink_cuiweidong
3472860fbd 新版 剧本编制 添加动作指令操作添加 以及 动作指令展示 2020-03-31 14:52:19 +08:00
joylink_cuiweidong
8c2f1cf729 新剧本 仿真类型切换代码调整 2020-03-30 17:39:00 +08:00
joylink_cuiweidong
0d5645a027 新版剧本接口代码调整 2020-03-30 16:56:38 +08:00
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
fan
bc68f1adc9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-26 15:43:56 +08:00
fan
2ce7cde8cb 调整icon导致x替换问题 2019-09-26 15:43:19 +08:00
joylink_cuiweidong
6664d33ed2 产品分化剧本设计调整 2019-09-26 13:21:15 +08:00
joylink_cuiweidong
293cee8d2f 剧本管理bug修改 2019-09-26 11:07:30 +08:00
joylink_cuiweidong
5964baeea1 国际化调整 2019-09-26 10:59:38 +08:00
joylink_cuiweidong
0bb8e6ba0b 产品分化剧本修改 2019-09-26 10:54:07 +08:00
joylink_cuiweidong
bde4904b2a 产品分化调整 2019-09-26 09:07:19 +08:00
joylink_cuiweidong
27d7431b9e 国际化调整 2019-09-24 14:09:26 +08:00
joylink_cuiweidong
37f1631585 仿真国际化调整 2019-09-11 14:35:26 +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
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
joylink_cuiweidong
eaec6c4446 修复 剧本修改时候重置剧本的bug 2019-08-29 13:05:30 +08:00
joylink_cuiweidong
2abda64836 剧本录制模块页面结构调整 2019-08-22 18:13:55 +08:00
joylink_cuiweidong
1212d30677 调整剧本不能修改问题 2019-08-22 09:09:35 +08:00
program-walker
cdb7ca645a 修改剧本编制界面样式 2019-08-21 20:40:02 +08:00
program-walker
c9dfbb0749 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/scriptManage/scriptRecord/addRole.vue
2019-08-21 20:34:47 +08:00
joylink_cuiweidong
8318fc6349 剧本编制 重置剧本调整 取消剧本角色处理 2019-08-21 20:32:37 +08:00
program-walker
22f83008e8 修改剧本编制界面样式 2019-08-21 20:16:47 +08:00
joylink_cuiweidong
005cb8ba78 剧本编制 成员角色调整 2019-08-21 20:11:16 +08:00
joylink_cuiweidong
aab5bcc995 剧本录制添加成员角色 2019-08-21 18:45:16 +08:00
joylink_cuiweidong
52c4106a75 背景只能保存一次 2019-08-21 14:28:34 +08:00
joylink_cuiweidong
1943f767c4 对话讲述人和接收人可以互换 2019-08-21 14:08:43 +08:00
joylink_cuiweidong
300ed72365 指令文字为红色,隐藏修改按钮
指令和对话添加后原内容不清除
2019-08-21 12:03:01 +08:00
joylink_cuiweidong
51dcc5e904 剧本编制样式调整 2019-08-21 10:24:55 +08:00
joylink_cuiweidong
6e6a56903f 剧本编制样式调整 2019-08-20 18:31:48 +08:00
joylink_cuiweidong
7f2c741818 剧本列表页面 样式调整 2019-08-20 17:54:40 +08:00
joylink_cuiweidong
8172457cda 剧本编制模块样式调整 2019-08-20 15:55:32 +08:00
joylink_cuiweidong
2727309402 剧本录制样式修改 2019-08-20 15:41:54 +08:00
ival
21a0110966 增加录制脚本页面布局 2019-08-20 12:47:39 +08:00
joylink_cuiweidong
43dfc04281 定时保存数据
剧本编制页面修改
2019-08-19 14:09:08 +08:00
joylink_cuiweidong
ecefa16f5e 剧本编制修改 2019-08-16 17:15:20 +08:00
joylink_cuiweidong
14901a50f2 修改 创建剧本的跳转逻辑
编制剧本的表单重置
2019-08-16 14:37:42 +08:00
joylink_cuiweidong
2598087dac Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/en/map.js
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/map.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/tip.js
#	src/utils/baseUrl.js
#	src/views/map/mapdraft/mapedit/routingoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routingoperate/route.vue
#	src/views/map/mapdraft/mapedit/switchoperate/detail.vue
2019-08-16 13:45:49 +08:00
joylink_cuiweidong
f722a0bc27 录制剧本模块修改 2019-08-16 09:25:12 +08:00
joylink_cuiweidong
2e53745790 剧本管理模块 2019-08-15 14:06:53 +08:00
joylink_cuiweidong
ca7b21e61e 修改剧本管理界面 2019-08-15 09:04:17 +08:00