zyy
|
b85dcb41dc
|
调整道岔生成逻辑
|
2020-12-15 11:10:05 +08:00 |
|
joylink_cuiweidong
|
c437ac62c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:19:31 +08:00 |
|
joylink_cuiweidong
|
0ecea0aabc
|
地图绘制代码调整
|
2020-12-14 17:18:57 +08:00 |
|
zyy
|
e5a51e0d90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-12-14 17:07:15 +08:00 |
|
zyy
|
40687fcd5b
|
调整信号机批量设置偏移量
|
2020-12-14 17:06:23 +08:00 |
|
joylink_cuiweidong
|
1deaf4defc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 16:54:31 +08:00 |
|
joylink_cuiweidong
|
89b635e24a
|
地图绘制代码调整
|
2020-12-14 16:53:43 +08:00 |
|
fan
|
0364fa0f2d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 15:51:29 +08:00 |
|
fan
|
62cba757e6
|
绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整
|
2020-12-14 15:22:47 +08:00 |
|
zyy
|
02a6293d5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 11:29:43 +08:00 |
|
zyy
|
0310ee6c57
|
调整地图流程
|
2020-12-14 11:29:26 +08:00 |
|
joylink_cuiweidong
|
328805ba80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 20:17:41 +08:00 |
|
joylink_cuiweidong
|
d8c6a8657b
|
哈尔滨运行图编制代码调整
|
2020-12-11 20:17:18 +08:00 |
|
fan
|
70e260cc4f
|
哈尔滨屏蔽门调整
|
2020-12-11 19:49:48 +08:00 |
|
fan
|
f9d8bda8b0
|
宁波三号线延续保护添加箭头
|
2020-12-11 13:19:34 +08:00 |
|
joylink_cuiweidong
|
1b0ab87020
|
车站绘图代码调整（去除公里标名称必填）
文字绘图代码调整（调整文字字体，与车站名称字体一致）
|
2020-12-10 18:33:18 +08:00 |
|
joylink_cuiweidong
|
9a7a69201a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 18:03:19 +08:00 |
|
joylink_cuiweidong
|
fd267160b1
|
信号机绘图代码调整（解决设置信号机归属联锁站bug）
运行图编制代码调整
|
2020-12-10 18:02:59 +08:00 |
|
fan
|
80ebd84062
|
宁波三号线调整
|
2020-12-10 17:34:13 +08:00 |
|
joylink_cuiweidong
|
a22445552a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 13:54:13 +08:00 |
|
joylink_cuiweidong
|
3f7eccdc2f
|
运行图编制代码调整
|
2020-12-10 13:53:34 +08:00 |
|
sunzhenyu
|
72abaf9643
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 11:29:23 +08:00 |
|
sunzhenyu
|
dae99ee4ad
|
修改综合演练三维驾驶初始样式
|
2020-12-10 11:29:12 +08:00 |
|
zyy
|
1a093e6594
|
调整交控皮肤显示条件，增加自动折返进路显示
|
2020-12-09 17:08:36 +08:00 |
|
zyy
|
4361d503f3
|
调整信号机联锁站设置搜索
|
2020-12-09 15:03:46 +08:00 |
|
zyy
|
7ce6cf6e8a
|
调整修改区段bug
|
2020-12-08 18:41:18 +08:00 |
|
zyy
|
9ede8ad97d
|
增加删除范围，调整退出仿真发送取消订阅
|
2020-12-08 13:56:36 +08:00 |
|
zyy
|
085990f755
|
增加站台紧急按钮批量删除，增加区段批量删除范围
|
2020-12-08 11:09:02 +08:00 |
|
zyy
|
4362eef88b
|
增加删除范围
|
2020-12-07 18:36:53 +08:00 |
|
zyy
|
ed93c3159e
|
删除元素补充
|
2020-12-07 18:19:31 +08:00 |
|
zyy
|
c97074f585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 18:00:42 +08:00 |
|
zyy
|
b0234db4a2
|
调整道岔生成逻辑
|
2020-12-07 18:00:26 +08:00 |
|
sunzhenyu
|
ce7a3de96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 17:14:15 +08:00 |
|
sunzhenyu
|
d973dbc46e
|
修改三维设备界面隐藏显示
|
2020-12-07 17:14:06 +08:00 |
|
zyy
|
6b53bc55d6
|
调整删除区段关联车次窗
|
2020-12-07 16:10:03 +08:00 |
|
zyy
|
6995a8a962
|
增加以区段为目标删除左右所有元素
|
2020-12-07 15:09:53 +08:00 |
|
joylink_cuiweidong
|
cd39147257
|
实训平台代码调整
|
2020-12-04 18:10:07 +08:00 |
|
zyy
|
7054f6c1e6
|
增加运行图编辑
|
2020-12-04 17:10:03 +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 |
|
zyy
|
de081382fa
|
增加运行图交路设置
|
2020-12-02 09:31:23 +08:00 |
|
zyy
|
b93af93af3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 10:21:06 +08:00 |
|
zyy
|
20e774c8b8
|
删除多余配置
|
2020-12-01 10:20:54 +08:00 |
|
fan
|
388f9a14ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-30 18:25:41 +08:00 |
|
fan
|
97a373b9d9
|
代码调整
|
2020-11-30 18:22:22 +08:00 |
|
joylink_cuiweidong
|
888001c65e
|
删除暂时无用代码
|
2020-11-30 16:12:24 +08:00 |
|
joylink_cuiweidong
|
f9bac6886a
|
删除暂时无用代码
|
2020-11-30 10:23:32 +08:00 |
|
sunzhenyu
|
dda3cedf30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:50:39 +08:00 |
|
sunzhenyu
|
7491a63b42
|
三维客流退出样式
|
2020-11-27 17:50:33 +08:00 |
|
joylink_cuiweidong
|
6a9406054d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:37:30 +08:00 |
|
joylink_cuiweidong
|
c1507b01e1
|
地图数据加载到缓存store里（刷新之后数据会丢失）
删除暂时无用的代码
|
2020-11-27 17:37:13 +08:00 |
|
sunzhenyu
|
7068b73585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:25:02 +08:00 |
|
sunzhenyu
|
c8cdf34397
|
修改三维客流退出页面取消订阅
|
2020-11-27 17:24:52 +08:00 |
|
joylink_cuiweidong
|
b3f538fa09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 15:04:15 +08:00 |
|
joylink_cuiweidong
|
93e936a766
|
北交大 客流项目代码调整
|
2020-11-27 15:03:55 +08:00 |
|
fan
|
056570c096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:18:42 +08:00 |
|
fan
|
76f9db3eb6
|
留言板添加至新标签页
(cherry picked from commit a509af1e09)
|
2020-11-27 14:17:54 +08:00 |
|
joylink_cuiweidong
|
90ec120603
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:05:28 +08:00 |
|
joylink_cuiweidong
|
c2cd9e73d5
|
考试系统代码调整
|
2020-11-27 14:05:10 +08:00 |
|
sunzhenyu
|
c2f2698092
|
修改三维客流窗口操作
|
2020-11-27 13:59:54 +08:00 |
|
joylink_cuiweidong
|
c6ec7c9049
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 11:15:42 +08:00 |
|
joylink_cuiweidong
|
e1ab504ddb
|
屏蔽门绘图调整
|
2020-11-26 11:15:25 +08:00 |
|
fan
|
a84120c2e5
|
语音路径调整
|
2020-11-26 09:33:30 +08:00 |
|
joylink_cuiweidong
|
a5dad072ca
|
实训平台代码调整
|
2020-11-25 18:28:20 +08:00 |
|
joylink_cuiweidong
|
2732e60a94
|
教学系统 实训代码调整
|
2020-11-25 15:52:52 +08:00 |
|
joylink_cuiweidong
|
8c054f492f
|
实训平台 代码调整
|
2020-11-25 13:31:36 +08:00 |
|
joylink_cuiweidong
|
e355191291
|
教学系统 实训代码调整
|
2020-11-25 09:45:59 +08:00 |
|
joylink_cuiweidong
|
c7a98096a2
|
教学系统 代码调整
|
2020-11-24 19:17:10 +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 |
|
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
|
ce5287964b
|
删除无效代码
|
2020-11-23 17:09:27 +08:00 |
|
joylink_cuiweidong
|
0599da13aa
|
综合演练暂时无用代码删除
|
2020-11-23 17:05:16 +08:00 |
|
joylink_cuiweidong
|
acd3e5c6ff
|
删除无效的文件
|
2020-11-23 10:47:33 +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 |
|
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 |
|