diff --git a/src/components/cockpit/governanceReport/index.vue b/src/components/cockpit/governanceReport/index.vue index c60a89a..8028b62 100644 --- a/src/components/cockpit/governanceReport/index.vue +++ b/src/components/cockpit/governanceReport/index.vue @@ -37,7 +37,7 @@ import TableHeader from '@/components/table/header/index.vue' import { getTemplateList } from '@/api/harmonic-boot/luckyexcel' import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit' import { getTime } from '@/utils/formatTime' - +import { ElMessage } from 'element-plus' const prop = defineProps({ w: { type: [String, Number] }, h: { type: [String, Number] }, @@ -118,12 +118,15 @@ const tableStore: any = new TableStore({ column: [], beforeSearchFun: () => { setTime() - if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) { - tableStore.table.params.sensitiveUserId = idList.value[0].id - } - if (!tableStore.table.params.tempId && templateList.value?.length > 0) { - tableStore.table.params.tempId = templateList.value[0].id - } + // if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) { + // tableStore.table.params.sensitiveUserId = idList.value[0].id + // } + // if (!tableStore.table.params.tempId && templateList.value?.length > 0) { + // tableStore.table.params.tempId = templateList.value[0].id + // } + // if( !tableStore.table.params.tempId){ + // return ElMessage.warning('请选择模板') + // } }, loadCallback: () => { luckysheet.create({ diff --git a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue index 23fcd64..432719b 100644 --- a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue +++ b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue @@ -14,7 +14,7 @@ @@ -24,11 +24,7 @@
- + + + diff --git a/src/views/auth/menu/popupMenu.vue b/src/views/auth/menu/popupMenu.vue index 7f24ecd..13373ac 100644 --- a/src/views/auth/menu/popupMenu.vue +++ b/src/views/auth/menu/popupMenu.vue @@ -1,29 +1,43 @@