joylink_cuiweidong
|
7820e64371
|
iscs psd 绘图元素修改代码调整
|
2020-02-05 17:43:15 +08:00 |
|
joylink_fanyuhong
|
7ce1b02447
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 17:30:32 +08:00 |
|
joylink_fanyuhong
|
f12fabfd8e
|
iscs调整
|
2020-02-05 17:30:12 +08:00 |
|
joylink_cuiweidong
|
3133025fc9
|
iscs fas 元素修改代码调整
|
2020-02-05 17:16:11 +08:00 |
|
joylink_cuiweidong
|
544b930e48
|
iscs 矩形右键代码调整
|
2020-02-05 17:06:42 +08:00 |
|
joylink_cuiweidong
|
e560ee0e02
|
iscs 矩形和文字 右键操作修改
|
2020-02-05 17:05:57 +08:00 |
|
zyy
|
1673c5ad7f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
# src/views/iscs/iscsDraw/iscsCommonElem/line.vue
# src/views/iscs/iscsDraw/iscsOperate/index.vue
|
2020-02-05 16:58:51 +08:00 |
|
zyy
|
a0ac36401b
|
调整报警系统绘图基础元素问题
|
2020-02-05 16:57:01 +08:00 |
|
joylink_cuiweidong
|
7119dc204c
|
iscs 右键操作代码调整
|
2020-02-05 16:41:16 +08:00 |
|
joylink_cuiweidong
|
960d8e6902
|
ISCS 绘制右键操作修改
|
2020-02-05 16:33:23 +08:00 |
|
zyy
|
61f02f4616
|
调整基础线段元素
|
2020-02-05 16:24:19 +08:00 |
|
zyy
|
7df4ee07ce
|
调整iscs绘图canvas宽度
|
2020-02-05 15:15:53 +08:00 |
|
joylink_fanyuhong
|
7a86276e9f
|
iscs调整
|
2020-02-05 14:55:32 +08:00 |
|
joylink_cuiweidong
|
61eb7c5e44
|
iscs 闭路电视 车站时序编辑页面调整
|
2020-02-05 14:01:54 +08:00 |
|
zyy
|
57fcf95047
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 12:22:06 +08:00 |
|
zyy
|
aa709a546d
|
增加前台保存iscs
|
2020-02-05 12:21:56 +08:00 |
|
joylink_fanyuhong
|
3c4ade2979
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 12:14:21 +08:00 |
|
joylink_fanyuhong
|
f32465165e
|
iscs增加基础元素文字线段矩形
|
2020-02-05 12:14:10 +08:00 |
|
zyy
|
252b3b5871
|
增加门禁绘图
|
2020-02-05 10:22:22 +08:00 |
|
zyy
|
ab0728d973
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 10:17:11 +08:00 |
|
zyy
|
4df54dae1a
|
归类iscs绘图分类
|
2020-02-05 10:16:59 +08:00 |
|
joylink_cuiweidong
|
a851a50f5a
|
iscs 闭路电视 车站时序编辑页面
|
2020-02-04 19:04:29 +08:00 |
|
joylink_fanyuhong
|
2e7bc81e6b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-04 18:24:56 +08:00 |
|
joylink_fanyuhong
|
720ec4b0ce
|
iscs交互处理
|
2020-02-04 18:24:31 +08:00 |
|
joylink_cuiweidong
|
28294ceb2f
|
fiscs 闭路电视车站时序页面修改
|
2020-02-04 17:55:28 +08:00 |
|
joylink_cuiweidong
|
7a07d12e67
|
iscs 闭路电视 车站时序 车站控制页面布局调整
|
2020-02-04 11:14:51 +08:00 |
|
joylink_cuiweidong
|
458e401f38
|
iscs 闭路电视 车站控制 页面调整
|
2020-02-03 18:31:11 +08:00 |
|
joylink_fanyuhong
|
55a38da7e4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-03 18:20:46 +08:00 |
|
joylink_fanyuhong
|
d65e141242
|
iscs调整
|
2020-02-03 18:20:36 +08:00 |
|
joylink_cuiweidong
|
35494c1480
|
iscs 闭路电视 车站控制页面布局
|
2020-02-03 17:33:08 +08:00 |
|
joylink_cuiweidong
|
d285265293
|
代码调整
|
2020-02-03 13:54:29 +08:00 |
|
joylink_cui
|
4a441311ba
|
iscs 乘客信息计时一览 页面样式调整
|
2020-02-03 13:32:37 +08:00 |
|
joylink_cuiweidong
|
8606bf6e06
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-21 18:06:46 +08:00 |
|
joylink_cuiweidong
|
751d9d13b1
|
iscs系统 乘客信息 计时一览代码调整
|
2020-01-21 18:06:28 +08:00 |
|
zyy
|
12377d8704
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-21 16:44:53 +08:00 |
|
zyy
|
610dff44d4
|
增加机电样式
|
2020-01-21 16:44:46 +08:00 |
|
joylink_cuiweidong
|
2ee83398c4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-21 16:18:47 +08:00 |
|
joylink_cuiweidong
|
b11ad0cc4f
|
新版地图 自动信号列表 添加自动信号名称筛选
连锁出清区段限制为物理区段和道岔区段
|
2020-01-21 16:18:33 +08:00 |
|
fan
|
9130b7752a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-21 16:06:03 +08:00 |
|
fan
|
35a94fd31d
|
广播页面调整
|
2020-01-21 16:05:52 +08:00 |
|
zyy
|
1501124923
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-21 10:23:58 +08:00 |
|
zyy
|
6bd3ad8b42
|
调整机电控制模式样式
|
2020-01-21 10:23:52 +08:00 |
|
joylink_cuiweidong
|
8b574e723f
|
iscs 系统滚动条样式调整
|
2020-01-21 09:28:14 +08:00 |
|
fan
|
17783e0147
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 18:34:13 +08:00 |
|
fan
|
5f014536cf
|
PA调整
|
2020-01-20 18:33:47 +08:00 |
|
joylink_cuiweidong
|
e4d1ec8eb4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 18:30:09 +08:00 |
|
joylink_cuiweidong
|
e9f52faf89
|
iscs 系统代码调整
|
2020-01-20 18:29:51 +08:00 |
|
zyy
|
f2cc16c03f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 18:29:12 +08:00 |
|
zyy
|
5771905881
|
增加机电控制模式
|
2020-01-20 18:29:06 +08:00 |
|
joylink_cuiweidong
|
87c2e61cdf
|
iscs 系统 乘客信息 主画面 页面调整
|
2020-01-20 15:37:57 +08:00 |
|
zyy
|
9ea26b8f4f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/iscs/iscsSystem/config/pis/mainScreen.vue
|
2020-01-20 14:05:09 +08:00 |
|
zyy
|
7fd8e11649
|
搭建iscs系统架子
|
2020-01-20 14:04:31 +08:00 |
|
fan
|
847b80e9d9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 11:10:37 +08:00 |
|
fan
|
b67fe4fd17
|
iscs PA界面调整
|
2020-01-20 11:09:12 +08:00 |
|
joylink_cuiweidong
|
cb21623773
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 11:05:16 +08:00 |
|
joylink_cuiweidong
|
2499c23a2b
|
iscs 系统界面乘客信息代码调整
|
2020-01-20 11:05:05 +08:00 |
|
zyy
|
79f18c0c96
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 10:55:41 +08:00 |
|
zyy
|
8b68d80a81
|
调整模块iscs显示样式
|
2020-01-20 10:55:33 +08:00 |
|
joylink_cuiweidong
|
546fd73fd2
|
iscs 绘图组件调整
|
2020-01-20 10:15:14 +08:00 |
|
joylink_cuiweidong
|
6d37d2aa16
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:26:11 +08:00 |
|
zyy
|
a033690502
|
调整综合监控文件位置及加载方式
|
2020-01-20 09:20:09 +08:00 |
|