fan
|
efee6ddfc4
|
merge
|
2021-03-19 15:55:05 +08:00 |
|
fan
|
44b2c5d0f8
|
教学管理调整
|
2021-03-19 15:49:05 +08:00 |
|
joylink_cuiweidong
|
3230f15415
|
代码调整
|
2021-03-19 14:50:52 +08:00 |
|
joylink_cuiweidong
|
5e271d3320
|
运行图代码调整
|
2021-03-19 14:49:33 +08:00 |
|
joylink_cuiweidong
|
8acee05b38
|
运行图代码调整
|
2021-03-19 13:38:53 +08:00 |
|
joylink_cuiweidong
|
82f8db41d1
|
运行图 代码调整
|
2021-03-19 13:23:58 +08:00 |
|
joylink_cuiweidong
|
70260cfbe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-19 11:19:00 +08:00 |
|
joylink_cuiweidong
|
5fdf48b7ab
|
运行图 代码调整
|
2021-03-19 11:18:37 +08:00 |
|
ival
|
d7e068c79d
|
修改引入文件路径问题
|
2021-03-19 11:02:40 +08:00 |
|
ival
|
12f6bae8e5
|
解决冲突
|
2021-03-19 10:52:57 +08:00 |
|
ival
|
1b2abcffb3
|
Merge branch 'test-ival' into test
# Conflicts:
# src/permission.js
# src/views/demo/index.vue
# src/views/newMap/displayNew/demoTraining/index.vue
# src/views/newMap/displayNew/lesson/index.vue
|
2021-03-19 10:15:43 +08:00 |
|
ival
|
a1b6201f9b
|
新增文件
|
2021-03-19 10:11:33 +08:00 |
|
ival
|
d03315f8fd
|
重构运行图解析代码逻辑
|
2021-03-19 10:10:51 +08:00 |
|
joylink_cuiweidong
|
1383dfbee3
|
运行图 代码调整
|
2021-03-18 18:46:52 +08:00 |
|
joylink_cuiweidong
|
e603837d9c
|
运行图代码调整
|
2021-03-18 17:52:19 +08:00 |
|
joylink_cuiweidong
|
e49d7c8ef8
|
代码调整
|
2021-03-18 16:30:28 +08:00 |
|
joylink_cuiweidong
|
f8860eba00
|
demo 代码调整
|
2021-03-18 15:58:27 +08:00 |
|
joylink_cuiweidong
|
07f477ae54
|
运行图代码调整
|
2021-03-18 15:05:56 +08:00 |
|
joylink_cuiweidong
|
b0a04a9dec
|
Merge remote-tracking branch 'remotes/origin/test_newRunplan' into test
|
2021-03-18 15:02:03 +08:00 |
|
joylink_cuiweidong
|
f3c5feefcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-18 15:01:30 +08:00 |
|
joylink_cuiweidong
|
d4a6aa1cb2
|
demo 代码调整
|
2021-03-18 15:01:13 +08:00 |
|
fan
|
700928ed22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-18 11:21:17 +08:00 |
|
fan
|
23d8feb8b7
|
按钮顺序调整
|
2021-03-18 11:21:00 +08:00 |
|
joylink_cuiweidong
|
816fa77d79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-18 11:13:01 +08:00 |
|
joylink_cuiweidong
|
5336a1899e
|
demo 修改
|
2021-03-18 11:12:31 +08:00 |
|
fan
|
36aee735a8
|
设备检测登录调整
|
2021-03-18 10:57:33 +08:00 |
|
fan
|
12698a808b
|
设备检测登录调整
|
2021-03-18 10:25:41 +08:00 |
|
fan
|
52898a24ac
|
仿真按钮样式调整
|
2021-03-18 09:35:45 +08:00 |
|
fan
|
e875fa92fc
|
教学管理暂提
|
2021-03-18 09:03:15 +08:00 |
|
ival
|
b4bf5114c6
|
demo
|
2021-03-17 18:07:49 +08:00 |
|
ival
|
43b6ebaa37
|
demo
|
2021-03-17 18:06:45 +08:00 |
|
ival
|
520c95a00c
|
增加demo
|
2021-03-17 17:51:22 +08:00 |
|
ival
|
666ad3f7d9
|
增加demo
|
2021-03-17 17:50:17 +08:00 |
|
ival
|
e183f40611
|
提交代码
|
2021-03-17 13:35:15 +08:00 |
|
ival
|
94bb1a0395
|
修改运行图代码代码
|
2021-03-17 10:15:21 +08:00 |
|
joylink_cuiweidong
|
df2ff455d3
|
运行图代码调整
|
2021-03-17 09:36:00 +08:00 |
|
joylink_cuiweidong
|
f21d270cf5
|
地图数据 交路预览页面调整
|
2021-03-17 09:33:19 +08:00 |
|
ival
|
e38bca7ff8
|
运行图 任务修改弹窗，显示描述的问题
|
2021-03-17 09:13:19 +08:00 |
|
ival
|
01d166a9c9
|
修改定位偏差的问题
|
2021-03-17 09:05:28 +08:00 |
|
fan
|
7da708858d
|
教学管理暂提
|
2021-03-16 19:06:25 +08:00 |
|
ival
|
64f38e7091
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-16 18:24:08 +08:00 |
|
ival
|
2480a8b110
|
迁移以前的运行图到同济新版
|
2021-03-16 18:23:56 +08:00 |
|
joylink_cuiweidong
|
e5047e1e16
|
运行图代码调整
|
2021-03-16 18:06:31 +08:00 |
|
joylink_cuiweidong
|
553ec75fd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-16 17:43:44 +08:00 |
|
joylink_cuiweidong
|
76dcd271d9
|
代码调整
|
2021-03-16 17:43:22 +08:00 |
|
ival
|
0985a6f1df
|
修改运行图表单名称
|
2021-03-16 11:14:52 +08:00 |
|
ival
|
1ad9ea0cb7
|
修改运行图菜单名称
|
2021-03-16 09:55:28 +08:00 |
|
ival
|
b678416593
|
修改 隐藏
|
2021-03-16 09:52:45 +08:00 |
|
ival
|
72281db3a8
|
隐藏 生成仅环路计划
|
2021-03-16 09:28:00 +08:00 |
|
ival
|
c11568348f
|
优化代码
|
2021-03-15 21:15:03 +08:00 |
|