diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts index 6433ccb..746ba08 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts +++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts @@ -49,7 +49,40 @@ export const tableConfig = (el, elGroup, elFormula) => { treeConfig: { defaultExpandAll: true, api: () => { - return Promise.resolve(data); + return new Promise((resolve) => { + setTimeout(() => { + resolve(data); + }, 100); + }); + }, + formConfig: { + schemas: [ + { + field: 'type', + label: '', + component: 'NsRadioGroup', + autoSubmit: true, + defaultValue: 1, + componentProps: { + options: [ + { label: '碳排', value: 1 }, + { label: '用电量', value: 2 }, + { label: '用水量', value: 3 }, + { label: '燃气量', value: 4 }, + { label: '供热量', value: 5 }, + ], + }, + }, + { + field: 'name', + label: '', + component: 'NsInput', + autoSubmit: true, + componentProps: { + placeholder: '请输入', + }, + }, + ], }, }, diff --git a/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts b/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts index 5fc70e7..5b2ba0f 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts +++ b/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts @@ -1,6 +1,5 @@ import { dateUtil } from '/nerv-lib/util/date-util'; import data from './mock.json'; - export const tableConfig = { title: '设备台账', // api: '/carbon_emission/device/getDeviceList', @@ -8,7 +7,24 @@ export const tableConfig = { treeConfig: { defaultExpandAll: true, api: () => { - return Promise.resolve(data); + return new Promise((resolve) => { + setTimeout(() => { + resolve(data); + }, 100); + }); + }, + formConfig: { + schemas: [ + { + field: 'name', + label: '设备名称', + component: 'NsInput', + autoSubmit: true, + componentProps: { + placeholder: '请输入', + }, + }, + ], }, }, params: { diff --git a/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue b/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue index c680905..df5a00e 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue @@ -3,5 +3,8 @@ diff --git a/lib/component/form/form/props.ts b/lib/component/form/form/props.ts index 6353bb6..e239a60 100644 --- a/lib/component/form/form/props.ts +++ b/lib/component/form/form/props.ts @@ -1,5 +1,3 @@ - - import { reactive, PropType } from 'vue'; import { PropTypes } from '/nerv-lib/util/type'; diff --git a/lib/component/table/table.vue b/lib/component/table/table.vue index 521a6d0..bd12dee 100644 --- a/lib/component/table/table.vue +++ b/lib/component/table/table.vue @@ -14,6 +14,7 @@ {{ tableTitle }}
+
@@ -667,8 +668,7 @@ display: flex; .ns-part-tree { width: 300px; - padding-top: 14px; - padding-left: 8px; + padding: 16px; overflow-y: auto; } .ns-part-table { diff --git a/lib/component/tree/props.ts b/lib/component/tree/props.ts new file mode 100644 index 0000000..b6d7d52 --- /dev/null +++ b/lib/component/tree/props.ts @@ -0,0 +1,45 @@ +import { PropType } from 'vue'; +import { PropTypes } from '/nerv-lib/util/type'; +import { AxiosRequestConfig } from 'axios'; +import { treeProps as TreeProps } from 'ant-design-vue/es/tree/Tree'; +import { formProps } from '/nerv-lib/component/form/form/props'; +export const treeFormProps = { + formLayout: 'vertical', + labelCol: { span: 0 }, + wrapperCol: { span: 24 }, +}; +export const treeProps = { + ...TreeProps(), + api: { + type: [String, Object, Function] as PropType, + default: undefined, + }, + params: PropTypes.object.def(() => ({})), + dynamicParams: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.array, + PropTypes.object, + PropTypes.func, + ]), + requiredParams: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.array, + PropTypes.object, + PropTypes.bool, + ]), + + formConfig: PropTypes.object, //查询表单 + defaultParams: PropTypes.object, //查询表单 + value: PropTypes.array.def(() => []), + refreshTime: PropTypes.number.def(0), + enableTableSession: PropTypes.bool.def(false), + expand: PropTypes.bool.def(true), + showExpand: PropTypes.bool.def(true), + blockNode: PropTypes.bool.def(true), + defaultExpandAll: PropTypes.bool.def(true), + resultField: PropTypes.string.def('data'), + transform: { + type: Function, + default: (data: any) => data, + }, +}; diff --git a/lib/component/tree/tree-api.vue b/lib/component/tree/tree-api.vue index 660a981..3a9a851 100644 --- a/lib/component/tree/tree-api.vue +++ b/lib/component/tree/tree-api.vue @@ -1,66 +1,77 @@