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 @@
基础数据
- + 拓展数据 - + @@ -142,6 +142,8 @@ import { ElMessage } from 'element-plus' import { useDictData } from '@/stores/dictData' import { addCsDictData, updateCsDictData } from '@/api/system-boot/csDictData' +const formRef = ref() +const formRef2 = ref() const dictData = useDictData() const DataSelect = dictData.getBasicData('Data') const DataTypeSelect = dictData.getBasicData('Cs_Data_Type') @@ -216,7 +218,76 @@ const form = reactive({ limitName: null, limitTable: 'pq_overlimit' }) -const rules = {} +const rules = { + dataType: [ + { required: true, message: '请输入数据分类', trigger: 'blur' }, + { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } + ], + name: [ + { required: true, message: '请输入数据名称', trigger: 'blur' } + ], + otherName: [ + { required: true, message: '请输入别名', trigger: 'blur' } + ], + showName: [ + { required: true, message: '请输入展示名称', trigger: 'blur' } + ], + phase: [ + { type: 'array', required: true, message: '请选择相别', trigger: 'blur' } + ], + unit: [ + { required: true, message: '请输入单位', trigger: 'blur' } + ], + type: [ + { required: true, message: '请输入基础数据类型', trigger: 'blur' } + ], + harmStart: [ + { required: true, message: '请填写开始结束次数', trigger: 'blur' } + ], + statMethod: [ + { required: true, message: '请选择统计方法', trigger: 'blur' } + ], + classId: [ + { required: true, message: '请选择数据存储', trigger: 'blur' } + ], + resourcesId: [ + { required: true, message: '请选择报表数据来源', trigger: 'blur' } + ], + sort: [ + { required: true, message: '请填写序号', trigger: 'blur' } + ], + defaultValue: [ + { required: true, message: '请输入参数缺省值', trigger: 'blur' }, + { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } + ], + eventType: [ + { required: true, message: '请输入事件类别', trigger: 'blur' } + ], + maxNum: [ + { type: 'date', required: true, message: '请设置最大值', trigger: 'blur' } + ], + minNum: [ + { type: 'date', required: true, message: '请设置最小值', trigger: 'blur' } + ], + setValue: [ + { required: true, message: '请输入枚举序列', trigger: 'blur' } + ], + strlen: [ + { required: true, message: '请输入字符串长度上限', trigger: 'blur' } + ], + tranRule: [ + { required: true, message: '请填写上送规则', trigger: 'blur' } + ], + ctlSts: [ + { required: true, message: '请选择是否可远程控制', trigger: 'blur' } + ], + storeFlag: [ + { required: true, message: '请选择是否需遥控校验', trigger: 'blur' } + ], + tranFlag: [ + { required: true, message: '请选择是否存储||是否加密', trigger: 'blur' } + ] +} const dialogVisible = ref(false) const title = ref('') const open = (text: string, data?: anyObj) => {