Merge remote-tracking branch 'origin/master'

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

@@ -10,7 +10,6 @@
       <el-form-item label="姓名">
         <el-input v-model="form.name"></el-input>
       </el-form-item>
-      <el-form-item label="任务名称"> </el-form-item>
       <el-form-item>
         <el-button
           size="mini"
@@ -411,6 +410,8 @@ export default {
       // 总条数
       total: 0,
       queryForm: {
+        pageSize: 10,
+        pageNum: 1,
         level: "",
         name: "",
         region: "",
@@ -449,16 +450,16 @@ export default {
       const params = {
         pageNum: this.queryForm.pageNum,
         pageSize: this.queryForm.pageSize,
-        gradeId: this.$store.state.user.userId,
-        //   noticeId:
+        // gradeId: this.$store.state.user,
+        // noticeId: this.$store.state.user.noticeId,
       };
-      //   getDepInfo().then((res) => {});
-      //接口
-      //   listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-      //     this.userList = response.rows;
-      //     this.total = response.total;
-      //     this.loading = false;
-      //   }
+      const gradeId = this.$store.state.user;
+
+      console.log(gradeId, "gradeId");
+      getNoticeInfo(params).then((res) => {
+        console.log(params, "params");
+        console.log(res, "查询res");
+      });
     },
     //  搜索按钮
     handleQuery() {

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

@@ -470,11 +470,17 @@ export default {
     dataReceiver(row) {
       //传值状态，如果是已结束跳过去只能查看，已发布可以新增或者删除
       console.log("row", row);
+      const noticeId = row.id;
+      const pageNum = this.queryForm.pageNum;
+      const pageSize = this.queryForm.pageSize;
+      const status = row.noticeState;
       this.$router.push({
         path: "/teachAffairAdministration/smartSchool/teachAffairAdministration/electronicRecord/dataReceiver",
         query: {
-          id: row.id,
-          status: row.noticeState,
+          noticeId,
+          pageNum,
+          pageSize,
+          status,
         },
       });
     },