joylink_cuiweidong
|
f749aa6709
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-23 16:42:21 +08:00 |
|
joylink_cuiweidong
|
9398ccfa7c
|
iSCS 代码调整
|
2021-03-23 16:41:40 +08:00 |
|
fan
|
c146dacecb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach
|
2021-03-23 15:55:38 +08:00 |
|
fan
|
7a5e1bf701
|
评价规则调整
|
2021-03-23 15:55:23 +08:00 |
|
ival
|
160cbaf2bf
|
增加 iscs 火灾 展厅和站台 背景图
|
2021-03-23 15:29:42 +08:00 |
|
ival
|
a63b8e0179
|
增加iscs图样
|
2021-03-22 18:40:29 +08:00 |
|
lVAL
|
79779e2a86
|
优化代码报错，以及修改保存iscs的数据的lineCode为mapId
|
2020-12-30 13:25:20 +08:00 |
|
zyy
|
04d73495b7
|
调整综合监控关联关系
|
2020-11-04 16:32:19 +08:00 |
|
zyy
|
6684ffd729
|
调整综合监控故障流程显示
|
2020-11-03 18:48:02 +08:00 |
|
zyy
|
333c8b2c86
|
调整福州综合监控故障设置
|
2020-11-03 10:30:26 +08:00 |
|
zyy
|
a5d3b9b008
|
调整综合监控流程
|
2020-10-16 11:07:44 +08:00 |
|
zyy
|
114516abb8
|
调整综合监控
|
2020-10-15 15:28:23 +08:00 |
|
zyy
|
78dd2f3d26
|
调整综合监控开关状态
|
2020-10-15 10:30:30 +08:00 |
|
zyy
|
4b9a98c35a
|
调整综合监控流程
|
2020-10-14 19:09:53 +08:00 |
|
lVAL
|
7f4f0d661f
|
修改代码
|
2020-10-13 18:38:43 +08:00 |
|
lVAL
|
9bcb18baae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 18:36:03 +08:00 |
|
lVAL
|
a042147faf
|
增加group组功能
|
2020-10-13 18:35:50 +08:00 |
|
zyy
|
e2518c3eef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 16:19:22 +08:00 |
|
zyy
|
eb87177bae
|
调整编组内容数字跟着变化
|
2020-10-13 16:19:13 +08:00 |
|
lVAL
|
d07db0e516
|
增加 card页面
|
2020-10-13 15:38:07 +08:00 |
|
zyy
|
4c00f1f2bd
|
调整综合监控绘图流程
|
2020-10-13 14:55:42 +08:00 |
|
lVAL
|
d62f17b3d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 14:09:00 +08:00 |
|
lVAL
|
0feea5cb1a
|
增加绘图实例此操作界面
|
2020-10-13 14:08:47 +08:00 |
|
zyy
|
8ad2b2b3a3
|
调整综合监控字典及图片展示
|
2020-10-13 14:01:24 +08:00 |
|
lVAL
|
43b837c7d4
|
添加风扇机
|
2020-10-12 17:55:28 +08:00 |
|
zyy
|
e336410a58
|
调整图片
|
2020-10-12 16:45:24 +08:00 |
|
lVAL
|
24252fc5ff
|
添加活塞风井
|
2020-10-12 15:00:16 +08:00 |
|
lVAL
|
fae5fd0332
|
修改冲突
|
2020-10-12 14:33:22 +08:00 |
|
lVAL
|
dcd0c86998
|
修改代码-冲突
|
2020-10-12 14:32:30 +08:00 |
|
lVAL
|
d141ec87ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/shape/picture.js
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2020-10-12 14:30:12 +08:00 |
|
lVAL
|
68f6cb5841
|
增加图片
|
2020-10-12 14:28:25 +08:00 |
|
zyy
|
b3af89582d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/shape/picture.js
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2020-10-12 13:05:57 +08:00 |
|
zyy
|
d27266ab7a
|
调整线段画法
|
2020-10-12 13:04:13 +08:00 |
|
lVAL
|
5893c6a2c1
|
增加图片
|
2020-10-12 12:20:07 +08:00 |
|
lVAL
|
5167486c74
|
增加图片资源，增加图片旋转功能
|
2020-10-10 18:39:56 +08:00 |
|
lVAL
|
a3f19c2c46
|
修改代码
|
2020-10-10 14:03:21 +08:00 |
|
lVAL
|
3ac15df91e
|
修改table的绘制表格的问题
|
2020-10-10 09:37:58 +08:00 |
|
lVAL
|
d40821f404
|
增加部分图层
|
2020-10-09 13:16:34 +08:00 |
|
lVAL
|
15a08feef8
|
补充优化键盘事件处理bug
|
2020-09-30 17:18:01 +08:00 |
|
lVAL
|
d5c9706311
|
增加绘制园以及修改圆的最小半径值
|
2020-09-28 13:15:54 +08:00 |
|
lVAL
|
0e47dfcff1
|
适配图片APF
|
2020-09-27 16:12:25 +08:00 |
|
zyy
|
4362038f13
|
调整综合监控元素绘制
|
2020-09-25 16:07:53 +08:00 |
|
joylink_cuiweidong
|
7753f831f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 18:44:24 +08:00 |
|
joylink_cuiweidong
|
d67aa6804f
|
竞赛 理论考试 代码调整
|
2020-09-23 18:44:00 +08:00 |
|
zyy
|
5109f7b558
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 10:38:35 +08:00 |
|
zyy
|
21f5208c21
|
调整综合监控
|
2020-09-23 10:38:22 +08:00 |
|
joylink_cuiweidong
|
dc8ae0bbfe
|
iscs 绘图调整
|
2020-09-23 10:22:52 +08:00 |
|
joylink_cuiweidong
|
465391b20e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:46:12 +08:00 |
|
zyy
|
0ed3d83273
|
调整表格配置
|
2020-09-22 18:45:20 +08:00 |
|
joylink_cuiweidong
|
d56e713232
|
iscs 系统代码调整
|
2020-09-22 18:45:00 +08:00 |
|