Merge remote-tracking branch 'origin/master'

This commit is contained in:
Administrator 2025-09-04 20:13:31 +08:00
commit 64acb58263
7 changed files with 57 additions and 73 deletions

View File

@ -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
}
]
}
]
}

View File

@ -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, // 自动旋转
},

View File

@ -6,6 +6,11 @@
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
</setting-item>
</setting-item-box>
<setting-item-box name="组件 key " :alone="true">
<setting-item>
<n-input v-model:value="optionData.componentIndexKey" type="textarea" size="small"></n-input>
</setting-item>
</setting-item-box>
</collapse-item>
<!-- 基础配置可以复用PieCommon的配置面板 -->
<CollapseItem name="基础配置" :expanded="true">

View File

@ -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
}
]
}

View File

@ -1,7 +1,7 @@
<template>
<div class="go-border-box">
<img src="./assets/title.svg" class="svg" />
<div class="header-title">有限空间分布情况</div>
<div class="header-title">各企业有限空间总数及各等级有限空间的数量 </div>
<v-chart ref="vChartRef" autoresize :init-options="initOptions" :theme="themeColor" :option="option"></v-chart>
</div>
@ -9,8 +9,6 @@
<script setup lang="ts">
import 'echarts-gl'
import { toRaw, toReadonly, toRefs } from '@vue/reactivity'
import { isPreview } from '@/utils'
import { computed, onMounted, PropType, reactive, watch } from 'vue'
import VChart from 'vue-echarts'
import * as echarts from 'echarts'
@ -104,14 +102,6 @@ watch(
)
const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
updateChartData(newData)
})

View File

@ -12,7 +12,7 @@
</setting-item-box>
<setting-item-box name="标题" :alone="true">
<setting-item>
<n-input v-model:value="optionData.title" type="textarea" size="small"></n-input>
<n-input v-model:value="optionData.titleText" type="textarea" size="small"></n-input>
</setting-item>
</setting-item-box>
</collapse-item>

View File

@ -20,40 +20,48 @@
<div class="content">
<div class="scene-row" :style="{ backgroundImage: `url(${backgrounds[0]})` }">
<div class="scene-name-1" :style="{ color: option.sceneNameColor, fontSize: option.sceneNameSize + 'px' }">
危化品库</div>
{{ option.dataset[0].name }}</div>
<div class="metrics-container">
<div class="metric-top-1">
<div class="metric-label">
<span :style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">场景总数</span>
<span
:style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">{{ option.dataset[0].metrics[0].label }}</span>
</div>
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">262
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">
{{ option.dataset[0].metrics[0].value }}
</div>
</div>
<div class="metric-top-2">
<div class="metric-label">
<span :style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">智控场景</span>
<span
:style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">{{ option.dataset[0].metrics[1].label }}</span>
</div>
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">6852
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">
{{ option.dataset[0].metrics[1].value }}
</div>
</div>
</div>
</div>
<div class="scene-row reverse" :style="{ backgroundImage: `url(${backgrounds[1]})` }">
<div class="scene-name-2" :style="{ color: option.sceneNameColor, fontSize: option.sceneNameSize + 'px' }">
危废品库</div>
{{ option.dataset[1].name }} </div>
<div class="metrics-container">
<div class="metric-bottom-1">
<div class="metric-label">
<span :style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">智控场景</span>
<span
:style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">{{ option.dataset[1].metrics[0].label }}</span>
</div>
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">6852
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">
{{ option.dataset[1].metrics[0].value }}
</div>
</div>
<div class="metric-bottom-2">
<div class="metric-label">
<span :style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">场景总数</span>
<span
:style="{ color: option.labelColor, fontSize: option.labelSize + 'px' }">{{ option.dataset[1].metrics[1].label }}</span>
</div>
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">262
<div class="metric-value" :style="{ color: option.valueColor, fontSize: option.valueSize + 'px' }">
{{ option.dataset[1].metrics[1].value }}
</div>
</div>
</div>