Commit Graph

278 Commits

Author SHA1 Message Date
fan
deb60acd14 绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整 2020-07-31 15:53:25 +08:00
fan
65d25678db plc网关配置调整&考试试卷问题调整 2020-07-31 10:37:50 +08:00
fan
a5f6517ab8 设备管理IBP添加配置项 2020-07-27 15:33:54 +08:00
fan
a74993f217 添加地图配置项rmAtpSpeed,urmAtpSpeed&调整课程创建 2020-07-27 14:11:43 +08:00
fan
7a783cf032 项目设备大屏调整 2020-07-22 14:59:00 +08:00
fan
5a716b335f ibp设备配置调整 2020-07-21 10:03:13 +08:00
fan
0c08e93ba1 websocket调整&ibp设备配置调整 2020-07-21 10:01:19 +08:00
fan
a1895d4e7f 参数名称修改 2020-07-20 17:19:05 +08:00
fan
ceb0d0803d 参数名称修改 2020-07-20 17:04:36 +08:00
fan
7b92d4775a 设备配置调整 2020-07-20 17:00:59 +08:00
fan
60ca3e7376 设备配置调整 2020-07-20 16:54:10 +08:00
fan
a5961f5651 设备配置title调整 2020-07-20 16:04:43 +08:00
fan
0403b249a1 设备配置调整 2020-07-20 16:00:27 +08:00
fan
00608f2cb2 heb取消无法登录提示&会话、设备代码调整 2020-07-20 15:19:11 +08:00
fan
01174384ff 设备配置添加显示条件 2020-07-20 14:00:47 +08:00
zyy
b071b00d21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/system/commandDictionary/copyParam.vue
2020-07-20 13:31:02 +08:00
fan
00a98a5b14 merger 2020-07-20 13:29:32 +08:00
zyy
9e90adf9e9 调整指令复制接口 2020-07-20 13:29:22 +08:00
fan
18344338c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 11:18:34 +08:00
fan
05cf1251b9 psl添加关联屏蔽门属性 2020-07-20 11:18:19 +08:00
zyy
7bd6013565 增加指令字典 复制操作 2020-07-20 10:47:27 +08:00
zyy
e0f7175923 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 18:28:56 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
fan
f954e3cf53 设备配置调整 2020-07-17 17:20:32 +08:00
fan
fefd4b53b6 会话调整&设备配置调整 2020-07-17 16:35:24 +08:00
fan
c537063f8a 设备配置调整 2020-07-17 14:32:33 +08:00
fan
b49aa386dd 设备配置调整 2020-07-17 13:05:18 +08:00
fan
0a50c69b2c 设备配置调整 2020-07-16 19:11:20 +08:00
fan
c761e07ba2 设备配置调整 2020-07-16 13:31:05 +08:00
fan
803941e838 设备管理道岔配置调整 2020-07-15 16:11:58 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
fan
4098cba048 heb替换hyd 2020-07-09 18:04:11 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
e658fb7889 哈尔滨项目调整 2020-07-09 11:07:04 +08:00
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