diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 2109434..834f5b1 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -124,7 +124,7 @@ aside { //main-container全局样式 .app-container { padding: 10px 10px 0 10px; - min-height: calc(100vh - 5.25rem); + height: calc(100vh - 5.25rem); } .components-container { @@ -133,7 +133,7 @@ aside { } .pagination-container { - margin-top: 30px; + margin-top: 10px; } .text-center { diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index 7d0888c..bcbd948 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -4,18 +4,10 @@ @@ -45,13 +33,14 @@ import { queryXmInfo, } from '@/api/liswork/work/LisWork'; import { getitemtdh, saveitemtdh, delitemtdh } from '@/api/liswork/xtwh/ComOpt'; import { ElMessage } from 'element-plus'; const yq = defineModel(); +const loading = ref(false); const tableRef = ref(); const tableData = ref>([]); const columns = [ { label: '序号', type: 'index', visible: true, width: 50, align: 'center' }, { label: '通道号', prop: 'tdh', visible: true, align: 'center', slot: 'tdh' }, { label: '项目代号', prop: 'xmdh', visible: true, align: 'center' }, - { label: '项目', prop: 'xmmc', visible: true, align: 'center', slot: 'xmmc', showOverflowTooltip: false }, + { label: '项目', prop: 'xmmc', visible: true, align: 'center', slot: 'xmmc', showOverflowTooltip: false, width: 250 }, { label: '项目id', prop: 'xmid', visible: true, align: 'center' }, ]; const tableConfig = { @@ -108,7 +97,9 @@ const allClear = () => { } const xmList = ref>([]); const getXmList = () => { + loading.value = true; queryXmInfo({ yq: yq.value }).then((res: any) => { + loading.value = false; xmList.value = res.data.map((item: any) => { return { label: item.xmmc, diff --git a/src/views/liswork/xtwh/comopt/index.vue b/src/views/liswork/xtwh/comopt/index.vue index aadc9c6..598045f 100644 --- a/src/views/liswork/xtwh/comopt/index.vue +++ b/src/views/liswork/xtwh/comopt/index.vue @@ -112,7 +112,7 @@ const tabList = [ { key: 'SysSort', label: '项目排序', component: SysSort }, { key: 'SysReport', label: '报告单设置', component: SysReport }, ] -const activeName = ref('SysParameter') +const activeName = ref('SysGlobal') // 计算当前要渲染的组件 const currentComponent = computed(() => { diff --git a/src/views/liswork/xtwh/configdict/index.vue b/src/views/liswork/xtwh/configdict/index.vue index 69166fe..fa13382 100644 --- a/src/views/liswork/xtwh/configdict/index.vue +++ b/src/views/liswork/xtwh/configdict/index.vue @@ -1,48 +1,23 @@