diff --git a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue index 0d13dca1d5..ae78b8beb1 100644 --- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue @@ -671,7 +671,7 @@ defineExpose({ } } .label { - width: 100px; + width: 105px; color: #1f2329; } @@ -746,6 +746,7 @@ defineExpose({ color: #646a73; line-height: 26px; margin-right: 8px; + width: 35px; } .bottom-line { diff --git a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue index 408e16fd2a..75b5078b43 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue @@ -182,13 +182,12 @@ const addCascadeBlock = () => { cascadeList.value.push(arr) } -const indexCascade = [ - ' ', - t('report.week_mon'), - t('report.week_tue'), - t('report.week_wed'), - t('report.week_thu'), - t('report.week_fri') +const indexNumCascade = [ + t('visualization.number1'), + t('visualization.number2'), + t('visualization.number3'), + t('visualization.number4'), + t('visualization.number5') ] defineExpose({ @@ -248,7 +247,7 @@ defineExpose({
{{ t('v_query.select_cascaded_field') }}
-
{{ t('v_query.level_1', { msg: indexCascade[idx + 1] }) }}
+
{{ t('v_query.level_1', { msg: indexNumCascade[idx] }) }}
{ cascadeArr = cascadeArr.filter(ele => !!ele.length) } -const indexCascade = [ - ' ', - t('report.week_mon'), - t('report.week_tue'), - t('report.week_wed'), - t('report.week_thu'), - t('report.week_fri') +const indexNumCascade = [ + t('visualization.number1'), + t('visualization.number2'), + t('visualization.number3'), + t('visualization.number4'), + t('visualization.number5') ] const validateConditionType = ({ @@ -2729,7 +2728,7 @@ defineExpose({ class="tree-field" > {{ t('visualization.level') }}{{ indexCascade[index + 1] }}{{ t('visualization.level') }}{{ indexNumCascade[index] }} @@ -3559,7 +3558,7 @@ defineExpose({ } } .label { - width: 80px; + width: 85px; color: #1f2329; } diff --git a/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue b/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue index 8d297a5f61..ff7228a48d 100644 --- a/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue +++ b/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue @@ -59,13 +59,12 @@ const confirmClick = () => { emits('saveTree', arr) handleBeforeClose() } -const indexCascade = [ - ' ', - t('report.week_mon'), - t('report.week_tue'), - t('report.week_wed'), - t('report.week_thu'), - t('report.week_fri') +const indexNumCascade = [ + t('visualization.number1'), + t('visualization.number2'), + t('visualization.number3'), + t('visualization.number4'), + t('visualization.number5') ] const deleteCascade = idx => { @@ -101,7 +100,7 @@ defineExpose({
{{ t('v_query.tree_query_field') }}
-
{{ t('visualization.level') }}{{ indexCascade[idx + 1] }}
+
{{ t('visualization.level') }}{{ indexNumCascade[idx] }}