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

3137 Commits

Author SHA1 Message Date
zyy
04622834bd 调整数据 2020-02-07 11:03:38 +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
c65429fc1c sics调整 2020-02-07 10:06:10 +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
fe43e82be9 iscs acs 站台界面绘制 2020-02-07 09:54:50 +08:00
joylink_cuiweidong
52d62a8e4f ics 扶梯绘图代码调整 2020-02-07 09:52:47 +08:00
zyy
197f3936a4 数据保存 2020-02-06 20:11:55 +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
zyy
ccc7cae9f5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-06 18:06:33 +08:00
zyy
08fde3c3f4 数据保存 2020-02-06 18:05:49 +08:00
joylink_fanyuhong
35a0acfa2c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-06 18:05:25 +08:00
joylink_fanyuhong
ca6c51d0cc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-06 18:05:12 +08:00
joylink_fanyuhong
fb13bcd484 iscs调整 2020-02-06 18:02:56 +08:00
joylink_cuiweidong
8762a9ef2f iscs 绘图代码调整 2020-02-06 17:55:08 +08:00
joylink_cuiweidong
6ce533be52 iscs 绘图代码调整 2020-02-06 17:54:37 +08:00
joylink_fanyuhong
cb2fa49f96 iscs调整 2020-02-06 17:08:01 +08:00
joylink_fanyuhong
95dbb60509 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-06 17:04:58 +08:00
joylink_fanyuhong
c03faf9946 iscs调整 2020-02-06 17:02:49 +08:00
zyy
f7a0f54376 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/deviceRender.js
#	src/iscs/constant/iscsData.js
 2020-02-06 16:58:09 +08:00
zyy
2ed2bd8332 数据提交 2020-02-06 16:56:24 +08:00
joylink_cuiweidong
81ea1a4d3a ISCS 绘图数据修改 2020-02-06 16:49:01 +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
2765e860ac iscs绘图 2020-02-06 14:33:21 +08:00
joylink_fanyuhong
00fe7cd40a iscs绘图 2020-02-06 13:56:21 +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
zyy
f219fe98bd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 13:17:40 +08:00
zyy
b7d10fa587 前台保存数据 2020-02-06 13:17:31 +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_fanyuhong
6e96c3d5b7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-06 09:42:18 +08:00
joylink_fanyuhong
e2a3b5d94a iscs调整 2020-02-06 09:42:07 +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
0000eb7bc1 iscs调整 2020-02-05 17:32:19 +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
zyy
694c0c441c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-05 17:21:50 +08:00
zyy
ebb1626edd 保存数据 2020-02-05 17:21:04 +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_fanyuhong
b9cfd28c17 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 16:53:46 +08:00
joylink_fanyuhong
96e11142ed iscs调整 2020-02-05 16:53:28 +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
1948f89856 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-02-05 16:25:24 +08:00
zyy
61f02f4616 调整基础线段元素 2020-02-05 16:24:19 +08:00
joylink_fanyuhong
72305c2228 iscs调整 2020-02-05 15:59:52 +08:00
joylink_fanyuhong
68a84c9d81 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 15:23:47 +08:00
joylink_fanyuhong
7da4f1f537 iscs调整 2020-02-05 15:23:35 +08:00
zyy
7df4ee07ce 调整iscs绘图canvas宽度 2020-02-05 15:15:53 +08:00
joylink_fanyuhong
180384404a iscs调整 2020-02-05 14:59:14 +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
0c02a1865b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 14:47:56 +08:00
zyy
d5ab36bc5b 增加信号机虚拟信号字段 2020-02-05 14:47:46 +08:00
joylink_fanyuhong
50c9ab0d96 iscs调整 2020-02-05 14:43:12 +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
zyy
1db679509f 调整车站包围框显示 2020-02-04 15:43:58 +08:00
joylink_zyy
732c80ca6d 调整道岔绘画方式，兼容哈尔滨线路道岔绘制方法 2020-02-04 14:28:18 +08:00
joylink_zyy
e598f8bfcf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-04 11:25:26 +08:00
joylink_zyy
b7dbb88984 增加双重判断内外站台显示 2020-02-04 11:25:21 +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
f11865385b 调整哈尔滨线路车站包围框显示 2020-02-03 17:26:17 +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
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
joylink_cuiweidong
87c2e61cdf iscs 系统 乘客信息 主画面 页面调整 2020-01-20 15:37:57 +08:00
zyy
9ea26b8f4f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/iscs/iscsSystem/config/pis/mainScreen.vue
 2020-01-20 14:05:09 +08:00
zyy
7fd8e11649 搭建iscs系统架子 2020-01-20 14:04:31 +08:00
fan
847b80e9d9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 11:10:37 +08:00
fan
b67fe4fd17 iscs PA界面调整 2020-01-20 11:09:12 +08:00
joylink_cuiweidong
cb21623773 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 11:05:16 +08:00
joylink_cuiweidong
2499c23a2b iscs 系统界面乘客信息代码调整 2020-01-20 11:05:05 +08:00
zyy
79f18c0c96 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 10:55:41 +08:00
zyy
8b68d80a81 调整模块iscs显示样式 2020-01-20 10:55:33 +08:00
joylink_cuiweidong
546fd73fd2 iscs 绘图组件调整 2020-01-20 10:15:14 +08:00
fan
6544f37307 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 09:55:20 +08:00
fan
3011285293 发布地图管理调整 2020-01-20 09:54:59 +08:00
joylink_cuiweidong
6d37d2aa16 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 09:26:11 +08:00
joylink_cuiweidong
33a1918b75 issc 组件代码修改 2020-01-20 09:25:58 +08:00
zyy
a033690502 调整综合监控文件位置及加载方式 2020-01-20 09:20:09 +08:00
fan
b2cd2dd4ca Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 09:06:15 +08:00
fan
0f93d8f203 iscs系统调整 2020-01-20 09:05:52 +08:00
joylink_cuiweidong
41db7b6494 iscs 组件代码调整 2020-01-19 19:10:56 +08:00
joylink_cuiweidong
10e2c426e9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:56:48 +08:00
joylink_cuiweidong
8d948c82b1 iscs系统 乘客信息页面调整 2020-01-19 18:56:36 +08:00
zyy
1e78cb64f8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:36:23 +08:00
zyy
f42c48a0c4 调整iscs为新的系统 2020-01-19 18:36:17 +08:00
joylink_cuiweidong
caed94f56d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:35:02 +08:00
joylink_cuiweidong
2d30c5f0e7 iscs 组件代码调整 2020-01-19 18:34:28 +08:00
fan
7048991824 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 17:34:25 +08:00
fan
155f8abb96 新版绘图停车点偏移量调整+国际化调整 2020-01-19 17:34:03 +08:00
fan
53a89cc970 iscs调整 2020-01-19 15:29:05 +08:00
joylink_cuiweidong
0d3a095a81 iscs 绘图组件代码调整 2020-01-19 14:56:22 +08:00
fan
40cca79ce8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:23:17 +08:00
fan
e858a6d25b iscs调整 2020-01-19 14:22:37 +08:00