Commit Graph

224 Commits

Author SHA1 Message Date
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