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

244 Commits

Author SHA1 Message Date
fan
b14a730bab 哈尔滨项目调整 2020-07-09 10:25:04 +08:00
fan
5b1aad5fc7 调整虚拟屏蔽门配置 2020-07-08 16:29:40 +08:00
fan
714113c819 设备登录调整 2020-07-08 15:40:55 +08:00
joylink_cuiweidong
f4f5173ea3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/system/deviceManage/editConfig.vue
 2020-07-07 18:26:56 +08:00
joylink_cuiweidong
ac9a39f94c 设备管理代码调整 2020-07-07 18:25:05 +08:00
fan
85210dbf18 设备登录调整 2020-07-07 18:22:54 +08:00
zyy
6b0d31dbbc 调整配置项 2020-07-07 17:37:45 +08:00
joylink_cuiweidong
e2af1335a3 修改枚举 2020-07-07 16:30:06 +08:00
joylink_cuiweidong
3480ebb7b0 设备管理代码调整 2020-07-07 16:09:14 +08:00
joylink_cuiweidong
c345a60997 项目登陆路径调整（变成 design/login?project=xxx） 2020-07-07 15:42:56 +08:00
fan
421e591f52 Merge remote-tracking branch 'origin/test_device_login' into test 
# Conflicts:
#	src/layout/components/Title.vue
#	src/views/demonstration/detail/index.vue
 2020-07-07 09:47:21 +08:00
fan
13a4ee614c 综合演练仿真调整 2020-07-01 18:52:29 +08:00
fan
8f4cecec0c 综合演练调整 2020-06-30 14:27:32 +08:00
zyy
e3ee44aae7 调整道岔失表状态，成都3号线实操定义 2020-06-28 13:27:10 +08:00
fan
d7a5b555a2 设备登录调整 2020-06-24 18:40:48 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
fan
4d3a1eed73 项目设备管理调整 2020-06-19 18:39:41 +08:00
fan
df983b2cb9 项目设备管理调整 2020-06-19 18:02:50 +08:00
fan
271ef9dc11 添加通用配置项noParkingSM，parkingSM 2020-06-15 18:37:48 +08:00
fan
c4ce6ae0f9 线路管理添加配置项-ctcOverlapOnlyTurnBackStationLock 2020-06-15 14:33:38 +08:00
fan
7d7583a7e2 时间表管理&添加通用配置项 2020-06-11 11:26:41 +08:00
joylink_cuiweidong
c953d98ffa 佛山线路 现地信号机 操作调整 2020-06-10 14:37:43 +08:00
joylink_cuiweidong
4118eb7a32 线路配置添加参数 列车控制模式/级别 2020-06-10 13:42:06 +08:00
joylink_cuiweidong
83e8a6658a 线路配置添加字段（道岔正/反操是否联动，道岔单解/锁是否联动，是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路） 2020-06-09 13:34:32 +08:00
zyy
ad3694c7f5 调整综合监控模型，调整信号机自动触发显示，综合监控数据保存 2020-06-02 18:05:35 +08:00
zyy
de49bba2ad 调整信号机流程 综合监控操作 2020-06-02 16:17:00 +08:00
zyy
d161492fed 添加题库管理流程 2020-05-26 15:59:11 +08:00
fan
d03b3c1978 存在仿真管理 2020-05-12 09:04:17 +08:00
fan
ac1d5bfdff 配置turefalse改为中文 2020-05-11 14:52:54 +08:00
fan
56ed2a4f8c 调整更新坐标&联锁配置项 2020-05-11 14:45:07 +08:00
fan
29881aab0b 添加地图数据维护中提示&存在仿真管理添加类型 2020-05-09 19:24:12 +08:00
fan
15104970bc 西安二信号机调整&线路配置添加参数 2020-04-30 16:19:33 +08:00
fan
1c8929cb08 绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整 2020-04-29 17:25:30 +08:00
fan
e10e0368e6 线路管理配置项样式调整 2020-04-28 17:03:23 +08:00
fan
f6dd06843f 线路管理配置项样式调整 2020-04-28 16:59:47 +08:00
fan
e77f5a3be6 线路配置管理 2020-04-28 09:56:03 +08:00
zyy
2210965709 调整系统关于vue报错误 2020-04-24 14:17:15 +08:00
fan
9c07e3968d 代码调整 2020-04-23 18:35:27 +08:00
fan
09abc2fbe1 项目配置全部提出到ProjectConfig 2020-04-16 17:11:46 +08:00
fan
d1e9fc1a11 西安地铁子系统生成定制添加 2020-04-16 16:25:49 +08:00
fan
a1869a531f 集中站分隔调整&线路管理配置调整 2020-04-15 14:13:08 +08:00
joylink_cuiweidong
4154b4ce20 系统指令字典添加 产品类型 参数 2020-04-08 15:59:49 +08:00
fan
437491c9e7 调整 2020-03-31 13:13:21 +08:00
fan
a3b6c3b59c 创建线下用户 2020-03-30 20:28:20 +08:00
fan
9c18770137 生成线下用户 2020-03-30 17:15:45 +08:00
fan
338a9e9683 生成线下用户 2020-03-30 16:52:53 +08:00
fan
238f8a3d88 生成线下用户 2020-03-30 15:29:07 +08:00
fan
b229e9c08a 生成线下用户 2020-03-30 15:28:13 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
fan
39420c1432 存在仿真管理调整 2020-03-24 09:23:24 +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
joylink_fanyuhong
09278e4b1e 排序操作 2020-03-03 18:47:32 +08:00
joylink_fanyuhong
e60fde1a5a 地图排序 2020-03-03 14:24:25 +08:00
joylink_fanyuhong
a853439255 地图排序 2020-03-03 11:08:41 +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
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
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
joylink_cuiweidong
0bb7b11271 iscs bas 状态管理代码调整 生成uid代码调整 组件代码调整 2020-01-17 17:27:11 +08:00
joylink_cuiweidong
7987f6bd12 iscs bas 组件 uid 代码修改 2020-01-17 15:42:20 +08:00
zyy
3ec7d0a7e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 15:32:08 +08:00
zyy
e4b20395c4 增加iscs系统，调整成都一号线运行图导入 2020-01-17 15:31:58 +08:00
joylink_cuiweidong
22419fa6c9 iscs bas 组件代码调整 2020-01-17 15:15:58 +08:00
fan
95e5c9f603 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 14:20:49 +08:00
fan
582fc354db 快速入口增加参数projectCode 2020-01-17 14:20:31 +08:00
zyy
d4b352d4ba Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 14:15:21 +08:00
zyy
b9de20f22a iscs绘制元素 2020-01-17 14:15:14 +08:00
joylink_cuiweidong
d7b43924bb iscs bas 组件代码调整 2020-01-17 14:10:40 +08:00
joylink_cuiweidong
219e24cbcd iscs bas 组件 添加 2020-01-17 13:37:08 +08:00
joylink_cuiweidong
45fafdd0ee iscs 排风机 冷水机组绘图代码调整 2020-01-17 11:07:44 +08:00
fan
fb08f43afd Merge remote-tracking branch 'origin/dev_iscs' into dev 2020-01-16 18:23:20 +08:00
fan
019ca66662 Merge remote-tracking branch 'origin/dev_iscs' into dev 2020-01-16 18:16:23 +08:00
joylink_cuiweidong
91c722f288 Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs 
# Conflicts:
#	src/iscs/constant/deviceRender.js
#	src/iscs/constant/deviceType.js
#	src/iscs/shape/factory.js
#	src/iscs/utils/parser.js
 2020-01-16 18:11:40 +08:00