From 3ff144d18ed3ecd4a831f32bde9475f6e34fc585 Mon Sep 17 00:00:00 2001 From: fhysy <1149505133@qq.com> Date: Wed, 3 Jul 2024 09:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B7=20UI(=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B1=8F=E6=A0=B7=E5=BC=8F=E8=BD=AE?= =?UTF-8?q?=E6=92=AD=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/assets/images/big/v3/tabel-bg-active.png | Bin 0 -> 3478 bytes src/assets/images/big/v3/tabel-bg.png | Bin 0 -> 2117 bytes src/assets/images/big/v3/tabel-num-active.png | Bin 0 -> 1302 bytes src/assets/images/big/v3/tabel-num.png | Bin 0 -> 1366 bytes src/main.js | 4 + src/views/bigScreen/v3/index.vue | 6 +- .../bigScreen/v3/profile/deviceTable.vue | 173 ++++++++++++++++++ yarn.lock | 57 ++++++ 9 files changed, 238 insertions(+), 3 deletions(-) create mode 100644 src/assets/images/big/v3/tabel-bg-active.png create mode 100644 src/assets/images/big/v3/tabel-bg.png create mode 100644 src/assets/images/big/v3/tabel-num-active.png create mode 100644 src/assets/images/big/v3/tabel-num.png create mode 100644 src/views/bigScreen/v3/profile/deviceTable.vue diff --git a/package.json b/package.json index 7d9c183b..7751e133 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "url": "https://github.com/histroniot/smart-power-ui.git" }, "dependencies": { + "@jiaminghi/data-view": "^2.10.0", "@liveqing/liveplayer": "^2.7.0", "@riophae/vue-treeselect": "0.4.0", "axios": "0.21.0", diff --git a/src/assets/images/big/v3/tabel-bg-active.png b/src/assets/images/big/v3/tabel-bg-active.png new file mode 100644 index 0000000000000000000000000000000000000000..7d40f3da4f4592b8ad5b59184a8064f4505ab336 GIT binary patch literal 3478 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 G`2PT?jZ`QA literal 0 HcmV?d00001 diff --git a/src/assets/images/big/v3/tabel-bg.png b/src/assets/images/big/v3/tabel-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..c9f562214f41d38c3f981544c2c8255bd5117740 GIT binary patch literal 2117 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 literal 0 HcmV?d00001 diff --git a/src/main.js b/src/main.js index d99b6075..46c0c96b 100644 --- a/src/main.js +++ b/src/main.js @@ -20,6 +20,9 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, import { pluginsCope, getGuid } from "@/utils/hciot"; import Pagination from "@/components/Pagination"; import VueClipboard from 'vue-clipboard2' +// 将自动注册所有组件为全局组件 +import dataV from '@jiaminghi/data-view' + // import VueCron from 'vue-cron'; // 自定义表格工具扩展 @@ -59,6 +62,7 @@ Vue.prototype.msgInfo = function (msg) { Vue.component('Pagination', Pagination) Vue.component('RightToolbar', RightToolbar) Vue.use(iView) +Vue.use(dataV) Vue.use(VueClipboard) Vue.use(VueAMap); VueAMap.initAMapApiLoader({ diff --git a/src/views/bigScreen/v3/index.vue b/src/views/bigScreen/v3/index.vue index 34126ac6..a3a5066d 100644 --- a/src/views/bigScreen/v3/index.vue +++ b/src/views/bigScreen/v3/index.vue @@ -81,9 +81,7 @@ > - + @@ -130,6 +128,7 @@ + diff --git a/yarn.lock b/yarn.lock index 778224e9..0043269b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -813,6 +813,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.5.5": + version "7.24.7" + resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" + integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/template@^7.0.0", "@babel/template@^7.10.4", "@babel/template@^7.12.7": version "7.12.7" resolved "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz" @@ -903,6 +910,51 @@ cssnano-preset-default "^4.0.0" postcss "^7.0.0" +"@jiaminghi/bezier-curve@*": + version "0.0.9" + resolved "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz#5196aca93c8b061a612b4c3eabcedf9490cef6ee" + integrity sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw== + dependencies: + "@babel/runtime" "^7.5.5" + +"@jiaminghi/c-render@^0.4.3": + version "0.4.3" + resolved "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz#982ebd8f71b443bb9507834227834973ebd9b6d8" + integrity sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q== + dependencies: + "@babel/runtime" "^7.5.5" + "@jiaminghi/bezier-curve" "*" + "@jiaminghi/color" "*" + "@jiaminghi/transition" "*" + +"@jiaminghi/charts@*": + version "0.2.18" + resolved "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz#63ded95200789fc1a1fd04b7fd9e56f58d22d90f" + integrity sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA== + dependencies: + "@babel/runtime" "^7.5.5" + "@jiaminghi/c-render" "^0.4.3" + +"@jiaminghi/color@*": + version "1.1.3" + resolved "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz#a2336750d1266155ffe80375c58c26fdec495611" + integrity sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg== + +"@jiaminghi/data-view@^2.10.0": + version "2.10.0" + resolved "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz#2146d8fc71b9f24be808238ca050ddb7a4c8949f" + integrity sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA== + dependencies: + "@babel/runtime" "^7.5.5" + "@jiaminghi/charts" "*" + +"@jiaminghi/transition@*": + version "1.1.11" + resolved "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz#576d8af092434b34201eba5eaecc79dd33c8ad8c" + integrity sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg== + dependencies: + "@babel/runtime" "^7.5.5" + "@liveqing/liveplayer@^2.7.0": version "2.7.0" resolved "https://registry.yarnpkg.com/@liveqing/liveplayer/-/liveplayer-2.7.0.tgz#06b7c4093cc299b6f9cff060e9ef4835ff6f8f70" @@ -7436,6 +7488,11 @@ regenerator-runtime@^0.13.4: resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz" integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + regenerator-transform@^0.14.2: version "0.14.5" resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"