joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
1,259 Commits 20 Branches 0 Tags 448 MiB
522b94fcfe
Commit Graph

723 Commits

Author SHA1 Message Date
fan
cf45174dad Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-12 13:22:40 +08:00
fan
2dffe78baf 国际化调整 2019-09-12 13:22:30 +08:00
joylink_cuiweidong
22a77b63fd 仿真 国际化调整 2019-09-12 09:37:40 +08:00
fan
7a284fea4a 国际化调整 2019-09-12 09:25:33 +08:00
fan
b06f4d1ad4 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 17:12:00 +08:00
fan
436cd0418f 国际化调整 2019-09-11 17:11:51 +08:00
fan
1afb81bba5 权限打包调整 2019-09-11 17:09:51 +08:00
joylink_cuiweidong
1830952064 仿真 国际化调整 2019-09-11 15:33:00 +08:00
fan
6b80ac2452 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 15:26:57 +08:00
fan
0c11453197 权限打包搜索条件调整 2019-09-11 15:26:40 +08:00
joylink_cuiweidong
37f1631585 仿真国际化调整 2019-09-11 14:35:26 +08:00
fan
fd4c2de338 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/index.js
#	src/i18n/langs/zh/index.js
 2019-09-11 14:31:32 +08:00
fan
d1c146f9da 权限回收调整 2019-09-11 14:28:22 +08:00
joylink_cuiweidong
ef5d425942 考试 仿真国际化调整 2019-09-11 13:40:46 +08:00
fan
9c5f1f7633 国际化调整 2019-09-11 13:20:03 +08:00
joylink_cuiweidong
5c184755e2 教学仿真 国际化调整 2019-09-11 11:30:44 +08:00
joylink_cuiweidong
d31f4e8493 教学和考试的仿真 国际化调整 2019-09-11 11:02:18 +08:00
fan
fa4ccafc58 权限分发调整 2019-09-11 10:42:15 +08:00
fan
5c2e2cebe8 权限分发调整 2019-09-11 10:35:34 +08:00
joylink_cuiweidong
1ced2a4911 国际化调整 2019-09-11 09:34:12 +08:00
fan
7bb4ac4a06 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-11 09:26:38 +08:00
fan
3e1bd3fcd7 国际化考试系统大屏统计系统 2019-09-11 09:25:16 +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
fan
c96260215c ibp调整代码 2019-09-10 14:27:53 +08:00
fan
8083656e16 ibp删除钥匙孔 2019-09-10 10:26:18 +08:00
fan
0c9e367f3d ibp修改扶梯框边框宽度，调整select默认状态 2019-09-10 10:16:02 +08:00
joylink_cuiweidong
26472da421 钥匙组件代码重新封装 2019-09-09 19:03:23 +08:00
fan
a32bda33f1 ibp调整代码 2019-09-09 18:03:32 +08:00
fan
80ce4e19a8 ibp调整 2019-09-09 16:11:43 +08:00
sunzhenyu
4e1f95e900 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-09 10:22:21 +08:00
fan
760aa02496 ibp调整页面 2019-09-06 18:17:54 +08:00
fan
6b96fc928d ibp删除console 2019-09-06 17:42:36 +08:00
zyy
46a3f64f4d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 17:22:03 +08:00
zyy
ba21d7af9d desc: 修改权限打包字段， 修改地图绘制区段逻辑 2019-09-06 17:21:54 +08:00
fan
ddfeeb6718 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 16:55:31 +08:00
fan
3faf8f3906 ibp盘调整 2019-09-06 16:54:55 +08:00
zyy
10c4083ad3 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 15:54:11 +08:00
zyy
7b0b0d6d0c desc: 修改绘制地图赋值 2019-09-06 15:54:05 +08:00
fan
327c35355f ibp盘调整 2019-09-06 15:21:21 +08:00
fan
80edc1ad20 ibp盘调整 2019-09-06 15:08:47 +08:00
fan
32dab2fa7d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 14:48:47 +08:00
fan
ceccbbc825 ibp盘调整 2019-09-06 14:48:06 +08:00
zyy
1faa4e0add Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 14:21:08 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口，调整地图绘制优化 2019-09-06 14:21:01 +08:00
fan
20acc0e667 ibp盘调整 2019-09-06 10:27:13 +08:00
fan
fa604188b0 ibp盘调整 2019-09-06 09:55:16 +08:00
fan
455202a851 ibp盘调整 2019-09-05 18:54:54 +08:00
fan
c4bf259918 销毁实例前清除ibp数据 2019-09-05 09:35:32 +08:00
fan
063b6392fc 查询剧本列表接口调整展示调整 2019-09-05 09:07:16 +08:00
zyy
935e42fa5b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 19:07:04 +08:00
zyy
921ef7c03d desc: 调整接口请求次数 2019-09-04 19:06:55 +08:00
ival
33c4a3afc2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 19:00:38 +08:00
ival
02fc21e544 增加仿真的大屏角色以及IBP角色 2019-09-04 19:00:22 +08:00
fan
e24a0e1b4d Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-04 18:48:10 +08:00
fan
8df4cfd6e1 ibp代码调整 2019-09-04 18:47:49 +08:00
zyy
0f9b0f84a5 desc: 删除多余打印 2019-09-04 18:29:47 +08:00
zyy
1d7809bc33 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 17:58:56 +08:00
zyy
509e5218a7 desc: 调整引用问题 2019-09-04 17:58:22 +08:00
sunzhenyu
ebd1b211d1 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-04 17:36:15 +08:00
ival
8b56d035eb 修改按钮顺序 2019-09-04 17:19:26 +08:00
ival
92531836fe Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 16:58:25 +08:00
ival
f925043e41 增加大屏角色 2019-09-04 16:58:13 +08:00
zyy
118ed1296c desc: 增加琏计划运行图修改 2019-09-04 16:32:41 +08:00
zyy
6b9047c919 desc: 调整请求位置 2019-09-04 15:06:26 +08:00
zyy
949d51923e Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 14:47:58 +08:00
zyy
a037937627 desc: 调整运行图生成逻辑 2019-09-04 14:47:52 +08:00
fan
f065661cd4 ibp代码调整 2019-09-04 14:42:04 +08:00
fan
d303ca087e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-04 13:07:09 +08:00
fan
8a9092b2b4 ibp代码调整 2019-09-04 13:06:15 +08:00
ival
ec51f2de2c 修改代码 2019-09-04 13:04:56 +08:00
ival
eb7dafd1b2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 13:02:43 +08:00
ival
89fc3c0547 增加角色分配统计 2019-09-04 13:02:28 +08:00
zyy
8e06abcad9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 11:28:36 +08:00
zyy
b96701aceb desc: 调整运行图加载 2019-09-04 11:28:24 +08:00
joylink_cuiweidong
67f925ef7f 代码调整 2019-09-04 11:05:57 +08:00
joylink_cuiweidong
969fe6ac5a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/ibp/shape/background.js
 2019-09-04 11:02:02 +08:00
