Merge branch 'master' of 49.232.152.146:qangqi/dd_school

ruoyi-admin/src/main/resources/application.yml

@@ -35,6 +35,9 @@ server:
 #  port: 11324
 #  port: 11324
   #port: 8082
   #port: 8082
   servlet:
   servlet:
+    #配置超时时间
+    session:
+      timeout: 120s
     # 应用的访问路径
     # 应用的访问路径
     context-path: /
     context-path: /
   tomcat:
   tomcat:

ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataReceiver.vue

@@ -126,7 +126,7 @@
         @selection-change="handleSelectionChange"
         @selection-change="handleSelectionChange"
       >
       >
         <el-table-column align="center" type="selection"> </el-table-column>
         <el-table-column align="center" type="selection"> </el-table-column>
-        <el-table-column align="center" label="级部" prop="gid">
+        <el-table-column align="center" label="级部" prop="gruoName">
         </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="userName" label="姓名">
         <el-table-column align="center" prop="userName" label="姓名">
         </el-table-column>
         </el-table-column>
@@ -193,7 +193,6 @@ export default {
       single: true,
       single: true,
       // 非多个禁用
       // 非多个禁用
       multiple: true,
       multiple: true,
-      selectedRows: [],
     };
     };
   },
   },
   mounted() {
   mounted() {
@@ -204,12 +203,14 @@ export default {
     handleSecher() {
     handleSecher() {
       const tid = this.$route.query.noticeId;
       const tid = this.$route.query.noticeId;
       getTeaList(tid).then((res) => {
       getTeaList(tid).then((res) => {
+        console.log(res, 333333333333);
         this.dialogTableData = res.data;
         this.dialogTableData = res.data;
       });
       });
     },
     },
 
 
     //弹窗确定按钮
     //弹窗确定按钮
     confirmDialog() {
     confirmDialog() {
+      //   const ids = this.selectedRows.map((row) => parseInt(row.id));
       const ids = this.selectedRows.map((row) => parseInt(row.id));
       const ids = this.selectedRows.map((row) => parseInt(row.id));
       // dialogVisible = false
       // dialogVisible = false
       addTeachaer(ids).then((res) => {
       addTeachaer(ids).then((res) => {