github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-07-28 17:15:58 +08:00
commit a5e292f901
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/chart/components/senior/Threshold.vue
View File

@ -68,7 +68,7 @@
<span>
<svg-icon v-if="fieldItem.field.deType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="fieldItem.field.deType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon v-if="fieldItem.field.deType === 2 || fieldItem.field.value === 3" icon-class="field_value" class="field-icon-value" />
<svg-icon v-if="fieldItem.field.deType === 2 || fieldItem.field.deType === 3" icon-class="field_value" class="field-icon-value" />
<svg-icon v-if="fieldItem.field.deType === 5" icon-class="field_location" class="field-icon-location" />
</span>
<span :title="fieldItem.field.name" class="field-text">{{ fieldItem.field.name }}</span>

2
frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
View File

@ -16,7 +16,7 @@
<svg-icon v-if="fieldOption.deType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="fieldOption.deType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon
v-if="fieldOption.deType === 2 || fieldOption.value === 3"
v-if="fieldOption.deType === 2 || fieldOption.deType === 3"
icon-class="field_value"
class="field-icon-value"
/>