fan
eb26f87560 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-04 10:57:14 +08:00
fan
743fa388c4 代码调整 2019-09-04 10:56:44 +08:00
ival
d7fb121c2b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-04 10:13:42 +08:00
ival
df839856d9 修改IBP盘角色修改 2019-09-04 10:13:26 +08:00
zyy
51274a044b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 18:59:52 +08:00
zyy
abec58b726 desc: 修改弹窗点击蒙层不取消 2019-09-03 18:59:46 +08:00
fan
cb7d08bc93 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-03 18:45:39 +08:00
fan
ce5d0424d5 ibp代码调整 2019-09-03 18:45:02 +08:00
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +08:00
ival
c1af062bbd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-03 17:36:01 +08:00
ival
c97996fceb 设置冲突列颜色 2019-09-03 17:35:23 +08:00
zyy
bd494599a6 desc: 修改显示权限title 2019-09-03 17:03:05 +08:00
sunzhenyu
1af9b755d7 t ：Merge branch 'test' into dev 2019-09-03 16:56:20 +08:00
sunzhenyu
6fc5f991ef 区分cctv和正常镜头渲染，减少通信驱动的循环体，减少循环遍历的数据中内容，修改场景背景 2019-09-03 16:45:56 +08:00
fan
dafa95baed Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-03 16:14:13 +08:00
fan
ae853226d7 ibp调整 2019-09-03 16:14:00 +08:00
zyy
0372dd202d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 16:13:29 +08:00
zyy
40b67b8cf3 desc: 调整修改权限逻辑 2019-09-03 16:13:23 +08:00
ival
b8d2f43ebd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 15:46:31 +08:00
ival
dfcdb5628f 优化IBP盘代码 2019-09-03 15:46:16 +08:00
zyy
10ab09451b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 15:22:58 +08:00
zyy
27f05bdd0d desc: 增加缓存列表 2019-09-03 15:22:50 +08:00