sunzhenyu
|
5a8025b7ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:49:46 +08:00 |
|
sunzhenyu
|
a61bba357a
|
修改三维编辑器剔除文件bug
|
2020-12-03 16:49:38 +08:00 |
|
joylink_cuiweidong
|
fa7eefbeba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:36:39 +08:00 |
|
joylink_cuiweidong
|
ddd6905a0c
|
代码调整
|
2020-12-03 16:36:21 +08:00 |
|
sunzhenyu
|
ce48a13715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:23:23 +08:00 |
|
sunzhenyu
|
66c8fd8de9
|
剔除三维编辑器中旧的模块
|
2020-12-03 16:23:14 +08:00 |
|
joylink_cuiweidong
|
0933930011
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 15:30:03 +08:00 |
|
joylink_cuiweidong
|
a52c9786c1
|
发布地图 导出地图 代码调整
|
2020-12-03 15:29:45 +08:00 |
|
zyy
|
704356cec9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 14:01:27 +08:00 |
|
zyy
|
dfbeb6b604
|
删除多余配置
|
2020-12-03 14:01:15 +08:00 |
|
joylink_cuiweidong
|
7dc23a645d
|
代码调整
|
2020-12-03 13:52:51 +08:00 |
|
joylink_cuiweidong
|
3c004ab7a5
|
实训代码调整
|
2020-12-03 13:45:18 +08:00 |
|
joylink_cuiweidong
|
646d585ecf
|
实训/设计平台 左侧地图列表样式调整
|
2020-12-03 11:00:50 +08:00 |
|
fan
|
111f117ff8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 09:23:48 +08:00 |
|
fan
|
338743036e
|
注释用户信息 公司
|
2020-12-03 09:23:31 +08:00 |
|
fan
|
cdbd7a0d5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 18:38:40 +08:00 |
|
fan
|
6cc64d7cfc
|
导入学生信息添加loading&哈尔滨日志
|
2020-12-02 18:38:28 +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
|
c2cb4ce764
|
展示绑定单位管理人员
|
2020-12-02 16:27:44 +08:00 |
|
fan
|
3d672ce15b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 15:23:34 +08:00 |
|
fan
|
d96df1ce68
|
个人信息关闭后终止状态&贵装备展示留言板
|
2020-12-02 15:23:23 +08:00 |
|
joylink_cuiweidong
|
84d7d145c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 14:25:40 +08:00 |
|
joylink_cuiweidong
|
caeb8aa457
|
福州一号线新版 配置文件调整
|
2020-12-02 14:25:20 +08:00 |
|
fan
|
706c2343a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 14:22:53 +08:00 |
|
fan
|
d8f8acfe02
|
单位调整&哈尔滨区段限速调整
|
2020-12-02 14:22:26 +08:00 |
|
zyy
|
ccd6e4ef74
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 09:31:39 +08:00 |
|
zyy
|
de081382fa
|
增加运行图交路设置
|
2020-12-02 09:31:23 +08:00 |
|
fan
|
422ed21415
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 19:00:37 +08:00 |
|
fan
|
9c06b3ed27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 18:50:32 +08:00 |
|
fan
|
4ac37c5d18
|
单位调整
|
2020-12-01 18:50:23 +08:00 |
|
joylink_cuiweidong
|
dd50c9ac58
|
删除购买按钮 删除暂时无用的文件
|
2020-12-01 18:47:47 +08:00 |
|
joylink_cuiweidong
|
eb8f171bdd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 17:22:39 +08:00 |
|
joylink_cuiweidong
|
941f57e02c
|
代码调整
|
2020-12-01 17:20:44 +08:00 |
|
fan
|
ab7ff394ce
|
单位调整
|
2020-12-01 15:20:34 +08:00 |
|
sunzhenyu
|
42e37af6ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 10:27:15 +08:00 |
|
sunzhenyu
|
5911e330bf
|
限制三维客流镜头移动
|
2020-12-01 10:27:02 +08:00 |
|
sunzhenyu
|
01993cf65e
|
修改三维客流人物坐动画，修改重置动作bug
|
2020-12-01 10:26:15 +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
|
798d4589cf
|
代码调整
|
2020-11-30 18:06:32 +08:00 |
|
joylink_cuiweidong
|
888001c65e
|
删除暂时无用代码
|
2020-11-30 16:12:24 +08:00 |
|
joylink_cuiweidong
|
19d1a6e0b1
|
设计平台 用户实训管理 用户仿真管理 代码调整
|
2020-11-30 13:56:42 +08:00 |
|
joylink_cuiweidong
|
572dc1b3bd
|
实训平台 地图列表 代码调整
|
2020-11-30 11:14:52 +08:00 |
|
joylink_cuiweidong
|
706335aadf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-30 10:23:47 +08:00 |
|
joylink_cuiweidong
|
f9bac6886a
|
删除暂时无用代码
|
2020-11-30 10:23:32 +08:00 |
|
sunzhenyu
|
e44138953a
|
merge
|
2020-11-30 10:14:24 +08:00 |
|