Commit Graph

121 Commits

Author SHA1 Message Date
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
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
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
f32465165e iscs增加基础元素文字线段矩形 2020-02-05 12:14:10 +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