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 00000000..7d40f3da Binary files /dev/null and b/src/assets/images/big/v3/tabel-bg-active.png differ 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 00000000..c9f56221 Binary files /dev/null and b/src/assets/images/big/v3/tabel-bg.png differ diff --git a/src/assets/images/big/v3/tabel-num-active.png b/src/assets/images/big/v3/tabel-num-active.png new file mode 100644 index 00000000..3135d891 Binary files /dev/null and b/src/assets/images/big/v3/tabel-num-active.png differ diff --git a/src/assets/images/big/v3/tabel-num.png b/src/assets/images/big/v3/tabel-num.png new file mode 100644 index 00000000..bd7a6cea Binary files /dev/null and b/src/assets/images/big/v3/tabel-num.png differ 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"