diff --git a/src/assets/icons/svg/A_gjclmune.svg b/src/assets/icons/svg/A_gjclmune.svg index d384f296..347d3dda 100644 --- a/src/assets/icons/svg/A_gjclmune.svg +++ b/src/assets/icons/svg/A_gjclmune.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_gjshmenu.svg b/src/assets/icons/svg/A_gjshmenu.svg index 2c259d6e..5889964d 100644 --- a/src/assets/icons/svg/A_gjshmenu.svg +++ b/src/assets/icons/svg/A_gjshmenu.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_loginCode.svg b/src/assets/icons/svg/A_loginCode.svg index 37671c34..8471a079 100644 --- a/src/assets/icons/svg/A_loginCode.svg +++ b/src/assets/icons/svg/A_loginCode.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_loginPassword.svg b/src/assets/icons/svg/A_loginPassword.svg index 7a41e113..9975353c 100644 --- a/src/assets/icons/svg/A_loginPassword.svg +++ b/src/assets/icons/svg/A_loginPassword.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_loginUser.svg b/src/assets/icons/svg/A_loginUser.svg index fdbfc579..55e31cbe 100644 --- a/src/assets/icons/svg/A_loginUser.svg +++ b/src/assets/icons/svg/A_loginUser.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_product1.svg b/src/assets/icons/svg/A_product1.svg index 25909a10..dd24af51 100644 --- a/src/assets/icons/svg/A_product1.svg +++ b/src/assets/icons/svg/A_product1.svg @@ -1 +1,3 @@ - + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_qjsxt.svg b/src/assets/icons/svg/A_qjsxt.svg index a8c06e73..1fdce7f7 100644 --- a/src/assets/icons/svg/A_qjsxt.svg +++ b/src/assets/icons/svg/A_qjsxt.svg @@ -1 +1,3 @@ - + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_yjsxt.svg b/src/assets/icons/svg/A_yjsxt.svg index 0c8ded5e..a7c8ffe7 100644 --- a/src/assets/icons/svg/A_yjsxt.svg +++ b/src/assets/icons/svg/A_yjsxt.svg @@ -1 +1,3 @@ - + + + \ No newline at end of file diff --git a/src/assets/icons/svg/A_yuanjiaodian.svg b/src/assets/icons/svg/A_yuanjiaodian.svg index 41d753ae..88157a44 100644 --- a/src/assets/icons/svg/A_yuanjiaodian.svg +++ b/src/assets/icons/svg/A_yuanjiaodian.svg @@ -1 +1,3 @@ - + + + \ No newline at end of file diff --git a/src/assets/icons/svg/a-404.svg b/src/assets/icons/svg/a-404.svg new file mode 100644 index 00000000..692cca42 --- /dev/null +++ b/src/assets/icons/svg/a-404.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/alert.svg b/src/assets/icons/svg/alert.svg new file mode 100644 index 00000000..57e809e3 --- /dev/null +++ b/src/assets/icons/svg/alert.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/arrow-left.svg b/src/assets/icons/svg/arrow-left.svg new file mode 100644 index 00000000..1deb82cd --- /dev/null +++ b/src/assets/icons/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/authenticate.svg b/src/assets/icons/svg/authenticate.svg new file mode 100644 index 00000000..c00a81bf --- /dev/null +++ b/src/assets/icons/svg/authenticate.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/big.svg b/src/assets/icons/svg/big.svg new file mode 100644 index 00000000..4e3590f7 --- /dev/null +++ b/src/assets/icons/svg/big.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/bigS_alarm.svg b/src/assets/icons/svg/bigS_alarm.svg index 0832163a..8fbd21af 100644 --- a/src/assets/icons/svg/bigS_alarm.svg +++ b/src/assets/icons/svg/bigS_alarm.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/bigS_jc.svg b/src/assets/icons/svg/bigS_jc.svg index e0528fe2..feb26fae 100644 --- a/src/assets/icons/svg/bigS_jc.svg +++ b/src/assets/icons/svg/bigS_jc.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/bigS_jj.svg b/src/assets/icons/svg/bigS_jj.svg index e5191eeb..f6aad0cc 100644 --- a/src/assets/icons/svg/bigS_jj.svg +++ b/src/assets/icons/svg/bigS_jj.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/bug.svg b/src/assets/icons/svg/bug.svg index 05a150dc..82bdbe94 100644 --- a/src/assets/icons/svg/bug.svg +++ b/src/assets/icons/svg/bug.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/build.svg b/src/assets/icons/svg/build.svg index 97c46886..91e69513 100644 --- a/src/assets/icons/svg/build.svg +++ b/src/assets/icons/svg/build.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/button.svg b/src/assets/icons/svg/button.svg index 904fddc8..6e03d7db 100644 --- a/src/assets/icons/svg/button.svg +++ b/src/assets/icons/svg/button.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/cascader.svg b/src/assets/icons/svg/cascader.svg index e256024f..98149d35 100644 --- a/src/assets/icons/svg/cascader.svg +++ b/src/assets/icons/svg/cascader.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/category.svg b/src/assets/icons/svg/category.svg new file mode 100644 index 00000000..67beaaef --- /dev/null +++ b/src/assets/icons/svg/category.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/channel.svg b/src/assets/icons/svg/channel.svg new file mode 100644 index 00000000..f997c3af --- /dev/null +++ b/src/assets/icons/svg/channel.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/chart.svg b/src/assets/icons/svg/chart.svg index 27728fb0..0906a666 100644 --- a/src/assets/icons/svg/chart.svg +++ b/src/assets/icons/svg/chart.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/checkbox.svg b/src/assets/icons/svg/checkbox.svg index 013fd3a2..edb525bb 100644 --- a/src/assets/icons/svg/checkbox.svg +++ b/src/assets/icons/svg/checkbox.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/client.svg b/src/assets/icons/svg/client.svg new file mode 100644 index 00000000..3866ccd6 --- /dev/null +++ b/src/assets/icons/svg/client.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/clipboard.svg b/src/assets/icons/svg/clipboard.svg index 90923ff6..5b726c92 100644 --- a/src/assets/icons/svg/clipboard.svg +++ b/src/assets/icons/svg/clipboard.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/cloud.svg b/src/assets/icons/svg/cloud.svg new file mode 100644 index 00000000..d5bd6eb4 --- /dev/null +++ b/src/assets/icons/svg/cloud.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/code.svg b/src/assets/icons/svg/code.svg index ed4d23cf..ca1b0f2f 100644 --- a/src/assets/icons/svg/code.svg +++ b/src/assets/icons/svg/code.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/color.svg b/src/assets/icons/svg/color.svg index 44a81aab..04d203d7 100644 --- a/src/assets/icons/svg/color.svg +++ b/src/assets/icons/svg/color.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/component.svg b/src/assets/icons/svg/component.svg index 29c34580..3d909f1d 100644 --- a/src/assets/icons/svg/component.svg +++ b/src/assets/icons/svg/component.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/connect.svg b/src/assets/icons/svg/connect.svg new file mode 100644 index 00000000..60b58f3b --- /dev/null +++ b/src/assets/icons/svg/connect.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/dashboard.svg b/src/assets/icons/svg/dashboard.svg index 5317d370..59a6f277 100644 --- a/src/assets/icons/svg/dashboard.svg +++ b/src/assets/icons/svg/dashboard.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/date-range.svg b/src/assets/icons/svg/date-range.svg index fda571e7..b73c6870 100644 --- a/src/assets/icons/svg/date-range.svg +++ b/src/assets/icons/svg/date-range.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/date.svg b/src/assets/icons/svg/date.svg index 52dc73ee..3848549d 100644 --- a/src/assets/icons/svg/date.svg +++ b/src/assets/icons/svg/date.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/device.svg b/src/assets/icons/svg/device.svg new file mode 100644 index 00000000..c07fcf6e --- /dev/null +++ b/src/assets/icons/svg/device.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/dict.svg b/src/assets/icons/svg/dict.svg index 48493773..de3d11a5 100644 --- a/src/assets/icons/svg/dict.svg +++ b/src/assets/icons/svg/dict.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/disconnect.svg b/src/assets/icons/svg/disconnect.svg new file mode 100644 index 00000000..dfe6daee --- /dev/null +++ b/src/assets/icons/svg/disconnect.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/documentation.svg b/src/assets/icons/svg/documentation.svg index 70431228..4fa531f8 100644 --- a/src/assets/icons/svg/documentation.svg +++ b/src/assets/icons/svg/documentation.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/download.svg b/src/assets/icons/svg/download.svg index c8969513..2cbf96fd 100644 --- a/src/assets/icons/svg/download.svg +++ b/src/assets/icons/svg/download.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/drag.svg b/src/assets/icons/svg/drag.svg index 4185d3ce..d7bdc102 100644 --- a/src/assets/icons/svg/drag.svg +++ b/src/assets/icons/svg/drag.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/druid.svg b/src/assets/icons/svg/druid.svg index a2b4b4ed..07824f0c 100644 --- a/src/assets/icons/svg/druid.svg +++ b/src/assets/icons/svg/druid.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/edit.svg b/src/assets/icons/svg/edit.svg index d26101f2..59a60b72 100644 --- a/src/assets/icons/svg/edit.svg +++ b/src/assets/icons/svg/edit.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/education.svg b/src/assets/icons/svg/education.svg index 7bfb01d1..6728098d 100644 --- a/src/assets/icons/svg/education.svg +++ b/src/assets/icons/svg/education.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/email.svg b/src/assets/icons/svg/email.svg index 74d25e21..917140c9 100644 --- a/src/assets/icons/svg/email.svg +++ b/src/assets/icons/svg/email.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/event-a.svg b/src/assets/icons/svg/event-a.svg new file mode 100644 index 00000000..7b7b925e --- /dev/null +++ b/src/assets/icons/svg/event-a.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/example.svg b/src/assets/icons/svg/example.svg index 46f42b53..8f430c42 100644 --- a/src/assets/icons/svg/example.svg +++ b/src/assets/icons/svg/example.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/excel.svg b/src/assets/icons/svg/excel.svg index 74d97b80..4fc0733c 100644 --- a/src/assets/icons/svg/excel.svg +++ b/src/assets/icons/svg/excel.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/exit-fullscreen.svg b/src/assets/icons/svg/exit-fullscreen.svg index 485c128b..96ae640e 100644 --- a/src/assets/icons/svg/exit-fullscreen.svg +++ b/src/assets/icons/svg/exit-fullscreen.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/eye-open.svg b/src/assets/icons/svg/eye-open.svg index 88dcc98e..e74c11a3 100644 --- a/src/assets/icons/svg/eye-open.svg +++ b/src/assets/icons/svg/eye-open.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/eye.svg b/src/assets/icons/svg/eye.svg index 16ed2d87..1dc053d7 100644 --- a/src/assets/icons/svg/eye.svg +++ b/src/assets/icons/svg/eye.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/firmware.svg b/src/assets/icons/svg/firmware.svg new file mode 100644 index 00000000..93a01d17 --- /dev/null +++ b/src/assets/icons/svg/firmware.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/form.svg b/src/assets/icons/svg/form.svg index dcbaa185..deac0865 100644 --- a/src/assets/icons/svg/form.svg +++ b/src/assets/icons/svg/form.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/fullscreen.svg b/src/assets/icons/svg/fullscreen.svg index 0e86b6fa..c21d9d28 100644 --- a/src/assets/icons/svg/fullscreen.svg +++ b/src/assets/icons/svg/fullscreen.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/github.svg b/src/assets/icons/svg/github.svg index db0a0d43..fece15ae 100644 --- a/src/assets/icons/svg/github.svg +++ b/src/assets/icons/svg/github.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/group.svg b/src/assets/icons/svg/group.svg new file mode 100644 index 00000000..ed478974 --- /dev/null +++ b/src/assets/icons/svg/group.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/guide.svg b/src/assets/icons/svg/guide.svg index b2710017..8eb1a0aa 100644 --- a/src/assets/icons/svg/guide.svg +++ b/src/assets/icons/svg/guide.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/icon.svg b/src/assets/icons/svg/icon.svg index 82be8eee..9b8bf86b 100644 --- a/src/assets/icons/svg/icon.svg +++ b/src/assets/icons/svg/icon.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/input.svg b/src/assets/icons/svg/input.svg index ab91381e..c052f6df 100644 --- a/src/assets/icons/svg/input.svg +++ b/src/assets/icons/svg/input.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/international.svg b/src/assets/icons/svg/international.svg index e9b56eee..56dea405 100644 --- a/src/assets/icons/svg/international.svg +++ b/src/assets/icons/svg/international.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/iot.svg b/src/assets/icons/svg/iot.svg new file mode 100644 index 00000000..b1f46a6e --- /dev/null +++ b/src/assets/icons/svg/iot.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/job.svg b/src/assets/icons/svg/job.svg index 2a93a251..dae7a6c0 100644 --- a/src/assets/icons/svg/job.svg +++ b/src/assets/icons/svg/job.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/language.svg b/src/assets/icons/svg/language.svg index 0082b577..17e5b70a 100644 --- a/src/assets/icons/svg/language.svg +++ b/src/assets/icons/svg/language.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/link.svg b/src/assets/icons/svg/link.svg index 48197ba4..d0d01379 100644 --- a/src/assets/icons/svg/link.svg +++ b/src/assets/icons/svg/link.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/list.svg b/src/assets/icons/svg/list.svg index 20259edd..246f8907 100644 --- a/src/assets/icons/svg/list.svg +++ b/src/assets/icons/svg/list.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/listener.svg b/src/assets/icons/svg/listener.svg new file mode 100644 index 00000000..20cf43ff --- /dev/null +++ b/src/assets/icons/svg/listener.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/live.svg b/src/assets/icons/svg/live.svg new file mode 100644 index 00000000..506cb9da --- /dev/null +++ b/src/assets/icons/svg/live.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/live1.svg b/src/assets/icons/svg/live1.svg new file mode 100644 index 00000000..a48f8163 --- /dev/null +++ b/src/assets/icons/svg/live1.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/lock.svg b/src/assets/icons/svg/lock.svg index 74fee543..f56b379a 100644 --- a/src/assets/icons/svg/lock.svg +++ b/src/assets/icons/svg/lock.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/log-a.svg b/src/assets/icons/svg/log-a.svg new file mode 100644 index 00000000..3934b70d --- /dev/null +++ b/src/assets/icons/svg/log-a.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/log.svg b/src/assets/icons/svg/log.svg index d879d33b..20292469 100644 --- a/src/assets/icons/svg/log.svg +++ b/src/assets/icons/svg/log.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/logininfor.svg b/src/assets/icons/svg/logininfor.svg index 267f8447..09070470 100644 --- a/src/assets/icons/svg/logininfor.svg +++ b/src/assets/icons/svg/logininfor.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/message.svg b/src/assets/icons/svg/message.svg index 14ca8172..2bee3882 100644 --- a/src/assets/icons/svg/message.svg +++ b/src/assets/icons/svg/message.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/model.svg b/src/assets/icons/svg/model.svg new file mode 100644 index 00000000..aed27680 --- /dev/null +++ b/src/assets/icons/svg/model.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/money.svg b/src/assets/icons/svg/money.svg index c1580de1..f6a5112c 100644 --- a/src/assets/icons/svg/money.svg +++ b/src/assets/icons/svg/money.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/monitor-a.svg b/src/assets/icons/svg/monitor-a.svg new file mode 100644 index 00000000..9eb956d7 --- /dev/null +++ b/src/assets/icons/svg/monitor-a.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/monitor.svg b/src/assets/icons/svg/monitor.svg index bc308cb0..643997ad 100644 --- a/src/assets/icons/svg/monitor.svg +++ b/src/assets/icons/svg/monitor.svg @@ -1,2 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/mq.svg b/src/assets/icons/svg/mq.svg new file mode 100644 index 00000000..3f890303 --- /dev/null +++ b/src/assets/icons/svg/mq.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/nested.svg b/src/assets/icons/svg/nested.svg index 06713a86..091a5460 100644 --- a/src/assets/icons/svg/nested.svg +++ b/src/assets/icons/svg/nested.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/number.svg b/src/assets/icons/svg/number.svg index ad5ce9af..d917307d 100644 --- a/src/assets/icons/svg/number.svg +++ b/src/assets/icons/svg/number.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/online.svg b/src/assets/icons/svg/online.svg index 330a2029..d7f1cedf 100644 --- a/src/assets/icons/svg/online.svg +++ b/src/assets/icons/svg/online.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/ota.svg b/src/assets/icons/svg/ota.svg new file mode 100644 index 00000000..93a01d17 --- /dev/null +++ b/src/assets/icons/svg/ota.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/password.svg b/src/assets/icons/svg/password.svg index 6c64defe..d862ea8d 100644 --- a/src/assets/icons/svg/password.svg +++ b/src/assets/icons/svg/password.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/pdf.svg b/src/assets/icons/svg/pdf.svg index 957aa0cc..f77dfc72 100644 --- a/src/assets/icons/svg/pdf.svg +++ b/src/assets/icons/svg/pdf.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/people.svg b/src/assets/icons/svg/people.svg index 2bd54aeb..6c4124ee 100644 --- a/src/assets/icons/svg/people.svg +++ b/src/assets/icons/svg/people.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/peoples.svg b/src/assets/icons/svg/peoples.svg index aab852e5..8965a85c 100644 --- a/src/assets/icons/svg/peoples.svg +++ b/src/assets/icons/svg/peoples.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/phone.svg b/src/assets/icons/svg/phone.svg index ab8e8c4e..385f2378 100644 --- a/src/assets/icons/svg/phone.svg +++ b/src/assets/icons/svg/phone.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/plugin.svg b/src/assets/icons/svg/plugin.svg new file mode 100644 index 00000000..89d0d1d4 --- /dev/null +++ b/src/assets/icons/svg/plugin.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/post.svg b/src/assets/icons/svg/post.svg index 2922c613..e40958a6 100644 --- a/src/assets/icons/svg/post.svg +++ b/src/assets/icons/svg/post.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/product.svg b/src/assets/icons/svg/product.svg new file mode 100644 index 00000000..63544c9d --- /dev/null +++ b/src/assets/icons/svg/product.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/qq.svg b/src/assets/icons/svg/qq.svg index ee13d4ec..0ab49740 100644 --- a/src/assets/icons/svg/qq.svg +++ b/src/assets/icons/svg/qq.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/qrcode.svg b/src/assets/icons/svg/qrcode.svg index 87bce593..a0dc8e1a 100644 --- a/src/assets/icons/svg/qrcode.svg +++ b/src/assets/icons/svg/qrcode.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/question.svg b/src/assets/icons/svg/question.svg index cf75bd4b..5c005fba 100644 --- a/src/assets/icons/svg/question.svg +++ b/src/assets/icons/svg/question.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/radio.svg b/src/assets/icons/svg/radio.svg index 0cde3452..a1236cae 100644 --- a/src/assets/icons/svg/radio.svg +++ b/src/assets/icons/svg/radio.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/rate.svg b/src/assets/icons/svg/rate.svg index aa3b14d7..0c4e2006 100644 --- a/src/assets/icons/svg/rate.svg +++ b/src/assets/icons/svg/rate.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/receiver.svg b/src/assets/icons/svg/receiver.svg new file mode 100644 index 00000000..52d32f80 --- /dev/null +++ b/src/assets/icons/svg/receiver.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/redis-list.svg b/src/assets/icons/svg/redis-list.svg new file mode 100644 index 00000000..fd4622f4 --- /dev/null +++ b/src/assets/icons/svg/redis-list.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/redis.svg b/src/assets/icons/svg/redis.svg index 2f1d62df..d63ca26a 100644 --- a/src/assets/icons/svg/redis.svg +++ b/src/assets/icons/svg/redis.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/row.svg b/src/assets/icons/svg/row.svg index 07809922..28538333 100644 --- a/src/assets/icons/svg/row.svg +++ b/src/assets/icons/svg/row.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/scene.svg b/src/assets/icons/svg/scene.svg new file mode 100644 index 00000000..3ca69485 --- /dev/null +++ b/src/assets/icons/svg/scene.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/search.svg b/src/assets/icons/svg/search.svg index 84233dda..d0fcd0e6 100644 --- a/src/assets/icons/svg/search.svg +++ b/src/assets/icons/svg/search.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/select.svg b/src/assets/icons/svg/select.svg index d6283828..756e7fcd 100644 --- a/src/assets/icons/svg/select.svg +++ b/src/assets/icons/svg/select.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/server.svg b/src/assets/icons/svg/server.svg index ca37b001..33617554 100644 --- a/src/assets/icons/svg/server.svg +++ b/src/assets/icons/svg/server.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/share.svg b/src/assets/icons/svg/share.svg new file mode 100644 index 00000000..b78dfc0b --- /dev/null +++ b/src/assets/icons/svg/share.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/shopping.svg b/src/assets/icons/svg/shopping.svg index 87513e7c..313ddf3b 100644 --- a/src/assets/icons/svg/shopping.svg +++ b/src/assets/icons/svg/shopping.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/size.svg b/src/assets/icons/svg/size.svg index ddb25b8d..08344b1b 100644 --- a/src/assets/icons/svg/size.svg +++ b/src/assets/icons/svg/size.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/skill.svg b/src/assets/icons/svg/skill.svg index a3b73121..9a928369 100644 --- a/src/assets/icons/svg/skill.svg +++ b/src/assets/icons/svg/skill.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/slider.svg b/src/assets/icons/svg/slider.svg index fbe4f39f..02314a46 100644 --- a/src/assets/icons/svg/slider.svg +++ b/src/assets/icons/svg/slider.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/small.svg b/src/assets/icons/svg/small.svg new file mode 100644 index 00000000..75285c49 --- /dev/null +++ b/src/assets/icons/svg/small.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/star.svg b/src/assets/icons/svg/star.svg index 6cf86e66..cb6f6c2f 100644 --- a/src/assets/icons/svg/star.svg +++ b/src/assets/icons/svg/star.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/start.svg b/src/assets/icons/svg/start.svg new file mode 100644 index 00000000..105a273f --- /dev/null +++ b/src/assets/icons/svg/start.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/stop.svg b/src/assets/icons/svg/stop.svg new file mode 100644 index 00000000..216baf8c --- /dev/null +++ b/src/assets/icons/svg/stop.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/subscribe.svg b/src/assets/icons/svg/subscribe.svg new file mode 100644 index 00000000..5e9dc082 --- /dev/null +++ b/src/assets/icons/svg/subscribe.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/subscribe1.svg b/src/assets/icons/svg/subscribe1.svg new file mode 100644 index 00000000..c9cc044c --- /dev/null +++ b/src/assets/icons/svg/subscribe1.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/swagger.svg b/src/assets/icons/svg/swagger.svg index 05d4e7bc..0bc68e5d 100644 --- a/src/assets/icons/svg/swagger.svg +++ b/src/assets/icons/svg/swagger.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/switch.svg b/src/assets/icons/svg/switch.svg index 0ba61e38..3d225617 100644 --- a/src/assets/icons/svg/switch.svg +++ b/src/assets/icons/svg/switch.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/system.svg b/src/assets/icons/svg/system.svg index dba28cf6..74c2b327 100644 --- a/src/assets/icons/svg/system.svg +++ b/src/assets/icons/svg/system.svg @@ -1,2 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/tab.svg b/src/assets/icons/svg/tab.svg index b4b48e48..03c1e5ea 100644 --- a/src/assets/icons/svg/tab.svg +++ b/src/assets/icons/svg/tab.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/table.svg b/src/assets/icons/svg/table.svg index 0e3dc9de..5383da05 100644 --- a/src/assets/icons/svg/table.svg +++ b/src/assets/icons/svg/table.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/textarea.svg b/src/assets/icons/svg/textarea.svg index 2709f292..80357a71 100644 --- a/src/assets/icons/svg/textarea.svg +++ b/src/assets/icons/svg/textarea.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/theme.svg b/src/assets/icons/svg/theme.svg index 5982a2f7..4ff1c1e0 100644 --- a/src/assets/icons/svg/theme.svg +++ b/src/assets/icons/svg/theme.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/time-range.svg b/src/assets/icons/svg/time-range.svg index 13c1202b..5ce36a2e 100644 --- a/src/assets/icons/svg/time-range.svg +++ b/src/assets/icons/svg/time-range.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/time.svg b/src/assets/icons/svg/time.svg index b376e32a..1abf60c4 100644 --- a/src/assets/icons/svg/time.svg +++ b/src/assets/icons/svg/time.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/tool.svg b/src/assets/icons/svg/tool.svg index c813067e..55be2e4a 100644 --- a/src/assets/icons/svg/tool.svg +++ b/src/assets/icons/svg/tool.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/topic.svg b/src/assets/icons/svg/topic.svg new file mode 100644 index 00000000..2daa0e39 --- /dev/null +++ b/src/assets/icons/svg/topic.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/tree-table.svg b/src/assets/icons/svg/tree-table.svg index 8aafdb82..a4c419b4 100644 --- a/src/assets/icons/svg/tree-table.svg +++ b/src/assets/icons/svg/tree-table.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/tree.svg b/src/assets/icons/svg/tree.svg index dd4b7dd2..a9532c53 100644 --- a/src/assets/icons/svg/tree.svg +++ b/src/assets/icons/svg/tree.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/upload.svg b/src/assets/icons/svg/upload.svg index bae49c0a..d02fae76 100644 --- a/src/assets/icons/svg/upload.svg +++ b/src/assets/icons/svg/upload.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/user.svg b/src/assets/icons/svg/user.svg index 0ba0716a..e725128a 100644 --- a/src/assets/icons/svg/user.svg +++ b/src/assets/icons/svg/user.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/validCode.svg b/src/assets/icons/svg/validCode.svg index cfb10214..f6288c63 100644 --- a/src/assets/icons/svg/validCode.svg +++ b/src/assets/icons/svg/validCode.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/video.svg b/src/assets/icons/svg/video.svg new file mode 100644 index 00000000..801c270e --- /dev/null +++ b/src/assets/icons/svg/video.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/videotape.svg b/src/assets/icons/svg/videotape.svg new file mode 100644 index 00000000..225a5c26 --- /dev/null +++ b/src/assets/icons/svg/videotape.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/wechat.svg b/src/assets/icons/svg/wechat.svg index c586e551..6c905c9d 100644 --- a/src/assets/icons/svg/wechat.svg +++ b/src/assets/icons/svg/wechat.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/icons/svg/wifi_0.svg b/src/assets/icons/svg/wifi_0.svg new file mode 100644 index 00000000..918dacc8 --- /dev/null +++ b/src/assets/icons/svg/wifi_0.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/wifi_1.svg b/src/assets/icons/svg/wifi_1.svg new file mode 100644 index 00000000..918dacc8 --- /dev/null +++ b/src/assets/icons/svg/wifi_1.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/wifi_2.svg b/src/assets/icons/svg/wifi_2.svg new file mode 100644 index 00000000..918dacc8 --- /dev/null +++ b/src/assets/icons/svg/wifi_2.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/wifi_3.svg b/src/assets/icons/svg/wifi_3.svg new file mode 100644 index 00000000..918dacc8 --- /dev/null +++ b/src/assets/icons/svg/wifi_3.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/wifi_4.svg b/src/assets/icons/svg/wifi_4.svg new file mode 100644 index 00000000..918dacc8 --- /dev/null +++ b/src/assets/icons/svg/wifi_4.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/zhifubao.svg b/src/assets/icons/svg/zhifubao.svg new file mode 100644 index 00000000..e9bd1e96 --- /dev/null +++ b/src/assets/icons/svg/zhifubao.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/icons/svg/zip.svg b/src/assets/icons/svg/zip.svg index f806fc48..a7d023ef 100644 --- a/src/assets/icons/svg/zip.svg +++ b/src/assets/icons/svg/zip.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 4cb5142c..12a308d3 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -58,7 +58,7 @@ } .svg-icon { - margin-right: 16px; + margin-right: 14px; } .el-menu { diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss index 5b3f5514..df7c9a57 100644 --- a/src/assets/styles/theme.scss +++ b/src/assets/styles/theme.scss @@ -11,6 +11,11 @@ .el-submenu__icon-arrow{ color: $menuGreenText !important; } + .sidebar-logo-link{ + img{ + background: transparent !important; + } + } .sidebar-container{ background-color: $menuGreenBg !important; diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue index 4c7fbcb3..6e87f562 100644 --- a/src/components/RightToolbar/index.vue +++ b/src/components/RightToolbar/index.vue @@ -1,22 +1,30 @@ + + +
+ + +
+
+
+ + +
+
+
+
{{ item.deviceName }}
+
+ +
+
+
+ + {{ item.deviceState === 'ONLINE' ? '在线' : (item.deviceState === 'OFFLINE' ? '离线' : (item.deviceState === 'OUTLINE' ? '脱线' : '未激活')) }} + + {{ val }} +
+
+
+
+
+ Key: + {{ item.deviceKey }} +
+
+ 设备组: + + {{ item.groupName }} + + +
+
+ 型号: + + {{ item.modelName }} + +
+
+ 所属项目: + + {{ item.inProjectName || '-' }} + + {{ item.inProjectName || '-' }} +
+
+ 类型: + {{ item.deviceTypeName }} +
+
+ 创建时间: + + {{ item.createTime }} + +
+
+ +
+
+
+
+ + + - -
- - + - - - - - - - + + - - + - - - + + + + + - - - - - + - - - - - - - - - - - + + + + + + - - + - - *注意:锁定即参数不可修改;未锁则可以修改。 + + + + -
- -
-
-
- -
-
+ + + + + + + *注意:锁定即参数不可修改;未锁则可以修改。 +
+ +
+
+ + + +
- + - @@ -457,7 +575,7 @@ import { updateDevice, exportDevice, listDeviceTypeList, - disassociateChild, + disassociateChild } from "@/api/iot/device"; import { listModel, getModel } from "@/api/iot/model"; import DetailsWrap from "./profile/details"; @@ -465,31 +583,30 @@ import ParamWrap from "@/components/ParamWrap/deviceParam"; import GatewayDetail from "@/views/profile/DeviceDetailsView/index"; import EDialogTableInput from "@/components/EDialogTableInput"; import DialogTemplate from "@/components/DialogTemplate"; -import JsBarcode from "jsbarcode" +import JsBarcode from "jsbarcode"; import { getProjectGroupList, listProject } from "@/api/tenant/project"; const deviceStatusOpt = { ONLINE: "在线", OFFLINE: "离线", OUTLINE: "脱线", - UNACTIVE: "未激活", + UNACTIVE: "未激活" }; const lineTypeOpt = { MAIN: "总路", - BRANCH: "支路", + BRANCH: "支路" }; const selectModelTable = { otherOption: { - tableType: "model", + tableType: "model" }, queryOption: { disable: false, labelWidth: "68px", params: { protocolType: "", - modelName: "", - + modelName: "" }, inline: true, queryChilds: [ @@ -501,7 +618,7 @@ const selectModelTable = { type: "input", key: "modelName", size: "small", - value: "", + value: "" }, { style: "", @@ -526,16 +643,16 @@ const selectModelTable = { { key: "OFFICIAL", label: "官方平台", - value: "OFFICIAL", - }, + value: "OFFICIAL" + } ], optionKey: { key: "key", label: "label", - value: "value", - }, - }, - ], + value: "value" + } + } + ] }, tableOption: { loading: false, @@ -551,7 +668,7 @@ const selectModelTable = { align: "left", width: "200", "show-overflow-tooltip": false, - tempType: "span", + tempType: "span" }, { style: "", @@ -561,7 +678,7 @@ const selectModelTable = { align: "left", width: "200", "show-overflow-tooltip": false, - tempType: "span", + tempType: "span" }, { style: "", @@ -571,7 +688,7 @@ const selectModelTable = { align: "left", width: "120", "show-overflow-tooltip": false, - tempType: "span", + tempType: "span" }, { style: "", @@ -581,7 +698,7 @@ const selectModelTable = { align: "left", width: "", "show-overflow-tooltip": false, - tempType: "span", + tempType: "span" }, { style: "", @@ -591,21 +708,21 @@ const selectModelTable = { align: "left", width: "", "show-overflow-tooltip": false, - tempType: "span", - }, - ], - }, + tempType: "span" + } + ] + } }; const selectDeviceTable = { otherOption: { - tableType: "device", + tableType: "device" }, queryOption: { disable: false, labelWidth: "68px", params: { deviceName: "", - deviceType: "GATEWAY_CONTROLLER", + deviceType: "GATEWAY_CONTROLLER" }, inline: true, queryChilds: [ @@ -617,9 +734,9 @@ const selectDeviceTable = { type: "input", key: "deviceName", size: "small", - value: "", - }, - ], + value: "" + } + ] }, tableOption: { loading: false, @@ -635,7 +752,7 @@ const selectDeviceTable = { align: "left", width: "", "show-overflow-tooltip": false, - tempType: "span", + tempType: "span" }, { style: "", @@ -645,7 +762,7 @@ const selectDeviceTable = { align: "left", width: "", "show-overflow-tooltip": false, - tempType: "span", + tempType: "span" }, { style: "", @@ -655,7 +772,7 @@ const selectDeviceTable = { align: "left", width: "", "show-overflow-tooltip": false, - tempType: "span", + tempType: "span" }, { style: "", @@ -665,13 +782,13 @@ const selectDeviceTable = { align: "center", width: "160", "show-overflow-tooltip": false, - tempType: "span", - }, + tempType: "span" + } ], tableList: { - type: Array, - }, - }, + type: Array + } + } }; export default { @@ -681,16 +798,18 @@ export default { ParamWrap, GatewayDetail, EDialogTableInput, - DialogTemplate, + DialogTemplate }, data() { return { + //列表显示视图 + viewType: "card", deviceStatusOpt, selectModelTable, selectDeviceTable, lineTypeOpt, - imgModelShow:false, - qrCodeUrl:'', + imgModelShow: false, + qrCodeUrl: "", sourceId: "", componectVal: "", // 遮罩层 @@ -712,13 +831,13 @@ export default { // 是否显示弹出层 open: false, // 弹出层标题 - inProjectList:[], + inProjectList: [], // 弹出层标题 - projectGroupList:[], + projectGroupList: [], // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 12, modelId: null, parentId: null, deviceName: null, @@ -728,45 +847,47 @@ export default { inProject: null, groupId: null, orderByColumn: "createTime", - isAsc: "desc", + isAsc: "desc" }, // 表单参数 form: {}, // 表单校验 rules: { modelId: [ - { required: true, message: "所属型号不能为空", trigger: "change" }, + { required: true, message: "所属型号不能为空", trigger: "change" } ], deviceType: [ - { required: true, message: "设备类型不能为空", trigger: "blur" }, + { required: true, message: "设备类型不能为空", trigger: "blur" } ], parentId: [ - { required: false, message: "父设备不能为空", trigger: "change" }, + { required: false, message: "父设备不能为空", trigger: "change" } ], deviceName: [ - { required: true, message: "设备名称不能为空", trigger: "blur" }, + { required: true, message: "设备名称不能为空", trigger: "blur" } ], lineType: [ - { required: false, message: "线路类型不能为空", trigger: "blur" }, + { required: false, message: "线路类型不能为空", trigger: "blur" } ], deviceKey: [ { required: true, validator: this.chenking_deviceKey, - trigger: "blur", - }, + trigger: "blur" + } ], deviceTag: [ - { required: true, message: "设备标签不能为空", trigger: "change" }, - ], + { required: true, message: "设备标签不能为空", trigger: "change" } + ] }, deviceTypeList: {}, deviceTagList: [], + imgPath: "", }; }, created() { + this.imgPath = (process.env.NODE_ENV === "production") ? `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API;'' console.log(this.$route); - if (this.$route.query.deviceState){ + if (this.$route.query.deviceState) { this.queryParams.deviceState = this.$route.query.deviceState; } this.init(); @@ -783,44 +904,56 @@ export default { this.form.prodKey = e.prodKey; this.deviceTypeChange(this.form.deviceType); }, + changeViewType(type) { + this.viewType=type; + }, // 查询所属项目列表 getInProjectList() { listProject({ pageNum: 1, pageSize: 100, - orderByColumn: 'createTime', - isAsc: 'desc' + orderByColumn: "createTime", + isAsc: "desc" }).then(response => { this.inProjectList = response.rows; - if(this.$route.query.projectId){ + if (this.$route.query.projectId) { this.queryParams.inProject = parseInt(this.$route.query.projectId); this.getList(); } }); }, - changeProject(e){ - console.log("changeProject",e) + changeProject(e) { + console.log("changeProject", e); this.queryParams.groupId = null; this.projectGroupList = []; - if(e){ + if (e) { this.getInProjectGroupList(); } }, // 查询所属项目列表 getInProjectGroupList() { getProjectGroupList({ - projectId: this.queryParams.inProject, + projectId: this.queryParams.inProject }).then(response => { - this.projectGroupList = response.rows||[]; + this.projectGroupList = response.rows || []; }); }, handleDeviceDialogEvent(e) { this.form.parentId = e.deviceId; this.form.parentName = e.deviceName; }, - lookQrCode(url){ - this.qrCodeUrl = url; + lookQrCode(item) { this.imgModelShow = true; + this.$nextTick(() => { + JsBarcode(this.$refs.qrCode, item.deviceKey, { + format: "CODE128", //条形码的格式 + width: 2, //线宽 + height: 65, //条码高度 + lineColor: "#000", //线条颜色 + displayValue: true, //是否显示文字 + margin: 3 //设置条形码周围的空白区域 + }); + }); }, // 字典状态字典翻译 statusFormat(row, column) { @@ -830,7 +963,7 @@ export default { if (this.$route.query["deviceId"]) { this.handleDetails(this.$route.query); } - this.getDicts(" device_tag").then((response) => { + this.getDicts(" device_tag").then(response => { this.deviceTagList = response.data; }); this.getDeviceTypeList(); @@ -839,7 +972,7 @@ export default { sortChange(column) { const sort = { isAsc: column.order === "descending" ? "desc" : "asc", - orderByColumn: column.prop, + orderByColumn: column.prop }; this.queryParams = Object.assign(this.queryParams, sort); this.handleQuery(); @@ -865,7 +998,7 @@ export default { }, // 根据 型号id 获取 型号详情 getModelInfoById(modelId) { - getModel(modelId).then((res) => { + getModel(modelId).then(res => { this.$refs.paramWrap.setList(res.data.paramList || []); }); }, @@ -880,38 +1013,22 @@ export default { }, // 查询设备类型列表 getDeviceTypeList() { - listDeviceTypeList().then((response) => { + listDeviceTypeList().then(response => { this.deviceTypeList = response.data; }); }, /** 查询设备列表 */ getList() { this.loading = true; - listDevice(this.queryParams).then((response) => { - let list = response.rows.map(item=>{ - // if(item.deviceLabel && item.deviceLabel[0] == '空间'){ - // item.deviceLabel.shift(); - // return item; - // } + listDevice(this.queryParams).then(response => { + let list = response.rows.map(item => { + item.deviceImage = item.deviceImage || ""; return item; - }) + }); this.deviceList = list; // this.deviceList = response.rows; this.total = response.total; this.loading = false; - this.$nextTick(() => { - this.deviceList.forEach((item,index) => { - JsBarcode(this.$refs["qrCodeDiv" + item.deviceKey], item.deviceKey, { - format: "CODE128", //条形码的格式 - width: 2, //线宽 - height: 65, //条码高度 - lineColor: "#000", //线条颜色 - displayValue: true, //是否显示文字 - margin: 3 //设置条形码周围的空白区域 - }); - this.deviceList[index].qrCodeUrl=this.$refs["qrCodeDiv" + item.deviceKey].src; - }) - }) }); }, // 取消按钮 @@ -933,7 +1050,7 @@ export default { inProject: null, groupId: null, lineType: undefined, - deviceTag: "", + deviceTag: "" }; this.resetForm("form"); }, @@ -958,7 +1075,7 @@ export default { this.reset(); const deviceId = row.deviceId || this.ids; const _this = this; - getDevice(deviceId).then((response) => { + getDevice(deviceId).then(response => { _this.form = response.data; _this.open = true; _this.title = "修改设备"; @@ -969,7 +1086,7 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { this.form.paramList = this.$refs.paramWrap.getResult(); this.form.lineType = @@ -977,13 +1094,13 @@ export default { ? this.form.lineType : undefined; if (this.form.deviceId != null) { - updateDevice(this.form).then((response) => { + updateDevice(this.form).then(response => { this.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { - addDevice(this.form).then((response) => { + addDevice(this.form).then(response => { this.msgSuccess("新增成功"); this.open = false; this.getList(); @@ -998,9 +1115,9 @@ export default { this.$confirm("是否确认取消父子设备关联?", "警告", { confirmButtonText: "确定", cancelButtonText: "取消", - type: "warning", + type: "warning" }) - .then(function () { + .then(function() { return disassociateChild({ childIds: [row.deviceId] }); }) .then(() => { @@ -1017,10 +1134,10 @@ export default { { confirmButtonText: "确定", cancelButtonText: "取消", - type: "warning", + type: "warning" } ) - .then(function () { + .then(function() { return delDevice(deviceIds); }) .then(() => { @@ -1034,12 +1151,12 @@ export default { this.$confirm("是否确认导出所有设备数据项?", "警告", { confirmButtonText: "确定", cancelButtonText: "取消", - type: "warning", + type: "warning" }) - .then(function () { + .then(function() { return exportDevice(queryParams); }) - .then((response) => { + .then(response => { this.download(response.msg); }); }, @@ -1050,8 +1167,8 @@ export default { } else { callback(); } - }, - }, + } + } }; @@ -1147,4 +1264,119 @@ export default { border-radius: 10px; background: #ffffff; } +// 卡片视图样式 +.card-list-box { + .card-item-col { + margin-top: 15px; + } + + .device-card { + height: 100%; + border-radius: 10px; + border: 1px solid #ebeef5; + background-color: #fff; + overflow: hidden; + color: #303133; + transition: 0.3s; + cursor: pointer; + &:hover { + box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.2); + //border: 1px solid #409EFF; + } + + .card-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 10px 20px; + .device-img-box{ + width: 60px; + height: 60px; + img{ + width: 100%; + height: 100%; + } + } + .card-header-right{ + width: calc(100% - 110px); + flex: 1; + padding-left: 10px; + .card-header-right-top{ + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 5px; + .device-name { + font-size: 16px; + line-height: 16px; + font-weight: bold; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: calc(100% - 30px); + } + } + .card-header-right-content{ + .status-tag { + margin-right: 5px; + } + } + } + .device-title { + display: flex; + flex-direction: column; + .device-id { + font-size: 12px; + color: #909399; + cursor: pointer; + } + } + } + .card-content { + padding: 10px 20px; + display: flex; + flex-wrap: wrap; + .info-item { + display: flex; + align-items: center; + margin-bottom: 5px; + font-size: 11px; + width: 50%; + .label { + color: #909399; + width: 35px; + } + .value { + width: calc(100% - 35px); + color: #606266; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + &:nth-child(2n){ + width: 50%; + .label { + width: 70px; + } + } + } + } + + .card-footer { + display: flex; + justify-content: space-around; + align-items: center; + padding: 10px 15px; + border-top: 1px solid #ebeef5; + + .el-button { + padding: 5px 8px; + + &:hover { + color: #409EFF; + } + } + } + } +} diff --git a/src/views/tenant/device/index.vue b/src/views/tenant/device/index.vue index f1c8ea65..3bbdb9dd 100644 --- a/src/views/tenant/device/index.vue +++ b/src/views/tenant/device/index.vue @@ -1,7 +1,12 @@ +
+ + +
+
+
+ + +
+
+
+
{{ item.deviceName }}
+
+ +
+
+
+ + {{ item.deviceState === 'ONLINE' ? '在线' : (item.deviceState === 'OFFLINE' ? '离线' : (item.deviceState === 'OUTLINE' ? '脱线' : '未激活')) }} + + {{ val }} +
+
+
+
+
+ Key: + {{ item.deviceKey }} +
+
+ 设备组: + + {{ item.groupName }} + + +
+
+ 型号: + + {{ item.modelName }} + +
+
+ 所属项目: + + {{ item.inProjectName || '-' }} + + {{ item.inProjectName || '-' }} +
+
+ 类型: + {{ item.deviceTypeName }} +
+
+ 创建时间: + + {{ item.createTime }} + +
+
+ +
+
+
+
+ -
- 返回列表 +
+ 返回列表
- +
@@ -173,8 +355,8 @@ import { exportDevice, listDeviceTypeList } from "@/api/tenant/device"; -import DetailsWrap from './profile/details' -import GatewayDetail from '@/views/profile/DeviceDetailsView/index' +import DetailsWrap from "./profile/details"; +import GatewayDetail from "@/views/profile/DeviceDetailsView/index"; import JsBarcode from "jsbarcode"; import { getProjectGroupList, listProject } from "@/api/tenant/project"; const deviceStatusOpt = { @@ -196,10 +378,12 @@ export default { }, data() { return { + //列表显示视图 + viewType: "card", deviceStatusOpt, lineTypeOpt, - imgModelShow:false, - qrCodeUrl:'', + imgModelShow: false, + qrCodeUrl: "", sourceId: "", componectVal: "", selectTableShow: false, @@ -221,13 +405,13 @@ export default { // 设备表格数据 deviceList: [], // 弹出层标题 - inProjectList:[], + inProjectList: [], // 设备组列表 - projectGroupList:[], + projectGroupList: [], // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 12, modelId: null, parentId: null, deviceName: null, @@ -239,37 +423,51 @@ export default { isAsc: "desc" }, // 表单校验 - deviceTypeList: {} + deviceTypeList: {}, + imgPath: "", }; }, created() { - if (this.$route.query['deviceId']) { - this.handleDetails(this.$route.query) + this.imgPath = (process.env.NODE_ENV === "production") ? `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}${window.dasConfig.prodApi ? window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API;'' + if (this.$route.query["deviceId"]) { + this.handleDetails(this.$route.query); } this.getDeviceTypeList(); this.getInProjectList(); this.getList(); }, methods: { - changeProject(e){ - console.log("changeProject",e) + changeProject(e) { + console.log("changeProject", e); this.queryParams.groupId = null; this.projectGroupList = []; - if(e){ + if (e) { this.getInProjectGroupList(); } }, + changeViewType(type) { + this.viewType=type; + }, // 查询所属项目列表 getInProjectGroupList() { getProjectGroupList({ - projectId: this.queryParams.inProject, + projectId: this.queryParams.inProject }).then(response => { - this.projectGroupList = response.rows||[]; + this.projectGroupList = response.rows || []; }); }, - lookQrCode(url){ - this.qrCodeUrl = url; + lookQrCode(item) { this.imgModelShow = true; + this.$nextTick(() => { + JsBarcode(this.$refs.qrCode, item.deviceKey, { + format: "CODE128", //条形码的格式 + width: 2, //线宽 + height: 65, //条码高度 + lineColor: "#000", //线条颜色 + displayValue: true, //是否显示文字 + margin: 3 //设置条形码周围的空白区域 + }); + }); }, sortChange(column) { const sort = { @@ -287,12 +485,15 @@ export default { handleDetails(row) { this.sourceId = row.deviceId; // this.componectVal = "DetailsWrap"; - this.componectVal = row.deviceType === 'GATEWAY_CONTROLLER'? 'GatewayDetail' : "DetailsWrap"; + this.componectVal = + row.deviceType === "GATEWAY_CONTROLLER" + ? "GatewayDetail" + : "DetailsWrap"; }, // 跳转详情页 toTableClick() { - if (this.$route.query['deviceId']) { - this.$router.push('/device_tenant/device_tenant') + if (this.$route.query["deviceId"]) { + this.$router.push("/device_tenant/device_tenant"); } this.componectVal = ""; }, @@ -310,11 +511,11 @@ export default { listProject({ pageNum: 1, pageSize: 100, - orderByColumn: 'createTime', - isAsc: 'desc' + orderByColumn: "createTime", + isAsc: "desc" }).then(response => { this.inProjectList = response.rows; - if(this.$route.query.projectId){ + if (this.$route.query.projectId) { this.queryParams.inProject = parseInt(this.$route.query.projectId); this.getList(); } @@ -330,29 +531,13 @@ export default { getList() { this.loading = true; listDevice(this.queryParams).then(response => { - let list = response.rows.map(item=>{ - // if(item.deviceLabel && item.deviceLabel[0] == '空间'){ - // item.deviceLabel.shift(); - // return item; - // } + let list = response.rows.map(item => { + item.deviceImage = item.deviceImage || ""; return item; - }) + }); this.deviceList = list; this.total = response.total; this.loading = false; - this.$nextTick(() => { - this.deviceList.forEach((item,index) => { - JsBarcode(this.$refs["qrCodeDiv" + item.deviceKey], item.deviceKey, { - format: "CODE128", //条形码的格式 - width: 2, //线宽 - height: 65, //条码高度 - lineColor: "#000", //线条颜色 - displayValue: true, //是否显示文字 - margin: 3 //设置条形码周围的空白区域 - }); - this.deviceList[index].qrCodeUrl=this.$refs["qrCodeDiv" + item.deviceKey].src; - }) - }) }); }, /** 搜索按钮操作 */ @@ -476,4 +661,119 @@ export default { border-radius: 10px; background: #ffffff; } +// 卡片视图样式 +.card-list-box { + .card-item-col { + margin-top: 15px; + } + + .device-card { + height: 100%; + border-radius: 10px; + border: 1px solid #ebeef5; + background-color: #fff; + overflow: hidden; + color: #303133; + transition: 0.3s; + cursor: pointer; + &:hover { + box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.2); + //border: 1px solid #409EFF; + } + + .card-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 10px 20px; + .device-img-box{ + width: 60px; + height: 60px; + img{ + width: 100%; + height: 100%; + } + } + .card-header-right{ + width: calc(100% - 110px); + flex: 1; + padding-left: 10px; + .card-header-right-top{ + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 5px; + .device-name { + font-size: 16px; + line-height: 16px; + font-weight: bold; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: calc(100% - 30px); + } + } + .card-header-right-content{ + .status-tag { + margin-right: 5px; + } + } + } + .device-title { + display: flex; + flex-direction: column; + .device-id { + font-size: 12px; + color: #909399; + cursor: pointer; + } + } + } + .card-content { + padding: 10px 20px; + display: flex; + flex-wrap: wrap; + .info-item { + display: flex; + align-items: center; + margin-bottom: 5px; + font-size: 11px; + width: 50%; + .label { + color: #909399; + width: 35px; + } + .value { + width: calc(100% - 35px); + color: #606266; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + &:nth-child(2n){ + width: 50%; + .label { + width: 70px; + } + } + } + } + + .card-footer { + display: flex; + justify-content: space-around; + align-items: center; + padding: 10px 15px; + border-top: 1px solid #ebeef5; + + .el-button { + padding: 5px 8px; + + &:hover { + color: #409EFF; + } + } + } + } +}