fan
|
588f77173a
|
行调大赛理论考试&福州Iscs
|
2020-09-17 15:36:46 +08:00 |
|
fan
|
0abd0aaba5
|
福建综合监控
|
2020-09-17 09:01:22 +08:00 |
|
fan
|
fbda89c39e
|
iscs调整
|
2020-08-12 15:19:38 +08:00 |
|
fan
|
30e30d5ef3
|
佛山线路问题调整&iscs样式调整
|
2020-08-12 11:02:47 +08:00 |
|
fan
|
8687650e41
|
ibp系统调整&发布地图管理调整
|
2020-08-11 14:34:17 +08:00 |
|
fan
|
86c7e44876
|
iscs调整
|
2020-06-24 15:02:09 +08:00 |
|
zyy
|
7f242ba443
|
调整综合监控绘图元素， 调整按图折返配置
|
2020-06-16 16:39:07 +08:00 |
|
zyy
|
dfdbddad2b
|
调整综合监控数据，调整地图绘制功能按钮显示状态逻辑判断
|
2020-06-16 14:45:34 +08:00 |
|
zyy
|
428967e843
|
调整地图绘制右键菜单样式，调整道岔触发居中，绘制综合监控数据
|
2020-06-15 16:13:28 +08:00 |
|
zyy
|
24acb1ba86
|
调整配置，增加综合监控数据
|
2020-06-11 14:48:40 +08:00 |
|
zyy
|
015dd9e113
|
调整综合监控数据，调整绘图
|
2020-06-09 17:48:08 +08:00 |
|
zyy
|
768c62333c
|
调整站台操作，增加综合监控调节
|
2020-06-05 18:04:27 +08:00 |
|
zyy
|
fbf26cfafc
|
调整综合监控绘图元素，保存绘图数据
|
2020-06-05 13:24:38 +08:00 |
|
zyy
|
f4fca9a083
|
调整策略右键弹出窗口，增加综合监控元素配置
|
2020-06-05 10:32:32 +08:00 |
|
zyy
|
5a9a837e02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
# src/utils/baseUrl.js
# src/views/iscs/iscsDraw/iscsBasOperate/index.vue
|
2020-06-04 17:32:45 +08:00 |
|
zyy
|
9be9c9a313
|
增加西安 三号线设置折返策略元素
|
2020-06-04 17:29:18 +08:00 |
|
fan
|
5ad0464fcd
|
iscs调整
|
2020-06-04 11:17:43 +08:00 |
|
fan
|
44bb0f0f29
|
实操竞赛调整
|
2020-06-03 18:17:52 +08:00 |
|
fan
|
f6997d3bd9
|
合并代码
|
2020-06-03 14:30:14 +08:00 |
|
fan
|
8bf9f77e0b
|
西安三号线控制权调整&iscs调整
|
2020-06-03 14:27:54 +08:00 |
|
zyy
|
631fba04bb
|
调整道岔佛山线路显示， 综合监控元素添加
|
2020-06-03 10:12:36 +08:00 |
|
zyy
|
ad3694c7f5
|
调整综合监控模型，调整信号机自动触发显示，综合监控数据保存
|
2020-06-02 18:05:35 +08:00 |
|
zyy
|
a1978bd266
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsDraw/iscsCommonElem/button.vue
|
2020-06-02 16:17:53 +08:00 |
|
zyy
|
de49bba2ad
|
调整信号机流程 综合监控操作
|
2020-06-02 16:17:00 +08:00 |
|
fan
|
e473199e24
|
iscs调整
|
2020-06-02 16:12:34 +08:00 |
|
fan
|
d93e40ab48
|
iscs调整
|
2020-06-01 18:33:17 +08:00 |
|
joylink_cuiweidong
|
a354264097
|
竞赛代码调整
|
2020-05-26 13:03:37 +08:00 |
|
joylink_cuiweidong
|
597f5cb990
|
代码调整
|
2020-05-09 16:39:33 +08:00 |
|
fan
|
cd57807d1f
|
iscs状态表调整
|
2020-05-09 09:26:19 +08:00 |
|
fan
|
f6b6dd2f46
|
iscs状态表调整
|
2020-05-09 09:15:13 +08:00 |
|
joylink_cuiweidong
|
107cc4b73b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-08 18:37:56 +08:00 |
|
joylink_cuiweidong
|
76fd09cf08
|
iscs 绘图代码调整
新版地图 交路绘图代码调整
|
2020-05-08 18:37:00 +08:00 |
|
fan
|
d7da333e07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-08 17:20:52 +08:00 |
|
fan
|
d524dc9d4d
|
iscs调整
|
2020-05-08 17:20:43 +08:00 |
|
joylink_cuiweidong
|
0200d8acf9
|
iscs 绘图代码调整
|
2020-05-08 14:17:51 +08:00 |
|
joylink_cuiweidong
|
01ff826744
|
iscs 绘图调整
|
2020-05-08 10:18:47 +08:00 |
|
joylink_cuiweidong
|
2084f4cf03
|
iscs 绘图代码调整
|
2020-05-07 18:15:13 +08:00 |
|
joylink_cuiweidong
|
d2586049e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
# src/views/iscs/iscsSystem/config/index.vue
|
2020-05-07 16:47:52 +08:00 |
|
fan
|
62d12e8ed5
|
iscs调整图元说明公共区域
|
2020-05-07 16:39:38 +08:00 |
|
joylink_cuiweidong
|
11e1c23402
|
iscs 绘图代码调整
iscs 绘图 添加虚线
iscs 绘图数据调整
|
2020-05-07 16:38:24 +08:00 |
|
fan
|
0f81decc2c
|
iscs调整
|
2020-05-07 13:49:03 +08:00 |
|
fan
|
ed3f1cee82
|
iscs调整&新版考试实训类型匹配
|
2020-05-07 10:16:15 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
joylink_cuiweidong
|
73ee89f299
|
iscs 代码调整
|
2020-02-10 11:17:51 +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 |
|
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_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_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
|
7a86276e9f
|
iscs调整
|
2020-02-05 14:55:32 +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
|
f32465165e
|
iscs增加基础元素文字线段矩形
|
2020-02-05 12:14:10 +08:00 |
|
joylink_cuiweidong
|
546fd73fd2
|
iscs 绘图组件调整
|
2020-01-20 10:15:14 +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 |
|
zyy
|
a033690502
|
调整综合监控文件位置及加载方式
|
2020-01-20 09:20:09 +08:00 |
|