joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
4,657 Commits 20 Branches 0 Tags 448 MiB
8059353f06
Commit Graph

2847 Commits

Author SHA1 Message Date
joylink_cuiweidong
518fc37db6 设计平台 公共地图 已发布地图列表 代码调整 2020-04-15 13:21:29 +08:00
joylink_cuiweidong
2a50ce7287 设计平台 加载计划运行图管理 创建通用运行图 地图过滤 2020-04-15 10:34:33 +08:00
joylink_cuiweidong
900b727fc4 新版地图数据校验文字调整 2020-04-15 09:37:42 +08:00
fan
2f6f75ff3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 18:52:19 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
joylink_cuiweidong
c6f532be4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 18:45:33 +08:00
joylink_cuiweidong
9ea5d7fdfb 新版地图信号机 区段前端校验 2020-04-14 18:45:14 +08:00
fan
4bbc0d648f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 15:46:36 +08:00
fan
61c2260d93 西安二号线调整 2020-04-14 15:45:13 +08:00
joylink_cuiweidong
ba666eb334 实训平台教学 代码调整 2020-04-14 14:51:14 +08:00
fan
7c9d9ef4c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 11:29:18 +08:00
fan
7086fb1db6 考试实训类型调整 2020-04-14 11:26:41 +08:00
zyy
cc984c8eb0 调整佛山线路，成都一号线运行图 方向信息 2020-04-14 10:27:33 +08:00
zyy
feca56f94b 调整字段名称显示，调整佛山线路标注字段 2020-04-14 09:48:54 +08:00
zyy
bd8c631d45 调整进路保存侧防列表字段 2020-04-13 19:13:52 +08:00
zyy
64279ed484 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 18:59:19 +08:00
zyy
b7edbc8697 侧防列表更新 2020-04-13 18:59:01 +08:00
fan
b7e6b9a8c1 佛山运行图导入上行时间调整&西安二号线车站调整 2020-04-13 18:30:21 +08:00
fan
20491dac81 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:13:52 +08:00
fan
f91c8e37d2 佛山运行图导入参数调整&西安二号线车站调整 2020-04-13 17:12:33 +08:00
zyy
2dc975ef7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:04:01 +08:00
zyy
df92090509 增加配置中侧防数据，调整接口 2020-04-13 17:03:48 +08:00
joylink_cuiweidong
8475870cf8 哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整 2020-04-13 14:54:35 +08:00
joylink_cuiweidong
fe41d48a73 旧版课程 实训定义 代码调整 2020-04-13 10:37:47 +08:00
joylink_zyy
826504d9c7 调整考试系统哈尔滨 现地不能操作 2020-04-11 11:20:22 +08:00
joylink_zyy
5296521a9c 调整实训平台哈尔滨现地操作不能触发 2020-04-10 21:46:23 +08:00
joylink_fanyuhong
f6be5ef329 试卷规则调整 2020-04-10 20:46:17 +08:00
fan
528aa24bd0 实训添加页面调整 2020-04-10 19:19:55 +08:00
sunzhenyu
2b0ee65a67 新数据三维区段模型自动生成修改，哈尔滨背景模型修改 2020-04-10 18:55:06 +08:00
fan
78d2271d2d 实训课程编辑路由调整 2020-04-10 17:54:24 +08:00
fan
08d02e9563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:51:36 +08:00
fan
b0797644f9 实训课程编辑调整&线二号线调整 2020-04-10 17:50:26 +08:00
zyy
2d70c294f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:24:12 +08:00
zyy
3bfb74d55b 调整绘图隐藏元素 2020-04-10 17:23:53 +08:00
joylink_cuiweidong
f0fc3712f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:54:34 +08:00
joylink_cuiweidong
c9f7a72d0b 代码调整 2020-04-10 16:54:17 +08:00
fan
26e9c33736 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:47:20 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
zyy
74942486fd Merge branch 'master' into test 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/index.vue
#	src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
 2020-04-10 16:43:40 +08:00
