Skip to content

2.12 dashboard #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wzyyy98 wants to merge 5 commits into
base: 2.12
Choose a base branch
from
Open

2.12 dashboard #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
083134a
feat: 仪表盘组件
Wzyyy98 Apr 27, 2026
3cce9d4
fix: 仪表组件及部分样式修改
Wzyyy98 Apr 28, 2026
5a800a4
feat: 表盘组件
Wzyyy98 Apr 30, 2026
9566086
fix: 图片及样式优化
Wzyyy98 Apr 30, 2026
a7c74b3
fix: merge 2.12
Wzyyy98 Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions views/device/components/DashboardPreviewTab/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ defineExpose({
.dashboard-preview-tab {
width: 100%;
height: 100%;
:deep(.unified-drawer .list-container .lazy-image-container){
// width: 90px !important;
img{
width: 100% !important;
height: 100% !important;
object-fit: cover;
}
}
}

.preview-host {
Expand Down
Binary file added visDashboard/MetadataManagement/EventShowCard/eventShowCard.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 45 additions & 44 deletions visDashboard/MetadataManagement/IndividualCard/Config.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
<template>
<template>
<div class="card-container">
<div class="card-header">
<config-item
v-if="isProduct"
label="设备"
>
<a-select
v-model:value="config.deviceId"
:options="deviceOptions"
placeholder="请选择设备"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onDeviceChange"
/>
</config-item>

<config-item label="属性">
<a-select
v-model:value="config.propertyId"
:options="typeOptions"
placeholder="请选择属性"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onTypeChange"
/>
</config-item>
</div>
<a-divider />
<config-item label="图标">
<IconLibrary
v-model:type="config.icon"
Expand Down Expand Up @@ -56,8 +85,6 @@
/>
</config-item>



<config-item label="属性值样式">
<div class="card-container-row">
<ColorPicker
Expand Down Expand Up @@ -97,47 +124,6 @@
/>
</div>
</config-item>
<!-- <config-item label="默认值">
<a-input
v-model:value="config.value"
placeholder="请输入默认值"
style="width: 100%"
@change="onChange"
/>
</config-item>
<config-item label="标题">
<a-input
v-model:value="config.title"
placeholder="请输入标题"
style="width: 100%"
@change="onChange"
/>
</config-item> -->
<config-item
v-if="isProduct"
label="设备"
>
<a-select
v-model:value="config.deviceId"
:options="deviceOptions"
placeholder="请选择设备"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onDeviceChange"
/>
</config-item>
<config-item label="属性">
<a-select
v-model:value="config.propertyId"
:options="typeOptions"
placeholder="请选择属性"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onTypeChange"
/>
</config-item>
</div>
</template>

Expand Down Expand Up @@ -268,10 +254,25 @@ watch(

<style lang="less" scoped>
.card-container {
.card-header {
gap: 12px;
display: flex;
flex-direction: column;
padding: 14px 16px;
border-radius: 12px;
background: #f7f9fc;
}
color: #fff;
gap: 12px;
display: flex;
flex-direction: column;
:deep(.ant-divider-horizontal) {
margin: 0;
margin-bottom: 12px;
}
:deep(.config-form-item-content) {
padding: 0;
}
}

.card-container-row {
Expand Down
2 changes: 1 addition & 1 deletion visDashboard/MetadataManagement/IndividualCard/IndividualCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ const displayValue = computed(() => {
if (value === undefined || value === null || value === '') {
const fallback = config.value.value
if (fallback === undefined || fallback === null || fallback === '') {
return 'N/A'
return '--'
}
return String(fallback)
}
Expand Down
2 changes: 1 addition & 1 deletion visDashboard/MetadataManagement/IndividualCard/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
iconSize: 32,
titleColor: 'rgba(0, 0, 0, 0.88)',
titleFontSize: 32,
value: 'N/A',
value: '',
valueColor: 'rgba(0, 0, 0, 0.88)',
valueFontSize: 32,
unit: '',
Expand Down
Binary file added visDashboard/MetadataManagement/IndividualCard/individualCard.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 45 additions & 28 deletions visDashboard/MetadataManagement/PropertyBattery/Config.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
<template>
<div class="card-container">
<div class="card-container"> <div class="card-header">
<config-item
v-if="isProduct"
label="设备"
>
<a-select
v-model:value="config.deviceId"
:options="deviceOptions"
placeholder="请选择设备"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onDeviceChange"
/>
</config-item>

<config-item label="属性">
<a-select
v-model:value="config.propertyId"
:options="typeOptions"
placeholder="请选择属性"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onTypeChange"
/>
</config-item>

</div>
<a-divider />
<config-item label="标题样式">
<div class="card-container-row">
<ColorPicker
Expand Down Expand Up @@ -122,33 +151,6 @@
@change="onChange"
/>
</config-item>

<config-item
v-if="isProduct"
label="设备"
>
<a-select
v-model:value="config.deviceId"
:options="deviceOptions"
placeholder="请选择设备"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onDeviceChange"
/>
</config-item>

<config-item label="属性">
<a-select
v-model:value="config.propertyId"
:options="typeOptions"
placeholder="请选择属性"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onTypeChange"
/>
</config-item>
</div>
</template>

Expand Down Expand Up @@ -271,10 +273,25 @@ watch(

<style lang="less" scoped>
.card-container {
.card-header {
gap: 12px;
display: flex;
flex-direction: column;
padding: 14px 16px;
border-radius: 12px;
background: #f7f9fc;
}
color: #fff;
gap: 12px;
display: flex;
flex-direction: column;
:deep(.ant-divider-horizontal) {
margin: 0;
margin-bottom: 12px;
}
:deep(.config-form-item-content) {
padding: 0;
}
}

.card-container-row {
Expand Down
2 changes: 1 addition & 1 deletion visDashboard/MetadataManagement/PropertyBattery/PropertyBattery.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const displayValue = computed(() => {
if (value === undefined || value === null || value === '') {
const fallback = config.value.value
if (fallback === undefined || fallback === null || fallback === '') {
return 'N/A'
return '--'
}
return String(fallback)
}
Expand Down
2 changes: 1 addition & 1 deletion visDashboard/MetadataManagement/PropertyBattery/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const propertyBatteryConfig = {
propertyBattery: {
titleColor: 'rgba(0, 0, 0, 0.88)',
titleFontSize: 16,
value: 'N/A',
value: '',
valueColor: 'rgba(0, 0, 0, 0.88)',
valueFontSize: 32,
unit: '%',
Expand Down
Binary file added visDashboard/MetadataManagement/PropertyBattery/propertyBattery.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 45 additions & 28 deletions visDashboard/MetadataManagement/PropertyChart/Config.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
<template>
<div class="card-container">
<div class="card-container"> <div class="card-header">
<config-item
v-if="isProduct"
label="设备"
>
<a-select
v-model:value="config.deviceId"
:options="deviceOptions"
placeholder="请选择设备"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onDeviceChange"
/>
</config-item>

<config-item label="属性">
<a-select
v-model:value="config.propertyId"
:options="typeOptions"
placeholder="请选择属性"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onTypeChange"
/>
</config-item>

</div>
<a-divider />
<config-item label="标题样式">
<div class="card-container-row">
<ColorPicker
Expand Down Expand Up @@ -88,33 +117,6 @@
@change="onChange"
/>
</config-item>

<config-item
v-if="isProduct"
label="设备"
>
<a-select
v-model:value="config.deviceId"
:options="deviceOptions"
placeholder="请选择设备"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onDeviceChange"
/>
</config-item>

<config-item label="属性">
<a-select
v-model:value="config.propertyId"
:options="typeOptions"
placeholder="请选择属性"
optionFilterProp="label"
style="width: 100%"
popupClassName="is-dark"
@change="onTypeChange"
/>
</config-item>
</div>
</template>

Expand Down Expand Up @@ -237,10 +239,25 @@ watch(

<style lang="less" scoped>
.card-container {
.card-header {
gap: 12px;
display: flex;
flex-direction: column;
padding: 14px 16px;
border-radius: 12px;
background: #f7f9fc;
}
color: #fff;
gap: 12px;
display: flex;
flex-direction: column;
:deep(.ant-divider-horizontal) {
margin: 0;
margin-bottom: 12px;
}
:deep(.config-form-item-content) {
padding: 0;
}
}

.card-container-row {
Expand Down
2 changes: 1 addition & 1 deletion visDashboard/MetadataManagement/PropertyChart/PropertyChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ const displayValue = computed(() => {
const value = currentRawValue.value

if (value === undefined || value === null || value === '') {
return 'N/A'
return '--'
}

return String(value)
Expand Down
Binary file added visDashboard/MetadataManagement/PropertyChart/propertyChart.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading