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 @@ +