zyy
11eedc59ad 调整区段计算实际长度出现问题 2020-04-10 16:41:48 +08:00
zyy
f058795597 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:19:54 +08:00
zyy
057b627c0d 调整区段计算 2020-04-10 16:19:37 +08:00
sunzhenyu
8a1746e13f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:13:42 +08:00
sunzhenyu
ee0b0ba391 添加三维驾驶界面mmi站台，安全距离，行车登记，驾驶模式显示视图 2020-04-10 16:13:36 +08:00
joylink_cuiweidong
e3f5d5210b 代码调整 2020-04-10 16:00:38 +08:00
joylink_cuiweidong
e05057bf3f 宁波一号线 自动折返代码调整 2020-04-10 14:05:20 +08:00
zyy
48ca2388cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 11:20:04 +08:00
zyy
6c7cfe4648 调整逻辑区段重新生成及修改逻辑调整 2020-04-10 11:19:48 +08:00
fan
c1f6803fa5 宁波一号线:现地站台实训集中站显示切换切换问题 2020-04-10 11:05:20 +08:00
joylink_cuiweidong
9e45a0d342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 10:42:19 +08:00
joylink_cuiweidong
888ae6e936 宁波一号线 自动折返按钮实训操作代码调整 2020-04-10 10:41:41 +08:00
zyy
bacb6a9484 Merge branch 'master' into test 2020-04-10 10:18:13 +08:00
zyy
76851cdff2 调整区段字段显隐控制条件 2020-04-10 10:17:34 +08:00
zyy
db7acfd6c7 调整区段字段显隐 2020-04-10 10:10:44 +08:00
fan
5c55261f55 本地导入调整 2020-04-10 09:09:06 +08:00
fan
9f5644ccc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:57:03 +08:00
fan
1e4b7bbfd9 本地导入 2020-04-09 18:54:22 +08:00
zyy
e519aee3e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:39:42 +08:00
zyy
9b68feaba5 调整区段字段显隐判断 2020-04-09 18:39:27 +08:00
fan
991fa86ede Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:23:35 +08:00
fan
7e0834b13a 代码哈尔滨实训数据&本地导入导出 2020-04-09 18:22:10 +08:00
zyy
289f1dbff0 调整现地列车显示 2020-04-09 17:37:27 +08:00
fan
47e692d3a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:52:19 +08:00
fan
5036229c47 操作定义老地图处理 2020-04-09 16:51:17 +08:00
joylink_cuiweidong
3db904a75e 代码调整 2020-04-09 16:45:34 +08:00
fan
0adcf6dac1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:14:29 +08:00
fan
79f473ad8b 实训管理老地图处理（未完） 2020-04-09 16:11:36 +08:00
zyy
184ff9d1e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 15:21:57 +08:00
zyy
ee10377b04 调整区段字段显示逻辑，道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
fan
f2ba430cc5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:49:06 +08:00
fan
50579656eb 进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理（未完） 2020-04-09 14:47:44 +08:00
zyy
15df2687c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 13:45:18 +08:00
zyy
b6d03d24a8 调整区段绘制方式 2020-04-09 13:45:01 +08:00
joylink_cuiweidong
bcca3c5858 一键生成实训代码调整 2020-04-09 09:42:35 +08:00
zyy
78995be06f 调整右键点击道岔区段获取道岔菜单列表 2020-04-09 09:39:14 +08:00
joylink_cuiweidong
2ddd132327 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 09:23:25 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
fan
88bb30c413 实训管理调整（tabel 实训类型和操作不显示） 2020-04-08 18:47:48 +08:00
joylink_cuiweidong
4154b4ce20 系统指令字典添加 产品类型 参数 2020-04-08 15:59:49 +08:00
fan
b723628d80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:33:45 +08:00
fan
5bd90ea0d1 实训操作类型筛选调整 2020-04-08 15:32:35 +08:00
joylink_cuiweidong
053648e0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:29:16 +08:00
joylink_cuiweidong
1554803dd4 代码调整 2020-04-08 15:27:55 +08:00
zyy
14e4c2c785 调整 框选设置元素 设备集中站流程 2020-04-08 15:20:29 +08:00
fan
df0d560df8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 14:25:27 +08:00
fan
02d4b8f71f 进路复制 2020-04-08 14:24:11 +08:00
zyy
425b7d3869 Merge branch 'master' into test 2020-04-08 14:12:58 +08:00
fan
507e28adde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:25:45 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +08:00
joylink_cuiweidong
08a3480dad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/scripts/OperationConfig.js
 2020-04-08 13:10:31 +08:00
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00
zyy
a27ee1e859 调整一键生成实训延迟显示 2020-04-08 10:42:06 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成，调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
joylink_cuiweidong
778d74ecd5 北京一号线现地 道岔 站台实训操作步骤代码调整 2020-04-07 17:19:28 +08:00
fan
0079b698e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:45:48 +08:00
fan
88b4bcf2bb 指令接口调整 2020-04-07 16:44:36 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +08:00
zyy
f26eea8f4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:19:34 +08:00
zyy
402a383bf6 删除多余打印，调整名称 2020-04-07 16:19:24 +08:00
fan
87ddad535b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 14:41:38 +08:00
fan
6667adca07 实训调整 2020-04-07 14:40:24 +08:00
zyy
1f6b627768 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 13:38:28 +08:00
zyy
aa06844b18 地图绘制信号机增加偏移量字段 2020-04-07 13:37:17 +08:00
fan
6498f68295 宁波实训调整 2020-04-07 13:09:34 +08:00
zyy
d3f28ff338 Merge branch 'test' 2020-04-03 18:34:04 +08:00
joylink_cuiweidong
38a05e530d 北京一号线现地操作步骤代码调整 2020-04-03 16:31:57 +08:00
fan
19900d9816 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 13:36:59 +08:00
fan
ba759b1d77 哈尔滨本地项目调整 2020-04-03 13:33:33 +08:00
zyy
6fd9276fe8 调整实训步骤，及地图加载状态 2020-04-03 13:30:04 +08:00
zyy
e1d0aa6af5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 17:16:12 +08:00
zyy
34c7ad0fba 调整实训查询表头逻辑 2020-04-02 17:15:55 +08:00
fan
e45ec364a5 宁波实训跳转集中站 2020-04-02 16:52:59 +08:00
fan
e49f32d6b2 宁波实训跳转集中站 2020-04-02 16:28:07 +08:00
fan
a9294357b5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 16:24:04 +08:00
fan
523a1f9cd6 宁波实训跳转集中站 2020-04-02 16:22:53 +08:00
zyy
8fdd0d27bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/scripts/cmdPlugin/ValidateHandler.js
 2020-04-02 15:01:18 +08:00
