吴朋磊 1 день назад
Родитель
Сommit
f5e758ad88
2 измененных файлов с 9 добавлено и 8 удалено
  1. 7 6
      src/views/examination/index.vue
  2. 2 2
      src/views/performanceMonitor/index.vue

+ 7 - 6
src/views/examination/index.vue

@@ -16,7 +16,8 @@
         <div class="page_jg_20"></div>
         <div class="page_table">
           <el-table :data="tableData" stripe v-loading="tableLoading" element-loading-text="拼命加载中……" show-overflow-tooltip highlight-current-row
-            element-loading-spinner="el-icon-loading" element-loading-background="#ffffff" @row-click="handleRowClick" ref="tableRef">
+            element-loading-spinner="el-icon-loading" element-loading-background="#ffffff" 
+              @row-click="handleRowClick" ref="tableRef" height="calc(100vh - 200px)">
               <el-table-column align="center" v-if="tableData.length" width="50">
                 <template #default="{ row }">
                   <el-radio v-model="selectRow.id" :value="row.id"></el-radio>
@@ -63,7 +64,7 @@
         <div class="page_jg_20"></div>
         <div class="page_table">
           <el-table :data="selectRow?.children" stripe v-loading="tableLoading" element-loading-text="拼命加载中……" show-overflow-tooltip
-            element-loading-spinner="el-icon-loading" element-loading-background="#ffffff">
+            element-loading-spinner="el-icon-loading" element-loading-background="#ffffff" height="calc(100vh - 200px)">
               <el-table-column type="index" label="序号" align="center" width="50" />
               <el-table-column prop="tenantCode" label="学校编号" align="center" width="80" />
               <el-table-column prop="tenantName" label="学校名称" align="center" />
@@ -113,7 +114,6 @@ import AddSchool from '@/views/examination/addSchool.vue'
 import { getJoinExamList, deleteSchool } from '@/api/examination'
 const schooltName = ref('')
 const tableLoading = ref(false)
-const tableData = ref([])
 interface SchoolItem {
   id: number | string;
   tenantCode: string;
@@ -124,6 +124,7 @@ interface SchoolItem {
   childrenCount?: number;
   children?: SchoolItem[];
 }
+const tableData = ref<SchoolItem[]>([])
 const selectRow = ref<SchoolItem>({
   id: '',
   tenantCode: '',
@@ -134,9 +135,9 @@ const selectRow = ref<SchoolItem>({
   childrenCount: 0,
   children: []
 })
-const permissions = ref([]) // 权限列表
+const permissions = ref<string[]>([]) // 权限列表
 onMounted(() => {
-  permissions.value = JSON.parse(localStorage.getItem('permissions'))
+  permissions.value = JSON.parse(localStorage.getItem('permissions') || '[]')
   GetJoinExamList()
 })
 const checkRowKey = ref(0)
@@ -159,7 +160,7 @@ const GetJoinExamList = () => {
       selectRow.value = tableData.value[checkRowKey.value]
       selectListId.value = selectRow.value?.children?.map(item => (item.tenantCode))?? []
       nextTick(() => {
-        tableRef.value.setCurrentRow(tableData.value[checkRowKey.value]); // 高亮当前行
+        tableRef.value?.setCurrentRow(tableData.value[checkRowKey.value]); // 高亮当前行
       });
     }
     tableLoading.value = false

+ 2 - 2
src/views/performanceMonitor/index.vue

@@ -25,7 +25,7 @@
                     <TabSearch tabType="line" :tabList="dateRangeTablist" :defaultTabKey="defaultDateRangeTab"
                         @tabChange="(val) => HandleTabChange('dateRange', val)">
                     </TabSearch>
-                    <div  class="custom_date_picker">
+                    <div class="custom_date_picker" v-if="defaultDateRangeTab === 'custom'">
                         <el-date-picker
                             v-model="customDateRange"
                             type="daterange"
@@ -551,7 +551,7 @@ onMounted(() => {
         display: flex;
         align-items: center;
         gap: 12px;
-
+        height: 36px;
         .custom_date_picker {
            :deep(.el-input__wrapper) {
                 width: 230px !important;