joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
7,358 Commits 20 Branches 0 Tags 448 MiB
528fda2c15
Commit Graph

7181 Commits

Author SHA1 Message Date
fan
709ef4ddd0 故障触发问题调整 2020-10-12 15:25:55 +08:00
fan
da0276e0b8 故障触发问题调整 2020-10-12 15:22:39 +08:00
fan
5e69a04814 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 15:19:15 +08:00
fan
6b3a2b3875 故障触发问题调整 2020-10-12 15:19:03 +08:00
lVAL
24252fc5ff 添加活塞风井 2020-10-12 15:00:16 +08:00
lVAL
505a2d0770 修改链接地址为测试 2020-10-12 14:48:57 +08:00
lVAL
fae5fd0332 修改冲突 2020-10-12 14:33:22 +08:00
lVAL
dcd0c86998 修改代码-冲突 2020-10-12 14:32:30 +08:00
lVAL
b3c5f74c01 修改图片 2020-10-12 14:31:32 +08:00
lVAL
54925a77b6 修改冲突 2020-10-12 14:30:41 +08:00
lVAL
d141ec87ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/picture.js
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2020-10-12 14:30:12 +08:00
lVAL
68f6cb5841 增加图片 2020-10-12 14:28:25 +08:00
fan
7b1864ce77 merge 2020-10-12 14:27:34 +08:00
joylink_cuiweidong
b64b6936f1 竞赛 实操场景代码调整 2020-10-12 14:26:57 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
joylink_cuiweidong
32239c7346 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 13:49:05 +08:00
joylink_cuiweidong
a081499bff 竞赛 实操代码调整 2020-10-12 13:47:58 +08:00
zyy
b3af89582d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/picture.js
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2020-10-12 13:05:57 +08:00
zyy
d27266ab7a 调整线段画法 2020-10-12 13:04:13 +08:00
lVAL
b3ba6a0d73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 12:20:24 +08:00
lVAL
5893c6a2c1 增加图片 2020-10-12 12:20:07 +08:00
zyy
34fa34ba61 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 09:28:18 +08:00
zyy
d05cb2e3bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsSystem/stationConfig/index.vue
 2020-10-12 09:27:53 +08:00