zyy
dd26f5fd96 调整宁波一号线实训步骤定义 2020-04-02 15:00:28 +08:00
fan
75df1f7d2d 宁波考试&教学添加切换集中站 2020-04-02 14:46:21 +08:00
zyy
747595e8e8 Merge branch 'test' 2020-04-02 11:25:57 +08:00
zyy
8117a31c80 调整代码 2020-04-02 10:51:47 +08:00
sunzhenyu
bbd3a078c5 修改jl3dpassflow文件冲突 2020-04-01 18:46:58 +08:00
fan
9d02306fda Merge remote-tracking branch 'origin/test' 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/index.vue
 2020-04-01 18:00:58 +08:00
sunzhenyu
f31f048846 merge 2020-04-01 16:54:01 +08:00
fan
8f30d436ee 调整绘图&三维跳转页面icon 2020-04-01 16:24:03 +08:00
sunzhenyu
fba612403a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 16:03:16 +08:00
sunzhenyu
d7fd261c07 修改三维客流视图画面 2020-04-01 16:03:09 +08:00
fan
ebd90d2485 本地项目调整&elementUI升版本至2.12.0 2020-04-01 15:32:06 +08:00
fan
c1abbaed49 关闭gzip 2020-04-01 15:01:08 +08:00
joylink_cuiweidong
5d10d40ea3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 14:15:09 +08:00
joylink_cuiweidong
f64c7d5317 代码调整 2020-04-01 14:14:55 +08:00
fan
2a59c51b00 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 13:49:18 +08:00
joylink_cuiweidong
995460afdf 仿真界面添加列车详情 2020-04-01 12:53:58 +08:00
fan
b778621329 Merge branch 'dev_pack' into test 
# Conflicts:
#	package.json
#	vue.config.js
 2020-04-01 10:33:26 +08:00
fan
7df417424e 调整本地项目快速入口 2020-04-01 09:07:42 +08:00
joylink_cuiweidong
046cfe8318 Merge branch 'dev' into test 2020-03-31 19:13:42 +08:00
joylink_cuiweidong
06a6087f0c 代码调整 2020-03-31 19:12:30 +08:00
joylink_cuiweidong
955ddacbe0 Merge branch 'dev' into test 2020-03-31 19:09:06 +08:00
joylink_cuiweidong
bc6940f80b 仿真界面添加列车详情(未完成) 2020-03-31 19:06:23 +08:00
fan
eddca622df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-31 18:51:02 +08:00
fan
bfd5b07145 调整本地项目综合演练 2020-03-31 18:50:16 +08:00
sunzhenyu
ec0f59682b merge 2020-03-31 18:45:00 +08:00
sunzhenyu
3bbd28c17b 限制只有新数据有驾驶面板 2020-03-31 18:42:38 +08:00
sunzhenyu
d4f7da9c8b 添加驾驶操作面板，三维模型资源改本地 2020-03-31 18:30:15 +08:00
zyy
3ab182f3c4 调整逻辑区段显示，过滤框选逻辑区段 2020-03-31 17:52:53 +08:00
fan
335132c9b9 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 16:55:58 +08:00
fan
007c3658c6 调整本地项目 2020-03-31 16:54:04 +08:00
fan
e35149248d 调整本地项目 2020-03-31 15:11:20 +08:00
joylink_cuiweidong
3472860fbd 新版 剧本编制 添加动作指令操作添加 以及 动作指令展示 2020-03-31 14:52:19 +08:00
zyy
900489638c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-31 14:41:30 +08:00
zyy
1873898adc 调整回车内容不修改 2020-03-31 14:41:17 +08:00
fan
724e198f79 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 13:47:25 +08:00
fan
5563212ec0 调整哈尔滨项目 2020-03-31 13:45:45 +08:00
fan
28e8cf53af 调整icon图标 2020-03-31 13:33:09 +08:00
fan
437491c9e7 调整 2020-03-31 13:13:21 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
 2020-03-31 11:14:33 +08:00
fan
c7bd705726 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-31 10:06:56 +08:00
fan
d6e883e167 考试调整 2020-03-31 10:06:41 +08:00
zyy
1ad7265f58 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-31 09:43:01 +08:00
zyy
aaefa200c4 调整实训定义，调整提示逻辑 2020-03-31 09:42:46 +08:00
fan
e43ad1fa99 调整哈尔滨显示 2020-03-31 09:27:02 +08:00
fan
a3b6c3b59c 创建线下用户 2020-03-30 20:28:20 +08:00
fan
38bed2b045 Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 19:59:00 +08:00
fan
19d5f71596 调整哈尔滨打包设计平台 2020-03-30 19:58:37 +08:00
zyy
9412fd0740 计算区段实际长度保留小数点3位 2020-03-30 17:59:23 +08:00
zyy
38ada8ccb2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:54:01 +08:00
zyy
919639ad03 调整哈尔滨现地操作步骤流程完善 2020-03-30 17:53:44 +08:00
joylink_cuiweidong
d4f3a4afa2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:39:16 +08:00
joylink_cuiweidong
8c2f1cf729 新剧本 仿真类型切换代码调整 2020-03-30 17:39:00 +08:00
fan
2de6c8c787 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:16:16 +08:00
fan
9c18770137 生成线下用户 2020-03-30 17:15:45 +08:00
zyy
1e2a015955 调整区段实际长度逻辑 2020-03-30 17:07:51 +08:00
joylink_cuiweidong
0d5645a027 新版剧本接口代码调整 2020-03-30 16:56:38 +08:00
fan
5d21051eaa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:53:09 +08:00
fan
338a9e9683 生成线下用户 2020-03-30 16:52:53 +08:00
joylink_cuiweidong
68f77a25b6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:16:29 +08:00
joylink_cuiweidong
8f6f033870 剧本仿真切换仿真类型代码调整 2020-03-30 16:16:11 +08:00
zyy
af6eb5917f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:15:50 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
fan
238f8a3d88 生成线下用户 2020-03-30 15:29:07 +08:00
fan
343b8fd55e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 15:28:28 +08:00
fan
b229e9c08a 生成线下用户 2020-03-30 15:28:13 +08:00
joylink_cuiweidong
52dd666430 新版公共地图预览代码调整 2020-03-30 15:26:47 +08:00
fan
dee1efe00f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 13:07:32 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
zyy
c5dbd2b141 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2020-03-27 18:20:28 +08:00
zyy
47519b7040 调整道岔生成默认状态，调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
a8d9aa001c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 18:15:02 +08:00
fan
6ef1fc2013 实训调整 2020-03-27 18:14:46 +08:00
joylink_cuiweidong
93dc9a6983 新版剧本编制接口调整 2020-03-27 17:29:01 +08:00
zyy
a95e940255 调整实训步骤校验 2020-03-27 14:37:28 +08:00
fan
3a8a3b87d8 调整左边弹框显示 2020-03-27 14:01:57 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n 
# Conflicts:
#	src/views/designPlatform/demonList.vue
 2020-03-27 13:55:00 +08:00
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
joylink_cuiweidong
d4279dd03a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 11:31:53 +08:00
joylink_cuiweidong
966bed109b 新版剧本代码调整 2020-03-27 11:31:40 +08:00
zyy
faf772712c 调整增加自动生成实训操作步骤 2020-03-27 11:24:47 +08:00
sunzhenyu
b8d4cbcaba 将三维沙盘中设备信息按钮隐藏 2020-03-27 11:04:25 +08:00
fan
3c1d038a81 实训仿真调整 2020-03-27 10:51:49 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
zyy
aba49d9ee4 增加联锁表配置查询条件 2020-03-26 17:23:19 +08:00
fan
aadbe543a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-26 09:44:27 +08:00
zyy
a2875baa19 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 18:26:30 +08:00
zyy
41100ac9bf 调整宁波线路 道岔 封锁 单锁状态 2020-03-25 18:26:19 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
fan
1210496ecb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 15:24:08 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
zyy
f96c8a11ef Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 13:46:14 +08:00
zyy
d5c9799189 删除路径单元模块 新增设置站间运行等级 2020-03-25 13:45:58 +08:00
fan
df70024740 代码调整 2020-03-24 18:42:18 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +08:00
fan
9ff1d7e30c Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	src/store/modules/socket.js
 2020-03-24 10:13:01 +08:00
fan
e9aad944ae 绘图线条调整 2020-03-24 10:05:51 +08:00
fan
39420c1432 存在仿真管理调整 2020-03-24 09:23:24 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
fan
03df0aee07 登录页调整 2020-03-23 14:15:27 +08:00
fan
f574279afe Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 13:59:51 +08:00
fan
a85f1d8f5e 代码调整 2020-03-23 13:52:50 +08:00
zyy
72d27264f4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 13:48:56 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑，站台流程 2020-03-23 13:48:35 +08:00
fan
3b16939d1c Merge remote-tracking branch 'origin/dev' into test 2020-03-23 10:35:18 +08:00
fan
a435040ef1 综合演练调整 2020-03-23 10:30:23 +08:00
fan
88ca3a568e Merge remote-tracking branch 'origin/dev' into test 2020-03-20 18:51:36 +08:00
zyy
788737369a 调整哈尔滨线路 现地 行调 菜单高度 2020-03-20 17:56:20 +08:00
fan
cc6af4f056 综合演练调整 2020-03-20 17:36:07 +08:00
sunzhenyu
d55ca741dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-20 17:00:46 +08:00
sunzhenyu
0b6415b162 修改三维设备视图，修改站台模型贴图，修改客流量加载页面 2020-03-20 17:00:12 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev 
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
 2020-03-20 15:16:08 +08:00
fan
471fac0499 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 15:01:22 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
zyy
473d60ca0c Merge branch 'dev' into test 2020-03-20 13:08:35 +08:00
zyy
7f419b5bac Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
 2020-03-20 11:24:00 +08:00
zyy
3e14220cfc 调整综合监控站台数据，及样式 2020-03-20 11:20:13 +08:00
fan
cc21437843 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 11:09:16 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
joylink_cuiweidong
59f5336f8a 北京一号线信号机区段操作代码调整 2020-03-20 10:31:19 +08:00
sunzhenyu
3abc9fad16 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-20 09:55:23 +08:00
sunzhenyu
2760a4a678 修改三维客流视图加载界面，修改仿真站台模型 2020-03-20 09:55:13 +08:00
zyy
3b645724cc Merge branch 'dev' into test 2020-03-19 18:40:12 +08:00
fan
7de2c38af4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 16:17:53 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
joylink_cuiweidong
bd046abd8b Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-19 13:08:34 +08:00
joylink_cuiweidong
65566a1438 添加 贵州装备制造职业学院 案例展示 
北京一号线操作代码调整
 2020-03-19 13:06:48 +08:00
