diff --git a/public/staticData/static.json b/public/staticData/static.json index 6ebff16..261179d 100644 --- a/public/staticData/static.json +++ b/public/staticData/static.json @@ -317,40 +317,36 @@ } }, "T05": { - "SceneDistribution": { + "WorkshopScene": { "a": { "source": [ { - "title": "调漆作业室", - "label": "场景总数", - "value": 141, - "color": "#00E5FF", - "image": "scene-total.png" + "name": "调漆作业室", + "icon": "warehouse", + "metrics": [ + { + "label": "场景总数", + "value": 141 + }, + { + "label": "智控场景", + "value": 0 + } + ] }, { - "title": "调漆作业室", - "label": "智控场景", - "value": 0, - "color": "#FFD700", - "image": "scene-control.png" - } - ] - }, - "b": { - "source": [ - { - "title": "喷漆作业室", - "label": "场景总数", - "value": 466, - "color": "#00E5FF", - "image": "scene-total.png" - }, - { - "title": "喷漆作业室", - "label": "智控场景", - "value": 0, - "color": "#FFD700", - "image": "scene-control.png" + "name": "喷漆作业室", + "icon": "warehouse", + "metrics": [ + { + "label": "智控场景", + "value": 466 + }, + { + "label": "场景总数", + "value": 0 + } + ] } ] } diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts index 4be240a..4c24f27 100644 --- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.ts @@ -10,6 +10,7 @@ export const includes = ['legend'] // 其它配置 const otherConfig = { sceneCode: 'T01', + componentIndexKey:"", dateTime: { selectValue: 'day', dataset: [ @@ -72,7 +73,7 @@ export const option = { title: [ { x: 'center', - top: '35%', + top: '30%', text: total, textStyle: { color: '#eee', @@ -82,7 +83,7 @@ export const option = { }, { x: 'center', - top: '48%', + top: '43%', text: '总数', textStyle: { color: '#ccc', @@ -108,11 +109,11 @@ export const option = { }, grid3D: { show: false, - boxHeight: 4, + boxHeight: 2, top: '-10%', viewControl: { distance: 180, - alpha: 30, + alpha: 35, beta: 60, autoRotate: false, // 自动旋转 }, diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.vue b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.vue index 153ddbe..a5af0ae 100644 --- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.vue +++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/config.vue @@ -6,6 +6,11 @@ + + + + + diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/data.json b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/data.json index 4c76d33..b84a323 100644 --- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/data.json +++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/data.json @@ -7,24 +7,8 @@ ], "source": [ { - "name": "类型1", - "value": 1867 - }, - { - "name": "类型2", - "value": 3100 - }, - { - "name": "类型3", - "value": 4000 - }, - { - "name": "类型4", - "value": 1987 - }, - { - "name": "类型5", - "value": 200 + "name": "污水处理站数量", + "value": 275 } ] } \ No newline at end of file diff --git a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue index bf0f629..d596464 100644 --- a/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/FiniteSpatialDistribution/index.vue @@ -1,7 +1,7 @@