zyy
|
f7a0f54376
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/iscsData.js
|
2020-02-06 16:58:09 +08:00 |
|
zyy
|
2ed2bd8332
|
数据提交
|
2020-02-06 16:56:24 +08:00 |
|
joylink_cuiweidong
|
81ea1a4d3a
|
ISCS 绘图数据修改
|
2020-02-06 16:49:01 +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
|
2765e860ac
|
iscs绘图
|
2020-02-06 14:33:21 +08:00 |
|
joylink_fanyuhong
|
00fe7cd40a
|
iscs绘图
|
2020-02-06 13:56:21 +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 |
|
zyy
|
f219fe98bd
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 13:17:40 +08:00 |
|
zyy
|
b7d10fa587
|
前台保存数据
|
2020-02-06 13:17:31 +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_fanyuhong
|
6e96c3d5b7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 09:42:18 +08:00 |
|
joylink_fanyuhong
|
e2a3b5d94a
|
iscs调整
|
2020-02-06 09:42:07 +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 |
|
joylink_fanyuhong
|
0000eb7bc1
|
iscs调整
|
2020-02-05 17:32:19 +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 |
|
zyy
|
694c0c441c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-05 17:21:50 +08:00 |
|
zyy
|
ebb1626edd
|
保存数据
|
2020-02-05 17:21:04 +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
|
fd09e2aae5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/iscs/iscsDraw/iscsCommonElem/line.vue
|
2020-02-05 17:00:15 +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 |
|
joylink_cuiweidong
|
61839bdeca
|
iscs 线段右键修改代码调整
|
2020-02-05 16:57:04 +08:00 |
|
zyy
|
a0ac36401b
|
调整报警系统绘图基础元素问题
|
2020-02-05 16:57:01 +08:00 |
|
joylink_fanyuhong
|
b9cfd28c17
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 16:53:46 +08:00 |
|
joylink_fanyuhong
|
96e11142ed
|
iscs调整
|
2020-02-05 16:53:28 +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
|
1948f89856
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-05 16:25:24 +08:00 |
|
zyy
|
61f02f4616
|
调整基础线段元素
|
2020-02-05 16:24:19 +08:00 |
|
joylink_fanyuhong
|
72305c2228
|
iscs调整
|
2020-02-05 15:59:52 +08:00 |
|
joylink_fanyuhong
|
68a84c9d81
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 15:23:47 +08:00 |
|
joylink_fanyuhong
|
7da4f1f537
|
iscs调整
|
2020-02-05 15:23:35 +08:00 |
|
zyy
|
7df4ee07ce
|
调整iscs绘图canvas宽度
|
2020-02-05 15:15:53 +08:00 |
|
joylink_fanyuhong
|
180384404a
|
iscs调整
|
2020-02-05 14:59:14 +08:00 |
|
joylink_fanyuhong
|
8260a67a2d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 14:55:51 +08:00 |
|
joylink_fanyuhong
|
7a86276e9f
|
iscs调整
|
2020-02-05 14:55:32 +08:00 |
|
zyy
|
0c02a1865b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 14:47:56 +08:00 |
|