fan
73d763b700 Merge remote-tracking branch 'origin/dev' into test 2020-03-18 19:06:23 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
joylink_cuiweidong
0bba854e15 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 10:53:56 +08:00
joylink_cuiweidong
ce02703a5a 自动折返和自动进路按钮绘图代码调整 2020-03-18 10:53:42 +08:00
fan
aa97a242b1 绘图问题调整 2020-03-18 10:31:23 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +08:00
fan
43ffec406d 综合演练调整 2020-03-18 09:59:54 +08:00
zyy
12f283cbae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
#	src/views/newMap/newMapdraft/mapoperate/index.vue
 2020-03-18 09:12:18 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
3beb346ce1 功能按钮代码调整 2020-03-17 18:59:51 +08:00
fan
71d328296f 综合演练调整 2020-03-17 18:44:49 +08:00
joylink_cuiweidong
d8d143ae38 删除地图绘制中，车站里面的引导总锁 2020-03-17 17:59:47 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
fan
022cf8c6ac 代码调整 2020-03-17 10:07:02 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
zyy
933f0c1bba 调整综合演练ibp获取数据 2020-03-16 16:06:50 +08:00
fan
4ab462ed5d 合并代码 2020-03-16 15:32:00 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
1745bfbcf1 ibp盘绘制更新保存流程调整完成 2020-03-16 14:47:59 +08:00
zyy
1c78d52fed 调整ibp文件配置路径 2020-03-16 11:02:33 +08:00
joylink_zyy
0e570584bc 调整ibp绘制地图 2020-03-13 21:17:20 +08:00
zyy
5dbd676ccf 调整代码 2020-03-13 19:04:28 +08:00
zyy
ce21ff9d91 调整接口 2020-03-13 19:01:59 +08:00
fan
47a856e0c1 Merge remote-tracking branch 'origin/dev' into test 2020-03-13 18:24:11 +08:00
zyy
19f64034fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/theme/chengdu_01/model.js
#	src/utils/baseUrl.js
 2020-03-13 18:20:02 +08:00
fan
553900df47 调整成都三操作 2020-03-13 18:19:27 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
fan
a7b81a3383 调整车次窗初始显示 2020-03-13 16:35:03 +08:00
fan
6c52c3b56f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-13 13:25:54 +08:00
zyy
31d50d95e2 增加仿真系统 iscs工作站 2020-03-13 13:23:04 +08:00
fan
7753c53ee0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/shape/Train/index.js
 2020-03-13 13:08:18 +08:00
fan
4a2c539553 哈尔滨现地显示 2020-03-13 13:01:58 +08:00
zyy
cb4c615345 调整哈尔滨综合监控绘图宽度，高度显示， 综合监控名称动态显示 2020-03-12 18:36:05 +08:00
joylink_cuiweidong
a124110a86 Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-12 15:13:56 +08:00
joylink_cuiweidong
56126bdbf3 列车精确定位代码调整 
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
 2020-03-12 14:41:53 +08:00
zyy
b7ee3e5f6e 增加批量调整区段名称位置 2020-03-12 13:13:00 +08:00
joylink_cuiweidong
42010f4d8d Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-11 18:24:16 +08:00
fan
8ad0544dc2 创建小站台时，不设置区段为站台轨 2020-03-11 18:00:45 +08:00
fan
bd2938173a Merge remote-tracking branch 'origin/dev' into test 2020-03-11 16:59:47 +08:00
fan
939360917e 调整信号机接近区段颜色变化 2020-03-11 16:58:14 +08:00
fan
3273724484 调整自动折返非空校验 2020-03-11 15:50:47 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
sunzhenyu
b4d5363559 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-11 14:33:54 +08:00
fan
0aac76bb0e Merge remote-tracking branch 'origin/dev' into test 2020-03-11 10:54:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
sunzhenyu
d3d1909a82 新数据三维仿真优化 2020-03-10 18:57:13 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00
fan
2a61f97663 Merge remote-tracking branch 'origin/dev' into test 2020-03-09 18:39:30 +08:00
fan
d45950fa68 自动折返调整 2020-03-09 18:35:01 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00
zyy
e59fe1cae5 Merge branch 'dev' into test 2020-03-09 17:05:43 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
zyy
4eff0fc013 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
 2020-03-07 11:08:57 +08:00
joylink_fanyuhong
7f53be45b1 进路调整，绘图相关调整 
(cherry picked from commit e9749da)
 2020-03-06 20:42:04 +08:00
joylink_fanyuhong
e9749daddb 进路调整，绘图相关调整 2020-03-06 18:25:05 +08:00
zyy
93be0b7ff6 调整车站引导总锁在地图绘制中不显示，增加字体的默认状态 2020-03-06 12:18:04 +08:00
zyy
b2a154a3a4 增加车站 站台 屏蔽门批量设置功能 2020-03-06 12:04:00 +08:00
joylink_fanyuhong
e966312a03 Merge remote-tracking branch 'origin/dev' into test 2020-03-06 11:31:42 +08:00
zyy
6d0849f5b3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/utils/parser.js
 2020-03-06 10:23:14 +08:00
