joylink_cuiweidong
|
6a72265a7b
|
Merge branch 'iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into iscs
|
2021-03-31 13:55:32 +08:00 |
|
joylink_cuiweidong
|
3be099bdf8
|
iscs 绘图form表单调整
|
2021-03-31 13:53:18 +08:00 |
|
ival
|
134ccdaded
|
增加 新iscs_new 功能
|
2021-03-31 13:03:06 +08:00 |
|
ival
|
d9a8baeb93
|
调整目录结构
|
2021-03-31 08:53:05 +08:00 |
|
ival
|
0381242401
|
增加模块
|
2021-03-30 18:39:59 +08:00 |
|
ival
|
7e66128000
|
修改
|
2021-03-30 18:10:31 +08:00 |
|
ival
|
15c1463f5a
|
Merge branch 'iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into iscs
|
2021-03-30 18:07:13 +08:00 |
|
ival
|
56aebd69e7
|
增加iscs_new 代码
|
2021-03-30 18:06:53 +08:00 |
|
joylink_cuiweidong
|
72fadaa866
|
iscs新版绘图界面调整
|
2021-03-30 10:29:48 +08:00 |
|
ival
|
9277754f5e
|
修改代码
|
2021-03-29 18:43:51 +08:00 |
|
ival
|
e15e5703b4
|
Merge branch 'iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into iscs
|
2021-03-29 13:12:13 +08:00 |
|
ival
|
ad7b55704e
|
增加 门禁iscs背景图，以及iscs_new的部分代码
|
2021-03-29 13:12:04 +08:00 |
|
ival
|
68a01f94f2
|
修改代码
|
2021-03-29 10:59:57 +08:00 |
|
joylink_cuiweidong
|
5150fe4651
|
Merge branch 'iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into iscs
|
2021-03-29 10:04:17 +08:00 |
|
joylink_cuiweidong
|
df44298137
|
运行图编制 代码调整
|
2021-03-29 10:03:47 +08:00 |
|
ival
|
742d89f08a
|
增加部分 iscs_new 代码
|
2021-03-29 09:46:33 +08:00 |
|
ival
|
6b16e3d488
|
增加 iscs
|
2021-03-26 17:09:11 +08:00 |
|
joylink_cuiweidong
|
ea85ed29ae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-26 16:09:44 +08:00 |
|
ival
|
83c630bfc7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2021-03-26 16:09:05 +08:00 |
|
joylink_cuiweidong
|
c22b59733a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-26 16:08:43 +08:00 |
|
ival
|
6f0eca2503
|
修改 iscs加载的问题
|
2021-03-26 16:08:39 +08:00 |
|
joylink_cuiweidong
|
ce79c12b7d
|
代码调整
|
2021-03-26 16:08:21 +08:00 |
|
fan
|
ab49d70a61
|
教学管理返回按钮调整
|
2021-03-26 13:31:12 +08:00 |
|
fan
|
c519f74189
|
教学管理问题调整
|
2021-03-26 13:09:56 +08:00 |
|
fan
|
a70597a267
|
教学管理问题调整
|
2021-03-25 20:01:21 +08:00 |
|
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 |
|