diff --git a/src/styles/app.scss b/src/styles/app.scss index 8327f36..944dff7 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -161,7 +161,7 @@ body, .cn-operate-dialog .el-form--inline { display: grid; grid-template-columns: repeat(auto-fit, minmax(350px, 1fr)); - grid-gap: 10px; + grid-gap: 20px 10px; width: calc(100% - 1px); .el-form-item { diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts index 30483c4..60069b9 100644 --- a/src/utils/tableStore.ts +++ b/src/utils/tableStore.ts @@ -103,6 +103,8 @@ export default class TableStore { 'reset', () => { delete this.initData.pageSize + console.log(this.table.params) + console.log(this.initData) Object.assign(this.table.params, this.initData) this.index() this.table.resetCallback && this.table.resetCallback() diff --git a/src/views/govern/manage/basic/dictionary.vue b/src/views/govern/manage/basic/dictionary.vue index 6f32fba..96fe80f 100644 --- a/src/views/govern/manage/basic/dictionary.vue +++ b/src/views/govern/manage/basic/dictionary.vue @@ -64,6 +64,7 @@ const popupDictionary = ref() const dictData = useDictData() const DataSelect = dictData.getBasicData('Data') const DataTypeSelect = dictData.getBasicData('Cs_Data_Type') +const ResourcesIdSelect = dictData.getBasicData('Data_Day') const tableStore = new TableStore({ url: '/system-boot/csDictData/list', method: 'POST', @@ -78,7 +79,7 @@ const tableStore = new TableStore({ { title: '数据谐波次数', field: 'harmStart' }, { title: '数据统计方法', field: 'statMethod' }, { title: '数据存储', field: 'classIdName' }, - { title: '数据来源', field: 'resourcesId' }, + { title: '数据来源', field: 'resourcesIdName' }, { title: '操作', align: 'center', @@ -116,6 +117,7 @@ const tableStore = new TableStore({ loadCallback: () => { tableStore.table.data.forEach((item: any) => { item.classIdName = DataSelect.find((child: any) => child.id == item.classId)?.name || '/' + item.resourcesIdName = ResourcesIdSelect.find((child: any) => child.id == item.resourcesId)?.name || '/' item.phaseName = item.phase === 'M' ? '/' : item.phase || '/' for (let key in item) { if (typeof item[key] !== 'number') { @@ -126,7 +128,7 @@ const tableStore = new TableStore({ } }) -tableStore.table.params.searchState = '' +tableStore.table.params.searchValue = '' tableStore.table.params.dataType = '' tableStore.table.params.classId = '' provide('tableStore', tableStore) diff --git a/src/views/govern/manage/basic/popupDictionary.vue b/src/views/govern/manage/basic/popupDictionary.vue index aa401cb..720e744 100644 --- a/src/views/govern/manage/basic/popupDictionary.vue +++ b/src/views/govern/manage/basic/popupDictionary.vue @@ -4,7 +4,7 @@