zyy
a1f752fe59 调整地图绘制矩形框保存字段 2020-03-06 10:21:41 +08:00
joylink_fanyuhong
99532acc8a Merge remote-tracking branch 'origin/dev' into test 2020-03-06 10:20:51 +08:00
joylink_fanyuhong
9200cb99f7 站台增加功能按钮，未完 2020-03-05 18:17:47 +08:00
joylink_fanyuhong
c9e8827c3a 合并代码 2020-03-05 16:43:53 +08:00
joylink_fanyuhong
8d58125e1f 自动进路和引导总锁 2020-03-05 16:39:49 +08:00
zyy
30c672026f 增加矩形包围框 2020-03-05 15:48:51 +08:00
joylink_cuiweidong
dc12bd3f88 成都一号线 信号机 信号自动通过 代码调整 
自动通过模式，自动触发模式 状态参数调整
 2020-03-05 13:40:50 +08:00
zyy
8e7fc5104a 调整lc模块保存，自动折返绘图状态配置，流程完善 2020-03-05 12:21:28 +08:00
zyy
af5c108610 创建自动折返模块 2020-03-04 20:59:16 +08:00
zyy
3a5804c578 调整宁波一号线道岔，区段封锁 单锁状态，调整zc模块与站台的关系 2020-03-04 18:03:50 +08:00
joylink_fanyuhong
e30010c016 Merge remote-tracking branch 'origin/dev' into test 2020-03-03 18:48:22 +08:00
joylink_fanyuhong
09278e4b1e 排序操作 2020-03-03 18:47:32 +08:00
joylink_fanyuhong
6a5295c0c7 Merge remote-tracking branch 'origin/dev' into test 2020-03-03 15:22:59 +08:00
joylink_fanyuhong
e60fde1a5a 地图排序 2020-03-03 14:24:25 +08:00
joylink_fanyuhong
a853439255 地图排序 2020-03-03 11:08:41 +08:00
joylink_fanyuhong
692f30fd9f 运行图导入和列车调整 2020-03-02 14:46:59 +08:00
sheng
8dc726bbe1 Merge remote-tracking branch 'origin/dev' into test 2020-03-01 18:39:35 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_fanyuhong
d5539a986b 按计划行车接口报错提示 
(cherry picked from commit 1abad25)
 2020-02-28 11:28:13 +08:00
joylink_fanyuhong
ee33dec8a1 Merge remote-tracking branch 'origin/dev' into test 2020-02-27 22:18:42 +08:00
joylink_fanyuhong
41bc739eab 运行图预览 2020-02-27 22:09:51 +08:00
joylink_fanyuhong
40c8ee9c0c 调整运行图预览尺寸 2020-02-27 16:57:51 +08:00
joylink_fanyuhong
040636e2ce 调整运行图预览尺寸 2020-02-27 16:52:48 +08:00
joylink_fanyuhong
d85f8ea5a8 仿真调整 2020-02-27 16:30:48 +08:00
joylink_fanyuhong
c3ca956bd5 仿真调整 2020-02-26 11:34:50 +08:00
joylink_cuiweidong
b221e8e6b9 车站添加 是否车辆段／停车场 是否折返车站字段 2020-02-25 10:52:13 +08:00
joylink_fanyuhong
aa0f770630 仿真调整 2020-02-24 17:04:39 +08:00
sunleking
917acf6df1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-02-20 18:00:40 +08:00
sunleking
7eda57b08c 三维客流模拟加入监控多视角，拆分模型加载 2020-02-20 18:00:27 +08:00
sheng
9f43749e8c Merge remote-tracking branch 'origin/dev' into test 2020-02-18 23:29:04 +08:00
joylink_fanyuhong
412e6bd582 列车调整 2020-02-18 19:24:52 +08:00
sunleking
338f9a75e8 三维客流视图追加人物模型动画 2020-02-18 17:55:29 +08:00
joylink_fanyuhong
c14043f93b 自动进路调整 2020-02-18 14:45:32 +08:00
sunleking
9babb6e9a2 添加新数据显示客流量模拟 2020-02-17 09:41:18 +08:00
sunleking
61394c4b39 增加三维客流量模块，目前完成了基础的行走状态控制流程 2020-02-14 18:22:11 +08:00
joylink_fanyuhong
a42f1368ae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-14 18:08:10 +08:00
joylink_fanyuhong
2cd2f93c20 状态调整 2020-02-14 18:07:54 +08:00
zyy
3f5d74426e 更新数据 2020-02-14 11:22:35 +08:00
zyy
9c48c653d0 调整请求参数 2020-02-13 13:59:10 +08:00
zyy
0d91bc7c49 调整时间格式 2020-02-13 13:42:19 +08:00
zyy
f82c4a195e 调整创建运行图表单数据 2020-02-13 12:35:44 +08:00
zyy
42c11d0b7c 修改创建运行图表单 2020-02-13 12:14:39 +08:00
joylink_cuiweidong
39f445ac3b iscs 系统代码调整 2020-02-12 14:52:50 +08:00
joylink_fanyuhong
86c6ac4a57 进路选中切除状态调整 2020-02-11 15:58:54 +08:00
zyy
fbcaacce01 修改代码添加中间状态转换层 2020-02-11 14:50:56 +08:00
zyy
b73b81d212 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-10 16:27:52 +08:00
zyy
e884f3adc6 新增创建运行图表单 2020-02-10 16:27:43 +08:00
joylink_cuiweidong
73ee89f299 iscs 代码调整 2020-02-10 11:17:51 +08:00
sheng
11a36646ea Merge remote-tracking branch 'origin/dev' into test 2020-02-07 22:30:43 +08:00
joylink_cuiweidong
974e0ecc0d iscs 代码调整 2020-02-07 20:09:51 +08:00
joylink_cuiweidong
416766cb3e iscs 绘图显示 2020-02-07 20:02:36 +08:00
joylink_cuiweidong
a11556643a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-07 19:53:50 +08:00
joylink_cuiweidong
222462d289 iscs 绘图代码调整 2020-02-07 19:12:35 +08:00
joylink_fanyuhong
60d6ab5db9 iscs调整 2020-02-07 18:59:48 +08:00
joylink_fanyuhong
789d9c8be9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-07 18:40:26 +08:00
joylink_fanyuhong
13e2e69368 iscs调整 2020-02-07 18:40:16 +08:00
zyy
13fcc80c41 desc: 增加状态 2020-02-07 18:19:56 +08:00
joylink_fanyuhong
41f43f9d08 iscs调整 2020-02-07 14:43:27 +08:00
joylink_fanyuhong
e00e9e1802 Revert "iscs 绘图数据修改" 
This reverts commit 169035c
 2020-02-07 12:12:47 +08:00
