Commit Graph

232 Commits

Author SHA1 Message Date
lVAL
cc4edd174c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 09:26:55 +08:00
lVAL
5aefda5ef0 修改设计平台,table样式,增加padding:50px 2020-11-06 09:26:41 +08:00
fan
02615110a2 调整条件管理关闭 2020-11-05 18:02:02 +08:00
fan
3d03111631 条件管理调整 2020-11-05 15:31:28 +08:00
fan
38f3f82e18 剧本录制会话文字发送 2020-11-05 13:17:40 +08:00
fan
192ca67257 剧本动作触发条件调整 2020-11-05 09:38:50 +08:00
fan
636757ddbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-05 09:33:08 +08:00
fan
61ed5e3411 剧本动作触发条件参数delay调整 2020-11-05 09:32:44 +08:00
zyy
a6a91bfcff 调整剧本内容判断 2020-11-04 18:27:24 +08:00
fan
d693cd0517 merge 2020-11-04 16:43:58 +08:00
fan
2c79a2bce0 merge 2020-11-04 16:42:29 +08:00
fan
08a306f373 剧本条件调整 2020-11-04 16:41:01 +08:00
lVAL
847d97eb5d 优化替换背景 mask样式问题 2020-11-04 16:39:17 +08:00
lVAL
e9991d97f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/scriptManage/tipScriptRecord.vue
2020-11-04 16:18:56 +08:00
lVAL
f492750443 修改 替换背景 屏蔽范围 2020-11-04 16:17:01 +08:00
zyy
94c141dbbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 15:32:41 +08:00
zyy
096b681c35 调整剧本内容样式 2020-11-04 15:32:28 +08:00
fan
62dddae1e5 剧本条件调整 2020-11-04 14:54:12 +08:00
fan
06c252cd58 merge 2020-11-04 14:51:54 +08:00
fan
6993ad8d8e 剧本条件 2020-11-04 14:48:36 +08:00
lVAL
872a71c7b5 增加 替换背景的操作 2020-11-04 14:42:48 +08:00
fan
8158eb7773 剧本条件暂提 2020-11-04 10:18:29 +08:00
fan
55dda9ca10 添加停车场信号楼角色 2020-11-04 09:26:22 +08:00
fan
a1be6dbfb9 暂提 2020-11-03 18:52:33 +08:00
joylink_cuiweidong
5bf5c3bac3 代码调整 2020-11-03 17:13:49 +08:00
joylink_cuiweidong
b9f71f75d9 添加剧本删除动作接口
修改剧本编制样式
2020-11-03 16:37:47 +08:00
joylink_cuiweidong
06b0360aa1 剧本编制代码调整 2020-10-30 15:06:05 +08:00
joylink_cuiweidong
7665c3a97d 剧本编制代码调整
仿真 剧本 会话 综合演练 添加 电力调度角色
2020-10-30 11:24:42 +08:00
zyy
959d2ba999 调整剧本编制选中样式 2020-10-29 11:18:47 +08:00
joylink_cuiweidong
01045f914e 代码调整 2020-10-29 10:45:35 +08:00
joylink_cuiweidong
cdb56ef33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/competition.js
2020-10-28 15:56:23 +08:00
joylink_cuiweidong
2cdcdae4d9 剧本导入 场景导入代码调整 2020-10-28 15:53:45 +08:00
zyy
316249fbd6 调整多余配置路径 2020-10-28 13:51:26 +08:00
zyy
791e02aaf7 调整接口删除多余配置 2020-10-28 10:22:46 +08:00
joylink_cuiweidong
9b988f318f 草稿剧本 导入导出功能添加
竞赛场景导出功能添加
2020-10-27 17:57:59 +08:00
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +08:00
joylink_cuiweidong
35df9b43ec 剧本编制代码调整
会话代码调整
2020-10-23 17:48:40 +08:00
joylink_cuiweidong
39b06463b8 代码调整 2020-10-13 14:41:42 +08:00
joylink_cuiweidong
512973eb3a 剧本 添加 仿真角色 2020-10-13 13:06:17 +08:00
joylink_cuiweidong
047c9aa127 剧本 代码调整 2020-09-21 14:20:33 +08:00
joylink_cuiweidong
a22715ab23 剧本会话代码调整 2020-09-21 10:53:45 +08:00
joylink_cuiweidong
ee61b0615b 剧本修改代码调整(添加满分时长、及格时长、零分时长字段) 2020-09-18 17:04:35 +08:00
joylink_cuiweidong
51ed3b83c5 剧本编制代码调整 2020-09-11 15:09:43 +08:00
fan
ff4072c6da 调整加载动画 2020-09-09 10:28:56 +08:00
joylink_cuiweidong
de8263e062 剧本编制代码优化调整 2020-09-01 18:27:36 +08:00
joylink_cuiweidong
83a2cb21de 重置剧本代码调整 2020-08-31 16:51:36 +08:00
joylink_cuiweidong
92219adba0 剧本录制预览代码调整 2020-08-27 13:12:36 +08:00
joylink_cuiweidong
17d3be79cf 剧本编制代码调整 2020-08-25 13:44:18 +08:00
joylink_cuiweidong
43207730bf 剧本仿真代码调整 2020-08-21 14:55:28 +08:00
joylink_cuiweidong
e699efc06f 剧本录制预览代码调整 2020-08-21 14:16:44 +08:00