Commit Graph

181 Commits

Author SHA1 Message Date
fan
63b1c572d6 iscs调整 2021-09-03 14:46:22 +08:00
fan
2d5b863231 iscs Button hideType 赋值调整 2021-04-07 09:27:31 +08:00
fan
9a84b61e5a ISCS调整 2021-04-06 17:48:33 +08:00
ival
a215004143 修改代码 2021-04-06 16:01:14 +08:00
joylink_cuiweidong
09b2923126 iscs 代码调整 2021-03-30 09:57:05 +08:00
ival
3440c5ddc0 增加 圆 2021-03-29 15:00:02 +08:00
ival
a1fd2ed090 修改 福州door设备图层问题 2021-03-29 14:57:18 +08:00
ival
7456a19b3e 增加 门禁iscs背景图,以及iscs_new的部分代码 2021-03-29 13:09:51 +08:00
ival
988f879d46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
2021-03-25 13:20:26 +08:00
ival
85f73964d3 调整iscs站厅子图顺序 2021-03-25 13:19:28 +08:00
fan
5106ae8d14 meger 2021-03-25 13:07:02 +08:00
fan
1c85c5a502 教学管理调整 2021-03-25 13:03:12 +08:00
ival
1ba979c02c 增加 iscs站厅资源 2021-03-25 11:31:31 +08:00
fan
caafa7578b iscs添加设备图片 2021-03-24 15:00:45 +08:00
fan
022b946592 iscs添加背景图片 2021-03-24 14:12:35 +08:00
ival
833117dc45 1.修改 运行图 接口
2.增加 iscs 资源
2021-03-24 11:09:02 +08:00
ival
04444b2b12 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-23 17:35:50 +08:00
ival
27e938c102 修改 复制iscs图形 生成codebug的问题 2021-03-23 17:35:42 +08:00
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