From 0a5b27a7a023493b21d0d550c3c12647bdcdcfd6 Mon Sep 17 00:00:00 2001 From: fhysy <1149505133@qq.com> Date: Sat, 14 Sep 2024 14:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=20fast(=E5=A4=A7=E5=B1=8F):=20=E5=86=85?= =?UTF-8?q?=E5=B5=8C=E5=A4=A7=E5=B1=8F=E9=A1=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=81=E9=A1=B9=E7=9B=AE=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E7=9A=84=E5=8F=82=E6=95=B0=E5=92=8C=E5=88=86?= =?UTF-8?q?=E7=BB=84=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=92=8C=E6=98=BE?= =?UTF-8?q?=E9=9A=90=E5=8F=82=E6=95=B0=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E7=BB=84=E4=BB=B6=E5=BB=B6=E8=BF=9F=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.ccprod | 5 + .env.development | 5 + .env.dr | 5 + .env.drgy | 5 + .env.drgyprod | 5 + .env.drprod | 5 + package.json | 1 + src/router/index.js | 2 +- src/store/modules/attribute.js | 3 + src/views/bigScreenIframe/index.vue | 65 + src/views/iot/device/index.vue | 188 +- src/views/iot/model/index.vue | 170 +- src/views/iot/modelScries/index.vue | 136 +- .../DeviceManage/EDeviceChildren.vue | 20 +- .../profileV2/DeviceManage/EDeviceTable.vue | 26 +- .../DeviceAlarmConfig/DeviceAlarmConfig.vue | 10 +- src/views/profile/DeviceRunStarts/index.vue | 2 +- src/views/profile/DeviceRunStarts/table.vue | 50 +- src/views/profile/attribute/attributeForm.vue | 60 +- src/views/profile/attribute/attributeView.vue | 68 +- src/views/profile/attribute/groupForm.vue | 10 +- src/views/profile/attribute/groupView.vue | 37 +- src/views/profile/attribute/index.vue | 13 +- yarn.lock | 15517 ++++++++-------- 24 files changed, 8399 insertions(+), 8009 deletions(-) create mode 100644 src/views/bigScreenIframe/index.vue diff --git a/.env.ccprod b/.env.ccprod index 01065ed9..41d3826f 100644 --- a/.env.ccprod +++ b/.env.ccprod @@ -33,6 +33,11 @@ VUE_APP_THEME_CLASS = 'theme-grey-red' # 智慧用电管理系统/开发环境 VUE_APP_BASE_API = '/prod-api' +#平台大屏地址 +VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078' +#项目大屏地址 +VUE_APP_BIGSCREEN_PROJECT_URL = '' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.development b/.env.development index 964dd1f3..b043f3a8 100644 --- a/.env.development +++ b/.env.development @@ -28,6 +28,11 @@ VUE_APP_THEME_CLASS = 'theme-green' # 智慧用电管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' +#平台大屏地址 +VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078' +#项目大屏地址 +VUE_APP_BIGSCREEN_PROJECT_URL = '' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.dr b/.env.dr index b7cc0f5d..2078210a 100644 --- a/.env.dr +++ b/.env.dr @@ -32,6 +32,11 @@ VUE_APP_THEME_CLASS = 'theme-blue-black' # 智慧用电管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' +#平台大屏地址 +VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078' +#项目大屏地址 +VUE_APP_BIGSCREEN_PROJECT_URL = '' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.drgy b/.env.drgy index 0b4640ef..c45e46d2 100644 --- a/.env.drgy +++ b/.env.drgy @@ -32,6 +32,11 @@ VUE_APP_THEME_CLASS = 'theme-blue-white' # 智慧用电管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' +#平台大屏地址 +VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078' +#项目大屏地址 +VUE_APP_BIGSCREEN_PROJECT_URL = '' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.drgyprod b/.env.drgyprod index 688cc476..c627e385 100644 --- a/.env.drgyprod +++ b/.env.drgyprod @@ -33,6 +33,11 @@ VUE_APP_THEME_CLASS = 'theme-green' # 智慧用电管理系统/开发环境 VUE_APP_BASE_API = '/prod-api' +#平台大屏地址 +VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078' +#项目大屏地址 +VUE_APP_BIGSCREEN_PROJECT_URL = '' + # 前端端口 diff --git a/.env.drprod b/.env.drprod index 47d23726..d68f466d 100644 --- a/.env.drprod +++ b/.env.drprod @@ -33,6 +33,11 @@ VUE_APP_THEME_CLASS = 'theme-blue-black' # 智慧用电管理系统/开发环境 VUE_APP_BASE_API = '/prod-api' +#平台大屏地址 +VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078' +#项目大屏地址 +VUE_APP_BIGSCREEN_PROJECT_URL = '' + # 前端端口 port= 9988 diff --git a/package.json b/package.json index 3e21b3b9..a5af1a73 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "js-beautify": "1.13.0", "js-cookie": "2.2.1", "js-md5": "^0.7.3", + "jsbarcode": "^3.11.6", "jsencrypt": "3.0.0-rc.1", "moment": "^2.29.4", "nprogress": "0.2.0", diff --git a/src/router/index.js b/src/router/index.js index 06a6d701..6e6c116a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -76,7 +76,7 @@ export const constantRoutes = [ children: [ { path: '/index', - component: (resolve) => require(['@/views/bigScreen/v3/index'], resolve), + component: (resolve) => require(['@/views/bigScreenIframe/index'], resolve), name: 'BigScreen', meta: { title: '监控大屏', icon: 'dashboard', noCache: true, affix: true diff --git a/src/store/modules/attribute.js b/src/store/modules/attribute.js index e428358a..494c7ed2 100644 --- a/src/store/modules/attribute.js +++ b/src/store/modules/attribute.js @@ -59,6 +59,9 @@ const attribute = { resolve(state.groupList) }) }, + setAttribute({ commit, state }, data){ + commit('SET_ATTRIBUTE_LIST', data) + }, // 初始化 属性和分组数据 InitAttributeAndGroup({ commit, state }, data) { commit('SET_ATTRIBUTE_LIST', data.attrList) diff --git a/src/views/bigScreenIframe/index.vue b/src/views/bigScreenIframe/index.vue new file mode 100644 index 00000000..c375e8c5 --- /dev/null +++ b/src/views/bigScreenIframe/index.vue @@ -0,0 +1,65 @@ +