Commit Graph

200 Commits

Author SHA1 Message Date
joylink_cuiweidong
48bc783755 福州线 iscs 界面代码调整 2020-10-10 13:17:16 +08:00
joylink_cuiweidong
cbdd8eb810 竞赛平台 运营统计数据提交代码调整 2020-10-09 19:46:54 +08:00
joylink_cuiweidong
fa4ada05e4 场景编辑代码调整 2020-10-09 10:57:52 +08:00
joylink_cuiweidong
9885c50891 竞赛 场景代码调整 2020-09-30 18:16:08 +08:00
joylink_cuiweidong
6a0fbe5dc5 福州一号线 iscs 系统代码调整 2020-09-30 16:57:38 +08:00
joylink_cuiweidong
d67aa6804f 竞赛 理论考试 代码调整 2020-09-23 18:44:00 +08:00
joylink_cuiweidong
1faf2cbf91 代码调整 2020-09-22 18:47:34 +08:00
joylink_cuiweidong
d56e713232 iscs 系统代码调整 2020-09-22 18:45:00 +08:00
joylink_cuiweidong
f2bbefc27e iscs 三角形绘图元素添加 2020-09-22 15:25:33 +08:00
joylink_cuiweidong
d346ec8f2e iscs 系统代码调整 2020-09-22 11:31:18 +08:00
joylink_cuiweidong
af7b9c5545 iscs系统页面代码调整 2020-09-21 18:55:23 +08:00
fan
893ecd7ff4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 17:39:18 +08:00
fan
8199d383fb iscs调整 2020-09-21 17:39:06 +08:00
joylink_cuiweidong
0b380b3b0f 福州线路iscs系统 样式调整 2020-09-21 16:00:24 +08:00
joylink_cuiweidong
6cad4eabdb 竞赛系统 剧本加载逻辑调整 2020-09-18 16:02:22 +08:00
fan
cc0803630c 设备跳转运行图等(未完) 2020-08-13 11:23:07 +08:00
fan
a97c1fcb74 iscs工作站仿真取消订阅问题调整 2020-08-13 09:40:40 +08:00
fan
066340930f 退出iscs工作站清理仿真 2020-08-13 09:22:31 +08:00
zyy
7b6148919c 调整综合监控默认进入第一个界面 2020-07-09 18:52:13 +08:00
fan
de617cde50 设备登录调整&试卷管理调整 2020-07-08 10:31:33 +08:00
fan
086e56c1a7 设备登录调整 2020-07-07 19:00:48 +08:00
fan
a543aa79d1 设备登录调整 2020-07-07 17:45:26 +08:00
fan
86c7e44876 iscs调整 2020-06-24 15:02:09 +08:00
fan
9a620f8629 西安三道岔设置故障&iscs调整(未完) 2020-06-24 13:27:58 +08:00
zyy
b530818a7e 调整综合检控 cctv 流程 2020-06-17 10:29:56 +08:00
zyy
17158401de 调整综合监控导航栏 2020-06-17 09:16:03 +08:00
zyy
73338a7eaa 增加宁波线路车站折返逻辑 2020-06-16 17:49:55 +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
a166d492f1 调整字段名称,删除注释 2020-06-12 17:16:08 +08:00
zyy
5a01bbfbcf 调整综合监控加载数据流程 2020-06-12 17:12:13 +08:00
zyy
64a7e0e1ab 调整综合监控元素点击事件, 调整右键菜单样式 2020-06-12 15:34:53 +08:00
fan
fb570eb522 sics调整 2020-06-11 17:06:37 +08:00
fan
7d7583a7e2 时间表管理&添加通用配置项 2020-06-11 11:26:41 +08:00
fan
139066d66f 综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理 2020-06-10 16:56:52 +08:00
fan
1d56ae8249 合并代码 2020-06-09 18:33:17 +08:00
fan
fa8c31b2d4 iscs 照明系统模式表&时间表 2020-06-09 18:31:21 +08:00
zyy
015dd9e113 调整综合监控数据,调整绘图 2020-06-09 17:48:08 +08:00
fan
4b67f81cf0 iscs 小系统模式表 2020-06-09 14:39:32 +08:00
fan
de2defc461 iscs 小系统模式表&交互 2020-06-08 18:40:48 +08:00
fan
fc0772a11c iscs调整&站后折返显示调整 2020-06-05 18:59:35 +08:00
fan
7d8a8f8fb6 实操竞赛计时调整&iscs调整 2020-06-05 14:46:37 +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
c1d88ab3e9 iscs调整&列车调整 2020-06-02 17:50:56 +08:00
fan
e473199e24 iscs调整 2020-06-02 16:12:34 +08:00
fan
013596a502 iscs调整 2020-06-02 10:21:33 +08:00
fan
e72538f66b 合并代码 2020-06-01 18:35:01 +08:00
fan
d93e40ab48 iscs调整 2020-06-01 18:33:17 +08:00
zyy
dfe10ea585 增加综合监控绘图 复制粘贴 元素功能 2020-06-01 18:21:36 +08:00
fan
76990e129e iscs调整 2020-06-01 10:32:02 +08:00
fan
95e4f4c938 西安一三号线道岔失表调整&iscs调整 2020-05-29 16:57:21 +08:00
fan
f21751fcd3 哈尔滨title调整&理论考试缓存调整 2020-05-29 11:08:38 +08:00
fan
ae9cce3557 LCD屏控制 2020-05-26 11:10:37 +08:00
joylink_cuiweidong
3a48755817 竞赛裁判系统代码调整 2020-05-21 16:59:36 +08:00
fan
19bd41b214 调整hydIcon路径 2020-05-21 10:02:13 +08:00
fan
ea8222504e 添加竞赛接口 2020-05-20 10:02:07 +08:00
fan
597af25b40 iscs&站台故障 2020-05-19 18:38:58 +08:00
zyy
93f7210596 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 19:01:18 +08:00
zyy
674bcea387 调整综合监控 2020-05-15 19:01:07 +08:00
fan
c0d75502fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:48:38 +08:00
fan
d47a986fcc 故障操作&贵州状态班级展示 2020-05-15 18:48:10 +08:00
zyy
2faa2688e5 综合监控广播 2020-05-15 18:36:31 +08:00
fan
b3dfe242e2 iscs 2020-05-12 14:17:47 +08:00
fan
68fdc7f2ec 问题调整 2020-05-11 17:40:52 +08:00
fan
115f1da928 批量生成区段逻辑始终端偏移量 2020-05-11 13:25:09 +08:00
joylink_zyy
4d16abe984 注释综合监控请求 2020-05-10 21:51:44 +08:00
joylink_zyy
fa70eb85ca 注释iscs事件 2020-05-10 15:58:08 +08:00
zyy
d45a7fa39d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 10:24:17 +08:00
zyy
109c581e0e 调整iscs样式 2020-05-09 10:23:56 +08:00
fan
e56aa4d004 iscs火灾报警系统状态 2020-05-09 10:04:57 +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
ec0d0ccc29 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/iscs/iscsSystem/config/index.vue
2020-05-08 10:21:17 +08:00
joylink_cuiweidong
01ff826744 iscs 绘图调整 2020-05-08 10:18:47 +08:00
fan
dff19a4e8f iscs调整 2020-05-07 18:48:51 +08:00
fan
b0e63f77ed iscs调整 2020-05-07 18:47: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
0965e291fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-07 16:39:53 +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
joylink_cuiweidong
842f8f44f8 iscs 机电 传感器 页面布局调整 2020-05-07 15:06:13 +08:00
joylink_cuiweidong
135e9bddb7 iscs 机电传感器页面布局 2020-05-07 11:20:52 +08:00
joylink_cuiweidong
ea138e7f3c iscs系统 添加机电下的菜单 2020-05-07 09:42:26 +08:00
joylink_cuiweidong
bc9cd67681 代码调整 2020-05-06 18:29:08 +08:00
joylink_cuiweidong
4a32fddddb 绘图 交路代码调整
iscs 系统代码调整
考试保存规则代码调整
2020-05-06 16:56:30 +08:00
zyy
2210965709 调整系统关于vue报错误 2020-04-24 14:17:15 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
2020-03-20 15:16:08 +08:00
zyy
7f419b5bac Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
2020-03-20 11:24:00 +08:00
zyy
3e14220cfc 调整综合监控站台数据,及样式 2020-03-20 11:20:13 +08:00
joylink_cuiweidong
59f5336f8a 北京一号线信号机区段操作代码调整 2020-03-20 10:31:19 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
31d50d95e2 增加仿真系统 iscs工作站 2020-03-13 13:23:04 +08:00
zyy
cb4c615345 调整哈尔滨综合监控绘图宽度,高度显示, 综合监控名称动态显示 2020-03-12 18:36:05 +08:00
joylink_cuiweidong
39f445ac3b iscs 系统代码调整 2020-02-12 14:52:50 +08:00
joylink_cuiweidong
974e0ecc0d iscs 代码调整 2020-02-07 20:09:51 +08:00
joylink_cuiweidong
416766cb3e iscs 绘图显示 2020-02-07 20:02:36 +08:00