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

1176 Commits

Author SHA1 Message Date
zyy
ab9a02e232 desc: 调整琏计划运行图样式 2019-09-16 15:59:53 +08:00
ival
0cd99f16f1 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/views/publish/publishMap/index.vue
 2019-09-16 14:31:56 +08:00
ival
b52bb52888 修改地图导出以及登录失败错误信息提示 2019-09-16 14:29:43 +08:00
joylink_cuiweidong
382b81b94e 国际化调整 2019-09-16 13:55:18 +08:00
joylink_cuiweidong
87637e89ae 弹出层国际化调整 2019-09-16 11:17:42 +08:00
joylink_cuiweidong
711f3195e3 国际化调整 2019-09-16 10:25:39 +08:00
fan
836aa798dd 国际化调整 2019-09-16 09:06:19 +08:00
fan
6e44740fe2 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/menu.js
#	src/i18n/langs/zh/menu.js
 2019-09-16 09:05:33 +08:00
fan
126fc80ea4 国际化调整菜单 2019-09-16 08:56:37 +08:00
joylink_cuiweidong
3f772f0cd5 地图右键菜单国际化 2019-09-12 18:37:42 +08:00
joylink_cuiweidong
88d96ace7d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-12 17:38:17 +08:00
joylink_cuiweidong
24bbeda269 地图右键菜单国际化 2019-09-12 17:38:04 +08:00
fan
a362e629c7 国际化调整 2019-09-12 17:34:40 +08:00
fan
60522271fc Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/menu.js
#	src/i18n/langs/zh/menu.js
 2019-09-12 17:34:17 +08:00
fan
d9b8f1e8fd 国际化菜单调整调整 2019-09-12 17:28:02 +08:00
zyy
c777b3dbcc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/zh/rules.js
 2019-09-12 16:31:35 +08:00
zyy
f48a513df0 desc: 调整绘图逻辑，流程，字段显示 2019-09-12 16:30:42 +08:00
joylink_cuiweidong
6d03379cb0 地图右键菜单国际化 2019-09-12 16:03:03 +08:00
joylink_cuiweidong
b08cddc237 地图菜单国际化 2019-09-12 15:14:13 +08:00
joylink_cuiweidong
71a0f2d921 仿真国际化 2019-09-12 13:35:25 +08:00
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
63fb67b4cc Merge remote-tracking branch 'origin/dev' into test 2019-09-12 09:26:13 +08:00
fan
7a284fea4a 国际化调整 2019-09-12 09:25:33 +08:00
sunzhenyu
33442d2969 自动化test 2019-09-11 18:12:52 +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
76335c8d12 仿真购买 国际化调整 2019-09-11 16:23:14 +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
41b70bc477 Merge remote-tracking branch 'origin/dev' into test 2019-09-11 13:20:30 +08:00
fan
9c5f1f7633 国际化调整 2019-09-11 13:20:03 +08:00
joylink_cuiweidong
b13638803a 教学 仿真 国际化调整 2019-09-11 11:32:31 +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
5612cfc06e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-10 10:26:27 +08:00
fan
8083656e16 ibp删除钥匙孔 2019-09-10 10:26:18 +08:00
joylink_cuiweidong
dc44cd3198 钥匙组件调整 2019-09-10 10:20:15 +08:00
fan
0c9e367f3d ibp修改扶梯框边框宽度，调整select默认状态 2019-09-10 10:16:02 +08:00
joylink_cuiweidong
eaaccddc20 通化门，后卫寨 钥匙组件数据调整 2019-09-10 10:10:49 +08:00
joylink_cuiweidong
d6ab9b00e2 钥匙组件数据重新调整 2019-09-09 19:30:12 +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
7620d82d6e ibp调整背景图片加载方式 2019-09-09 16:22:45 +08:00
fan
80ce4e19a8 ibp调整 2019-09-09 16:11:43 +08:00
fan
c661945847 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-09 10:41:27 +08:00
fan
6eb3fecc4b 信号机调整 2019-09-09 10:41:14 +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
sunzhenyu
fd8f3e4dd0 修改过去不标准贴图，修改代码生成的不标准材质 2019-09-09 10:22:10 +08:00
fan
6472afe009 Merge remote-tracking branch 'origin/dev' into test 2019-09-06 18:46:54 +08:00
fan
31454a72c5 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 18:18:18 +08:00
fan
760aa02496 ibp调整页面 2019-09-06 18:17:54 +08:00
ival
1a516880b5 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 17:55:34 +08:00
ival
1918a634b1 修改变量 2019-09-06 17:55:18 +08:00
fan
621fe61d36 Merge remote-tracking branch 'origin/dev' into test 2019-09-06 17:43:09 +08:00
fan
6b96fc928d ibp删除console 2019-09-06 17:42:36 +08:00
fan
4cd1da15c0 Merge remote-tracking branch 'origin/dev' into test 2019-09-06 17:38:18 +08:00
fan
3ea2c656de ibp调整电子钟停止 2019-09-06 17:37:43 +08:00
fan
3abd85ab67 Merge remote-tracking branch 'origin/dev' into test 2019-09-06 17:25:35 +08:00
fan
a9ec1672ae Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 17:24:45 +08:00
fan
05b41d659e ibp拖动鼠标样式调整 2019-09-06 17:24:32 +08:00
zyy
37e8046241 Merge branch 'dev' into test 2019-09-06 17:22: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
c3a98567a3 Merge remote-tracking branch 'origin/dev' into test 2019-09-06 17:03:07 +08:00
fan
9d5c5646a2 ibp盘调整 2019-09-06 17:01:51 +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
ival
f774edd652 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-06 16:11:46 +08:00
ival
7c5d453c29 修改绘制地图同步数据逻辑 2019-09-06 16:11:28 +08:00
zyy
0cfc1dc972 Merge branch 'dev' into test 2019-09-06 15:55:06 +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
joylink_cuiweidong
37b72ddf7e 枣园站 ibp盘绘制 2019-09-06 14:23:31 +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
joylink_cuiweidong
d05a6583df ibp盘 圆形指示灯 调整 2019-09-06 10:55:34 +08:00
fan
20acc0e667 ibp盘调整 2019-09-06 10:27:13 +08:00
fan
f8df75252f ibp盘调整 2019-09-06 10:07:01 +08:00
fan
f5f7113c01 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-06 09:55:27 +08:00