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

2091 Commits

Author SHA1 Message Date
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
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
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
zyy
9d0c88633d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:21:28 +08:00
zyy
323eda0e07 调整iscs样式 2020-01-19 14:21:22 +08:00
joylink_cuiweidong
8b47257b6e iscs 组件代码调整 2020-01-19 14:15:09 +08:00
joylink_cuiweidong
0247dce3aa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:09:31 +08:00
joylink_cuiweidong
1d56688732 iscs 各组件生成uid方法修改 2020-01-19 14:09:15 +08:00
fan
0f50e1b00a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:03:51 +08:00
fan
df39d836dc iscs调整 2020-01-19 14:03:32 +08:00
joylink_cuiweidong
d8086e1311 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/utils/parser.js
 2020-01-19 13:52:24 +08:00
joylink_cuiweidong
d957ea049b iscs 生成uid代码调整 2020-01-19 13:49:55 +08:00
zyy
298dddf718 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 11:22:58 +08:00
zyy
2d5074d6d1 增加进路数据状态维护 2020-01-19 11:22:48 +08:00
fan
d9c15d961e 连接真实设备按钮仅车站值班员可见 2020-01-19 11:17:51 +08:00
fan
ea74886ba3 调整打开新页面时sessionStorage复制导致的路由处理错误 2020-01-19 10:26:40 +08:00
fan
15ca63be84 iscs调整 2020-01-19 10:05:55 +08:00
fan
d744d7a69e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/iscs/constant/deviceRender.js
#	src/iscs/constant/deviceType.js
#	src/iscs/shape/factory.js
#	src/iscs/utils/parser.js
 2020-01-17 18:49:15 +08:00
fan
87e62a6631 iscs综合监控 2020-01-17 18:45:28 +08:00
zyy
0bee3cc61d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 17:48:15 +08:00
zyy
1779f856be 新增iscs系统 2020-01-17 17:48:08 +08:00