joylink_fanyuhong
ed49b80e1d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
 2020-02-07 11:58:43 +08:00
joylink_fanyuhong
cc1765c43a iscs调整 2020-02-07 11:56:19 +08:00
joylink_cuiweidong
169035cddf iscs 绘图数据修改 2020-02-07 11:25:27 +08:00
zyy
f5af476867 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-07 10:50:44 +08:00
zyy
f9eee573b2 绘图显示在iscs界面上 2020-02-07 10:48:48 +08:00
joylink_fanyuhong
6604c4eb00 sics调整 2020-02-07 10:17:49 +08:00
joylink_fanyuhong
e183991b01 sics调整 2020-02-07 10:05:51 +08:00
joylink_fanyuhong
a4109e6ae9 iscs调整 2020-02-07 10:01:15 +08:00
joylink_cuiweidong
ec5e77ed0a iscs 绘图代码修改 2020-02-07 09:58:08 +08:00
joylink_cuiweidong
52d62a8e4f ics 扶梯绘图代码调整 2020-02-07 09:52:47 +08:00
zyy
4a9b866cc4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 19:43:55 +08:00
zyy
395702e6e6 数据更新 2020-02-06 19:43:46 +08:00
joylink_cuiweidong
3ab8c10f45 iscs fas 闸机绘图代码修改 2020-02-06 19:09:41 +08:00
joylink_fanyuhong
a11195a509 iscs调整 2020-02-06 18:14:13 +08:00
joylink_cuiweidong
6ce533be52 iscs 绘图代码调整 2020-02-06 17:54:37 +08:00
joylink_cuiweidong
0e10532316 iscs 绘图代码调整 2020-02-06 15:04:48 +08:00
joylink_fanyuhong
291af56b2f iscs调整 2020-02-06 14:54:19 +08:00
joylink_fanyuhong
f33fbbfb52 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-06 13:39:23 +08:00
joylink_fanyuhong
3bd848cc15 iscs调整 2020-02-06 13:36:42 +08:00
joylink_cuiweidong
69093e5662 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 12:19:57 +08:00
joylink_cuiweidong
a3679ef169 iscs 绘图元素 闸机添加是否右向属性 2020-02-06 12:17:33 +08:00
zyy
3053bdc26e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 11:20:27 +08:00
zyy
0f4e64b0fc 增加报警系统数据 2020-02-06 11:20:16 +08:00
joylink_cuiweidong
f29b10e2d7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 10:42:29 +08:00
joylink_cuiweidong
2c4f91d7ab iscs 绘图代码修改 2020-02-06 10:29:59 +08:00
zyy
a54616fc2c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-06 10:24:18 +08:00
zyy
963c6e8f84 调整绘图元素 2020-02-06 10:23:20 +08:00
joylink_cuiweidong
5c550ed2bf iscs 绘图线段代码调整 2020-02-05 19:12:13 +08:00
joylink_cuiweidong
1c93f243e8 iscs afc acs 绘图元素代码调整 2020-02-05 17:48:27 +08:00
joylink_cuiweidong
7820e64371 iscs psd 绘图元素修改代码调整 2020-02-05 17:43:15 +08:00
joylink_fanyuhong
7ce1b02447 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 17:30:32 +08:00
joylink_fanyuhong
f12fabfd8e iscs调整 2020-02-05 17:30:12 +08:00
joylink_cuiweidong
3133025fc9 iscs fas 元素修改代码调整 2020-02-05 17:16:11 +08:00
joylink_cuiweidong
544b930e48 iscs 矩形右键代码调整 2020-02-05 17:06:42 +08:00
joylink_cuiweidong
e560ee0e02 iscs 矩形和文字 右键操作修改 2020-02-05 17:05:57 +08:00
zyy
1673c5ad7f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/views/iscs/iscsDraw/iscsCommonElem/line.vue
#	src/views/iscs/iscsDraw/iscsOperate/index.vue
 2020-02-05 16:58:51 +08:00
