ival
|
584852038c
|
增加大铁仿真display
# Conflicts:
# src/iscs_new/plugins/shapeBuilder/entry.vue
|
2021-04-13 15:47:49 +08:00 |
|
fan
|
8a363c068a
|
大铁调整
|
2021-04-13 14:10:20 +08:00 |
|
fan
|
75e7c00957
|
地图分组管理
|
2021-04-13 10:15:11 +08:00 |
|
fan
|
cbb02621d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-12 18:19:58 +08:00 |
|
fan
|
8d5de4cc1a
|
地图分组管理
|
2021-04-12 18:09:49 +08:00 |
|
ival
|
dde06f834d
|
修改语言校验页面
|
2021-04-12 17:11:36 +08:00 |
|
fan
|
904d84e8ab
|
语音
|
2021-04-12 14:56:21 +08:00 |
|
sunzhenyu
|
f86c13ea86
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-09 18:21:45 +08:00 |
|
sunzhenyu
|
cea95f9d92
|
三维课程编辑器课程组件和数据结构修改，升级threejs版本
|
2021-04-09 18:21:24 +08:00 |
|
fan
|
7532c86e15
|
宁波三操作调整&导入运行图放开
|
2021-04-08 17:28:46 +08:00 |
|
joylink_cuiweidong
|
5f9e6fe882
|
运行图编制代码调整
|
2021-04-07 14:21:26 +08:00 |
|
fan
|
2d5b863231
|
iscs Button hideType 赋值调整
|
2021-04-07 09:27:31 +08:00 |
|
fan
|
9a84b61e5a
|
ISCS调整
|
2021-04-06 17:48:33 +08:00 |
|
ival
|
a215004143
|
修改代码
|
2021-04-06 16:01:14 +08:00 |
|
sunzhenyu
|
fb00e1418e
|
修改三维课程存读
|
2021-04-02 18:05:19 +08:00 |
|
sunzhenyu
|
a9745eb709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-02 15:49:32 +08:00 |
|
sunzhenyu
|
1cab2116d6
|
三维课程代码，修改课程组件间逻辑，修改课程数据结构。(未实装)
|
2021-04-02 15:49:24 +08:00 |
|
fan
|
fc861b1c70
|
组织管理调整
|
2021-04-02 09:58:45 +08:00 |
|
fan
|
baf424cfad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 16:37:25 +08:00 |
|
fan
|
a5b3f9cf04
|
组织管理调整
|
2021-04-01 16:28:30 +08:00 |
|
joylink_cuiweidong
|
81ecf0ac20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 10:59:05 +08:00 |
|
joylink_cuiweidong
|
fcf7d1b8ee
|
运行图代码调整
|
2021-04-01 10:58:41 +08:00 |
|
fan
|
f1824ad324
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 09:59:11 +08:00 |
|
fan
|
f327889bca
|
组织管理调整
|
2021-04-01 09:59:01 +08:00 |
|
joylink_cuiweidong
|
45c51157a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-01 09:42:12 +08:00 |
|
joylink_cuiweidong
|
618d975d68
|
运行图编制 代码调整
|
2021-04-01 09:41:14 +08:00 |
|
fan
|
0253e6e590
|
组织管理调整
|
2021-03-31 18:27:29 +08:00 |
|
fan
|
887edee9e6
|
考试系统按钮位置调整
|
2021-03-31 09:35:51 +08:00 |
|
fan
|
30bf7487ae
|
试卷编辑调整
|
2021-03-31 09:31:50 +08:00 |
|
fan
|
076c7192ec
|
教学管理调整
|
2021-03-30 18:07:45 +08:00 |
|
fan
|
1d50b1582d
|
BUG：208、209、210
|
2021-03-30 15:51:15 +08:00 |
|
fan
|
28d092401e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 15:23:48 +08:00 |
|
fan
|
d42579479b
|
教学管理问题调整
|
2021-03-30 15:23:37 +08:00 |
|
joylink_cuiweidong
|
0c407dbfa9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 14:59:09 +08:00 |
|
joylink_cuiweidong
|
b78454781b
|
运行图编制 添加任务/修改任务 代码调整
|
2021-03-30 14:58:51 +08:00 |
|
fan
|
51bce2825e
|
教学管理问题调整
|
2021-03-30 14:49:47 +08:00 |
|
fan
|
d8462bb404
|
教学管理问题调整
|
2021-03-30 14:31:25 +08:00 |
|
fan
|
692c9f0c03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 10:41:48 +08:00 |
|
fan
|
894dc96ea5
|
教学管理问题调整
|
2021-03-30 10:41:27 +08:00 |
|
joylink_cuiweidong
|
770bdff791
|
代码调整
|
2021-03-30 09:59:51 +08:00 |
|
joylink_cuiweidong
|
65595cbe85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-30 09:57:35 +08:00 |
|
joylink_cuiweidong
|
09b2923126
|
iscs 代码调整
|
2021-03-30 09:57:05 +08:00 |
|
fan
|
def94fee3e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 18:05:30 +08:00 |
|
fan
|
d0f756ed2f
|
BUG202\200:成绩查询页面点击重置报错;删除课程的提示需要修改
|
2021-03-29 18:05:22 +08:00 |
|
joylink_cuiweidong
|
14b98e0e3e
|
代码调整
|
2021-03-29 17:34:57 +08:00 |
|
joylink_cuiweidong
|
7521b8f2db
|
iscs 代码调整
|
2021-03-29 17:33:31 +08:00 |
|
fan
|
c4ae02df0d
|
BUG196:进入其他用户创建的班级的学生管理界面，建议删除导入模板下载
|
2021-03-29 17:08:45 +08:00 |
|
fan
|
ac56715942
|
课程详情调整
|
2021-03-29 17:07:14 +08:00 |
|
fan
|
1395beacb8
|
考试调整
|
2021-03-29 16:17:52 +08:00 |
|
fan
|
577fc1444f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 15:01:56 +08:00 |
|
fan
|
64a673419b
|
考试调整
|
2021-03-29 15:01:43 +08:00 |
|
ival
|
3440c5ddc0
|
增加 圆
|
2021-03-29 15:00:02 +08:00 |
|
ival
|
a1fd2ed090
|
修改 福州door设备图层问题
|
2021-03-29 14:57:18 +08:00 |
|
joylink_cuiweidong
|
3c61302df1
|
代码调整
|
2021-03-29 13:13:35 +08:00 |
|
ival
|
7456a19b3e
|
增加 门禁iscs背景图，以及iscs_new的部分代码
|
2021-03-29 13:09:51 +08:00 |
|
ival
|
45027796e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 11:32:00 +08:00 |
|
ival
|
7ffff137b5
|
修改 删除生成计划的 滚动
|
2021-03-29 11:31:47 +08:00 |
|
fan
|
5090b14819
|
merge
|
2021-03-29 11:10:57 +08:00 |
|
fan
|
57f3b563fd
|
考试调整
|
2021-03-29 11:04:57 +08:00 |
|
fan
|
d3b4a73595
|
留言板调整
|
2021-03-29 11:04:18 +08:00 |
|
ival
|
3e3ca007e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-29 11:00:44 +08:00 |
|
ival
|
2a66a7b2c6
|
修改代码
|
2021-03-29 11:00:24 +08:00 |
|
joylink_cuiweidong
|
0a796d4218
|
运行图编制 代码调整
|
2021-03-29 10:09:33 +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 |
|
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
|
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 |
|
joylink_cuiweidong
|
0796a12dd7
|
iscs 代码调整
|
2021-03-23 17:12:19 +08:00 |
|
joylink_cuiweidong
|
f749aa6709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 16:42:21 +08:00 |
|
joylink_cuiweidong
|
cbedee3c3b
|
iscs 代码调整
|
2021-03-23 16:42:06 +08:00 |
|
joylink_cuiweidong
|
9398ccfa7c
|
iSCS 代码调整
|
2021-03-23 16:41:40 +08:00 |
|
fan
|
c146dacecb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-23 15:55:38 +08:00 |
|
fan
|
7a5e1bf701
|
评价规则调整
|
2021-03-23 15:55:23 +08:00 |
|
ival
|
160cbaf2bf
|
增加 iscs 火灾 展厅和站台 背景图
|
2021-03-23 15:29:42 +08:00 |
|
fan
|
c6cfa2d816
|
merge
|
2021-03-23 11:08:11 +08:00 |
|
fan
|
e38b236aed
|
教学管理暂提
|
2021-03-23 11:06:14 +08:00 |
|
ival
|
09ec3247ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 10:42:01 +08:00 |
|
ival
|
fcc8cbf988
|
修改iscs
|
2021-03-23 10:41:47 +08:00 |
|
joylink_cuiweidong
|
393f3fe68a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 10:37:14 +08:00 |
|
joylink_cuiweidong
|
43e0379926
|
运行图编制 生成计划 界面调整
|
2021-03-23 10:36:56 +08:00 |
|
ival
|
050141025a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-22 18:40:41 +08:00 |
|
ival
|
a63b8e0179
|
增加iscs图样
|
2021-03-22 18:40:29 +08:00 |
|
joylink_cuiweidong
|
ba18a549fb
|
运行图编制 生成计划代码调整
|
2021-03-22 17:39:12 +08:00 |
|
joylink_cuiweidong
|
b383815100
|
地图绘制 交路预览 显示代码调整
|
2021-03-22 16:04:33 +08:00 |
|
joylink_cuiweidong
|
7e80c71fef
|
代码调整
|
2021-03-22 15:49:14 +08:00 |
|
joylink_cuiweidong
|
74c5764087
|
代码调整
|
2021-03-22 15:30:10 +08:00 |
|
joylink_cuiweidong
|
7ac00f45dc
|
运行图编制 代码调整
|
2021-03-22 15:12:34 +08:00 |
|
joylink_cuiweidong
|
42b59cc752
|
代码调整
|
2021-03-22 14:51:34 +08:00 |
|
joylink_cuiweidong
|
9b4309d0c1
|
代码调整
|
2021-03-22 14:38:19 +08:00 |
|
joylink_cuiweidong
|
2dae1bc8d8
|
代码调整
|
2021-03-22 14:30:21 +08:00 |
|
joylink_cuiweidong
|
26b72f9228
|
代码调整
|
2021-03-22 13:20:51 +08:00 |
|
joylink_cuiweidong
|
e945d654eb
|
代码调整
|
2021-03-22 13:16:07 +08:00 |
|
sunzhenyu
|
2ce3d41cad
|
mergetest
|
2021-03-19 18:14:58 +08:00 |
|
sunzhenyu
|
d22f9d62de
|
新三维客流逻辑基本完成(未实装)
|
2021-03-19 18:14:21 +08:00 |
|
fan
|
82fe1f3dc9
|
权重藐视调整
|
2021-03-19 17:34:37 +08:00 |
|
fan
|
f3aed3f16e
|
评价规则创建调整
|
2021-03-19 17:20:22 +08:00 |
|
fan
|
268ae6ad88
|
评价结果展示调整
|
2021-03-19 16:47:06 +08:00 |
|
fan
|
061df7a389
|
评价规则管理宽度调整
|
2021-03-19 16:27:44 +08:00 |
|
fan
|
5732f85453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-19 16:17:23 +08:00 |
|
fan
|
36e9d7c6bd
|
课程管理调整
|
2021-03-19 16:17:01 +08:00 |
|
ival
|
ffb4dbbba3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-19 16:11:55 +08:00 |
|
ival
|
9dabd1604f
|
注释同济运行图中不用模块
|
2021-03-19 16:11:45 +08:00 |
|
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
|
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
|
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 |
|