diff --git a/package.json b/package.json index 8cc295e7..142b68e5 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,6 @@ "@types/crypto-js": "^4.1.1", "@types/keymaster": "^1.6.30", "@types/lodash": "^4.14.184", - "@vicons/fluent": "^0.12.0", - "@vicons/tabler": "^0.12.0", "animate.css": "^4.1.1", "axios": "^1.4.0", "color": "^4.2.3", @@ -60,7 +58,10 @@ "@typescript-eslint/eslint-plugin": "^5.18.0", "@typescript-eslint/parser": "^5.18.0", "@vicons/carbon": "^0.12.0", + "@vicons/fluent": "^0.12.0", "@vicons/ionicons5": "~0.11.0", + "@vicons/material": "^0.12.0", + "@vicons/tabler": "^0.12.0", "@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue-jsx": "^3.0.1", "@vue/compiler-sfc": "^3.2.31", diff --git a/src/App.vue b/src/App.vue index 04025bcf..442c1031 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,26 +19,27 @@ import { GoAppProvider } from '@/components/GoAppProvider' import { I18n } from '@/components/I18n' import { useSystemInit, useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks' import { getToken } from '@/api/path' -import { onMounted, onUnmounted } from 'vue' import { useRouterStore } from '@/store/modules/routerStore/routerStore' +import { useOriginStore } from '@/store/modules/originStore/originStore' +import { useGetMessageByParent } from '@/utils/utils' + +const {getMessageByParent} = useGetMessageByParent() const routerStore = useRouterStore() -let handleMessage = function(event:{data:string}) { - const {data}:{data:any} = event - if(data.page === 'customLargeScreen' && data.type === 'setCallByParent') { - routerStore.setCallByParent(data.callByParent) +getMessageByParent('setCallByParent', (e) => { + if(e.data.type === 'setCallByParent' && e.data.page === 'customLargeScreen') { + const {data}:{data:any} = e + if(data.page === 'customLargeScreen' && data.type === 'setCallByParent') { + routerStore.setCallByParent(data.callByParent) + } } -} -onMounted(() => { - window.addEventListener('message', handleMessage); - let obj = { - page: 'customLargeScreen', - type: 'bindPostMessageEvent' - } - window.parent.postMessage(JSON.stringify(obj), '*'); }) -onUnmounted(() => { - window.removeEventListener('message', handleMessage); + +const originStore = useOriginStore() +getMessageByParent('getStore', (e) => { + if(e.data.type === 'getStore' && e.data.page === 'customLargeScreen') { + originStore.setOriginStore(e.data.data, false) + } }) getToken() diff --git a/src/api/path/business.api.ts b/src/api/path/business.api.ts index c1b06b6d..c04c209e 100644 --- a/src/api/path/business.api.ts +++ b/src/api/path/business.api.ts @@ -2,10 +2,15 @@ import { http } from "@/api/http"; import { RequestHttpEnum } from "@/enums/httpEnum"; import { httpErrorHandle } from '@/utils' +import moment from 'moment' export function getToken() { - const storage_access_token = localStorage.getItem('access_token') - if(storage_access_token) return storage_access_token + const storage_access_token = localStorage.getItem('access_token_obj') + if(storage_access_token) { + const obj = JSON.parse(storage_access_token) + const { access_token, expiration } = obj + if(expiration >= moment().format('x')) return access_token + } let queryStr = window.location.href queryStr = queryStr.split('?')[1] if(queryStr && queryStr.indexOf('#') > -1) queryStr = queryStr.split('#')[0] @@ -13,7 +18,11 @@ export function getToken() { queryStr && queryStr.split('&').forEach((item:string) => { query[item.split('=')[0]] = item.split('=')[1] }) - if(query.access_token) localStorage.setItem('access_token', query.access_token) + const obj = { + access_token: query.access_token, + expiration: 86400000 + moment().format('x') + } + if(query.access_token) localStorage.setItem('access_token_obj', JSON.stringify(obj)) return query.access_token } diff --git a/src/assets/images/chart/customponents/OverviewOfComputingNodes.png b/src/assets/images/chart/customponents/OverviewOfComputingNodes.png new file mode 100644 index 00000000..0ec3e482 Binary files /dev/null and b/src/assets/images/chart/customponents/OverviewOfComputingNodes.png differ diff --git a/src/assets/images/chart/customponents/RealTimeEvent.png b/src/assets/images/chart/customponents/RealTimeEvent.png new file mode 100644 index 00000000..3d8f370a Binary files /dev/null and b/src/assets/images/chart/customponents/RealTimeEvent.png differ diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.vue index cf411daa..976c5db1 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUE/index.vue @@ -45,7 +45,7 @@ const props = defineProps({ } }) Object.assign(props.chartConfig.attr, { w: 380, h: 250 }) -Object.assign(props.chartConfig.request, { requestInterval: 15, requestIntervalUnit: RequestHttpIntervalEnum.SECOND }) +if(!props.chartConfig.request.requestInterval) Object.assign(props.chartConfig.request, { requestInterval: 15, requestIntervalUnit: RequestHttpIntervalEnum.SECOND }) const { w, h } = toRefs(props.chartConfig.attr) const { dataset, fit, borderRadius } = toRefs(props.chartConfig.option) @@ -58,7 +58,7 @@ const getStyle = (radius: number) => { } const value = reactive([ - {label: '实时PUE', value: '0.000'}, + {label: '实时PUE', value: '1.000'}, {label: '昨日PUE', value: '0.000'}, {label: '上周PUE', value: '0.000'}, {label: '上月PUE', value: '0.000'}, diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.vue b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.vue index 3d61a791..9a72a595 100644 --- a/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceAlarmOverview/index.vue @@ -53,7 +53,7 @@ const props = defineProps({ } }) Object.assign(props.chartConfig.attr, { w: 380, h: 250 }) -Object.assign(props.chartConfig.request, { requestInterval: 15, requestIntervalUnit: RequestHttpIntervalEnum.SECOND }) +if(!props.chartConfig.request.requestInterval) Object.assign(props.chartConfig.request, { requestInterval: 15, requestIntervalUnit: RequestHttpIntervalEnum.SECOND }) const { w, h } = toRefs(props.chartConfig.attr) const { dataset, fit, borderRadius } = toRefs(props.chartConfig.option) diff --git a/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/config.ts b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/config.ts new file mode 100644 index 00000000..19de6e7f --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/config.ts @@ -0,0 +1,25 @@ +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { OverviewOfComputingNodesConfig } from './index' +import cloneDeep from 'lodash/cloneDeep' +// import logo from '@/assets/logo.png' + +export const option = { + // 图片路径 + dataset: '', + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 0 +} + +export default class Config extends PublicConfigClass implements CreateComponentType +{ + public key = OverviewOfComputingNodesConfig.key + public chartConfig = cloneDeep(OverviewOfComputingNodesConfig) + public option = cloneDeep(option) + public customData = cloneDeep({ + title: '计算节点运行概况', + showInterval: true, + }) +} diff --git a/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/config.vue b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/config.vue new file mode 100644 index 00000000..d1759a1d --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/config.vue @@ -0,0 +1,67 @@ + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/configData.vue b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/configData.vue new file mode 100644 index 00000000..2c83af5e --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/configData.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/index.ts b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/index.ts new file mode 100644 index 00000000..5c61d155 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/index.ts @@ -0,0 +1,16 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d' + +export const OverviewOfComputingNodesConfig: ConfigType = { + key: 'OverviewOfComputingNodes', + chartKey: 'VOverviewOfComputingNodes', + conKey: 'VCOverviewOfComputingNodes', + // VCD开头 + conDataKey: 'VCDOverviewOfComputingNodes', + title: '计算节点运行概况', + category: ChatCategoryEnum.CUSTOMCOMPONENTS, + categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS, + package: PackagesCategoryEnum.CUSTOMCOMPONENTS, + chartFrame: ChartFrameEnum.COMMON, + image: 'OverviewOfComputingNodes.png' +} diff --git a/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/index.vue b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/index.vue new file mode 100644 index 00000000..9ec7b6f7 --- /dev/null +++ b/src/packages/components/CustomComponents/CustomComponents/OverviewOfComputingNodes/index.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/Svg.vue b/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/Svg.vue index 2b797fe4..10c2eb72 100644 --- a/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/Svg.vue +++ b/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/Svg.vue @@ -1,510 +1,513 @@ diff --git a/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/index.vue b/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/index.vue index 8b58f06e..459f5ee8 100644 --- a/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/RealTimeAlarmStatistics/index.vue @@ -1,13 +1,12 @@