fan
|
dcf7b951ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 15:15:03 +08:00 |
|
fan
|
2f4b765d97
|
运行图加载调整&交路数据调整
|
2020-04-21 15:08:27 +08:00 |
|
joylink_cuiweidong
|
9b0ce027bf
|
代码调整
|
2020-04-21 11:26:07 +08:00 |
|
zyy
|
7a25c0b536
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 18:30:13 +08:00 |
|
zyy
|
dd4c575062
|
调整站间运行等级逻辑
|
2020-04-20 18:29:50 +08:00 |
|
fan
|
7c55c19933
|
交路区段区别显示&故障状态组调整
|
2020-04-20 17:10:50 +08:00 |
|
fan
|
8fee613083
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 15:39:52 +08:00 |
|
fan
|
f375b97631
|
派班工作站调整
|
2020-04-20 15:38:30 +08:00 |
|
zyy
|
85189c240f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 15:12:14 +08:00 |
|
zyy
|
a49a3bfaaf
|
调整西安二号线数据及皮肤配置
|
2020-04-20 15:12:01 +08:00 |
|
fan
|
53d94cee59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 09:58:12 +08:00 |
|
fan
|
ed26ff34d9
|
地图高级数据停站时间
|
2020-04-20 09:57:00 +08:00 |
|
zyy
|
308c33e6bc
|
调整区段及道岔绘图方式
|
2020-04-17 18:44:14 +08:00 |
|
joylink_cuiweidong
|
70a8ec07f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:39:55 +08:00 |
|
joylink_cuiweidong
|
211db36aca
|
西安二号线绘图 站台 扣车 代码调整
|
2020-04-17 16:39:42 +08:00 |
|
fan
|
c13624b60a
|
西安二号线调整
|
2020-04-17 15:59:50 +08:00 |
|
fan
|
2100144656
|
西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整
|
2020-04-17 15:02:35 +08:00 |
|
fan
|
795ad48e32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:34:36 +08:00 |
|
fan
|
07711a5bda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:32:18 +08:00 |
|
zyy
|
4bd05891be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:31:12 +08:00 |
|
fan
|
a4097e1f32
|
西安二号线调整
|
2020-04-17 13:30:59 +08:00 |
|
zyy
|
b628df2d85
|
调整对象拷贝方式
|
2020-04-17 13:30:58 +08:00 |
|
joylink_cuiweidong
|
467e8671fd
|
西安二号线屏蔽门绘图调整
|
2020-04-17 13:30:18 +08:00 |
|
joylink_cuiweidong
|
126d9f2309
|
代码调整
|
2020-04-17 11:29:50 +08:00 |
|
fan
|
1168f6fd8a
|
veu 告警调整
|
2020-04-17 10:54:02 +08:00 |
|
zyy
|
aa8ae83299
|
自动计算站间距离
|
2020-04-16 18:06:36 +08:00 |
|
joylink_cuiweidong
|
5fe37ec4e2
|
北京一号线 区段实训操作代码调整
|
2020-04-16 17:26:07 +08:00 |
|
zyy
|
bbe8dfabee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:09:36 +08:00 |
|
zyy
|
ceabc43f7d
|
增加站间距离字段
|
2020-04-16 17:09:23 +08:00 |
|
fan
|
3871ec173c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 15:54:11 +08:00 |
|
fan
|
d69e155e91
|
贵州装备添加联锁角色&&项目配置规整（未完）
|
2020-04-16 15:52:56 +08:00 |
|
joylink_cuiweidong
|
1c7a0461fe
|
北京一号线 站台实训操作代码调整
|
2020-04-16 15:50:04 +08:00 |
|
zyy
|
e027be4976
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 15:27:20 +08:00 |
|
zyy
|
9ea21f4b7a
|
调整侧防接口字段
|
2020-04-16 15:27:06 +08:00 |
|
joylink_cuiweidong
|
e88bdf8e0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 14:51:52 +08:00 |
|
joylink_cuiweidong
|
fc2d9c1ff7
|
草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
|
2020-04-16 14:50:40 +08:00 |
|
zyy
|
06c29aaced
|
Merge branch 'master' into test
# Conflicts:
# src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue
|
2020-04-16 12:08:07 +08:00 |
|
zyy
|
a9e991f061
|
调整侧防流程
|
2020-04-16 12:06:36 +08:00 |
|
zyy
|
40021e34f4
|
调整侧防流程
|
2020-04-16 10:52:11 +08:00 |
|
zyy
|
35e6f6846e
|
调整侧防流程
|
2020-04-16 10:51:29 +08:00 |
|
fan
|
aae2a734ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 09:03:22 +08:00 |
|
fan
|
8e5a79626a
|
西安二号线调整
|
2020-04-16 09:01:52 +08:00 |
|
joylink_cuiweidong
|
eadcf233b1
|
设计平台 地图列表样式调整
|
2020-04-15 15:42:47 +08:00 |
|
joylink_cuiweidong
|
fec4e33719
|
实训平台和设计平台 地图列表代码调整
|
2020-04-15 15:06:51 +08:00 |
|
fan
|
a1869a531f
|
集中站分隔调整&线路管理配置调整
|
2020-04-15 14:13:08 +08:00 |
|
joylink_cuiweidong
|
900b727fc4
|
新版地图数据校验文字调整
|
2020-04-15 09:37:42 +08:00 |
|
fan
|
2f6f75ff3c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 18:52:19 +08:00 |
|
fan
|
2613b68413
|
佛山列车显示调整&西安二号线集中站分割符
|
2020-04-14 18:51:09 +08:00 |
|
joylink_cuiweidong
|
c6f532be4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 18:45:33 +08:00 |
|
joylink_cuiweidong
|
9ea5d7fdfb
|
新版地图信号机 区段前端校验
|
2020-04-14 18:45:14 +08:00 |
|
fan
|
4bbc0d648f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 15:46:36 +08:00 |
|
fan
|
61c2260d93
|
西安二号线调整
|
2020-04-14 15:45:13 +08:00 |
|
joylink_cuiweidong
|
ba666eb334
|
实训平台教学 代码调整
|
2020-04-14 14:51:14 +08:00 |
|
zyy
|
feca56f94b
|
调整字段名称显示，调整佛山线路标注字段
|
2020-04-14 09:48:54 +08:00 |
|
zyy
|
bd8c631d45
|
调整进路保存侧防列表字段
|
2020-04-13 19:13:52 +08:00 |
|
zyy
|
64279ed484
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 18:59:19 +08:00 |
|
zyy
|
b7edbc8697
|
侧防列表更新
|
2020-04-13 18:59:01 +08:00 |
|
fan
|
b7e6b9a8c1
|
佛山运行图导入上行时间调整&西安二号线车站调整
|
2020-04-13 18:30:21 +08:00 |
|
fan
|
20491dac81
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:13:52 +08:00 |
|
fan
|
f91c8e37d2
|
佛山运行图导入参数调整&西安二号线车站调整
|
2020-04-13 17:12:33 +08:00 |
|
zyy
|
2dc975ef7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:04:01 +08:00 |
|
zyy
|
df92090509
|
增加配置中侧防数据，调整接口
|
2020-04-13 17:03:48 +08:00 |
|
joylink_cuiweidong
|
8475870cf8
|
哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整
|
2020-04-13 14:54:35 +08:00 |
|
joylink_zyy
|
826504d9c7
|
调整考试系统哈尔滨 现地不能操作
|
2020-04-11 11:20:22 +08:00 |
|
zyy
|
2d70c294f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 17:24:12 +08:00 |
|
zyy
|
3bfb74d55b
|
调整绘图隐藏元素
|
2020-04-10 17:23:53 +08:00 |
|
fan
|
26e9c33736
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:47:20 +08:00 |
|
fan
|
11586aef30
|
哈尔滨现地显示BUG调整&西安二号线皮肤调整
|
2020-04-10 16:45:41 +08:00 |
|
zyy
|
74942486fd
|
Merge branch 'master' into test
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/index.vue
# src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
|
2020-04-10 16:43:40 +08:00 |
|
zyy
|
11eedc59ad
|
调整区段计算实际长度出现问题
|
2020-04-10 16:41:48 +08:00 |
|
zyy
|
f058795597
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:19:54 +08:00 |
|
zyy
|
057b627c0d
|
调整区段计算
|
2020-04-10 16:19:37 +08:00 |
|
joylink_cuiweidong
|
e05057bf3f
|
宁波一号线 自动折返代码调整
|
2020-04-10 14:05:20 +08:00 |
|
zyy
|
48ca2388cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 11:20:04 +08:00 |
|
zyy
|
6c7cfe4648
|
调整逻辑区段重新生成及修改逻辑调整
|
2020-04-10 11:19:48 +08:00 |
|
fan
|
c1f6803fa5
|
宁波一号线:现地站台实训集中站显示切换切换问题
|
2020-04-10 11:05:20 +08:00 |
|
joylink_cuiweidong
|
9e45a0d342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 10:42:19 +08:00 |
|
joylink_cuiweidong
|
888ae6e936
|
宁波一号线 自动折返按钮实训操作代码调整
|
2020-04-10 10:41:41 +08:00 |
|
zyy
|
76851cdff2
|
调整区段字段显隐控制条件
|
2020-04-10 10:17:34 +08:00 |
|
zyy
|
9b68feaba5
|
调整区段字段显隐判断
|
2020-04-09 18:39:27 +08:00 |
|
zyy
|
289f1dbff0
|
调整现地列车显示
|
2020-04-09 17:37:27 +08:00 |
|
zyy
|
ee10377b04
|
调整区段字段显示逻辑，道岔计轴区段显示道岔菜单
|
2020-04-09 15:21:44 +08:00 |
|
zyy
|
b6d03d24a8
|
调整区段绘制方式
|
2020-04-09 13:45:01 +08:00 |
|
zyy
|
78995be06f
|
调整右键点击道岔区段获取道岔菜单列表
|
2020-04-09 09:39:14 +08:00 |
|
zyy
|
14e4c2c785
|
调整 框选设置元素 设备集中站流程
|
2020-04-08 15:20:29 +08:00 |
|
fan
|
df0d560df8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 14:25:27 +08:00 |
|
fan
|
02d4b8f71f
|
进路复制
|
2020-04-08 14:24:11 +08:00 |
|
zyy
|
425b7d3869
|
Merge branch 'master' into test
|
2020-04-08 14:12:58 +08:00 |
|
fan
|
a1c4a901af
|
实训步骤生成
|
2020-04-07 18:30:46 +08:00 |
|
zyy
|
f26eea8f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 16:19:34 +08:00 |
|
zyy
|
402a383bf6
|
删除多余打印，调整名称
|
2020-04-07 16:19:24 +08:00 |
|
fan
|
87ddad535b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 14:41:38 +08:00 |
|
fan
|
6667adca07
|
实训调整
|
2020-04-07 14:40:24 +08:00 |
|
zyy
|
1f6b627768
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-07 13:38:28 +08:00 |
|
zyy
|
aa06844b18
|
地图绘制信号机增加偏移量字段
|
2020-04-07 13:37:17 +08:00 |
|
fan
|
6498f68295
|
宁波实训调整
|
2020-04-07 13:09:34 +08:00 |
|
zyy
|
d3f28ff338
|
Merge branch 'test'
|
2020-04-03 18:34:04 +08:00 |
|
joylink_cuiweidong
|
38a05e530d
|
北京一号线现地操作步骤代码调整
|
2020-04-03 16:31:57 +08:00 |
|
fan
|
e45ec364a5
|
宁波实训跳转集中站
|
2020-04-02 16:52:59 +08:00 |
|
fan
|
e49f32d6b2
|
宁波实训跳转集中站
|
2020-04-02 16:28:07 +08:00 |
|
fan
|
a9294357b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 16:24:04 +08:00 |
|
fan
|
523a1f9cd6
|
宁波实训跳转集中站
|
2020-04-02 16:22:53 +08:00 |
|
zyy
|
8fdd0d27bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/scripts/cmdPlugin/ValidateHandler.js
|
2020-04-02 15:01:18 +08:00 |
|
zyy
|
dd26f5fd96
|
调整宁波一号线实训步骤定义
|
2020-04-02 15:00:28 +08:00 |
|
fan
|
75df1f7d2d
|
宁波考试&教学添加切换集中站
|
2020-04-02 14:46:21 +08:00 |
|
zyy
|
747595e8e8
|
Merge branch 'test'
|
2020-04-02 11:25:57 +08:00 |
|
zyy
|
8117a31c80
|
调整代码
|
2020-04-02 10:51:47 +08:00 |
|
fan
|
9d02306fda
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/index.vue
|
2020-04-01 18:00:58 +08:00 |
|
fan
|
8f30d436ee
|
调整绘图&三维跳转页面icon
|
2020-04-01 16:24:03 +08:00 |
|
fan
|
ebd90d2485
|
本地项目调整&elementUI升版本至2.12.0
|
2020-04-01 15:32:06 +08:00 |
|
fan
|
c1abbaed49
|
关闭gzip
|
2020-04-01 15:01:08 +08:00 |
|
joylink_cuiweidong
|
5d10d40ea3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 14:15:09 +08:00 |
|
joylink_cuiweidong
|
f64c7d5317
|
代码调整
|
2020-04-01 14:14:55 +08:00 |
|
fan
|
2a59c51b00
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-01 13:49:18 +08:00 |
|
joylink_cuiweidong
|
995460afdf
|
仿真界面添加列车详情
|
2020-04-01 12:53:58 +08:00 |
|
fan
|
b778621329
|
Merge branch 'dev_pack' into test
# Conflicts:
# package.json
# vue.config.js
|
2020-04-01 10:33:26 +08:00 |
|
joylink_cuiweidong
|
046cfe8318
|
Merge branch 'dev' into test
|
2020-03-31 19:13:42 +08:00 |
|
joylink_cuiweidong
|
06a6087f0c
|
代码调整
|
2020-03-31 19:12:30 +08:00 |
|
joylink_cuiweidong
|
955ddacbe0
|
Merge branch 'dev' into test
|
2020-03-31 19:09:06 +08:00 |
|
joylink_cuiweidong
|
bc6940f80b
|
仿真界面添加列车详情(未完成)
|
2020-03-31 19:06:23 +08:00 |
|
zyy
|
3ab182f3c4
|
调整逻辑区段显示，过滤框选逻辑区段
|
2020-03-31 17:52:53 +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
|
900489638c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 14:41:30 +08:00 |
|
zyy
|
1873898adc
|
调整回车内容不修改
|
2020-03-31 14:41:17 +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
|
c7bd705726
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 10:06:56 +08:00 |
|
fan
|
d6e883e167
|
考试调整
|
2020-03-31 10:06:41 +08:00 |
|
zyy
|
1ad7265f58
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-31 09:43:01 +08:00 |
|
zyy
|
aaefa200c4
|
调整实训定义，调整提示逻辑
|
2020-03-31 09:42:46 +08:00 |
|
fan
|
e43ad1fa99
|
调整哈尔滨显示
|
2020-03-31 09:27:02 +08:00 |
|
zyy
|
9412fd0740
|
计算区段实际长度保留小数点3位
|
2020-03-30 17:59:23 +08:00 |
|
zyy
|
38ada8ccb2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 17:54:01 +08:00 |
|
zyy
|
919639ad03
|
调整哈尔滨现地操作步骤流程完善
|
2020-03-30 17:53:44 +08:00 |
|
joylink_cuiweidong
|
8c2f1cf729
|
新剧本 仿真类型切换代码调整
|
2020-03-30 17:39:00 +08:00 |
|
zyy
|
1e2a015955
|
调整区段实际长度逻辑
|
2020-03-30 17:07:51 +08:00 |
|
joylink_cuiweidong
|
68f77a25b6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:16:29 +08:00 |
|
joylink_cuiweidong
|
8f6f033870
|
剧本仿真切换仿真类型代码调整
|
2020-03-30 16:16:11 +08:00 |
|
zyy
|
af6eb5917f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:15:50 +08:00 |
|
zyy
|
0c56d049ec
|
调整哈尔滨现地实训操作步骤
|
2020-03-30 16:15:35 +08:00 |
|
fan
|
dee1efe00f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 13:07:32 +08:00 |
|
fan
|
ab4928d924
|
差异化打包调整&哈尔滨登录页
|
2020-03-30 13:07:11 +08:00 |
|
zyy
|
c5dbd2b141
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-27 18:20:28 +08:00 |
|
zyy
|
47519b7040
|
调整道岔生成默认状态，调整道岔皮肤配置
|
2020-03-27 18:19:40 +08:00 |
|
fan
|
6ef1fc2013
|
实训调整
|
2020-03-27 18:14:46 +08:00 |
|
zyy
|
a95e940255
|
调整实训步骤校验
|
2020-03-27 14:37:28 +08:00 |
|
fan
|
3a8a3b87d8
|
调整左边弹框显示
|
2020-03-27 14:01:57 +08:00 |
|
fan
|
fb8d0b6615
|
Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2020-03-27 13:55:00 +08:00 |
|
fan
|
a697ab21d5
|
调整实训
|
2020-03-27 13:52:14 +08:00 |
|
fan
|
3c1d038a81
|
实训仿真调整
|
2020-03-27 10:51:49 +08:00 |
|