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

291 Commits

Author SHA1 Message Date
fan
8f30d436ee 调整绘图&三维跳转页面icon 2020-04-01 16:24:03 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
fan
b778621329 Merge branch 'dev_pack' into test 
# Conflicts:
#	package.json
#	vue.config.js
 2020-04-01 10:33:26 +08:00
fan
007c3658c6 调整本地项目 2020-03-31 16:54:04 +08:00
fan
2093dea56d 调整哈尔滨项目路由调整 2020-03-31 14:03:44 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
 2020-03-31 11:14:33 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
joylink_cuiweidong
966bed109b 新版剧本代码调整 2020-03-27 11:31:40 +08:00
fan
88ca3a568e Merge remote-tracking branch 'origin/dev' into test 2020-03-20 18:51:36 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev 
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
 2020-03-20 15:16:08 +08:00
zyy
3b645724cc Merge branch 'dev' into test 2020-03-19 18:40:12 +08:00
joylink_cuiweidong
99893786a4 设计平台普通用户iscs不可见 2020-03-19 14:33:54 +08:00
fan
73d763b700 Merge remote-tracking branch 'origin/dev' into test 2020-03-18 19:06:23 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
zyy
1c78d52fed 调整ibp文件配置路径 2020-03-16 11:02:33 +08:00
fan
47a856e0c1 Merge remote-tracking branch 'origin/dev' into test 2020-03-13 18:24:11 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
zyy
31d50d95e2 增加仿真系统 iscs工作站 2020-03-13 13:23:04 +08:00
joylink_fanyuhong
e30010c016 Merge remote-tracking branch 'origin/dev' into test 2020-03-03 18:48:22 +08:00
joylink_fanyuhong
09278e4b1e 排序操作 2020-03-03 18:47:32 +08:00
joylink_fanyuhong
6a5295c0c7 Merge remote-tracking branch 'origin/dev' into test 2020-03-03 15:22:59 +08:00
joylink_fanyuhong
a853439255 地图排序 2020-03-03 11:08:41 +08:00
sunleking
61394c4b39 增加三维客流量模块，目前完成了基础的行走状态控制流程 2020-02-14 18:22:11 +08:00
fan
69d624465f Merge remote-tracking branch 'origin/dev' into test 2020-01-20 18:40:03 +08:00
zyy
8b68d80a81 调整模块iscs显示样式 2020-01-20 10:55:33 +08:00
fan
12dab4eea4 Merge remote-tracking branch 'origin/dev' into test 2020-01-20 10:06:48 +08:00
zyy
a033690502 调整综合监控文件位置及加载方式 2020-01-20 09:20:09 +08:00
zyy
f42c48a0c4 调整iscs为新的系统 2020-01-19 18:36:17 +08:00
zyy
323eda0e07 调整iscs样式 2020-01-19 14:21:22 +08:00
fan
cd5ed00747 Merge remote-tracking branch 'origin/dev' into test 2020-01-19 13:17:01 +08:00
zyy
1779f856be 新增iscs系统 2020-01-17 17:48:08 +08:00
zyy
e4b20395c4 增加iscs系统，调整成都一号线运行图导入 2020-01-17 15:31:58 +08:00
fan
019ca66662 Merge remote-tracking branch 'origin/dev_iscs' into dev 2020-01-16 18:16:23 +08:00
sunzhenyu
d32820e1b4 修改三维背景bug，修改继电器模型和显示，继电器地址，修改三维地图站台偏差 2020-01-16 17:04:16 +08:00
fan
9233728346 iscs调整 2020-01-15 10:11:26 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
fan
365f36edef iscs 绘图 2020-01-14 09:06:03 +08:00
fan
662e38a22c 添加登录页哈尔滨盈达科技 2020-01-13 13:33:35 +08:00
fan
f2b62f281e 指令调整，公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
c8a6e0d8ec Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-02 17:01:23 +08:00
fan
65b766e27f 项目设备管理 2020-01-02 17:01:11 +08:00
fan
396e901a4d 添加/ 2020-01-02 09:06:03 +08:00
joylink_cuiweidong
ca6ca0ecc4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-30 18:45:17 +08:00
joylink_cuiweidong
cad56a82e9 Merge branch 'dev_prd' into dev 
# Conflicts:
#	src/views/demonstration/detail/index.vue
 2019-12-30 18:45:05 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
joylink_cuiweidong
1ad20fe522 删除实训平台 权限 权限打包 2019-12-27 11:11:38 +08:00
joylink_cuiweidong
d15eca77ea 删除系统管理产品编辑 
删除发布内容管理产品状态
 2019-12-27 10:04:09 +08:00
joylink_cuiweidong
044068d4a8 删除实训平台地图权限页面 打包详情按钮 
删除设计平台商品管理页面 添加按钮
 2019-12-26 19:15:48 +08:00
joylink_cuiweidong
d157dc0a88 删除权限管理的权限打包按钮 
删除权限分发管理的权限打包按钮
 2019-12-26 18:07:43 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