sunzhenyu
7d1a852322 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 09:27:07 +08:00
sunzhenyu
330efdc434 隐藏三维轨迹线 2020-10-12 09:26:58 +08:00
zyy
19bf12c627 调整页面 2020-10-12 09:26:14 +08:00
joylink_cuiweidong
a15c1ac3e3 代码调整 2020-10-10 19:47:50 +08:00
joylink_cuiweidong
70c713e736 代码调整 2020-10-10 19:44:58 +08:00
joylink_cuiweidong
4357b5dac2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 19:28:33 +08:00
joylink_cuiweidong
ae55d28a38 场景编辑代码调整 2020-10-10 19:28:15 +08:00
lVAL
a8c7e81890 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 18:40:19 +08:00
lVAL
5167486c74 增加图片资源，增加图片旋转功能 2020-10-10 18:39:56 +08:00
sunzhenyu
006f93f0d3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 18:22:40 +08:00
sunzhenyu
895aae1438 修改三维static配置地址，修改三维驾驶车厢内视角位置，修改切换列车屏蔽门三维动画状态，修改三维沙盘信号机道岔动画播放 2020-10-10 18:22:30 +08:00
fan
4ada7f987a ibp盘问题调整 2020-10-10 18:05:34 +08:00
fan
aa00f27ecc ibp盘问题调整 2020-10-10 18:02:00 +08:00
fan
3191d3689f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 17:58:27 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
joylink_cuiweidong
c70af998d7 福州一号线 iscs 页面代码调整 2020-10-10 15:37:45 +08:00
joylink_cuiweidong
20be6012d8 福州一号线 iscs 界面代码调整 2020-10-10 15:03:05 +08:00
lVAL
b50f950b80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 14:03:37 +08:00
lVAL
a3f19c2c46 修改代码 2020-10-10 14:03:21 +08:00
joylink_cuiweidong
d77563e17a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 13:17:34 +08:00
joylink_cuiweidong
48bc783755 福州线 iscs 界面代码调整 2020-10-10 13:17:16 +08:00
fan
3beefa0cfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 13:12:34 +08:00
fan
37a47e4c9c 绘图问题调整 2020-10-10 13:12:24 +08:00
lVAL
22b48e7e78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 09:38:14 +08:00
lVAL
3ac15df91e 修改table的绘制表格的问题 2020-10-10 09:37:58 +08:00
fan
218901d806 调整设计平台登录路径 2020-10-10 09:30:45 +08:00
fan
2db65c3dd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 09:10:54 +08:00
fan
cd1f780dda 调整比例和画布计算顺序 2020-10-10 09:10:42 +08:00
joylink_cuiweidong
545dbe8e3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 19:47:12 +08:00
joylink_cuiweidong
cbdd8eb810 竞赛平台 运营统计数据提交代码调整 2020-10-09 19:46:54 +08:00
fan
5fec834c3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 17:27:57 +08:00
fan
77b1d7d5fb ibp调整&南铁院登录页 2020-10-09 17:27:46 +08:00
joylink_cuiweidong
fbb7784a5b 竞赛系统代码调整 竞赛场景编辑代码调整 2020-10-09 17:03:11 +08:00
joylink_cuiweidong
2ea45b05a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 14:38:15 +08:00
joylink_cuiweidong
68921f80ff 竞赛系统 场景加载 已经开始演出接口代码调整 2020-10-09 14:37:59 +08:00
lVAL
dbdb3f7e51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 13:16:49 +08:00
lVAL
d40821f404 增加部分图层 2020-10-09 13:16:34 +08:00
joylink_cuiweidong
c701ca11b2 哈尔滨一号线 行调仿真添加道岔的解封和单解操作 2020-10-09 11:30:57 +08:00
joylink_cuiweidong
03a3dd8b4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:58:09 +08:00
joylink_cuiweidong
fa4ada05e4 场景编辑代码调整 2020-10-09 10:57:52 +08:00
lVAL
96d77eb652 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:25:32 +08:00
lVAL
c53219ea25 编排 iscs系统下 “环境与设备监控系统” 的菜单 2020-10-09 10:25:11 +08:00
sunzhenyu
077e470aaf 修改三维静态文件cbtc路径 2020-10-09 10:02:16 +08:00
joylink_cuiweidong
cb369c9113 竞赛场景代码调整 2020-09-30 18:36:05 +08:00
joylink_cuiweidong
9c8af370fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 18:17:33 +08:00
joylink_cuiweidong
9885c50891 竞赛 场景代码调整 2020-09-30 18:16:08 +08:00
sunzhenyu
2ea728751f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 18:06:28 +08:00
sunzhenyu
f23bf269a0 修改三维编辑器轨道停车点显示，修改三维列车救援vr操作台逻辑 2020-09-30 18:06:20 +08:00
lVAL
3e623fe0a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 17:18:15 +08:00
lVAL
15a08feef8 补充优化键盘事件处理bug 2020-09-30 17:18:01 +08:00
joylink_cuiweidong
6a0fbe5dc5 福州一号线 iscs 系统代码调整 2020-09-30 16:57:38 +08:00
joylink_cuiweidong
ea8387bd23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:59:33 +08:00
joylink_cuiweidong
63e2957216 调度电话 仿真初始化代码调整 2020-09-30 15:59:19 +08:00
fan
46dca0d34b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:22:47 +08:00
fan
7cc1adf4ab 线路添加配置 2020-09-30 15:22:36 +08:00
joylink_cuiweidong
40753ee679 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:19:20 +08:00
joylink_cuiweidong
3a0b561aa0 竞赛场景 运营统计代码调整 2020-09-30 15:19:02 +08:00
lVAL
24326c4808 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 14:57:19 +08:00
lVAL
65c8aeffa5 删除打印 2020-09-30 14:57:08 +08:00
lVAL
ff3aa9bc45 补充修改card 复制粘贴的问题 2020-09-30 14:56:37 +08:00
fan
0b4d9b6483 调整平台路径 2020-09-30 11:17:55 +08:00
fan
817121f7ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 10:32:52 +08:00
fan
185b942a46 调整平台路径 2020-09-30 10:32:43 +08:00
joylink_cuiweidong
082144ee01 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 10:16:51 +08:00
joylink_cuiweidong
fc00a6c56f 哈尔滨线路 引导进路命令代码调整 2020-09-30 10:16:15 +08:00
lVAL
d331d4d2ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 09:54:38 +08:00
lVAL
1f14423567 修改 绘制card复制粘贴的bug 2020-09-30 09:54:26 +08:00
joylink_cuiweidong
97a58458b3 代码调整 2020-09-29 18:50:43 +08:00
joylink_cuiweidong
9f78bc530d 竞赛 会话代码调整 2020-09-29 18:44:04 +08:00
joylink_cuiweidong
773e61519d 调度电话代码调整 2020-09-29 17:46:42 +08:00
joylink_cuiweidong
e7cb90c1cb 调度电话代码调整 2020-09-29 15:57:50 +08:00
joylink_cuiweidong
a6458e1519 会话 全选车站代码调整 2020-09-29 13:30:12 +08:00
joylink_cuiweidong
a6bb1fb65a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 13:19:05 +08:00
joylink_cuiweidong
9141a6f92c 会话代码调整 3d挂载js路径修改 帮助文档路径修改 2020-09-29 13:18:31 +08:00
fan
f5a7b6220a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 09:40:51 +08:00
fan
3a99a68118 调整平台路径 2020-09-29 09:40:41 +08:00
joylink_cuiweidong
f39ee786b4 竞赛 场景代码调整 2020-09-29 09:31:29 +08:00
joylink_cuiweidong
dc930dae12 代码调整 2020-09-28 21:00:14 +08:00
joylink_cuiweidong
27d4c66c8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 20:54:59 +08:00
joylink_cuiweidong
ca84d29af9 场景代码调整 2020-09-28 20:54:34 +08:00
fan
82c2502cc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 16:32:47 +08:00
fan
4eab63d1f3 调整打包路径 2020-09-28 16:32:33 +08:00
joylink_cuiweidong
acc2a706ad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 14:03:22 +08:00
joylink_cuiweidong
bca528df88 竞赛 理论考试代码调整 / 竞赛 场景更新代码调整 2020-09-28 14:02:04 +08:00
lVAL
1f20911475 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 13:16:19 +08:00
lVAL
d5c9706311 增加绘制园以及修改圆的最小半径值 2020-09-28 13:15:54 +08:00
fan
d087505fea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 09:42:34 +08:00
fan
abc2ef4e62 问题数据兼容调整 2020-09-28 09:42:20 +08:00
lVAL
00d4976f66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 16:12:35 +08:00
lVAL
0e47dfcff1 适配图片APF 2020-09-27 16:12:25 +08:00
zyy
9d2836cf64 调整层级 2020-09-27 15:40:23 +08:00
zyy
bae0a26c64 调整层级 2020-09-27 14:45:15 +08:00
zyy
e4d673cdb0 调整层级 2020-09-27 14:44:59 +08:00
lVAL
e6074f491b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 14:29:45 +08:00
lVAL
7375020995 修改鼠标事件处理 2020-09-27 14:29:32 +08:00
zyy
18f370f36f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 13:41:41 +08:00
zyy
118f95efc4 调整ibp 触摸板 2020-09-27 13:41:25 +08:00
joylink_cuiweidong
c5fbc578db 竞赛 场景管理 创建的创建和查询接口代码调整 2020-09-27 11:22:48 +08:00
zyy
9c3158c080 Merge branch 'test' 
# Conflicts:
#	src/views/newMap/chatView/chatBox.vue
 2020-09-25 18:47:03 +08:00
