joylink_cuiweidong
|
1949d81cac
|
实训平台代码调整
|
2020-11-25 15:08:18 +08:00 |
|
joylink_cuiweidong
|
8c054f492f
|
实训平台 代码调整
|
2020-11-25 13:31:36 +08:00 |
|
fan
|
7e0c3696ab
|
地图发布管理导入数据后重置table数据
|
2020-11-25 11:20:55 +08:00 |
|
fan
|
9ef4299527
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-25 10:29:14 +08:00 |
|
fan
|
dad52de123
|
发布地图管理编辑信息添加数据版本
|
2020-11-25 10:28:47 +08:00 |
|
joylink_cuiweidong
|
e355191291
|
教学系统 实训代码调整
|
2020-11-25 09:45:59 +08:00 |
|
joylink_cuiweidong
|
b99f0d7551
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 19:17:27 +08:00 |
|
joylink_cuiweidong
|
c7a98096a2
|
教学系统 代码调整
|
2020-11-24 19:17:10 +08:00 |
|
fan
|
db9bcd0cc1
|
进入iscs路径添加lineCode
|
2020-11-24 18:28:15 +08:00 |
|
fan
|
a69d3b45a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 18:01:07 +08:00 |
|
fan
|
345b676cbc
|
调整登录错误码
|
2020-11-24 17:48:36 +08:00 |
|
zyy
|
e249c344eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 17:35:27 +08:00 |
|
zyy
|
9ba73cbb77
|
调整哈尔滨综合监控数据
|
2020-11-24 17:35:14 +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
|
872824dff1
|
绘图代码调整
|
2020-11-24 16:53:13 +08:00 |
|
sunzhenyu
|
69e97c635f
|
修复三维cctv自适应dom界面
|
2020-11-24 15:17:27 +08:00 |
|
fan
|
906208b236
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:04:02 +08:00 |
|
fan
|
84ccf357f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:03:41 +08:00 |
|
joylink_cuiweidong
|
96a57af6fc
|
代码调整
|
2020-11-23 18:00:45 +08:00 |
|
fan
|
93f3e485fc
|
老旧接口调整
|
2020-11-23 18:00:12 +08:00 |
|
joylink_cuiweidong
|
c8256de5c7
|
屏蔽暂时无用代码
|
2020-11-23 17:32:17 +08:00 |
|
joylink_cuiweidong
|
ce5287964b
|
删除无效代码
|
2020-11-23 17:09:27 +08:00 |
|
joylink_cuiweidong
|
0599da13aa
|
综合演练暂时无用代码删除
|
2020-11-23 17:05:16 +08:00 |
|
sunzhenyu
|
28d0891365
|
merge
|
2020-11-23 14:27:22 +08:00 |
|
sunzhenyu
|
23411b5ddc
|
剔除项目三维本地模型
|
2020-11-23 14:26:33 +08:00 |
|
joylink_cuiweidong
|
acd3e5c6ff
|
删除无效的文件
|
2020-11-23 10:47:33 +08:00 |
|
joylink_cuiweidong
|
5056e18e0a
|
删除暂时无用的枚举
|
2020-11-23 10:14:42 +08:00 |
|
joylink_cuiweidong
|
c32dc326c4
|
北交大 客流站场仿真页面 订阅顺序调整 图例调整
|
2020-11-20 17:37:17 +08:00 |
|
joylink_cuiweidong
|
a131fd12d7
|
代码调整
|
2020-11-20 14:59:24 +08:00 |
|
joylink_cuiweidong
|
fece30a51d
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:53:50 +08:00 |
|
joylink_cuiweidong
|
756aca9281
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 14:22:15 +08:00 |
|
joylink_cuiweidong
|
1010df5613
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:21:57 +08:00 |
|
fan
|
9de00dba1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 13:47:53 +08:00 |
|
fan
|
3f241fc598
|
留言板表情包调整&删除张赛说的接口
|
2020-11-20 13:47:34 +08:00 |
|
zyy
|
a50264a8df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 13:22:19 +08:00 |
|
zyy
|
a6e0808092
|
调整客流量流程
|
2020-11-20 13:22:03 +08:00 |
|
fan
|
4ae8979563
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 11:22:42 +08:00 |
|
fan
|
9d4f0d6804
|
留言板表情包调整
|
2020-11-20 11:22:21 +08:00 |
|
zyy
|
c10283c256
|
增加客流量数据渲染
|
2020-11-20 11:13:47 +08:00 |
|
joylink_cuiweidong
|
99e7abd361
|
运行图编制代码调整
|
2020-11-19 17:02:55 +08:00 |
|
fan
|
9b9fcd01e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 14:17:46 +08:00 |
|
fan
|
11b54cef43
|
留言板表情包
|
2020-11-19 14:17:01 +08:00 |
|
joylink_cuiweidong
|
3052bf2843
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 13:48:30 +08:00 |
|
joylink_cuiweidong
|
954cb25ab0
|
北京交大项目 添加客流视图（未处理状态）
|
2020-11-19 13:48:11 +08:00 |
|
zyy
|
c098f68702
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 09:40:17 +08:00 |
|
zyy
|
648f38e68d
|
调整运行图间距
|
2020-11-19 09:40:03 +08:00 |
|
lVAL
|
516920d24c
|
修改文本样式
|
2020-11-18 17:01:15 +08:00 |
|
lVAL
|
fd5467a741
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 15:42:13 +08:00 |
|
lVAL
|
a3651cde07
|
优化 AUSTool 配置
|
2020-11-18 15:41:37 +08:00 |
|
joylink_cuiweidong
|
224ca3785d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 13:24:16 +08:00 |
|
joylink_cuiweidong
|
88ac007ebd
|
运行图代码调整
|
2020-11-18 13:22:53 +08:00 |
|
zyy
|
6897317693
|
增加索引
|
2020-11-18 13:16:47 +08:00 |
|
zyy
|
d8c25dde1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 13:15:40 +08:00 |
|
zyy
|
83e74cc53b
|
增加运行图客流量配置
|
2020-11-18 13:15:28 +08:00 |
|
fan
|
4c7e601406
|
调整北交大按钮顺序
|
2020-11-18 11:01:22 +08:00 |
|
fan
|
c1a357fe28
|
留言板项目接口调整
|
2020-11-18 10:55:11 +08:00 |
|
fan
|
dc57a1a82b
|
北交大添加留言板&联系方式&背景图片压缩
|
2020-11-18 09:31:10 +08:00 |
|
fan
|
6bd3f751c8
|
留言板调整
(cherry picked from commit cd59d4e26e)
|
2020-11-17 19:18:31 +08:00 |
|
fan
|
9a470268b2
|
留言板调整
|
2020-11-17 19:06:59 +08:00 |
|
fan
|
842c10a3f3
|
留言板调整
(cherry picked from commit c53c744edc)
|
2020-11-17 18:51:38 +08:00 |
|
fan
|
731a2af939
|
留言板报错调整
|
2020-11-17 18:39:11 +08:00 |
|
fan
|
6e35c6446e
|
展示更多距离调整
|
2020-11-17 18:33:21 +08:00 |
|
fan
|
d48d2564bc
|
留言板问题调整
|
2020-11-17 18:31:29 +08:00 |
|
fan
|
a22dd39077
|
留言板问题调整
|
2020-11-17 18:29:03 +08:00 |
|
fan
|
242ca313a0
|
删除接口调整
|
2020-11-17 17:17:23 +08:00 |
|
fan
|
3d7a5ddde0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-17 16:55:15 +08:00 |
|
fan
|
19a03ab258
|
留言板调整
|
2020-11-17 16:55:05 +08:00 |
|
sunzhenyu
|
05d4e319f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-17 10:20:23 +08:00 |
|
sunzhenyu
|
ea6103a861
|
修改三维客流列车显示
|
2020-11-17 10:19:59 +08:00 |
|
fan
|
df386dcb75
|
按钮判断条件调整
(cherry picked from commit 45bb150440)
|
2020-11-16 19:38:37 +08:00 |
|
fan
|
d477f46bc7
|
调整场景列表高度
|
2020-11-16 19:35:12 +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 |
|
joylink_cuiweidong
|
79673768f0
|
竞赛平台 代码调整
|
2020-11-16 18:22:21 +08:00 |
|
sunzhenyu
|
5c8beedb15
|
修改三维客流模块，区分列车和车站视角，修改车站初始视角
|
2020-11-16 18:22:04 +08:00 |
|
joylink_cuiweidong
|
3b8a59a24f
|
系统管理 数据字典管理代码调整
|
2020-11-16 17:33:17 +08:00 |
|
joylink_cuiweidong
|
64ecefcf6d
|
代码调整
|
2020-11-16 15:01:43 +08:00 |
|
joylink_cuiweidong
|
8bb621a4ef
|
仿真 初始化 按计划行车 代码调整
|
2020-11-16 14:37:35 +08:00 |
|
joylink_cuiweidong
|
bc0aa31a50
|
代码调整
|
2020-11-16 13:32:19 +08:00 |
|
joylink_cuiweidong
|
389bac03a4
|
竞赛平台添加 联系我们按钮及弹窗
|
2020-11-16 13:10:10 +08:00 |
|
zyy
|
3d3138b6a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:57:56 +08:00 |
|
zyy
|
3cb0d10704
|
调整实操场景样式，说明点击问题
|
2020-11-16 10:57:44 +08:00 |
|
fan
|
c63f8097e7
|
合并区域控制器故障
|
2020-11-16 10:54:25 +08:00 |
|
joylink_cuiweidong
|
59940ece21
|
竞赛平台 实操删除 切换地图 按钮
|
2020-11-16 10:53:16 +08:00 |
|
fan
|
a520ca5676
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:11:30 +08:00 |
|
fan
|
697dfdd365
|
样式调整
|
2020-11-16 10:11:07 +08:00 |
|
joylink_cuiweidong
|
c1c9e4ee49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 09:33:16 +08:00 |
|
joylink_cuiweidong
|
c986a37eb0
|
删除无用文件
|
2020-11-16 09:33:02 +08:00 |
|
sunleking
|
dd3de164d0
|
增加三维客流加载
|
2020-11-13 21:48:52 +08:00 |
|
sunzhenyu
|
ea4ce90b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 18:31:55 +08:00 |
|
sunzhenyu
|
c02d37872c
|
修改北交大三维客流显示
|
2020-11-13 18:31:48 +08:00 |
|
joylink_cuiweidong
|
d57d5bdd2b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 18:29:19 +08:00 |
|
joylink_cuiweidong
|
90a2e6d228
|
代码调整
|
2020-11-13 18:29:01 +08:00 |
|
sunzhenyu
|
f32137ad7f
|
merge
|
2020-11-13 18:27:12 +08:00 |
|
sunzhenyu
|
015632678f
|
修改三维客流模块
|
2020-11-13 18:26:22 +08:00 |
|
fan
|
c4dd7aa559
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:11:51 +08:00 |
|
fan
|
affba7de60
|
merge
|
2020-11-13 17:11:31 +08:00 |
|
joylink_cuiweidong
|
7745a78fa1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:11:13 +08:00 |
|
joylink_cuiweidong
|
bdc9be6465
|
仿真运行图 表号排序 代码调整
|
2020-11-13 17:10:54 +08:00 |
|
fan
|
64fbcc1223
|
问题调整
|
2020-11-13 17:07:26 +08:00 |
|
zyy
|
c760d65ec1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:05:22 +08:00 |
|
zyy
|
a752dcd2e5
|
调整路径配置，删除多余配置
|
2020-11-13 17:05:10 +08:00 |
|
joylink_cuiweidong
|
6cfd36fc4c
|
发布地图管理 地图排序 代码调整
|
2020-11-13 16:49:38 +08:00 |
|
joylink_cuiweidong
|
e25dc471a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 15:11:08 +08:00 |
|
joylink_cuiweidong
|
8be4500764
|
代码调整
|
2020-11-13 15:10:44 +08:00 |
|
zyy
|
b68424c3db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 14:20:47 +08:00 |
|
zyy
|
bbff820716
|
调整流程删除多余配置
|
2020-11-13 14:19:52 +08:00 |
|
joylink_cuiweidong
|
95bb8dff30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 14:14:34 +08:00 |
|
joylink_cuiweidong
|
0e7f27c1db
|
运行图 测试代码调整
|
2020-11-13 14:14:18 +08:00 |
|
fan
|
e971797748
|
一键生成子系统及权限
|
2020-11-13 13:57:54 +08:00 |
|
fan
|
17b1242a0a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 13:31:55 +08:00 |
|
fan
|
927d7b9f16
|
交大项目调整
|
2020-11-13 13:31:44 +08:00 |
|
joylink_cuiweidong
|
720c527683
|
系统生成子系统代码优化
|
2020-11-13 11:31:05 +08:00 |
|
sunzhenyu
|
9a286521a6
|
merge
|
2020-11-13 09:36:44 +08:00 |
|
sunzhenyu
|
eb6151db35
|
增加三维客流站台通信逻辑
|
2020-11-13 09:36:14 +08:00 |
|
zyy
|
009f7b57a2
|
调整国赛场景说明
|
2020-11-13 09:34:12 +08:00 |
|
zyy
|
19e1a4208e
|
增加场景说明
|
2020-11-12 19:42:33 +08:00 |
|
joylink_cuiweidong
|
bc71bf5a1d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 19:05:37 +08:00 |
|
joylink_cuiweidong
|
e5e7111965
|
运行图绘制代码调整
|
2020-11-12 19:04:57 +08:00 |
|
zyy
|
eb9c9d8ee3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-11-12 15:42:18 +08:00 |
|
zyy
|
c875c1bac0
|
调整格式
|
2020-11-12 15:41:35 +08:00 |
|
sunzhenyu
|
6ef0a46870
|
urlmerge
|
2020-11-12 15:00:14 +08:00 |
|
sunzhenyu
|
243312ad24
|
增加三维客流量模块，修改三维沙盘行车部分代码
|
2020-11-12 14:59:40 +08:00 |
|
joylink_cuiweidong
|
db3660a0eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 14:06:50 +08:00 |
|
joylink_cuiweidong
|
d0421ff9fe
|
代码调整
|
2020-11-12 14:06:13 +08:00 |
|
fan
|
d036ff5d83
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 13:33:31 +08:00 |
|
fan
|
19e42a4ec6
|
调整北交大项目菜单显示
|
2020-11-12 13:33:09 +08:00 |
|
joylink_cuiweidong
|
fee759e83b
|
会话 发送语音代码调整
|
2020-11-12 10:21:37 +08:00 |
|
joylink_cuiweidong
|
1d50db0510
|
线路管理 代码调整
|
2020-11-12 09:54:42 +08:00 |
|
joylink_cuiweidong
|
1a7a6e27c7
|
连挂操作代码调整
|
2020-11-11 18:49:32 +08:00 |
|
joylink_cuiweidong
|
b8f26007e4
|
设置连挂操作代码调整
|
2020-11-11 18:40:02 +08:00 |
|
joylink_cuiweidong
|
994433a3ba
|
指令字典 复刻指令代码调整
|
2020-11-11 17:52:08 +08:00 |
|
joylink_cuiweidong
|
2b51f077fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 17:00:13 +08:00 |
|
joylink_cuiweidong
|
387ad98a90
|
场景编辑代码调整
|
2020-11-11 16:59:58 +08:00 |
|
zyy
|
b0f2e8d8ae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:56:53 +08:00 |
|
zyy
|
866bf2414b
|
调整实操菜单
|
2020-11-11 16:56:38 +08:00 |
|
joylink_cuiweidong
|
cc514e7ee1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:40:21 +08:00 |
|
joylink_cuiweidong
|
e2eae2945b
|
运行图编制代码调整
|
2020-11-11 16:40:07 +08:00 |
|
lVAL
|
c76d8309cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:13:55 +08:00 |
|
lVAL
|
74919a6b81
|
data2json 过滤 列车数据 的两行错误数据
|
2020-11-11 16:13:48 +08:00 |
|
zyy
|
b539d54a6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:09:58 +08:00 |
|
zyy
|
286acf7348
|
调整剧本场景编辑
|
2020-11-11 16:09:43 +08:00 |
|
lVAL
|
15194a5e8f
|
增加打印信息
|
2020-11-11 16:00:47 +08:00 |
|
lVAL
|
b1702506cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 15:55:17 +08:00 |
|
lVAL
|
f4b0ad47ed
|
修改 data2json 中输出格式的问题
|
2020-11-11 15:55:05 +08:00 |
|
joylink_cuiweidong
|
f02a084bc8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 14:36:28 +08:00 |
|
joylink_cuiweidong
|
72ca1a24b2
|
运行图编制代码调整
|
2020-11-11 14:36:11 +08:00 |
|