zyy
6e7ad61b4a 调整新版地图，旧版地图在公共地图显示流程 2019-12-23 10:36:32 +08:00
zyy
b5cc83a0e0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 18:04:35 +08:00
zyy
3101af9948 增加线路皮肤配置，调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
sunzhenyu
5992e1a0ae 修改三维模块名称，升级threejs版本 2019-12-11 10:47:24 +08:00
sunzhenyu
edb19dfad6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2019-12-05 16:04:47 +08:00
sunzhenyu
7831bce219 添加仿真设备视图 2019-12-05 16:04:36 +08:00
fan
1e7fa5de77 Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-12-03 17:47:27 +08:00
sunzhenyu
6f081ca234 修改沙盘行车逻辑，增加站台模型，修改webworker通信，优化通信判断 2019-12-03 13:48:15 +08:00
joylink_cuiweidong
1e9ac72960 代码调整 2019-11-29 13:37:26 +08:00
joylink_cuiweidong
34272d7644 新版地图绘制调整 2019-11-29 13:10:18 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00
joylink_cuiweidong
e2aedd9fe0 代码调整 2019-11-25 10:31:03 +08:00
joylink_cuiweidong
bb296a7238 代码调整 2019-11-19 17:55:27 +08:00
joylink_cuiweidong
bd2744f567 代码调整 2019-11-19 17:42:36 +08:00
zyy
8d05730dc4 desc: 修改代码 2019-11-18 14:29:43 +08:00
zyy
9bfad2fdeb desc: 修改代码 2019-11-15 16:31:48 +08:00
zyy
805fe3d971 修改路由配置 2019-11-14 16:31:31 +08:00
zyy
db24914ee7 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-14 14:10:26 +08:00
zyy
558f359c77 删除elementui 改用cdn方式加载 2019-11-14 14:10:20 +08:00
ival
6ce30aaee2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
#	src/permission.js
#	src/views/display/demon/chartView.vue
#	src/views/display/demon/chatBox.vue
#	src/views/exam/detail/courseDetail.vue
 2019-11-14 14:03:41 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
fan
e41d324c27 删除实训平台运行图编辑，修改综合演练值班员角色调整问题 2019-11-14 11:30:32 +08:00
zyy
2266f6d823 desc: 修改代码 2019-11-13 09:06:57 +08:00
zyy
0cb102186f desc: 修改echarts加载方式 2019-11-12 17:20:23 +08:00
zyy
7018b4c308 desc: 修改代码 2019-11-12 13:36:21 +08:00
joylink_cuiweidong
713f411ffc 运行图设计调整 2019-11-08 13:47:51 +08:00
joylink_cuiweidong
32f0006726 剧本录制调整 2019-11-08 13:01:41 +08:00
zyy
18fb36b1b9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/config/skinCode/fuzhou_01.js
#	src/jmap/map.js
 2019-11-06 18:38:50 +08:00
zyy
9f1f02bf0e desc: 增加绘图撤销，重做 2019-11-06 18:37:32 +08:00
fan
ce7ca4b9d8 添加系统通知功能 2019-11-05 16:40:36 +08:00
zyy
bc332c1a9d desc: 调整国际化，高度问题 2019-11-01 18:08:05 +08:00
zyy
a43f1bd2c9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 15:19:22 +08:00
zyy
a133abc1d4 desc: 修改代码 2019-11-01 15:19:15 +08:00
joylink_cuiweidong
f3298cdb83 页面调整 2019-11-01 15:12:00 +08:00
joylink_cuiweidong
76e904455a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-01 10:07:00 +08:00
joylink_cuiweidong
d0608dd29e 接口调整 
文件位置调整
 2019-11-01 10:06:47 +08:00
zyy
53d4483081 desc: 修改代码 2019-10-31 18:43:05 +08:00
zyy
7a0d40184f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 17:30:31 +08:00
zyy
7ec68a75e3 desc: 删除多余文件， 调整路径配置 2019-10-31 17:30:24 +08:00
joylink_cuiweidong
24a56a9695 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/router/index.js
#	src/views/lesson/lessoncategory/edit/lesson/index.vue
 2019-10-31 16:11:29 +08:00
joylink_cuiweidong
ad97697406 接口调整 2019-10-31 15:56:07 +08:00
zyy
834d4e30cd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 15:44:51 +08:00
zyy
ff4829e037 desc: 调整路径 2019-10-31 15:44:43 +08:00
ival
6df897316b 移植system 2019-10-31 15:43:37 +08:00
joylink_cuiweidong
c031125e97 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 13:56:53 +08:00
joylink_cuiweidong
681ac5e886 路由调整 
接口调整
 2019-10-31 13:56:42 +08:00
zyy
a87372ea2c desc: 发布高度调整 2019-10-31 13:24:45 +08:00
zyy
c006a98f2e desc: 修改代码 2019-10-31 10:09:43 +08:00
zyy
7175a4d917 desc: 调整代码 2019-10-31 09:21:31 +08:00