diff --git a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue index 58e1dba..108649c 100644 --- a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue +++ b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue @@ -45,7 +45,7 @@ </template> </vxe-column> <vxe-column field="type_id" width="100px" :title="$t('cmdb.ciType.ciType')"></vxe-column> - <vxe-column field="show_attr_value" width="100px" :title="$t('cmdb.ciType.show')"></vxe-column> + <vxe-column field="show_attr_value" width="100px" :title="$t('cmdb.ci.instance')"></vxe-column> <vxe-column field="operate_type" width="89px" :title="$t('operation')"> <template #header="{ column }"> <span>{{ column.title }}</span> diff --git a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue index 5702c1b..4951388 100644 --- a/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue +++ b/cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue @@ -85,7 +85,7 @@ @change="onChange" format="YYYY-MM-DD HH:mm" :placeholder="[$t('cmdb.history.startTime'), $t('cmdb.history.endTime')]" - v-else-if="valueTypeMap[item.value_type] == 'date' || valueTypeMap[item.value_type] == 'datetime'" + v-else-if="item.value_type === '3'" :show-time="{ hideDisabledOptions: true, defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],