dong
|
778cdf2808
|
代码调整
|
2022-09-08 15:07:28 +08:00 |
|
fan
|
42cc8d9213
|
暂提
|
2022-09-08 09:45:46 +08:00 |
|
dong
|
09f78e9064
|
代码调整
|
2022-09-07 18:11:50 +08:00 |
|
dong
|
627faced59
|
条件表达式
|
2022-09-07 17:38:42 +08:00 |
|
fan
|
aea62ada61
|
增加prdType
|
2022-09-07 09:37:37 +08:00 |
|
fan
|
31f95a02c1
|
实训调整
|
2022-09-06 15:43:43 +08:00 |
|
fan
|
9e22641b95
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-05 17:55:52 +08:00 |
|
fan
|
6e049fd3e1
|
代码调整
|
2022-09-05 17:55:39 +08:00 |
|
joylink_cuiweidong
|
4a128b5f89
|
代码调整
|
2022-09-05 16:40:46 +08:00 |
|
fan
|
229528d1ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-05 15:48:10 +08:00 |
|
fan
|
9edc8a12ae
|
代码调整
|
2022-09-05 15:47:56 +08:00 |
|
fan
|
802cc70bfc
|
区段增加最大最小公里标
|
2022-09-05 15:47:14 +08:00 |
|
dong
|
4093d02a54
|
代码调整
|
2022-09-05 14:32:26 +08:00 |
|
dong
|
cb5179fafb
|
实训设计代码调整
|
2022-09-05 14:23:20 +08:00 |
|
dong
|
f7881c85e2
|
代码调整
|
2022-09-05 11:08:46 +08:00 |
|
dong
|
08449dd954
|
代码调整
|
2022-09-05 10:42:31 +08:00 |
|
fan
|
0d6f5c13f9
|
实训调整
|
2022-09-02 17:19:25 +08:00 |
|
fan
|
e7360ce946
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-02 17:03:57 +08:00 |
|
fan
|
0851691587
|
实训调整
|
2022-09-02 17:03:43 +08:00 |
|
dong
|
bcbb3e860b
|
代码调整
|
2022-09-02 16:50:26 +08:00 |
|
fan
|
97065ca162
|
实训调整
|
2022-09-02 15:19:32 +08:00 |
|
fan
|
b0cfbb3f35
|
实训调整
|
2022-09-02 15:07:37 +08:00 |
|
fan
|
cb3edd42a4
|
实训调整
|
2022-09-02 14:36:16 +08:00 |
|
fan
|
7aa2ffb953
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-02 10:28:41 +08:00 |
|
fan
|
aeeaac46e0
|
实训调整
|
2022-09-02 10:28:29 +08:00 |
|
joylink_cuiweidong
|
a99e6e44bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-09-02 10:22:46 +08:00 |
|
joylink_cuiweidong
|
9ee9e9ecdc
|
大铁项目 调度命令文件迁移到对应线路
|
2022-09-02 10:22:28 +08:00 |
|
fan
|
483536c721
|
实训调整
|
2022-09-02 10:00:44 +08:00 |
|
fan
|
0b32f34af2
|
实训调整
|
2022-09-02 09:45:51 +08:00 |
|
fan
|
663e19e870
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-01 16:24:06 +08:00 |
|
fan
|
8946835dca
|
实训调整
|
2022-09-01 16:10:04 +08:00 |
|
fan
|
678dcc3043
|
红河财经CCTV调整
|
2022-09-01 16:09:49 +08:00 |
|
dong
|
77ce75c91b
|
代码调整
|
2022-09-01 15:39:59 +08:00 |
|
dong
|
b3083b8dc8
|
代码调整
|
2022-09-01 13:54:10 +08:00 |
|
fan
|
7f5f1e7851
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-01 13:38:29 +08:00 |
|
fan
|
4694f0455c
|
实训提示
|
2022-09-01 13:38:11 +08:00 |
|
dong
|
dcded847e9
|
代码调整
|
2022-09-01 13:23:02 +08:00 |
|
dong
|
0b69add8bf
|
代码调整
|
2022-09-01 12:05:22 +08:00 |
|
fan
|
6b6d8ac871
|
地图预览大屏等切实训设计预览倒是实训步骤判断错误调整
|
2022-08-31 17:54:57 +08:00 |
|
fan
|
5fa020edcd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-31 17:03:23 +08:00 |
|
fan
|
e935e29001
|
实训调整
|
2022-08-31 17:03:10 +08:00 |
|
dong
|
0162aa45a9
|
代码调整
|
2022-08-31 15:35:59 +08:00 |
|
dong
|
4f99b40a2b
|
代码调整
|
2022-08-31 14:49:01 +08:00 |
|
dong
|
fca267fde1
|
代码调整
|
2022-08-31 14:34:24 +08:00 |
|
dong
|
e2c9fa3c3e
|
代码调整
|
2022-08-31 14:20:36 +08:00 |
|
dong
|
19a87a79db
|
代码调整
|
2022-08-31 11:22:58 +08:00 |
|
joylink_cuiweidong
|
abec73d06c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-31 10:56:00 +08:00 |
|
joylink_cuiweidong
|
646c2fb5d6
|
代码调整
|
2022-08-31 10:55:45 +08:00 |
|
fan
|
a1dd644078
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-31 10:36:04 +08:00 |
|
fan
|
4fe380c003
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
Conflicts:
src/views/designPlatform/trainingDesign.vue
|
2022-08-31 10:35:34 +08:00 |
|
dong
|
f72527f177
|
实训设计界面功能
|
2022-08-31 10:35:34 +08:00 |
|
fan
|
5adc99158b
|
实训调整
|
2022-08-31 10:34:18 +08:00 |
|
dong
|
8161162b45
|
代码调整
|
2022-08-30 18:09:09 +08:00 |
|
joylink_cuiweidong
|
271e798cb0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-30 17:58:18 +08:00 |
|
joylink_cuiweidong
|
a2eed75f00
|
代码调整
|
2022-08-30 17:58:07 +08:00 |
|
dong
|
182610098b
|
代码调整
|
2022-08-30 17:36:02 +08:00 |
|
joylink_cuiweidong
|
b5922b2f65
|
代码调整
|
2022-08-30 17:28:47 +08:00 |
|
joylink_cuiweidong
|
f38c129319
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-30 16:54:00 +08:00 |
|
joylink_cuiweidong
|
68314b3b08
|
代码调整
|
2022-08-30 16:53:37 +08:00 |
|
fan
|
4310f07a9b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-30 16:09:29 +08:00 |
|
fan
|
5ad7c1f8a1
|
实训调整
|
2022-08-30 16:09:17 +08:00 |
|
joylink_cuiweidong
|
74cedff597
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-30 15:43:30 +08:00 |
|
joylink_cuiweidong
|
1a92dbf183
|
实训 打分 代码调整
|
2022-08-30 15:43:21 +08:00 |
|
joylink_cuiweidong
|
3d40f79501
|
代码调整
|
2022-08-30 15:42:28 +08:00 |
|
fan
|
edc15a02ba
|
实训调整
|
2022-08-30 15:38:26 +08:00 |
|
fan
|
305b9e7eb5
|
实训调整
|
2022-08-30 13:16:39 +08:00 |
|
dong
|
a2c704ffea
|
实训草稿预览
|
2022-08-30 11:36:07 +08:00 |
|
fan
|
caacfa5719
|
实训调整
|
2022-08-30 11:14:24 +08:00 |
|
joylink_cuiweidong
|
f344e4ea07
|
实训 打分代码调整
|
2022-08-30 10:10:17 +08:00 |
|
fan
|
5fe936e754
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-30 10:06:52 +08:00 |
|
fan
|
c59285a139
|
实训调整
|
2022-08-30 10:06:43 +08:00 |
|
dong
|
9113a5d288
|
代码调整
|
2022-08-30 10:03:06 +08:00 |
|
fan
|
3ea1c92f71
|
实训调整
|
2022-08-30 09:52:31 +08:00 |
|
fan
|
caef0d9c79
|
实训调整
|
2022-08-30 09:42:25 +08:00 |
|
fan
|
647b34e368
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
Conflicts:
src/views/trainingManage/editDetails.vue
|
2022-08-30 09:32:17 +08:00 |
|
fan
|
6091119a5d
|
实训调整
|
2022-08-30 09:30:27 +08:00 |
|
dong
|
46b807e36e
|
实训条件编辑
|
2022-08-29 18:25:52 +08:00 |
|
fan
|
6127e21279
|
实训调整
|
2022-08-29 18:00:12 +08:00 |
|
fan
|
e39ea7a8f8
|
实训调整
|
2022-08-29 16:51:36 +08:00 |
|
fan
|
68833ecc35
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-29 14:37:25 +08:00 |
|
fan
|
13d463570a
|
实训调整
|
2022-08-29 14:37:13 +08:00 |
|
joylink_cuiweidong
|
ec24239c9e
|
代码调整
|
2022-08-29 14:09:12 +08:00 |
|
joylink_cuiweidong
|
5fd48d092e
|
代码调整
|
2022-08-29 14:08:14 +08:00 |
|
joylink_cuiweidong
|
2310b54e11
|
代码调整
|
2022-08-29 13:37:50 +08:00 |
|
joylink_cuiweidong
|
7388fc707f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-29 11:16:51 +08:00 |
|
joylink_cuiweidong
|
9577b8ecf2
|
代码调整
|
2022-08-29 11:16:15 +08:00 |
|
fan
|
3fe6e2076c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-29 11:06:31 +08:00 |
|
fan
|
a43ff34ad5
|
实训调整
|
2022-08-29 11:06:11 +08:00 |
|
joylink_cuiweidong
|
f0d9184a13
|
代码调整
|
2022-08-29 10:05:14 +08:00 |
|
joylink_cuiweidong
|
3410f4fe0f
|
代码调整
|
2022-08-29 09:48:09 +08:00 |
|
joylink_cuiweidong
|
af511e12a2
|
代码调整
|
2022-08-26 18:05:40 +08:00 |
|
joylink_cuiweidong
|
ca677c232e
|
代码调整
|
2022-08-26 17:37:42 +08:00 |
|
joylink_cuiweidong
|
fd87d9b27f
|
代码调整
|
2022-08-26 17:32:59 +08:00 |
|
Yuan
|
5f4be2eb18
|
Merge branch 'yly' into test
|
2022-08-25 18:24:56 +08:00 |
|
Yuan
|
fed6ac91d6
|
区域批量操作
|
2022-08-25 18:22:07 +08:00 |
|
joylink_cuiweidong
|
e671165355
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-25 15:19:09 +08:00 |
|
joylink_cuiweidong
|
86ae692f61
|
大铁项目 车务管理终端 增加/修改列车固定径路 代码调整
|
2022-08-25 15:18:32 +08:00 |
|
fan
|
c411d7237b
|
大屏显示调整
|
2022-08-25 15:16:08 +08:00 |
|
dong
|
3971a33039
|
代码调整
|
2022-08-25 14:34:27 +08:00 |
|
fan
|
832d26709f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-24 17:52:42 +08:00 |
|
fan
|
2f4816442f
|
新实训代码调整
|
2022-08-24 17:52:33 +08:00 |
|
dong
|
a61c51d5c5
|
代码调整
|
2022-08-24 16:09:16 +08:00 |
|
dong
|
7b94333a16
|
代码调整
|
2022-08-24 14:54:46 +08:00 |
|
fan
|
0452a4fee7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-24 11:14:12 +08:00 |
|
fan
|
7df2e4a404
|
代码调整
|
2022-08-24 11:02:17 +08:00 |
|
dong
|
d96678e7c4
|
代码调整
|
2022-08-23 18:16:12 +08:00 |
|
fan
|
a2e0f543bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-23 18:07:39 +08:00 |
|
fan
|
b66d899285
|
代码调整
|
2022-08-23 18:07:28 +08:00 |
|
joylink_cuiweidong
|
d0c3ca304d
|
大铁项目 车务管理终端 批量增加列车固定径路 代码调整
|
2022-08-23 17:59:04 +08:00 |
|
dong
|
5443e46708
|
实训代码调整
|
2022-08-23 17:42:44 +08:00 |
|
joylink_cuiweidong
|
86c0b72802
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-23 16:24:22 +08:00 |
|
joylink_cuiweidong
|
624a3a11f9
|
大铁项目 车务管理终端 列车固定径路增加/修改 代码调整
|
2022-08-23 16:24:11 +08:00 |
|
dong
|
1d128f92eb
|
代码调整
|
2022-08-23 15:42:24 +08:00 |
|
dong
|
806f20dc9f
|
代码调整
|
2022-08-23 15:29:13 +08:00 |
|
dong
|
546029e4ad
|
实训编制功能
|
2022-08-23 15:17:21 +08:00 |
|
joylink_cuiweidong
|
831cb965d9
|
大铁项目 车务管理终端 修改出入口 代码调整
|
2022-08-23 14:08:51 +08:00 |
|
joylink_cuiweidong
|
6d8f209cbb
|
大铁项目 车务管理终端 获取出入口列表 代码调整
|
2022-08-23 10:25:04 +08:00 |
|
fan
|
5939dc773f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-23 09:24:57 +08:00 |
|
fan
|
0664688a5c
|
代码调整
|
2022-08-23 09:24:36 +08:00 |
|
joylink_cuiweidong
|
2e7a2cab70
|
大铁项目 车务管理终端 出入口发布生效区 代码调整
|
2022-08-22 17:24:56 +08:00 |
|
joylink_cuiweidong
|
b3244ce77e
|
大铁线路 出入口增加 属性ioDirection(出入口类型)
|
2022-08-22 15:53:28 +08:00 |
|
joylink_cuiweidong
|
ac620e5607
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 14:44:27 +08:00 |
|
joylink_cuiweidong
|
2cca3e1bd4
|
代码调整
|
2022-08-22 14:44:09 +08:00 |
|
dong
|
a128496ef6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 13:44:08 +08:00 |
|
dong
|
ba81b37ca0
|
实训功能
|
2022-08-22 13:43:40 +08:00 |
|
joylink_cuiweidong
|
c88319f4c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 13:40:43 +08:00 |
|
joylink_cuiweidong
|
9d850f9653
|
大铁项目 车务管理终端 修改股道 代码调整
|
2022-08-22 13:40:29 +08:00 |
|
fan
|
dd43337d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-22 10:44:42 +08:00 |
|
fan
|
1bf1776be7
|
卡斯柯显示调整
|
2022-08-22 10:44:26 +08:00 |
|
joylink_cuiweidong
|
109b46b41b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 10:33:04 +08:00 |
|
joylink_cuiweidong
|
718953a8f7
|
大铁项目 车务管理终端 获取股道列表 代码调整
|
2022-08-22 10:32:49 +08:00 |
|
fan
|
0d5efd0941
|
实训预览暂提
|
2022-08-22 09:24:56 +08:00 |
|
dong
|
f1ffae48ef
|
实训管理
|
2022-08-19 18:03:30 +08:00 |
|
joylink_cuiweidong
|
434d028668
|
添加列车固定径路页面调整 列车固定径路发布生效区接口调整
|
2022-08-19 17:12:20 +08:00 |
|
joylink_cuiweidong
|
b7b5f0150c
|
大铁项目 车务管理终端 (删除/清空)固定列车径路
|
2022-08-19 15:52:00 +08:00 |
|
joylink_cuiweidong
|
22d2dd16f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-19 13:47:04 +08:00 |
|
joylink_cuiweidong
|
b07d8303a4
|
大铁项目 车务管理终端 获取固定列车径路列表
|
2022-08-19 13:46:49 +08:00 |
|
fan
|
a2b5b7bdda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-18 18:02:05 +08:00 |
|
fan
|
8c4a0e3266
|
发布实训管理
|
2022-08-18 18:01:53 +08:00 |
|
joylink_cuiweidong
|
3efdd6b316
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-18 16:10:55 +08:00 |
|
joylink_cuiweidong
|
3c7768c970
|
大铁项目 车务管理终端 获取股道列表 指令 代码调整
|
2022-08-18 16:10:22 +08:00 |
|
dong
|
b3652b84b0
|
实训设计列表功能
|
2022-08-18 15:35:10 +08:00 |
|
joylink_cuiweidong
|
fda477c08b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-18 11:05:13 +08:00 |
|
joylink_cuiweidong
|
7d473aba6c
|
大铁项目 车务管理终端 代码调整
|
2022-08-18 11:04:57 +08:00 |
|
fan
|
b1638adeec
|
调整画面管理
|
2022-08-18 09:36:45 +08:00 |
|
fan
|
da5f1a3fcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-17 15:47:10 +08:00 |
|
fan
|
0c553124dc
|
代码调整
|
2022-08-17 15:46:55 +08:00 |
|
joylink_cuiweidong
|
d76532bd2c
|
大铁线路代码调整
|
2022-08-17 15:24:35 +08:00 |
|
joylink_cuiweidong
|
b3da3ca56a
|
大铁线路 添加 车务终端管理界面
|
2022-08-17 13:47:23 +08:00 |
|
joylink_cuiweidong
|
0719a2031e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-17 11:29:34 +08:00 |
|