zyy
13f4cccaae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:42:26 +08:00
zyy
f8d3b70021 调整会话流程 2020-09-25 18:41:59 +08:00
fan
7a37e5cf5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:20:07 +08:00
fan
a5c36b4fca 成员管理问题调整 2020-09-25 18:19:49 +08:00
sunzhenyu
99f7521952 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:11:38 +08:00
sunzhenyu
160d4f9d59 增加三维列车救援vr下操纵杆控制触发动画,增加三维编辑器区段平整功能 2020-09-25 18:09:13 +08:00
joylink_cuiweidong
2c27c5a62c 会话代码调整 2020-09-25 17:33:18 +08:00
joylink_cuiweidong
bc10b0cbb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 17:15:40 +08:00
joylink_cuiweidong
7460428838 会话代码调整 2020-09-25 17:15:25 +08:00
zyy
fa6f9d00f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 16:08:07 +08:00
zyy
4362038f13 调整综合监控元素绘制 2020-09-25 16:07:53 +08:00
joylink_cuiweidong
c1e1409119 宁波一号线 实训操作定义调整 2020-09-25 16:03:43 +08:00
joylink_cuiweidong
0f188a6dab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 15:23:39 +08:00
joylink_cuiweidong
69e935f559 宁波线进路 实训定义代码调整 2020-09-25 15:23:23 +08:00
zyy
bcdf1524cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 15:23:06 +08:00
zyy
55910a826b 调整会话 2020-09-25 15:22:54 +08:00
joylink_cuiweidong
dd9ffdeb52 删除不必要的文件 2020-09-25 14:48:09 +08:00
joylink_cuiweidong
4dfb904133 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 14:47:13 +08:00
joylink_cuiweidong
2386f424d4 竞赛 理论考试 代码调整 2020-09-25 14:46:57 +08:00
zyy
a0adc641b2 增加iconfont图标导入，调整逻辑 2020-09-25 13:58:41 +08:00
zyy
7fb7c0a819 调整代码 2020-09-24 19:04:33 +08:00
zyy
88ec572564 调整车站值班员按钮 2020-09-24 18:34:25 +08:00
zyy
8a28526fe1 调整样式 2020-09-24 17:55:06 +08:00
zyy
a5b954c017 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 17:26:12 +08:00
zyy
aa34210cae 调整会话框流程 2020-09-24 17:25:52 +08:00
joylink_cuiweidong
83793d75ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 13:42:16 +08:00
joylink_cuiweidong
fcf01baa53 竞赛 理论考试 练习模式代码调整 2020-09-24 13:42:01 +08:00
zyy
c71d4beb39 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 13:40:24 +08:00
zyy
be565e3711 调整道岔逻辑 2020-09-24 13:40:09 +08:00
joylink_cuiweidong
7753f831f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 18:44:24 +08:00
joylink_cuiweidong
d67aa6804f 竞赛 理论考试 代码调整 2020-09-23 18:44:00 +08:00
sunzhenyu
0202d20591 修改三维cctv速度 2020-09-23 16:39:16 +08:00
sunzhenyu
a3342d93ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 16:21:07 +08:00
sunzhenyu
5215064faa 增加三维vr列车抢修测试界面，修改三维哈尔滨本地文件列车 2020-09-23 16:20:50 +08:00
zyy
5109f7b558 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 10:38:35 +08:00
zyy
21f5208c21 调整综合监控 2020-09-23 10:38:22 +08:00
joylink_cuiweidong
dc8ae0bbfe iscs 绘图调整 2020-09-23 10:22:52 +08:00
joylink_cuiweidong
1faf2cbf91 代码调整 2020-09-22 18:47:34 +08:00
joylink_cuiweidong
465391b20e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 18:46:12 +08:00
zyy
0ed3d83273 调整表格配置 2020-09-22 18:45:20 +08:00
joylink_cuiweidong
d56e713232 iscs 系统代码调整 2020-09-22 18:45:00 +08:00
zyy
d93cbc4beb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 18:03:58 +08:00
zyy
2ef9409527 增加图片 2020-09-22 18:03:46 +08:00
joylink_cuiweidong
5d0f5ad4fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 17:51:32 +08:00
joylink_cuiweidong
f26726055c iscs 绘图代码调整 2020-09-22 17:51:15 +08:00
zyy
0a01ea04c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 17:12:39 +08:00
zyy
57de1331e2 调整福州一号线综合监控配置 2020-09-22 17:12:28 +08:00
fan
7b766e2a47 理论题库导入 2020-09-22 16:56:32 +08:00
fan
4a0509546f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 16:45:31 +08:00
fan
21d2a9953f 理论题库导入 2020-09-22 16:45:19 +08:00
fan
53d7586313 理论题库导入 2020-09-22 16:45:03 +08:00
joylink_cuiweidong
0c81fb8208 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 15:26:00 +08:00
joylink_cuiweidong
f2bbefc27e iscs 三角形绘图元素添加 2020-09-22 15:25:33 +08:00
sunzhenyu
7d31d198f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 15:17:06 +08:00
sunzhenyu
89fd0ec052 修改三维cctv移动鼠标卡顿，改用主线程渲染人物动画 2020-09-22 15:16:53 +08:00
joylink_cuiweidong
1e8577cefd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 11:31:35 +08:00
joylink_cuiweidong
d346ec8f2e iscs 系统代码调整 2020-09-22 11:31:18 +08:00
fan
8f3f722d4a sics文字矩形组合元素添加 2020-09-22 11:28:28 +08:00
fan
6a68147700 去除创建会话提示 2020-09-22 09:52:48 +08:00
fan
e4be43ad37 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 09:51:22 +08:00
fan
87bee8bcb5 iscs调整&去除创建会话提示 2020-09-22 09:51:01 +08:00
joylink_cuiweidong
e56731421f Merge remote-tracking branch 'remotes/origin/test' 2020-09-21 18:55:51 +08:00
joylink_cuiweidong
af7b9c5545 iscs系统页面代码调整 2020-09-21 18:55:23 +08:00
zyy
a620e029e0 调整绘图配置 2020-09-21 18:14:17 +08:00
zyy
212138f370 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 18:05:36 +08:00
zyy
dd99815868 福州一号线绘图配置 2020-09-21 18:05:25 +08:00
fan
893ecd7ff4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 17:39:18 +08:00
fan
8199d383fb iscs调整 2020-09-21 17:39:06 +08:00
joylink_cuiweidong
3bc037678d Merge remote-tracking branch 'remotes/origin/test' 2020-09-21 16:28:17 +08:00
joylink_cuiweidong
e094134960 剧本代码调整 2020-09-21 16:24:17 +08:00
joylink_cuiweidong
9e46bcdf37 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/switch/create.vue
 2020-09-21 16:20:34 +08:00
joylink_cuiweidong
0945448549 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 16:00:41 +08:00
joylink_cuiweidong
0b380b3b0f 福州线路iscs系统 样式调整 2020-09-21 16:00:24 +08:00
fan
99894a1443 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 14:29:23 +08:00
fan
bf4ce9d247 iscs调整 2020-09-21 14:29:02 +08:00
zyy
179ea283b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 14:24:04 +08:00
zyy
165cef3f69 调整文件路径 2020-09-21 14:23:51 +08:00
joylink_cuiweidong
a93adc7094 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 14:20:46 +08:00