fan
|
0607e63d37
|
教学管理问题调整
|
2021-03-25 19:46:02 +08:00 |
|
fan
|
a267b1b64f
|
教学管理问题调整
|
2021-03-25 18:34:41 +08:00 |
|
fan
|
81d30804bb
|
教学管理问题调整
|
2021-03-25 17:38:46 +08:00 |
|
fan
|
c0add0cf1a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 16:08:53 +08:00 |
|
fan
|
bffb689e72
|
教学管理调整
|
2021-03-25 16:08:44 +08:00 |
|
joylink_cuiweidong
|
04ec5432d9
|
运行图编制代码调整
|
2021-03-25 15:18:58 +08:00 |
|
joylink_cuiweidong
|
c541e62be4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 15:07:34 +08:00 |
|
joylink_cuiweidong
|
f8d7ad88bb
|
运行图编制 代码调整
|
2021-03-25 15:07:14 +08:00 |
|
fan
|
c1580ca6ea
|
应用处班级添加提示文字
|
2021-03-25 15:00:30 +08:00 |
|
fan
|
6ea5a3e3aa
|
url
|
2021-03-25 14:11:57 +08:00 |
|
ival
|
d6e24e40fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 14:10:24 +08:00 |
|
ival
|
ba51c50417
|
修改代码
|
2021-03-25 14:10:18 +08:00 |
|
fan
|
19421566de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 14:09:38 +08:00 |
|
fan
|
159aec918f
|
教学管理调整
|
2021-03-25 14:09:03 +08:00 |
|
joylink_cuiweidong
|
8a8cc8e04c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 13:39:51 +08:00 |
|
joylink_cuiweidong
|
ccc4970a1a
|
运行图编制 生成计划 获取交路代码调整
|
2021-03-25 13:39:28 +08:00 |
|
ival
|
988f879d46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2021-03-25 13:20:26 +08:00 |
|
ival
|
85f73964d3
|
调整iscs站厅子图顺序
|
2021-03-25 13:19:28 +08:00 |
|
fan
|
0d57d977a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 13:07:34 +08:00 |
|
ival
|
ee7453d5cd
|
修改 站厅子图列表
|
2021-03-25 13:08:03 +08:00 |
|
fan
|
5106ae8d14
|
meger
|
2021-03-25 13:07:02 +08:00 |
|
fan
|
7dc0535ecf
|
教学管理调整
|
2021-03-25 13:05:30 +08:00 |
|
fan
|
a3d6dc727f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-25 13:03:27 +08:00 |
|
fan
|
1c85c5a502
|
教学管理调整
|
2021-03-25 13:03:12 +08:00 |
|
ival
|
d8d3b64dcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 11:31:40 +08:00 |
|
ival
|
1ba979c02c
|
增加 iscs站厅资源
|
2021-03-25 11:31:31 +08:00 |
|
joylink_cuiweidong
|
7619d9097e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 10:38:55 +08:00 |
|
joylink_cuiweidong
|
ca3f01104e
|
运行图编制 代码调整
|
2021-03-25 10:38:36 +08:00 |
|
ival
|
74b260782d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 09:22:17 +08:00 |
|
ival
|
1eef45efe4
|
注释代码
|
2021-03-25 09:22:07 +08:00 |
|
joylink_cuiweidong
|
9984b13759
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-25 09:15:37 +08:00 |
|
joylink_cuiweidong
|
76fccbc643
|
运行图编制 生成计划 代码调整
|
2021-03-25 09:15:07 +08:00 |
|
fan
|
caafa7578b
|
iscs添加设备图片
|
2021-03-24 15:00:45 +08:00 |
|
fan
|
022b946592
|
iscs添加背景图片
|
2021-03-24 14:12:35 +08:00 |
|
fan
|
b93daf1f8e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-24 13:50:26 +08:00 |
|
fan
|
6cca650a98
|
教学管理调整
|
2021-03-24 13:49:59 +08:00 |
|
ival
|
dd1fb890ad
|
修改 运行图 修改接口
|
2021-03-24 13:30:26 +08:00 |
|
ival
|
fd5716925b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-24 11:09:16 +08:00 |
|
ival
|
833117dc45
|
1.修改 运行图 接口
2.增加 iscs 资源
|
2021-03-24 11:09:02 +08:00 |
|
joylink_cuiweidong
|
213e654abc
|
iscs 代码调整
|
2021-03-23 18:20:06 +08:00 |
|
joylink_cuiweidong
|
d62d6ba815
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsSystem/stationConfig/index.vue
|
2021-03-23 18:19:47 +08:00 |
|
joylink_cuiweidong
|
6db9593a40
|
iscs 代码调整
|
2021-03-23 18:17:54 +08:00 |
|
fan
|
aed6392c88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-23 17:52:42 +08:00 |
|
fan
|
ebb618e053
|
iscs自动售检票
|
2021-03-23 17:52:32 +08:00 |
|
joylink_cuiweidong
|
5c5366e46a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 17:52:11 +08:00 |
|
joylink_cuiweidong
|
9c31d4963c
|
iscs 代码调整
|
2021-03-23 17:51:36 +08:00 |
|
ival
|
04444b2b12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 17:35:50 +08:00 |
|
ival
|
27e938c102
|
修改 复制iscs图形 生成codebug的问题
|
2021-03-23 17:35:42 +08:00 |
|
fan
|
7a3677cf8f
|
调整感温光纤探测系统高度
|
2021-03-23 17:24:48 +08:00 |
|
fan
|
2f4cd5569a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-23 17:14:17 +08:00 |
|