-
@@ -30,15 +43,15 @@
{{ index + 1 }}
- {{ item.enterpriseName }}
+ {{ item.name }}
diff --git a/public/staticData/static.json b/public/staticData/static.json
index c872c94..6ebff16 100644
--- a/public/staticData/static.json
+++ b/public/staticData/static.json
@@ -27,7 +27,7 @@
{
"rank": "TOP1",
"name": "株机公司",
- "value": 932
+ "value": 101
},
{
"rank": "TOP2",
@@ -162,98 +162,98 @@
]
}
]
+ }
+ },
+ "TopAlarmsHaz": {
+ "a": {
+ "titleText": "电动自行车停车场景数企业及场景数量",
+ "source": [
+ {
+ "rank": "TOP1",
+ "name": "株机公司",
+ "value": 96
+ },
+ {
+ "rank": "TOP2",
+ "name": "株洲所",
+ "value": 34
+ },
+ {
+ "rank": "TOP3",
+ "name": "时代新材",
+ "value": 19
+ },
+ {
+ "rank": "TOP4",
+ "name": "产投公司",
+ "value": 16
+ },
+ {
+ "rank": "TOP5",
+ "name": "四方股份",
+ "value": 12
+ }
+ ]
},
- "TopAlarmsHaz": {
- "a": {
- "titleText": "电动自行车停放区场景数前五的企业及场景数量",
- "source": [
- {
- "rank": "TOP1",
- "name": "株机公司",
- "value": 96
- },
- {
- "rank": "TOP2",
- "name": "株洲所",
- "value": 34
- },
- {
- "rank": "TOP3",
- "name": "时代新材",
- "value": 19
- },
- {
- "rank": "TOP4",
- "name": "产投公司",
- "value": 16
- },
- {
- "rank": "TOP5",
- "name": "四方股份",
- "value": 12
- }
- ]
- },
- "b": {
- "titleText": "电动汽车停车场场景数前五的企业及场景数量",
- "source": [
- {
- "rank": "TOP1",
- "name": "株机公司",
- "value": 18
- },
- {
- "rank": "TOP2",
- "name": "株洲所",
- "value": 18
- },
- {
- "rank": "TOP3",
- "name": "四方股份",
- "value": 20
- },
- {
- "rank": "TOP4",
- "name": "时代新材",
- "value": 12
- },
- {
- "rank": "TOP5",
- "name": "长江集团",
- "value": 10
- }
- ]
- },
- "c": {
- "titleText": "生产用电动车停放区场景数前五的企业及场景数量",
- "source": [
- {
- "rank": "TOP1",
- "name": "株机公司",
- "value": 82
- },
- {
- "rank": "TOP2",
- "name": "长客股份",
- "value": 63
- },
- {
- "rank": "TOP3",
- "name": "四方股份",
- "value": 32
- },
- {
- "rank": "TOP4",
- "name": "株洲所",
- "value": 24
- },
- {
- "rank": "TOP5",
- "name": "时代新材",
- "value": 22
- }
- ]
- }
+ "b": {
+ "titleText": "电动汽车停车场场景数企业及场景数量",
+ "source": [
+ {
+ "rank": "TOP1",
+ "name": "株机公司",
+ "value": 18
+ },
+ {
+ "rank": "TOP2",
+ "name": "株洲所",
+ "value": 18
+ },
+ {
+ "rank": "TOP3",
+ "name": "四方股份",
+ "value": 20
+ },
+ {
+ "rank": "TOP4",
+ "name": "时代新材",
+ "value": 12
+ },
+ {
+ "rank": "TOP5",
+ "name": "长江集团",
+ "value": 10
+ }
+ ]
+ },
+ "c": {
+ "titleText": "生产用电动车停车场景数企业及场景数量",
+ "source": [
+ {
+ "rank": "TOP1",
+ "name": "株机公司",
+ "value": 82
+ },
+ {
+ "rank": "TOP2",
+ "name": "长客股份",
+ "value": 63
+ },
+ {
+ "rank": "TOP3",
+ "name": "四方股份",
+ "value": 32
+ },
+ {
+ "rank": "TOP4",
+ "name": "株洲所",
+ "value": 24
+ },
+ {
+ "rank": "TOP5",
+ "name": "时代新材",
+ "value": 22
+ }
+ ]
}
}
},
@@ -330,7 +330,7 @@
{
"title": "调漆作业室",
"label": "智控场景",
- "value": null,
+ "value": 0,
"color": "#FFD700",
"image": "scene-control.png"
}
@@ -419,40 +419,36 @@
}
},
"T04": {
- "SceneDistribution": {
+ "WorkshopScene": {
"a": {
"source": [
{
- "title": "危化品库",
- "label": "场景总数",
- "value": 130,
- "color": "#00E5FF",
- "image": "scene-total.png"
+ "name": "危化品库",
+ "icon": "warehouse",
+ "metrics": [
+ {
+ "label": "场景总数",
+ "value": 130
+ },
+ {
+ "label": "智控场景",
+ "value": 0
+ }
+ ]
},
{
- "title": "危化品库",
- "label": "智控场景",
- "value": 0,
- "color": "#FFD700",
- "image": "scene-control.png"
- }
- ]
- },
- "b": {
- "source": [
- {
- "title": "危废品库",
- "label": "场景总数",
- "value": 152,
- "color": "#00E5FF",
- "image": "scene-total.png"
- },
- {
- "title": "危废品库",
- "label": "智控场景",
- "value": 0,
- "color": "#FFD700",
- "image": "scene-control.png"
+ "name": "危废品库",
+ "icon": "warehouse",
+ "metrics": [
+ {
+ "label": "智控场景",
+ "value": 152
+ },
+ {
+ "label": "场景总数",
+ "value": 0
+ }
+ ]
}
]
}
@@ -462,32 +458,39 @@
"titleText": "危化品库场景数量前五的企业及场景数量",
"source": [
{
- "company": "时代新材",
- "quantity": 30
+ "rank": "TOP1",
+ "name": "时代新材",
+ "value": 30
},
{
- "company": "株洲所",
- "quantity": 16
+ "rank": "TOP2",
+ "name": "株洲所",
+ "value": 16
},
{
- "company": "四方股份",
- "quantity": 15
+ "rank": "TOP3",
+ "name": "四方股份",
+ "value": 15
},
{
- "company": "产投公司",
- "quantity": 13
+ "rank": "TOP4",
+ "name": "产投公司",
+ "value": 13
},
{
- "company": "长江集团",
- "quantity": 11
+ "rank": "TOP5",
+ "name": "长江集团",
+ "value": 11
},
{
- "company": "长客股份",
- "quantity": 11
+ "rank": "TOP6",
+ "name": "长客股份",
+ "value": 11
},
{
- "company": "株机公司",
- "quantity": 11
+ "rank": "TOP7",
+ "name": "株机公司",
+ "value": 11
}
]
},
@@ -495,24 +498,29 @@
"titleText": "危废品库场景数量前五的企业及场景数量",
"source": [
{
- "company": "时代新材",
- "quantity": 27
+ "rank": "TOP1",
+ "name": "时代新材",
+ "value": 27
},
{
- "company": "株机公司",
- "quantity": 26
+ "rank": "TOP2",
+ "name": "株机公司",
+ "value": 26
},
{
- "company": "株洲所",
- "quantity": 20
+ "rank": "TOP3",
+ "name": "株洲所",
+ "value": 20
},
{
- "company": "产投公司",
- "quantity": 16
+ "rank": "TOP4",
+ "name": "产投公司",
+ "value": 16
},
{
- "company": "长客股份",
- "quantity": 12
+ "rank": "TOP5",
+ "name": "长客股份",
+ "value": 12
}
]
}
diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue
index 4e56dd5..bf0f629 100644
--- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue
+++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue
@@ -103,6 +103,15 @@ watch(
{ deep: true, immediate: true }
)
+
+
+
+
+
+
+
+
+
const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
updateChartData(newData)
})
diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts b/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts
index def22ce..cbaddb5 100644
--- a/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts
+++ b/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/config.ts
@@ -2,6 +2,7 @@ import { PublicConfigClass } from '@/packages/public'
import { CreateComponentType } from '@/packages/index.d'
import { TopAlarmsConfig } from './index'
import dataJson from './data.json'
+import { cloneDeep } from 'lodash'
export const option = {
sceneCode: 'T04',
componentIndexKey: "a",
@@ -51,6 +52,6 @@ export const option = {
export default class Config extends PublicConfigClass implements CreateComponentType {
public key = TopAlarmsConfig.key
public chartConfig = TopAlarmsConfig
- public option = option
+ public option = cloneDeep(option)
}
diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/index.vue
index 4c93f3e..d52f0a9 100644
--- a/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/index.vue
+++ b/src/packages/components/Charts/HazardousChemicalsSpace/TopAlarmsHaz/index.vue
@@ -18,9 +18,22 @@