lm 1 месяц назад
Родитель
Сommit
31826fdf85

+ 6 - 6
src/baseComponents/Table.vue

@@ -72,16 +72,16 @@ const props = defineProps({
     type:Array<ColumnProperty>
   },
   currentPage:{
-    required:true,
-    type:Number
+    type:Number,
+    default:1
   },
   pageSize:{
-    required:true,
-    type:Number
+    type:Number,
+    default:20
   },
   totalNum:{
-    required:true,
-    type:Number
+    type:Number,
+    default:0
   },
   loading:{
     type:Boolean,

+ 66 - 71
src/views/reviewManagement/stepComponent/numberMappingComponent/NumberMappingComponent.vue

@@ -29,77 +29,71 @@
                 <div class="page_jg_20"></div>
 
             
-              <Table 
-                  :hidePagination="true"
+              <Table :hidePagination="true"
                   class="teacher_table"
-                  :currentPage="1" :totalNum="0" 
-                  :pageSize="200" :tableColumns="classTableColumns" 
+                  :tableColumns="classTableColumns" 
                   :tableData="classList"
                   :tableRowClassName="tableRowClassName"
-                  @rowClick="HandleSelectRowClass"
-                  ></Table>
-            </div>
-            <div class="container_right">
-            
-            <div class="search_content">
-                <div class="content_left">
-                  <div  class="grade_title">班级编号对应表</div>
-                </div>
-                <div class="content_right">
-                  <span v-if="isConfigMode" class="config_switch_desc">
-                    {{ selectedClassItm?.id ? `当前选中的班级:${selectedClassItm.gradeName } ${selectedClassItm.className}` : '暂无选中的班级' }}
-                  </span>
-                  <el-switch v-model="isConfigMode" 
-                    style="--el-switch-on-color: #2E64FA"
-                    active-text="选中班级配置编号关系" />
-                    <el-button class="button_border" @click="AddOneRowClassCode">新增班级编号</el-button>
-                </div>
+                  @rowClick="HandleSelectRowClass">
+              </Table>
             </div>
 
-            <div class="page_jg_20"></div>
-
-            <div class="end_item">
-                <Table  :currentPage="1" :pageSize="2"
-                    :tableColumns="filterNumberMappingTableColumns" 
-                    :tableData="administrativeClassTableData" 
-                    :hidePagination="true"
-                    :totalNum="0">
-                  
-                    <template v-for="column in filterNumberMappingTableColumns.slice(1,-1)" :key="column.name"   v-slot:[column.name]="{row}"> 
-                      <div class="cell_container" @click="HandleAddClassBindCode(row, column.name)">
-                        <template v-if="row?.[column.name] && row?.[column.name]?.length > 0">
-                            <div v-for="(classItm, idx) in row?.[column.name]" :key="classItm.id">
-                                <el-tooltip
-                                effect="dark"
-                                :content="`${classItm.gradeName} ${classItm.className}`"
-                                placement="top-start"
-                                >
-                                <div v-if="isConfigMode" class="teacher_tag">
-                                    <span :title="classItm.className">{{ classItm.className }}</span>
-                                    <el-icon class="delete_icon" @click.stop="HandleRemoveCodeMappinClass(row, column.name, idx)"><Close /></el-icon>
-                                </div>
-                                <div v-else class="disabled_teacher">
-                                    <span :title="classItm.className">{{ classItm.className }}</span>
-                                </div>
-                                </el-tooltip>
-                            </div>
-                          </template>
-                          <template v-else>
-                          <span v-if="isConfigMode" class="placeholder_text" >请选择班级</span>
-                          <span v-else>-</span>
-                          </template>
-                      </div>
-                    </template>
-
-                    <template #operation="{row,currentIndex}">
-                      <div class="table_row_option">
-                        <span 
-                          :class="[administrativeClassTableData?.length === currentIndex ? 'el_button_delete' : 'editor_disable']" 
-                          @click="administrativeClassTableData?.length === currentIndex ? HandleDeleteRowClassCode(row) : ''">删除</span>
-                      </div>
-                    </template>
-                </Table>
-            </div>
+            <div class="container_right">
+              <div class="search_content">
+                  <div class="content_left">
+                    <div  class="grade_title">班级编号对应表</div>
+                  </div>
+                  <div class="content_right">
+                    <span v-if="isConfigMode" class="config_switch_desc">
+                      {{ selectedClassItm?.id ? `当前选中的班级:${selectedClassItm.gradeName } ${selectedClassItm.className}` : '暂无选中的班级' }}
+                    </span>
+                    <el-switch v-model="isConfigMode" 
+                      style="--el-switch-on-color: #2E64FA"
+                      active-text="选中班级配置编号关系" />
+                      <el-button class="button_border" @click="AddOneRowClassCode">新增班级编号</el-button>
+                  </div>
+              </div>
+              <div class="page_jg_20"></div>
+              <div class="end_item">
+                  <Table :tableColumns="filterNumberMappingTableColumns" 
+                      :tableData="administrativeClassTableData" 
+                      :hidePagination="true">
+                    
+                      <template v-for="column in filterNumberMappingTableColumns.slice(1,-1)" :key="column.name"   v-slot:[column.name]="{row}"> 
+                        <div class="cell_container" @click="HandleAddClassBindCode(row, column.name)">
+                          <template v-if="row?.[column.name] && row?.[column.name]?.length > 0">
+                              <div v-for="(classItm, idx) in row?.[column.name]" :key="classItm.id">
+                                  <el-tooltip
+                                  effect="dark"
+                                  :content="`${classItm.gradeName} ${classItm.className}`"
+                                  placement="top-start"
+                                  >
+                                  <div v-if="isConfigMode" class="teacher_tag">
+                                      <span :title="classItm.className">{{ classItm.className }}</span>
+                                      <el-icon class="delete_icon" @click.stop="HandleRemoveCodeMappinClass(row, column.name, idx)"><Close /></el-icon>
+                                  </div>
+                                  <div v-else class="disabled_teacher">
+                                      <span :title="classItm.className">{{ classItm.className }}</span>
+                                  </div>
+                                  </el-tooltip>
+                              </div>
+                            </template>
+                            <template v-else>
+                            <span v-if="isConfigMode" class="placeholder_text" >请选择班级</span>
+                            <span v-else>-</span>
+                            </template>
+                        </div>
+                      </template>
+
+                      <template #operation="{row,currentIndex}">
+                        <div class="table_row_option">
+                          <span 
+                            :class="[administrativeClassTableData?.length === currentIndex ? 'el_button_delete' : 'editor_disable']" 
+                            @click="administrativeClassTableData?.length === currentIndex ? HandleDeleteRowClassCode(row) : ''">删除</span>
+                        </div>
+                      </template>
+                  </Table>
+              </div>
             </div>
         </div>
 
@@ -379,8 +373,6 @@ const reloadData =async ()=>{
 }
 
 onMounted( async ()=>{
-  //  await GetClassTableData()
-  //  await GetTeachingRelationshipData()
   HandleTabChange(defaultTabkey.value)
 })
 
@@ -414,10 +406,13 @@ onMounted( async ()=>{
     gap:20px;
 
   .container_left {
-    height: 100%;
     flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
     width: 200px;
-    overflow-y: auto;
+    height: 100%;
+
     .search_content{
       height: 36px;
     }
@@ -437,7 +432,7 @@ onMounted( async ()=>{
     height: 100%;
     display: flex;
     flex-direction: column;
-    overflow: hidden;
+    overflow: auto;
 
     .config_switch_desc{
       font-size: 14px;

+ 1 - 4
src/views/reviewManagement/stepComponent/parameterSettingComponent/ParameterSettingComponent.vue

@@ -41,11 +41,8 @@
             </template>
         </Form>
 
-        <Table 
-            :currentPage="1" :pageSize="200"
-            :tableColumns="tableColumns" 
+        <Table :tableColumns="tableColumns" 
             :tableData="tableData"
-            :totalNum="0"
             :hidePagination="true">
             <template #subjectData="{row}">
                 <div class="subject_tag">

+ 2 - 7
src/views/reviewManagement/stepComponent/questionnaireTemplateComponent/QuestionnaireTemplateComponent.vue

@@ -11,13 +11,9 @@
             </div>
         </div>
         <div class="page_jg_20"></div>
-        <Table 
-            :currentPage="1" :pageSize="200"
-            :tableColumns="tableColumns" 
+        <Table :tableColumns="tableColumns" 
             :tableData="tableData"
-            :totalNum="0"
-            :hidePagination="true"
-        >
+            :hidePagination="true">
             <template #gender="{row}">
                 <el-select v-model="row.gender">
                     <el-option
@@ -63,7 +59,6 @@ import {tableColumns} from './table'
 
 import { getQuestionnaireTemplateListApi,saveQuestionnaireTemplateListApi} from '@/api/questionnaireTemplateComponent'
 import {getAllQuestionnaireListApi} from   '@/api/surveyManagement'
-import { ElMessage } from 'element-plus';
 
 const route = useRoute()
 const router = useRouter()

+ 0 - 1
src/views/reviewManagement/stepComponent/reviewAccountComponent/GenerateReviewCode.vue

@@ -42,7 +42,6 @@ import { ref,watch } from 'vue';
 import { useStore } from 'vuex';
 
 import { useRoute,useRouter } from 'vue-router';
-import { ElMessage } from 'element-plus';
 
 import FormSearchGroup from '@/baseComponents/FormSearchGroup.vue';
 import Table from '@/baseComponents/Table.vue';

+ 3 - 12
src/views/reviewManagement/stepComponent/reviewAccountComponent/ReviewAccountComponent.vue

@@ -18,13 +18,9 @@
             </div>
         </div>
         <div class="page_jg_20"></div>
-        <Table 
-            :currentPage="1" :pageSize="200"
-            :tableColumns="tableColumns" 
+        <Table :tableColumns="tableColumns" 
             :tableData="tableData"
-            :totalNum="0"
-            :hidePagination="true"
-        >
+            :hidePagination="true">
             <template v-for="item in Object.values(originReviewAccount)" 
                 v-slot:[`class_${item.evaluationGradeId}`]="{row}" :key="item">
                 {{ row[`class_${item.evaluationGradeId}`]?.className }}
@@ -125,12 +121,7 @@ const tableData = ref([]);
 const tableColumns = ref([])
 // 表头初始赋值 和 表行初始赋值 以及 批量编辑弹窗变量赋值
 const GetReviewAccountList = async ()=>{
-    let params = {
-        evaluationId: route.query.id,
-       
-        pageNum: 1,
-        pageSize: 20
-    }
+    let params = {evaluationId: route.query.id}
     let res = await getReviewAccountListApi(params)
     if(res?.code == 200){
         let gradeMsg = res.data?.dataList || {}

+ 12 - 12
src/views/reviewManagement/stepComponent/teachingRelationshipComponent/TeachingRelationshipComponent.vue

@@ -8,12 +8,12 @@
           <Table 
             :hidePagination="true"
             class="teacher_table"
-            :currentPage="1" :totalNum="0" 
-            :pageSize="200" :tableColumns="teacherTableColumns" 
+            :tableColumns="teacherTableColumns" 
             :tableData="teacherList"
             :tableRowClassName="tableRowClassName"
             @rowClick="HandleSelectTeacher"
             ></Table>
+
         </div>
         <div class="container_right">
           <div class="search_content">
@@ -61,11 +61,10 @@
           <div class="end_item">
 
             <!-- 行政班渲染表数据 -->
-            <Table v-if="searchParmams.classType === 'xingzeng'"  :currentPage="1" :pageSize="200"
+            <Table v-if="searchParmams.classType === 'xingzeng'"  
                 :tableColumns="filterAdministrativeClassTableColumns" 
                 :tableData="administrativeClassTableData" 
-                :hidePagination="true"
-                :totalNum="0">
+                :hidePagination="true">
 
                 <template #className="{row}">
                   {{ row.className.className }}
@@ -101,12 +100,9 @@
 
             <!-- 教学班渲染表数据 -->
             <Table v-else-if="searchParmams.classType === 'teach'"  
-                  :currentPage="1" :pageSize="200"
                 :tableColumns="filterTeachingClassTableColumns" 
                 :tableData="teachingClassTableData" 
-                :hidePagination="true"
-                :totalNum="0">
-
+                :hidePagination="true">
                 <template v-for="column in filterTeachingClassTableColumns" :key="column.name"   v-slot:[column.name]="{row}"> 
                   <div class="cell_container teaching_cell_container" @click="HandleAddTeacher(row, column.name,'teach')">
                     <div class="class_name">
@@ -545,12 +541,16 @@ onMounted( async ()=>{
   justify-content: space-between;
   align-items: stretch;
   gap:20px;
-  overflow: hidden;
+  overflow: auto;
 
   .container_left {
     flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+    
     width: 200px;
-    overflow-y: auto;
+    height: 100%;
     .teacher_table{
       margin-top: 16px;
       :deep(.el-table__body){
@@ -568,7 +568,7 @@ onMounted( async ()=>{
     height: 100%;
     display: flex;
     flex-direction: column;
-    overflow: hidden;
+    overflow: auto;
 
     .config_switch_desc{
       font-size: 14px;