joylink_cuiweidong
|
a354264097
|
竞赛代码调整
|
2020-05-26 13:03:37 +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 |
|
joylink_cuiweidong
|
597f5cb990
|
代码调整
|
2020-05-09 16:39:33 +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
|
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
|
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
|
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
|
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
|
5712885f8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 15:06:29 +08:00 |
|
joylink_cuiweidong
|
842f8f44f8
|
iscs 机电 传感器 页面布局调整
|
2020-05-07 15:06:13 +08:00 |
|
fan
|
5bd0c97238
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 13:49:23 +08:00 |
|
fan
|
0f81decc2c
|
iscs调整
|
2020-05-07 13:49:03 +08:00 |
|
joylink_cuiweidong
|
260bc0a69e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 11:21:16 +08:00 |
|
joylink_cuiweidong
|
135e9bddb7
|
iscs 机电传感器页面布局
|
2020-05-07 11:20:52 +08:00 |
|
fan
|
06a0eaf285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-07 10:16:41 +08:00 |
|
fan
|
ed3f1cee82
|
iscs调整&新版考试实训类型匹配
|
2020-05-07 10:16:15 +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 |
|
joylink_cuiweidong
|
eadcf233b1
|
设计平台 地图列表样式调整
|
2020-04-15 15:42:47 +08:00 |
|
joylink_cuiweidong
|
fec4e33719
|
实训平台和设计平台 地图列表代码调整
|
2020-04-15 15:06:51 +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
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +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
|
73ee89f299
|
iscs 代码调整
|
2020-02-10 11:17:51 +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 |
|
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 |
|
joylink_fanyuhong
|
789d9c8be9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-07 18:40:26 +08:00 |
|
joylink_fanyuhong
|
13e2e69368
|
iscs调整
|
2020-02-07 18:40:16 +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_fanyuhong
|
ed49b80e1d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
# src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
|
2020-02-07 11:58:43 +08:00 |
|
joylink_fanyuhong
|
cc1765c43a
|
iscs调整
|
2020-02-07 11:56:19 +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_fanyuhong
|
e183991b01
|
sics调整
|
2020-02-07 10:05:51 +08:00 |
|
joylink_fanyuhong
|
a4109e6ae9
|
iscs调整
|
2020-02-07 10:01:15 +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 |
|