zyy
a0ac36401b 调整报警系统绘图基础元素问题 2020-02-05 16:57:01 +08:00
joylink_cuiweidong
7119dc204c iscs 右键操作代码调整 2020-02-05 16:41:16 +08:00
joylink_cuiweidong
960d8e6902 ISCS 绘制右键操作修改 2020-02-05 16:33:23 +08:00
zyy
61f02f4616 调整基础线段元素 2020-02-05 16:24:19 +08:00
zyy
7df4ee07ce 调整iscs绘图canvas宽度 2020-02-05 15:15:53 +08:00
joylink_fanyuhong
8260a67a2d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 14:55:51 +08:00
joylink_fanyuhong
7a86276e9f iscs调整 2020-02-05 14:55:32 +08:00
zyy
d5ab36bc5b 增加信号机虚拟信号字段 2020-02-05 14:47:46 +08:00
joylink_cuiweidong
61eb7c5e44 iscs 闭路电视 车站时序编辑页面调整 2020-02-05 14:01:54 +08:00
zyy
57fcf95047 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 12:22:06 +08:00
zyy
aa709a546d 增加前台保存iscs 2020-02-05 12:21:56 +08:00
joylink_fanyuhong
3c4ade2979 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 12:14:21 +08:00
joylink_fanyuhong
f32465165e iscs增加基础元素文字线段矩形 2020-02-05 12:14:10 +08:00
zyy
252b3b5871 增加门禁绘图 2020-02-05 10:22:22 +08:00
zyy
ab0728d973 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 10:17:11 +08:00
zyy
4df54dae1a 归类iscs绘图分类 2020-02-05 10:16:59 +08:00
joylink_cuiweidong
a851a50f5a iscs 闭路电视 车站时序编辑页面 2020-02-04 19:04:29 +08:00
joylink_fanyuhong
2e7bc81e6b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-04 18:24:56 +08:00
joylink_fanyuhong
720ec4b0ce iscs交互处理 2020-02-04 18:24:31 +08:00
joylink_cuiweidong
28294ceb2f fiscs 闭路电视车站时序页面修改 2020-02-04 17:55:28 +08:00
joylink_cuiweidong
7a07d12e67 iscs 闭路电视 车站时序 车站控制页面布局调整 2020-02-04 11:14:51 +08:00
joylink_zyy
3490c68e83 调整站台属性增加内外站台属性 2020-02-04 11:01:50 +08:00
joylink_cuiweidong
458e401f38 iscs 闭路电视 车站控制 页面调整 2020-02-03 18:31:11 +08:00
joylink_fanyuhong
55a38da7e4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-03 18:20:46 +08:00
joylink_fanyuhong
d65e141242 iscs调整 2020-02-03 18:20:36 +08:00
joylink_cuiweidong
35494c1480 iscs 闭路电视 车站控制页面布局 2020-02-03 17:33:08 +08:00
joylink_zyy
4464229ac5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-03 17:18:02 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑，增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00
joylink_cuiweidong
d285265293 代码调整 2020-02-03 13:54:29 +08:00
joylink_cui
4a441311ba iscs 乘客信息计时一览 页面样式调整 2020-02-03 13:32:37 +08:00
joylink_cuiweidong
8606bf6e06 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 18:06:46 +08:00
joylink_cuiweidong
751d9d13b1 iscs系统 乘客信息 计时一览代码调整 2020-01-21 18:06:28 +08:00
zyy
12377d8704 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 16:44:53 +08:00
zyy
610dff44d4 增加机电样式 2020-01-21 16:44:46 +08:00
joylink_cuiweidong
2ee83398c4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 16:18:47 +08:00
joylink_cuiweidong
b11ad0cc4f 新版地图 自动信号列表 添加自动信号名称筛选 
连锁出清区段限制为物理区段和道岔区段
 2020-01-21 16:18:33 +08:00
fan
9130b7752a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 16:06:03 +08:00
fan
35a94fd31d 广播页面调整 2020-01-21 16:05:52 +08:00
joylink_cuiweidong
8f191be794 新版绘图 自动信号 出清区段非必填修改 2020-01-21 14:25:36 +08:00
zyy
1501124923 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 10:23:58 +08:00
zyy
6bd3ad8b42 调整机电控制模式样式 2020-01-21 10:23:52 +08:00
joylink_cuiweidong
8b574e723f iscs 系统滚动条样式调整 2020-01-21 09:28:14 +08:00
fan
69d624465f Merge remote-tracking branch 'origin/dev' into test 2020-01-20 18:40:03 +08:00
fan
17783e0147 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:34:13 +08:00
fan
5f014536cf PA调整 2020-01-20 18:33:47 +08:00
joylink_cuiweidong
e4d1ec8eb4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:30:09 +08:00
joylink_cuiweidong
e9f52faf89 iscs 系统代码调整 2020-01-20 18:29:51 +08:00
zyy
f2cc16c03f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:29:12 +08:00
zyy
5771905881 增加机电控制模式 2020-01-20 18:29:06 +08:00