7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #617 from veops/dev_ui_240914 

dev_ui_240914
This commit is contained in:
Leo Song 2024-09-14 17:28:42 +08:00 committed by GitHub
parent afda71f135 26f0a65ae4
commit 3beea17770
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-ui/src/modules/cmdb/views/operation_history/modules/ciTable.vue
View File

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

2
cmdb-ui/src/modules/cmdb/views/operation_history/modules/searchForm.vue
View File

@ -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')],

7
cmdb-ui/src/views/setting/components/employeeTreeSelect.vue
View File

@ -71,10 +71,9 @@ export default {
type: Boolean,
default: false,
},
// eslint-disable-next-line vue/require-default-prop
otherOptions: {
type: Array,
defualt: () => [],
default: () => [],
}
},
data() {
@ -105,8 +104,8 @@ export default {
employeeTreeSelectOption() {
return formatOption(
[
..._.cloneDeep(this.allTreeDepAndEmp),
..._.cloneDeep(this.otherOptions)
..._.cloneDeep((Array.isArray(this.allTreeDepAndEmp) ? this.allTreeDepAndEmp : [])),
..._.cloneDeep((Array.isArray(this.otherOptions) ? this.otherOptions : []))
],
this.idType,
false,