diff --git a/src/views/run/instant/instant.data.ts b/src/views/run/instant/instant.data.ts index 911a491..82e104d 100644 --- a/src/views/run/instant/instant.data.ts +++ b/src/views/run/instant/instant.data.ts @@ -193,6 +193,7 @@ export const searchFormSchema: FormSchema[] = [ component: 'Select', labelWidth: 40, componentProps: { + placeholder: '全部算法', options: [{ value: 1, label: "主成分分析(PCA)" }, { value: 2, label: "神经网络(ANN)" }], }, defaultValue: null, diff --git a/src/views/warn/alarm/alarm.data.ts b/src/views/warn/alarm/alarm.data.ts index a5108c1..9fc58e6 100644 --- a/src/views/warn/alarm/alarm.data.ts +++ b/src/views/warn/alarm/alarm.data.ts @@ -22,7 +22,6 @@ export const searchFormSchema: FormSchema[] = [ componentProps: ({ schema, tableAction, formActionType, formModel }) => { return { // xxxx props - allowClear: false, placeholder: '全部机组', options: optionList.units.map(unit => ({ value: unit.id, label: unit.name })), onChange: async (e: any) => { @@ -35,7 +34,7 @@ export const searchFormSchema: FormSchema[] = [ typeId: formModel.type, } //如果typeId是空,则不设置system'Options - if (!param.typeId) { + if (!param.typeId || !param.unitId) { systemOptions.value = [] return } @@ -55,7 +54,6 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 4 }, componentProps: ({ formModel }) => { return { - allowClear: false, placeholder: '全部系统', options: optionList.types.map(type => ({ value: type.id, label: type.name })), onChange: async (e: any) => { @@ -68,7 +66,7 @@ export const searchFormSchema: FormSchema[] = [ typeId: e, } //如果typeId是空,则不设置system'Options - if (!param.typeId) { + if (!param.typeId || !param.unitId) { systemOptions.value = [] return } @@ -86,7 +84,6 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 4 }, componentProps: () => { return { - allowClear: false, placeholder: '全部子系统', options: systemOptions.value.map(system => ({ value: system.id, label: system.name })), }