Commit Graph

58 Commits

Author SHA1 Message Date
joylink_cuiweidong
9b4309d0c1 代码调整 2021-03-22 14:38:19 +08:00
joylink_cuiweidong
2dae1bc8d8 代码调整 2021-03-22 14:30:21 +08:00
37e98a7d57 89版本问题 2021-03-13 00:20:59 +08:00
b92c8cafdc Revert "清除chrome89版本 windowopen 的noopener参数打不开的问题"
This reverts commit 2e442e6e8c.

# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
#	src/views/newMap/jlmapNew/index.vue
2021-03-13 00:15:32 +08:00
sunleking
7fa30c1a30 merge 2021-03-13 00:13:08 +08:00
sunleking
2e442e6e8c 清除chrome89版本 windowopen 的noopener参数打不开的问题 2021-03-13 00:10:55 +08:00
fan
c53000186a 调整国赛购买位置 2021-01-29 15:28:51 +08:00
fan
e77ce189d1 放开国赛购买注释 2021-01-29 15:09:12 +08:00
fan
012fdd117f 注释国赛系统购买 2021-01-28 20:05:45 +08:00
fan
18dee86d9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:20:30 +08:00
fan
f07981ce64 国赛购买权限 --暂提 2021-01-28 16:20:18 +08:00
sunzhenyu
e45e933436 修改三维驾驶中cctv视角按钮 2021-01-28 16:10:36 +08:00
joylink_cuiweidong
3329053207 仿真 综合演练 添加 联系方式 2020-12-29 16:15:10 +08:00
fan
941e0a791a 留言板调整 2020-12-18 13:38:13 +08:00
fan
855295ca75 通用ibp&留言板管理&贵装备课程发布调整 2020-12-17 13:19:12 +08:00
zyy
085990f755 增加站台紧急按钮批量删除,增加区段批量删除范围 2020-12-08 11:09:02 +08:00
sunzhenyu
d973dbc46e 修改三维设备界面隐藏显示 2020-12-07 17:14:06 +08:00
joylink_cuiweidong
23cbc94c78 代码调整 2020-12-02 18:37:32 +08:00
joylink_cuiweidong
95c685bfab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
2020-12-02 17:49:08 +08:00
joylink_cuiweidong
b51ebde280 北交大客流仿真系统代码调整 2020-12-02 17:45:19 +08:00
fan
d96df1ce68 个人信息关闭后终止状态&贵装备展示留言板 2020-12-02 15:23:23 +08:00
fan
76f9db3eb6 留言板添加至新标签页
(cherry picked from commit a509af1e09)
2020-11-27 14:17:54 +08:00
sunzhenyu
6ce808b8f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:32:43 +08:00
sunzhenyu
7ef4994a09 修改三维客流视窗跳转方式 2020-11-24 17:32:37 +08:00
joylink_cuiweidong
465e0e5860 北交大系统 仿真页面代码调整
教学 实训列表文字调整
2020-11-24 17:11:00 +08:00
joylink_cuiweidong
96a57af6fc 代码调整 2020-11-23 18:00:45 +08:00
joylink_cuiweidong
acd3e5c6ff 删除无效的文件 2020-11-23 10:47:33 +08:00
joylink_cuiweidong
954cb25ab0 北京交大项目 添加客流视图(未处理状态) 2020-11-19 13:48:11 +08:00
fan
4c7e601406 调整北交大按钮顺序 2020-11-18 11:01:22 +08:00
fan
dc57a1a82b 北交大添加留言板&联系方式&背景图片压缩 2020-11-18 09:31:10 +08:00
fan
df386dcb75 按钮判断条件调整
(cherry picked from commit 45bb150440)
2020-11-16 19:38:37 +08:00
fan
2c54e68928 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
#	src/views/newMap/displayNew/dispatherContest/sceneList.vue
2020-11-16 19:29:49 +08:00
fan
1de24c5d31 留言板功能部分实现 2020-11-16 19:26:23 +08:00
sunzhenyu
c5212b67ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 18:22:36 +08:00
sunzhenyu
5c8beedb15 修改三维客流模块,区分列车和车站视角,修改车站初始视角 2020-11-16 18:22:04 +08:00
joylink_cuiweidong
389bac03a4 竞赛平台添加 联系我们按钮及弹窗 2020-11-16 13:10:10 +08:00
joylink_cuiweidong
59940ece21 竞赛平台 实操删除 切换地图 按钮 2020-11-16 10:53:16 +08:00
sunzhenyu
c02d37872c 修改北交大三维客流显示 2020-11-13 18:31:48 +08:00
fan
927d7b9f16 交大项目调整 2020-11-13 13:31:44 +08:00
sunzhenyu
6ef0a46870 urlmerge 2020-11-12 15:00:14 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
sunzhenyu
3ad0ccffc1 增加三维客流规划模块 2020-11-06 18:28:30 +08:00
sunzhenyu
23b98c7c46 增加客流规划界面 2020-11-04 10:34:33 +08:00
zyy
6124f6c38a 删除多余配置 2020-10-28 16:14:57 +08:00
zyy
a55c67c721 调整国赛菜单 2020-10-26 17:05:04 +08:00
zyy
cdf91f98d2 调整综合监控流程 2020-10-26 15:24:08 +08:00
joylink_cuiweidong
fbb7784a5b 竞赛系统代码调整 竞赛场景编辑代码调整 2020-10-09 17:03:11 +08:00
joylink_cuiweidong
6cad4eabdb 竞赛系统 剧本加载逻辑调整 2020-09-18 16:02:22 +08:00
joylink_cuiweidong
5428f98843 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/jlmap3d/passflow/jl3dpassflow.vue
2020-09-17 15:23:14 +08:00
joylink_cuiweidong
e93755a29f 哈尔滨 真实摄像头添加(暂时不能播放) 2020-09-17 15:19:00 +08:00