diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts b/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts index 38562ce..e668b83 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/config.ts @@ -5,20 +5,26 @@ import dataJson from './data.json' export const option = { dataset: dataJson.source, - title: '智慧园区', + header: ['所属企业', '设备类型', '设备名称'], + headerTextColor: '#ffffff', + textColor: '#ffffff', + headerBackgroundColor: '#1A385A', + itemBackgroundColor: '#0F233E', + timeColor: '#FF4D4F', + headerHeight: 40, + itemHeight: 35, + fontSize: 14, + title: '设备实时在线概况', + titleSize: 18, titleColor: '#ffffff', - titleSize: 22, - labelColor: '#B0E0E6', - labelSize: 16, - valueColor: '#00E5FF', - valueSize: 32, - unitColor: '#B0E0E6', - unitSize: 14, - borderColor: '#4A90E2' + iconColor: '#00E5FF', + onlineRate: 75, + onlineDevice: 23, + totalDevice: 100 } export default class Config extends PublicConfigClass implements CreateComponentType { public key = DeviceStatusConfig.key public chartConfig = DeviceStatusConfig public option = option -} +} \ No newline at end of file diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue b/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue index f4479f1..b55c8c9 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/config.vue @@ -6,11 +6,23 @@ - - + + - - + + + + + + + + + + + + + + @@ -25,4 +37,4 @@ defineProps({ required: true } }) - + \ No newline at end of file diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/data.json b/src/packages/components/Charts/MyComponents/DeviceStatus/data.json index c920014..7b91fd7 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/data.json +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/data.json @@ -1,8 +1,34 @@ { "source": [ - { "label": "设备总数", "value": 108, "unit": "个", "icon": "database" }, - { "label": "在线设备", "value": 100, "unit": "个", "icon": "wifi" }, - { "label": "离线设备", "value": 8, "unit": "个", "icon": "exclamation-circle" }, - { "label": "故障设备", "value": 2, "unit": "个", "icon": "tool" } + { + "enterprise": "所属企业所属企业", + "deviceType": "设备类型", + "deviceName": "设备名称设备名称", + "time": "1h" + }, + { + "enterprise": "所属企业所属企业", + "deviceType": "设备类型", + "deviceName": "设备名称设备名称", + "time": "1D 2h" + }, + { + "enterprise": "所属企业所属企业", + "deviceType": "设备类型", + "deviceName": "设备名称设备名称", + "time": "2h" + }, + { + "enterprise": "所属企业所属企业", + "deviceType": "设备类型", + "deviceName": "设备名称设备名称", + "time": "2h" + }, + { + "enterprise": "所属企业所属企业", + "deviceType": "设备类型", + "deviceName": "设备名称设备名称", + "time": "1D 2h" + } ] -} +} \ No newline at end of file diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/index.ts b/src/packages/components/Charts/MyComponents/DeviceStatus/index.ts index bcf9ed1..b8ec037 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/index.ts +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/index.ts @@ -1,14 +1,15 @@ import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' export const DeviceStatusConfig: ConfigType = { key: 'DeviceStatus', chartKey: 'VDeviceStatus', conKey: 'VCDeviceStatus', - title: '设备状态', + title: '设备在线概况', category: 'MyComponents', categoryName: '自定义组件', package: PackagesCategoryEnum.CHARTS, chartFrame: ChartFrameEnum.COMMON, image: 'device_status.png' } -export default DeviceStatusConfig +export default DeviceStatusConfig \ No newline at end of file diff --git a/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue b/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue index d572e74..7d85ff8 100644 --- a/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue +++ b/src/packages/components/Charts/MyComponents/DeviceStatus/index.vue @@ -1,18 +1,36 @@