Commit Graph

547 Commits

Author SHA1 Message Date
joylink_cuiweidong
c5fbc578db 竞赛 场景管理 创建的创建和查询接口代码调整 2020-09-27 11:22:48 +08:00
zyy
85f4a5e1b0 增加系统通知流程 2020-09-09 11:25:31 +08:00
sunleking
9ca8f50dea 修改按钮文字描述 2020-08-31 11:16:18 +08:00
fan
a44132056c 地图绘制添加防淹门 2020-08-20 13:17:58 +08:00
sunzhenyu
5b4db675a8 修改三维通号进入的界面,修改三维vr维修Gui 2020-08-13 15:55:25 +08:00
joylink_cuiweidong
2ba34b5d0b 宁波一号线控制权转换代码调整 2020-07-29 16:02:14 +08:00
fan
40402a9a8e 试卷规则bug修复&哈尔滨操作调整 2020-07-13 16:48:23 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
fan
421e591f52 Merge remote-tracking branch 'origin/test_device_login' into test
# Conflicts:
#	src/layout/components/Title.vue
#	src/views/demonstration/detail/index.vue
2020-07-07 09:47:21 +08:00
sunzhenyu
9d855f5910 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 12:11:30 +08:00
fan
8f4cecec0c 综合演练调整 2020-06-30 14:27:32 +08:00
fan
fe7b727f31 福州行调仿真增加信号机操作 2020-06-28 15:28:20 +08:00
sunzhenyu
01351fb34a test 2020-06-23 10:07:52 +08:00
fan
a381bfdcd8 退出计划调整为初始化,并不限制点击 2020-06-15 13:34:24 +08:00
sunzhenyu
6cae01f373 增加三维驾驶换端操作,修改三维cctv中前往站台找不到路径点bug,增加综合演练车站cctv 2020-06-08 18:22:12 +08:00
joylink_cuiweidong
d8cfcbd595 添加实操列表页面和实操创建页面 2020-05-26 17:55:11 +08:00
zyy
d161492fed 添加题库管理流程 2020-05-26 15:59:11 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +08:00
zyy
af26f55e9b 调整裁判管理报名列表 2020-05-20 18:32:52 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
fan
eba0bff786 竞赛系统 2020-05-19 10:18:01 +08:00
zyy
09b3b684cf 调整竞赛系统路由 2020-05-19 09:03:38 +08:00
fan
c8d7347e61 课程问题调整 2020-05-18 15:47:55 +08:00
zyy
6391e8e881 调整竞赛系统路径,页面路由配置 2020-05-15 16:01:16 +08:00
zyy
ae5916b90a 调整竞赛系统路由配置 2020-05-15 14:50:05 +08:00
fan
92eaa38aef 贵州装备班级相关&绘图逻辑区段调整 2020-05-12 19:07:48 +08:00
joylink_cuiweidong
4d1f6a6a9d 新版绘图 高级数据 交路 生成站间运行时间 接口调整 2020-04-26 13:18:25 +08:00
sunzhenyu
8f15f049f1 修改三维动画播放器重复更新bug,增加宁波线路三维背景,修改三维仿真行车逻辑改为后台数据控制 2020-04-24 18:00:12 +08:00
fan
f375b97631 派班工作站调整 2020-04-20 15:38:30 +08:00
fan
ed26ff34d9 地图高级数据停站时间 2020-04-20 09:57:00 +08:00
fan
4231966cac 取消cdn加载&调整快速入口进入房间 2020-04-17 09:13:40 +08:00
fan
ee209d5dbf 综合演练二维码下添加房间号 2020-04-16 17:23:43 +08:00
fan
d69e155e91 贵州装备添加联锁角色&&项目配置规整(未完) 2020-04-16 15:52:56 +08:00
fan
a1869a531f 集中站分隔调整&线路管理配置调整 2020-04-15 14:13:08 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成,调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
fan
0079b698e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:45:48 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +08:00
zyy
402a383bf6 删除多余打印,调整名称 2020-04-07 16:19:24 +08:00
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
8e3d9b541c 调整本地项目加入新房间失败提示&除dev其他打包开启gzip 2020-04-01 10:22:03 +08:00
fan
eddca622df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-31 18:51:02 +08:00
fan
bfd5b07145 调整本地项目综合演练 2020-03-31 18:50:16 +08:00
sunzhenyu
ec0f59682b merge 2020-03-31 18:45:00 +08:00
sunzhenyu
d4f7da9c8b 添加驾驶操作面板,三维模型资源改本地 2020-03-31 18:30:15 +08:00
fan
335132c9b9 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 16:55:58 +08:00
fan
007c3658c6 调整本地项目 2020-03-31 16:54:04 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
fan
724e198f79 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 13:47:25 +08:00
fan
5563212ec0 调整哈尔滨项目 2020-03-31 13:45:45 +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
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
fan
df70024740 代码调整 2020-03-24 18:42:18 +08:00
fan
9ff1d7e30c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/store/modules/socket.js
2020-03-24 10:13:01 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
zyy
473d60ca0c Merge branch 'dev' into test 2020-03-20 13:08:35 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
zyy
3b645724cc Merge branch 'dev' into test 2020-03-19 18:40:12 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
fan
bd2938173a Merge remote-tracking branch 'origin/dev' into test 2020-03-11 16:59:47 +08:00
fan
0aac76bb0e Merge remote-tracking branch 'origin/dev' into test 2020-03-11 10:54:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
fan
2a61f97663 Merge remote-tracking branch 'origin/dev' into test 2020-03-09 18:39:30 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +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
e60fde1a5a 地图排序 2020-03-03 14:24:25 +08:00
joylink_fanyuhong
a853439255 地图排序 2020-03-03 11:08:41 +08:00
8dc726bbe1 Merge remote-tracking branch 'origin/dev' into test 2020-03-01 18:39:35 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_fanyuhong
d5539a986b 按计划行车接口报错提示
(cherry picked from commit 1abad25)
2020-02-28 11:28:13 +08:00
joylink_fanyuhong
ee33dec8a1 Merge remote-tracking branch 'origin/dev' into test 2020-02-27 22:18:42 +08:00
joylink_cuiweidong
b221e8e6b9 车站添加 是否车辆段/停车场 是否折返车站字段 2020-02-25 10:52:13 +08:00
sunleking
61394c4b39 增加三维客流量模块,目前完成了基础的行走状态控制流程 2020-02-14 18:22:11 +08:00
joylink_cuiweidong
b11ad0cc4f 新版地图 自动信号列表 添加自动信号名称筛选
连锁出清区段限制为物理区段和道岔区段
2020-01-21 16:18:33 +08:00
fan
3011285293 发布地图管理调整 2020-01-20 09:54:59 +08:00
fan
155f8abb96 新版绘图停车点偏移量调整+国际化调整 2020-01-19 17:34:03 +08:00
zyy
e4b20395c4 增加iscs系统,调整成都一号线运行图导入 2020-01-17 15:31:58 +08:00
fan
02a6954ffd 仿真接口报错提示调整 2020-01-17 13:17:12 +08:00
fan
365f36edef iscs 绘图 2020-01-14 09:06:03 +08:00
fan
287eab2431 代码调整 2020-01-06 14:46:03 +08:00
fan
2554ed1135 代码调整 2020-01-06 14:43:08 +08:00
fan
68a7171495 国际化调整 2020-01-06 11:25:07 +08:00
fan
673df154b4 国际化和连接真实设备调整 2020-01-03 17:00:33 +08:00
joylink_cuiweidong
e1d979e89a 代码调整 2020-01-02 17:06:35 +08:00
fan
65b766e27f 项目设备管理 2020-01-02 17:01:11 +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
joylink_cuiweidong
23d14d6c8e 实训平台 教学详情和仿真详情 合计改为权限总数 2019-12-30 09:58:43 +08:00
joylink_cuiweidong
f985a93c9e 设计平台 课程设计 实训管理 prdtype 接口调整 2019-12-27 10:47:07 +08:00
fan
2a11b8d697 信号机增加名字旋转标识,区段关联关系增加校验,进路列表增加编码展示列 2019-12-26 16:54:24 +08:00
fan
78b28f118b 信号机参数名调整,旋转限制调整 2019-12-26 15:14:17 +08:00
joylink_cuiweidong
4a30ced825 创建课程时,所属产品变为产品类型 2019-12-25 19:40:49 +08:00
joylink_cuiweidong
cb1ca75eb7 用户仿真统计
新增-产品名称改为产品类型
前端维护一个产品类型枚举
2019-12-25 18:56:25 +08:00