Commit Graph

11 Commits

Author SHA1 Message Date
joylink_cuiweidong
0e10532316 iscs 绘图代码调整 2020-02-06 15:04:48 +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
2c4f91d7ab iscs 绘图代码修改 2020-02-06 10:29:59 +08:00
joylink_cuiweidong
1c93f243e8 iscs afc acs 绘图元素代码调整 2020-02-05 17:48:27 +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_fanyuhong
f32465165e iscs增加基础元素文字线段矩形 2020-02-05 12:14:10 +08:00
zyy
a033690502 调整综合监控文件位置及加载方式 2020-01-20 09:20:09 +08:00