zyy
|
672c95c6c6
|
调整信号接近区段
|
2021-05-27 16:10:58 +08:00 |
|
zyy
|
529839b3ac
|
调整进路更新，延续保护更新
|
2021-05-27 15:15:58 +08:00 |
|
zyy
|
3a06aae186
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-27 14:19:43 +08:00 |
|
zyy
|
e150fda807
|
调整延续保护
|
2021-05-27 14:19:28 +08:00 |
|
joylink_cuiweidong
|
aa9c961cb0
|
旧版仿真 增加 仿真订阅（/queue/simulation/{id}/state）
|
2021-05-27 13:56:17 +08:00 |
|
joylink_cuiweidong
|
796983e9e8
|
合并 设计平台菜单（pdf上传和编辑器）
|
2021-05-27 13:28:35 +08:00 |
|
fan
|
7412e01b32
|
代码暂提
|
2021-05-26 17:18:20 +08:00 |
|
zyy
|
2b338ba0de
|
调整进路预览
|
2021-05-26 17:03:38 +08:00 |
|
fan
|
ce1b6c5f8a
|
meger
|
2021-05-26 15:48:55 +08:00 |
|
fan
|
46d74d3002
|
代码暂提
|
2021-05-26 15:46:29 +08:00 |
|
zyy
|
8b2f8c7bc1
|
Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test-nan02
|
2021-05-26 14:43:51 +08:00 |
|
zyy
|
2d6f8ad984
|
增加车场弹窗
|
2021-05-26 14:43:34 +08:00 |
|
fan
|
86e2520b05
|
代码暂提
|
2021-05-26 14:04:36 +08:00 |
|
fan
|
16faefb526
|
线路配置添加 figuresOfTripNumber（车次号位数）&figuresOfServiceNumber（服务号位数）
|
2021-05-25 18:02:59 +08:00 |
|
fan
|
5188192736
|
BUG275 南京11站：车次号步进，在马群创建的车次步进到油坊桥的区段后，列车不显示
|
2021-05-25 17:53:23 +08:00 |
|
fan
|
c4894290f4
|
Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02
|
2021-05-25 16:07:22 +08:00 |
|
fan
|
337ed03f78
|
哈尔滨问题调整
|
2021-05-25 16:05:45 +08:00 |
|
joylink_cuiweidong
|
45371fb2d3
|
修改canvasId 初始化位置
|
2021-05-25 09:32:11 +08:00 |
|
fan
|
9548e24464
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-24 15:53:50 +08:00 |
|
fan
|
49011b95e2
|
添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整
|
2021-05-24 15:53:38 +08:00 |
|
fan
|
4796e7f648
|
代码暂提
|
2021-05-24 11:29:59 +08:00 |
|
sunzhenyu
|
e031986664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-21 15:31:29 +08:00 |
|
sunzhenyu
|
351d268e52
|
三维课程增加场景id显示，修改提示窗下一步功能区分，修改事件驱动条件
|
2021-05-21 15:30:50 +08:00 |
|
joylink_cuiweidong
|
e17104f537
|
地图绘制 停站时间/运行等级 代码调整
|
2021-05-21 15:12:40 +08:00 |
|
joylink_cuiweidong
|
13af28467c
|
地图绘制 停站时间/运行等级 界面与接口代码调整
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
|
2021-05-21 15:02:28 +08:00 |
|
joylink_cuiweidong
|
4cefb0cfbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-21 11:34:28 +08:00 |
|
joylink_cuiweidong
|
bf8d0eb574
|
地图绘制 停站时间 界面与接口代码调整
|
2021-05-21 11:33:37 +08:00 |
|
fan
|
fbd700d52e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-21 10:01:54 +08:00 |
|
fan
|
2438b9f0a0
|
删除仿真、绘图、运行图编制的心跳检测
|
2021-05-21 10:01:45 +08:00 |
|
zyy
|
54ad4bf93b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:58:42 +08:00 |
|
zyy
|
55ee64479f
|
调整系统绘图模块新增
|
2021-05-20 17:58:23 +08:00 |
|
fan
|
e49840afc8
|
绑定数据编辑调整
|
2021-05-20 17:51:00 +08:00 |
|
fan
|
7a33bae3fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:39:32 +08:00 |
|
fan
|
4c948d91ff
|
绑定数据编辑调整
|
2021-05-20 17:38:55 +08:00 |
|
zyy
|
89b63e9709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:13:19 +08:00 |
|
zyy
|
c4ec37a403
|
调整权限字段显示
|
2021-05-20 17:13:05 +08:00 |
|
sunzhenyu
|
f3c9bfdcb6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 17:06:35 +08:00 |
|
sunzhenyu
|
5392755eda
|
修改三维课程联控菜单位置，修改三维模型添加bug，修改移动模型指示器，修改操作切换，修改模型场景中显示移除逻辑，修改事件触发器逻辑
|
2021-05-20 17:06:28 +08:00 |
|
zyy
|
3a2baf8374
|
调整权限流程
|
2021-05-20 16:37:55 +08:00 |
|
zyy
|
24aefdebd4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-20 15:13:54 +08:00 |
|
zyy
|
be1106fc20
|
调整权限字段显示，地图绘制新增
|
2021-05-20 15:13:37 +08:00 |
|
fan
|
e212bd52e9
|
pdf上传检索调整
|
2021-05-20 15:06:14 +08:00 |
|
fan
|
5ee943a313
|
暂提
|
2021-05-20 11:04:21 +08:00 |
|
fan
|
db6e9503f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02
|
2021-05-20 09:29:10 +08:00 |
|
zyy
|
fbb9365b62
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-19 18:14:44 +08:00 |
|
zyy
|
83561a2545
|
调整权限分发
|
2021-05-19 18:14:27 +08:00 |
|
fan
|
8db97250d8
|
暂提
|
2021-05-19 18:03:58 +08:00 |
|
fan
|
9b422cd3b9
|
南京二号线调整（未完）
|
2021-05-19 16:07:52 +08:00 |
|
fan
|
6b57369b8f
|
车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见
|
2021-05-19 15:45:49 +08:00 |
|
zyy
|
4cd675cf67
|
增加系统预览绘制
|
2021-05-19 15:07:59 +08:00 |
|
joylink_cuiweidong
|
65daf903bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-19 09:44:05 +08:00 |
|
joylink_cuiweidong
|
17c4fdafa6
|
代码调整
|
2021-05-19 09:43:24 +08:00 |
|
fan
|
853e049cc5
|
哈尔滨运行图调整
|
2021-05-18 14:19:28 +08:00 |
|
joylink_cuiweidong
|
b87425f8c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-18 10:49:20 +08:00 |
|
joylink_cuiweidong
|
622885d3d5
|
删除暂时没有用的npm 模块（lodash,mock）
发布地图 地图分组代码调整
|
2021-05-18 10:48:58 +08:00 |
|
fan
|
4b83445624
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-18 10:04:20 +08:00 |
|
fan
|
7af49deb90
|
综合演练添加车站值班员
|
2021-05-18 10:04:03 +08:00 |
|
joylink_cuiweidong
|
60aeeaedea
|
代码调整
|
2021-05-17 19:15:25 +08:00 |
|
joylink_cuiweidong
|
1ca70a08b8
|
代码调整
|
2021-05-17 19:07:24 +08:00 |
|
joylink_cuiweidong
|
6a07a81233
|
代码调整
|
2021-05-17 19:06:00 +08:00 |
|
joylink_cuiweidong
|
5a6fcc48eb
|
代码调整
|
2021-05-17 19:00:27 +08:00 |
|
joylink_cuiweidong
|
c0d2b19589
|
代码调整
|
2021-05-17 18:57:20 +08:00 |
|
joylink_cuiweidong
|
ada429fcde
|
pdf上传 代码调整
|
2021-05-17 18:41:58 +08:00 |
|
joylink_cuiweidong
|
8033c42655
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 17:20:49 +08:00 |
|
joylink_cuiweidong
|
57feb88e6c
|
pdf 上传 代码调整
|
2021-05-17 17:20:26 +08:00 |
|
fan
|
0a9c8665ff
|
代码调整
|
2021-05-17 16:37:56 +08:00 |
|
fan
|
5215d8ba2c
|
merge
|
2021-05-17 13:37:03 +08:00 |
|
fan
|
bc2fa1fbae
|
代码调整
|
2021-05-17 13:35:49 +08:00 |
|
joylink_cuiweidong
|
3bbfae4082
|
pdf上传 代码调整
|
2021-05-17 10:42:13 +08:00 |
|
joylink_cuiweidong
|
290542ee28
|
pdf上传代码调整
|
2021-05-17 09:51:06 +08:00 |
|
zyy
|
1dba8c2e9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2021-05-14 18:33:09 +08:00 |
|
zyy
|
54295fe452
|
增加pdf 上传
|
2021-05-14 18:31:46 +08:00 |
|
sunzhenyu
|
a8d89df500
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-14 18:09:24 +08:00 |
|
sunzhenyu
|
883c70bd30
|
增加三维课程角色选择，增加三维课程信息提示跳转部分
|
2021-05-14 18:09:18 +08:00 |
|
fan
|
69c6526516
|
Bug260 、Bug261、郑州共赢代码调整
|
2021-05-14 15:59:04 +08:00 |
|
fan
|
006b9762e1
|
merge
|
2021-05-14 15:07:00 +08:00 |
|
fan
|
ddfddfa292
|
代码调整
|
2021-05-14 15:05:57 +08:00 |
|
zyy
|
9bd90ce182
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-14 13:14:24 +08:00 |
|
zyy
|
af9eb2c8b6
|
增加文章编辑器
|
2021-05-14 13:14:08 +08:00 |
|
joylink_cuiweidong
|
d584e7ea7d
|
添加 图纸管理页面
|
2021-05-13 18:09:10 +08:00 |
|
joylink_cuiweidong
|
02241f455a
|
地图绘图 高级数据 代码调整
|
2021-05-13 14:19:58 +08:00 |
|
joylink_cuiweidong
|
61b982e9b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-13 13:55:21 +08:00 |
|
joylink_cuiweidong
|
f4cd046f1a
|
大铁项目 根据车站值班员 显示绘图
|
2021-05-13 13:55:02 +08:00 |
|
fan
|
149d4cf995
|
Bug 206 语音训练结果在查询的时候，选择A用户，结果里出现了B用户的语音
|
2021-05-13 13:22:30 +08:00 |
|
fan
|
bf69914d21
|
代码问题调整
(cherry picked from commit 7cd36b7446)
|
2021-05-13 13:13:44 +08:00 |
|
sunzhenyu
|
c5a020e1a6
|
修改三维设备展示文本错别字
|
2021-05-12 10:37:39 +08:00 |
|
sunzhenyu
|
7b4d6a267e
|
修改三维设备手摇道岔文字描述
|
2021-05-11 16:11:15 +08:00 |
|
sunzhenyu
|
7b73ff0e69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-11 15:59:44 +08:00 |
|
sunzhenyu
|
14d63ae42a
|
三维设备视图手摇道岔操作展示
|
2021-05-11 15:59:35 +08:00 |
|
fan
|
8cf5d36ce3
|
南京二号线调整
|
2021-05-11 15:36:11 +08:00 |
|
fan
|
c1d5b84e0b
|
添加一键校验发布地图
|
2021-05-10 15:44:34 +08:00 |
|
fan
|
9c7b6e4ab2
|
运行图解析调整
|
2021-05-10 15:08:58 +08:00 |
|
fan
|
4f07f16ecf
|
运行图解析调整
|
2021-05-10 14:40:37 +08:00 |
|
joylink_cuiweidong
|
d0ce678ca0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-10 13:50:55 +08:00 |
|
joylink_cuiweidong
|
cc259c8a15
|
哈尔滨项目运行图代码调整
|
2021-05-10 13:50:17 +08:00 |
|
fan
|
a9da38daf2
|
运行图解析调整
|
2021-05-10 09:13:22 +08:00 |
|
fan
|
b2892930ad
|
语音训练添加录音播放
|
2021-05-08 14:33:55 +08:00 |
|
fan
|
e597a3ae8f
|
添加站台紧急停车
|
2021-05-08 14:11:22 +08:00 |
|
fan
|
cfd6990189
|
场景语音训练调整
|
2021-05-06 16:22:10 +08:00 |
|
fan
|
6cb4ee9c27
|
场景语音训练调整
|
2021-05-06 16:15:09 +08:00 |
|
fan
|
0b78df8c9c
|
场景语音训练调整
|
2021-05-06 15:35:14 +08:00 |
|
fan
|
78c8b39edb
|
场景语音训练调整
|
2021-05-06 14:50:34 +08:00 |
|
fan
|
b4a0a42235
|
场景语音训练调整
|
2021-05-06 10:30:29 +08:00 |
|
fan
|
8dc44f11f8
|
场景语音训练调整
|
2021-05-06 09:54:51 +08:00 |
|
fan
|
21990ebf11
|
场景语音训练调整
|
2021-04-30 17:38:15 +08:00 |
|
fan
|
cc00e11304
|
场景语音训练调整
|
2021-04-30 17:34:37 +08:00 |
|
fan
|
d3238e77e2
|
场景语音训练调整
|
2021-04-30 16:50:04 +08:00 |
|
fan
|
21fe3c8b1e
|
语音训练调整
|
2021-04-30 16:35:28 +08:00 |
|
fan
|
f9d2d8a0ac
|
语音训练调整
|
2021-04-30 16:14:56 +08:00 |
|
sunzhenyu
|
861065e159
|
修改三维编辑器v-for key警告
|
2021-04-30 10:01:36 +08:00 |
|
sunzhenyu
|
528af2fea6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 17:56:01 +08:00 |
|
sunzhenyu
|
2f60a7a352
|
增加静态测试模型，修改三维课程播放器模型触发器模块，增加三维动画模块，修改课程信息模块
|
2021-04-29 17:55:55 +08:00 |
|
fan
|
0585502691
|
大铁线路操作调整
|
2021-04-29 15:50:15 +08:00 |
|
fan
|
acf4f6bea9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 13:25:58 +08:00 |
|
fan
|
ae5df5de5b
|
大铁线路操作调整
|
2021-04-29 13:25:48 +08:00 |
|
joylink_cuiweidong
|
87c86536df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 11:02:37 +08:00 |
|
joylink_cuiweidong
|
9ce15c6d25
|
代码调整
|
2021-04-29 11:02:15 +08:00 |
|
fan
|
5ee38364a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-29 10:35:44 +08:00 |
|
fan
|
ed7c4bb8f5
|
大铁线路操作调整
|
2021-04-29 10:35:34 +08:00 |
|
joylink_cuiweidong
|
330416f0e0
|
语音训练代码调整
|
2021-04-29 10:21:51 +08:00 |
|
fan
|
5678d8dfad
|
信号机坐标编辑显示
|
2021-04-28 18:46:04 +08:00 |
|
fan
|
edbd6d55cf
|
信号机坐标编辑显示
|
2021-04-28 17:14:48 +08:00 |
|
fan
|
823c30118c
|
大铁仿真操作调整
|
2021-04-28 16:58:29 +08:00 |
|
fan
|
83eddd42d3
|
大铁仿真操作调整
|
2021-04-27 15:52:39 +08:00 |
|
fan
|
c99194f84e
|
新版仿真订阅消息调整
|
2021-04-27 10:17:51 +08:00 |
|
fan
|
09781774c7
|
大铁线路操作调整
|
2021-04-26 17:59:23 +08:00 |
|
fan
|
d917ccce3d
|
大铁线路操作调整
|
2021-04-25 18:13:47 +08:00 |
|
fan
|
c22a40b6f0
|
BUG234 => 测试环境中苏电院教学管理页面显示问题
|
2021-04-25 14:54:05 +08:00 |
|
fan
|
2bd741d4ab
|
大铁操作调整
|
2021-04-25 10:09:43 +08:00 |
|
fan
|
13e0f107f0
|
后端状态转译
|
2021-04-23 17:43:45 +08:00 |
|
fan
|
87daa342d6
|
query newApi 判断调整
|
2021-04-23 15:14:10 +08:00 |
|
fan
|
c6f5f84d77
|
query测试
|
2021-04-23 15:01:04 +08:00 |
|
fan
|
bd2165ff35
|
大铁仿真调整
|
2021-04-23 14:11:29 +08:00 |
|
fan
|
6f06822793
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-23 09:01:26 +08:00 |
|
fan
|
7379945c42
|
大铁仿真调整
|
2021-04-23 09:01:12 +08:00 |
|
sunzhenyu
|
cf930c1e72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-22 18:08:05 +08:00 |
|
sunzhenyu
|
e9b9345e95
|
增加三维课程播放器，增加第一人称控制碰撞检测，完善编辑器数据
|
2021-04-22 18:07:56 +08:00 |
|
joylink_cuiweidong
|
e1757e4114
|
代码调整
|
2021-04-22 11:30:07 +08:00 |
|
joylink_cuiweidong
|
7ef86d0517
|
代码调整
|
2021-04-22 10:52:48 +08:00 |
|
joylink_cuiweidong
|
40909b073e
|
代码调整
|
2021-04-21 17:55:41 +08:00 |
|
joylink_cuiweidong
|
5039c09c16
|
样式调整
|
2021-04-21 17:19:25 +08:00 |
|
joylink_cuiweidong
|
54ec91a835
|
添加 修改检查配置接口
|
2021-04-21 15:46:37 +08:00 |
|
joylink_cuiweidong
|
70e9ab6a87
|
代码调整
|
2021-04-21 15:25:08 +08:00 |
|
joylink_cuiweidong
|
62698088d8
|
代码调整
|
2021-04-21 15:19:32 +08:00 |
|
joylink_cuiweidong
|
97a07bb70e
|
大铁 进路删除 代码调整
|
2021-04-21 15:17:27 +08:00 |
|
joylink_cuiweidong
|
6fe2bf0aca
|
大铁 进路预览代码调整
|
2021-04-21 14:40:44 +08:00 |
|
joylink_cuiweidong
|
d13292b8f1
|
大铁线路 进路预览代码调整
|
2021-04-21 13:40:37 +08:00 |
|
joylink_cuiweidong
|
af13800539
|
大铁线路 进路添加代码调整
|
2021-04-21 09:20:48 +08:00 |
|
fan
|
3ba2f8ac5b
|
merge
|
2021-04-20 17:29:32 +08:00 |
|
fan
|
0226042942
|
宁波三Bug调整
|
2021-04-20 17:25:27 +08:00 |
|
joylink_cuiweidong
|
1ffac1ba84
|
代码调整
|
2021-04-16 17:46:07 +08:00 |
|
joylink_cuiweidong
|
d1a177827d
|
大铁项目 添加进路 代码调整
|
2021-04-16 17:21:15 +08:00 |
|
joylink_cuiweidong
|
e554ff45b7
|
代码调整
|
2021-04-16 16:36:17 +08:00 |
|
joylink_cuiweidong
|
388f85c3db
|
代码调整
|
2021-04-16 16:26:58 +08:00 |
|
joylink_cuiweidong
|
a3dff96e73
|
大铁 项目 添加进路 代码调整
|
2021-04-16 15:59:08 +08:00 |
|
joylink_cuiweidong
|
3ba63c65ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 14:22:48 +08:00 |
|
joylink_cuiweidong
|
84169141ab
|
大铁 指示灯 代码调整
|
2021-04-16 14:22:29 +08:00 |
|
sunzhenyu
|
3440daf55e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 13:19:07 +08:00 |
|
sunzhenyu
|
72d0bb084f
|
修改三维单体设备信号机亮灯逻辑，修改三维课程编辑播放器
|
2021-04-16 13:18:59 +08:00 |
|
joylink_cuiweidong
|
0de0206192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-16 09:48:35 +08:00 |
|
joylink_cuiweidong
|
91190c6dc3
|
代码调整
|
2021-04-16 09:48:03 +08:00 |
|
ival
|
14fd6c1a40
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-15 18:15:20 +08:00 |
|
ival
|
14f718ec1a
|
增加指示器显示
|
2021-04-15 18:15:12 +08:00 |
|
joylink_cuiweidong
|
b5b9b493e7
|
代码调整
|
2021-04-15 18:07:51 +08:00 |
|
joylink_cuiweidong
|
16294b6373
|
代码调整
|
2021-04-15 17:12:41 +08:00 |
|
joylink_cuiweidong
|
d3b240989b
|
代码调整
|
2021-04-15 16:15:18 +08:00 |
|
joylink_cuiweidong
|
bb928cb37b
|
代码调整
|
2021-04-15 15:55:30 +08:00 |
|
joylink_cuiweidong
|
4050ddf937
|
大铁进路添加 代码调整
|
2021-04-15 15:53:34 +08:00 |
|
joylink_cuiweidong
|
bebac3b8e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 17:48:55 +08:00 |
|
joylink_cuiweidong
|
9233b651f6
|
代码调整
|
2021-04-14 17:48:28 +08:00 |
|
sunzhenyu
|
2412aac899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 17:35:46 +08:00 |
|
sunzhenyu
|
63f935616d
|
修改三维课程编辑器事件和图片资源部分
|
2021-04-14 17:35:41 +08:00 |
|
joylink_cuiweidong
|
8d763d00e4
|
运行图编制代码调整
|
2021-04-14 16:43:09 +08:00 |
|
joylink_cuiweidong
|
1a7786dd14
|
运行图编制 代码调整
|
2021-04-14 15:30:52 +08:00 |
|
joylink_cuiweidong
|
63855ca1ff
|
运行图编制代码调整
|
2021-04-14 15:17:34 +08:00 |
|
joylink_cuiweidong
|
a1342ed2b6
|
运行图代码调整
|
2021-04-14 14:36:33 +08:00 |
|
joylink_cuiweidong
|
448832293b
|
运行图代码调整
|
2021-04-14 14:26:00 +08:00 |
|
joylink_cuiweidong
|
ae263b0dc7
|
运行图样式调整
|
2021-04-14 13:57:35 +08:00 |
|
sunzhenyu
|
c9b7d18e43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-14 09:13:02 +08:00 |
|
sunzhenyu
|
f1ab1f9819
|
三维课程编辑测试展示(未完成)
|
2021-04-14 09:12:53 +08:00 |
|
fan
|
8575de2bd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-04-13 18:09:52 +08:00 |
|
fan
|
0b5cc8e15d
|
信号按钮调整
|
2021-04-13 18:09:37 +08:00 |
|
ival
|
68cad1616a
|
删除无用代码
|
2021-04-13 15:48:01 +08:00 |
|
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 |
|