Merge branch 'master' of 49.232.152.146:qangqi/dd_school

ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js

@@ -54,6 +54,14 @@ export function getDepInfo(query) {
     params: query
   })
 }
+
+//查看档案详情
+export function getFileTnfo(id) {
+  return request({
+    url: '/teacherFiles/files/'+id,
+      method: 'get',
+  })
+}
 // 同步档案
 export function syncNotice(id) {
   return request({

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

@@ -231,6 +231,7 @@
               type="success"
               size="mini"
               style="float: right; margin-right: 50px; margin-top: 10px"
+              @click="handleExtract"
               >提 取
             </el-button>
           </div>
@@ -333,7 +334,8 @@
 <script>
 import {
   getteacherNotice, // 通知下档案查看|数据维护
-  getNoticeInfo, //查看档案详情//查看档案详情
+  getNoticeInfo, //查看档案详情
+  getFileTnfo, //查看档案详情
   getDepInfo, //级部查询列表
   syncNotice, // 同步档案
 } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
@@ -350,6 +352,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         courseName: "",
+        filesSemester: "",
         gradeName: "",
         teacherName: "",
       },
@@ -388,24 +391,21 @@ export default {
     };
   },
   mounted() {
-    console.log("id", this.$route.query.noticeId);
-    console.log("status", this.$route.query.noticeState);
+    // console.log("id", this.$route.query.noticeId);
+    // console.log("status", this.$route.query.noticeState);
     this.getList();
   },
   methods: {
     /** 查询信息列表 */
     getList() {
-      //   this.loading = true;
       const params = {
+        pageNum: this.queryForm.pageNum,
+        pageSize: this.queryForm.pageSize,
         noticeId: this.$route.query.noticeId,
-        pageNum: this.$route.query.pageNum,
-        pageSize: this.$route.query.pageSize,
       };
       getteacherNotice(params).then((res) => {
         this.tableData = res.rows;
         this.total = res.total;
-        console.log(this.total, "total");
-        console.log(res, "getList");
       });
     },
     //  搜索按钮
@@ -426,23 +426,23 @@ export default {
     },
     //查看按钮
     handleCheck(row) {
-      const params = {
-        pageNum: this.queryForm.pageNum,
-        pageSize: this.queryForm.pageSize,
-        teacherId: row.teacherId,
-        // noticeId: row.noticeId,
-      };
-      getNoticeInfo(params).then((res) => {
-        // this.dialogForm = res.rows;
-        this.dialogForm = res.rows[0];
-
-        console.log(this.dialogForm, "弹窗数据");
-        // console.log(res, "res");
+      const id = row.id;
+      getFileTnfo(id).then((res) => {
+        this.dialogForm = res.rows;
+        // this.tableFirstData = res.rows;
+        // this.tableSecondData = res.rows;
+        // this.tableThirdData = res.rows;
+        // this.tableForthData = res.rows;
         this.check = true;
         this.title = "基本信息查看";
         this.dialogVisible = true;
       });
     },
+
+    // 提取
+    handleExtract() {
+      //   syncNotice().then(() => {});
+    },
     //修改按钮
     handleEdit(row) {
       this.check = false;

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

@@ -426,7 +426,6 @@ export default {
     },
     //  数据维护按钮
     dataMaintenance(row) {
-      console.log("数据维护按钮row", row);
       const noticeId = row.id;
       const pageNum = this.queryForm.pageNum;
       const pageSize = this.queryForm.pageSize;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java

@@ -16,7 +16,9 @@ import com.ruoyi.common.annotation.Excel;
 public class SchoolOrganizationSignin extends OurBaseEntity
 {
     private static final long serialVersionUID = 1L;
-
+    /** id */
+    @Excel(name = "id")
+    private Long id;
     /** 姓名 */
     @Excel(name = "姓名")
     private String name;

smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DdSchoolDeptController.java

-package yangtz.cs.liu.dingding.controller;
-
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/dd/school/dept")
-public class DdSchoolDeptController {
-
-    @GetMapping("/getDeptList")
-    public TableDataInfo getDeptList(){
-        return null;
-    }
-}