zpy 9.4

ruoyi-ui/src/api/smartSchool/classTeacherWork/laboratoryManagement/laboratoryArrangements.js

+import request from "@/utils/request";
+
+// 查看实验室安排列表
+export function getLabplan(query) {
+  return request({
+    url: "/schoolLabClassYear/getTeacherLabList",
+    params: query,
+  });
+}
+//新增年级实验室预约
+export function addLabplan(data) {
+  return request({
+    url: "/schoolLabClassYear/add",
+    method: "post",
+    data,
+  });
+}
+// 修改年级实验室预约
+export function updateLabplan(data) {
+  return request({
+    url: "/schoolLabClassYear/edit",
+    method: "put",
+    data,
+  });
+}
+//删除年级实验室预约
+export function deleteLabplan(id) {
+  return request({
+    url: "/schoolLabClassYear/" + id,
+    method: "post",
+  });
+}
+
+// 查询年级实验室预约列表
+export function getLabplanlist(query) {
+  return request({
+    url: "/schoolLabClassYear/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询年级实验室详细信息
+export function getLabplanxq(id) {
+  return request({
+    url: "/schoolLabClassYear/" + id,
+    method: "get",
+  });
+}
+
+//获取当前学年+学期
+export function getSemester() {
+  return request({
+    url: "/experimentPlan/getSemester",
+    method: "get",
+  });
+}

ruoyi-ui/src/api/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment.js

+import request from "@/utils/request";
+
+//获取实验名称下拉框
+export function getLabplanxlk(query) {
+  return request({
+    url: "/schoolLabClassYear/getLab",
+    method: "get",
+    params: query,
+  });
+}
+//新增年级实验室预约
+export function addLabplan(data) {
+  return request({
+    url: "/schoolLabClassYear/add",
+    method: "post",
+    data,
+  });
+}
+// 修改年级实验室预约
+export function updateLabplan(data) {
+  return request({
+    url: "/schoolLabClassYear/edit",
+    method: "put",
+    data,
+  });
+}
+//删除年级实验室预约
+export function deleteLabplan(id) {
+  return request({
+    url: "/schoolLabClassYear/" + id,
+    method: "post",
+  });
+}
+
+// 查询年级实验室预约列表
+export function getLabplanlist(query) {
+  return request({
+    url: "/schoolLabClassYear/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询年级实验室详细信息
+export function getLabplanxq(id) {
+  return request({
+    url: "/schoolLabClassYear/" + id,
+    method: "get",
+  });
+}
+
+//获取当前学年+学期
+export function getSemester() {
+  return request({
+    url: "/experimentPlan/getSemester",
+    method: "get",
+  });
+}

ruoyi-ui/src/api/smartSchool/laboratoryManagement/gradeExperimentapp.js

@@ -9,11 +9,10 @@ export function getLabClassYear(query) {
   });
   });
 }
 }
 // 获取实验室
 // 获取实验室
-export function getLabList(query) {
+export function getLabList(plannedStartTime, plannedEndTime) {
   return request({
   return request({
-    url: "/schoolLabClassYear/getLabList",
+    url: `/schoolLabClassYear/getLabList?plannedStartTime=${plannedStartTime}&plannedEndTime=${plannedEndTime}`,
     method: "get",
     method: "get",
-    params: query,
   });
   });
 }
 }
 // 分配实验室
 // 分配实验室

ruoyi-ui/src/api/smartSchool/laboratoryManagement/teacherApplication.js

+import request from "@/utils/request";
+
+// 实验室管理-教师申请列表
+export function getTeacherlist(query) {
+  return request({
+    url: "/schoolTeacherLabApply/getTeacherLabApplyList",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查看详情
+export function getTeacherxq(id) {
+  return request({
+    url: "/schoolTeacherLabApply/" + id,
+    method: "get",
+  });
+}
+// 审批确认
+export function updateState(data) {
+  return request({
+    url: "/schoolTeacherLabApply/updateState",
+    method: "put",
+    data,
+  });
+}

ruoyi-ui/src/views/smartSchool/laboratoryManagement/leader/laboratoryCompletion/index.vue

@@ -23,6 +23,7 @@
         <el-table :data="tableData" border style="width: 100%">
         <el-table :data="tableData" border style="width: 100%">
             <el-table-column align="center" type="index" label="序号" width="55" />
             <el-table-column align="center" type="index" label="序号" width="55" />
             <el-table-column align="center" prop="grade" label="级部" />
             <el-table-column align="center" prop="grade" label="级部" />
+            <el-table-column align="center" prop="name" label="实验名称" />
             <el-table-column align="center" prop="name" label="学期" />
             <el-table-column align="center" prop="name" label="学期" />
             <el-table-column align="center" prop="address" label="总班级数" />
             <el-table-column align="center" prop="address" label="总班级数" />
             <el-table-column align="center" prop="grade" label="已完成班级数" />
             <el-table-column align="center" prop="grade" label="已完成班级数" />