zpy 8.31

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

+import request from "@/utils/request";
+
+//获取当前最新学年
+export function getNewYear(data) {
+  return request({
+    url: "/schoolGrade/getNewYear",
+    method: "get",
+    data,
+  });
+}
+// 查询级部
+export function getGrade(schoolYear) {
+  return request({
+    url: "/experimentPlan/getGrade/" + schoolYear,
+    method: "get",
+  });
+}
+// 根据级部查询对应班级
+export function getClass(id) {
+  return request({
+    url: "/experimentPlan/getClass/" + id,
+    method: "get",
+  });
+}
+//新增实验计划
+export function addExperimentPlan(data) {
+  return request({
+    url: "/experimentPlan/add",
+    method: "post",
+    data,
+  });
+}
+// 修改实验室
+export function updateExperimentPlan(data) {
+  return request({
+    url: "/experimentPlan/edit",
+    method: "put",
+    data,
+  });
+}
+// 查询实验计划列表
+export function getExperimentPlan(query) {
+  return request({
+    url: "/experimentPlan/list",
+    params: query,
+  });
+}
+// 查询实验计划详细信息
+export function getExperimentPlanxq(id) {
+  return request({
+    url: "/experimentPlan/" + id,
+    method: "get",
+  });
+}
+
+// 删除实验室
+export function deleteExperimentPlan(id) {
+  return request({
+    url: "/experimentPlan/" + id,
+    method: "post",
+  });
+}
+//学科下拉框
+export function subExperimentPlan(schoolYear) {
+  return request({
+    url: "/experimentPlan/getSub/" + schoolYear,
+    method: "get",
+  });
+}
+//获取当前学期
+export function getSemester() {
+  return request({
+    url: "/experimentPlan/getSemester",
+    method: "get",
+  });
+}

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

+import request from "@/utils/request";
+
+// 查看列表
+export function getExperimentPlan(query) {
+  return request({
+    url: "/experimentPlan/getExperimentList",
+    method: "get",
+    params: query,
+  });
+}
+// 查看详情
+export function getExperimentPlaxq(id) {
+  return request({
+    url: "/experimentPlan/" + id,
+    method: "get",
+  });
+}

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

+import request from "@/utils/request";
+
+// 查看列表
+export function getLabClassYear(query) {
+  return request({
+    url: "/schoolLabClassYear/getLabClassYear",
+    method: "get",
+    params: query,
+  });
+}
+// 获取实验室
+export function getLabList(query) {
+  return request({
+    url: "/schoolLabClassYear/getLabList",
+    method: "get",
+    params: query,
+  });
+}
+// 分配实验室
+export function getAllocationLab(data) {
+  return request({
+    url: "/schoolLabClassYear/allocationLab",
+    method: "post",
+    data,
+  });
+}
+// 查看详情
+export function getLabClassYearxq(id) {
+  return request({
+    url: "/schoolLabClassYear/getLabClassYear/" + id,
+    method: "get",
+  });
+}

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

+import request from "@/utils/request";
+
+//新增实验室
+export function addSchoolLab(data) {
+  return request({
+    url: "/schoolLab/add",
+    method: "post",
+    data,
+  });
+}
+
+// 查询实验室列表
+export function getSchoolLab(query) {
+  return request({
+    url: "/schoolLab/list",
+    method: "get",
+    params: query,
+  });
+}
+// 查看实验室详情
+
+export function getSchoolLabxq(id) {
+  return request({
+    url: "/schoolLab/" + id,
+    method: "get",
+  });
+}
+
+// 修改实验室
+export function updateSchoolLab(data) {
+  return request({
+    url: "/schoolLab/edit",
+    method: "put",
+    data,
+  });
+}
+// 删除实验室
+export function deleteSchoolLab(id) {
+  return request({
+    url: "/schoolLab/" + id,
+    method: "post",
+  });
+}
+//负责人下拉框
+export function departUser() {
+  return request({
+    url: "/schoolLab/getLabAdmin",
+    method: "get",
+  });
+}
+//学科下拉框
+export function subSchoolLab() {
+  return request({
+    url: "/schoolLab/getSub",
+    method: "get",
+  });
+}

ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment/index.vue

@@ -2,13 +2,13 @@
     <div class="app-container">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="88px">
             <el-form-item label="学科分类">
-                <el-select v-model="queryForm.subject" placeholder="请选择">
+                <el-select v-model="queryForm.sub" placeholder="请选择">
                     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="计划时间">
-                <el-date-picker v-model="queryForm.time" type="daterange" range-separator="至" start-placeholder="开始日期"
+                <el-date-picker v-model="queryForm.plannedStartTime" type="daterange" range-separator="至" start-placeholder="开始日期"
                     end-placeholder="结束日期" value-format="yyyy-MM-dd">
                 </el-date-picker>
             </el-form-item>

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

@@ -14,7 +14,6 @@
                     <el-option label="上学期" value="0"></el-option>
                     <el-option label="下学期" value="1"></el-option>
                 </el-select>
-
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>