Skip to content

D
dd_school
Commit 1222aa5b by zhaopanyu
Options

zpy 9.7

parent 3b47933a
Showing with 1002 additions and 193 deletions
ruoyi-ui/src/api/smartSchool/classTeacherWork/laboratoryManagement/laboratoryApplicationrecords.js 0 → 100644
import request from "@/utils/request";
// 查看列表
export function getTeacherlabList(query) {
return request({
url: "/schoolTeacherLabApply/list",
method: "get",
params: query,
});
}
// 查看详情
export function getTeacherLab(id) {
return request({
url: "/schoolTeacherLabApply/" + id,
method: "get",
});
}
//附件上传
export function uploadFile(data) {
return request({
url: "/common/upload",
method: "post",
data: data,
});
}
//上传附件
export function uploadFilelist(data) {
return request({
url: "/schoolTeacherLabApply/attachment",
method: "put",
data: data,
});
}
ruoyi-ui/src/api/smartSchool/classTeacherWork/laboratoryManagement/laboratoryArrangements.js
import request from "@/utils/request"; import request from "@/utils/request";
// 查看实验室安排列表 // 查看实验室安排列表
export function getLabplan(query) { export function getTeacherlabList(query) {
return request({ return request({
url: "/schoolLabClassYear/getTeacherLabList", url: "/schoolLabClassYear/getTeacherLabList",
method: "get",
params: query, params: query,
}); });
} }
//新增年级实验室预约 //获取当前学年+学期
export function addLabplan(data) { export function getSemester() {
return request({ return request({
url: "/schoolLabClassYear/add", url: "/experimentPlan/getSemester",
method: "post", method: "get",
data,
}); });
} }
// 修改年级实验室预约
export function updateLabplan(data) { //新增年级实验室预约
export function addSchoolLab(data) {
return request({ return request({
url: "/schoolLabClassYear/edit", url: "/schoolLabClassYear/add",
method: "put", method: "post",
data, data,
}); });
} }
//删除年级实验室预约 // 查询实验室使用状态
export function deleteLabplan(id) { export function getTeacherLab(query) {
return request({ return request({
url: "/schoolLabClassYear/" + id, url: "/schoolTeacherLabApply/getTeacherLab",
method: "post", method: "get",
params: query,
}); });
} }
// 查询年级实验室预约列表 // 获取班级
export function getLabplanlist(query) { export function getTeacherClass(query) {
return request({ return request({
url: "/schoolLabClassYear/list", url: "/schoolTeacherLabApply/getTeacherClass",
method: "get", method: "get",
params: query, params: query,
}); });
} }
// 查询年级实验室详细信息 // 教师申请实验室
export function getLabplanxq(id) { export function schoolTeacherapply(data) {
return request({ return request({
url: "/schoolLabClassYear/" + id, url: "/schoolTeacherLabApply/add",
method: "get", method: "post",
data,
}); });
} }
//获取当前学年+学期 // 教师申请实验室
export function getSemester() { export function getTeacherLabxq(id) {
return request({ return request({
url: "/experimentPlan/getSemester", url: "/schoolLabClassYear/" + id,
method: "get", method: "get",
}); });
} }
ruoyi-ui/src/api/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp.js 0 → 100644
import request from "@/utils/request";
//获取学年+学期
export function getNewYear(data) {
return request({
url: "/experimentPlan/getSemester",
method: "get",
data,
});
}
// 查询级部
export function getGrade() {
return request({
url: "/experimentPlan/getGrade",
method: "get",
});
}
//新增个人实验申请
export function addExperimentPlan(data) {
return request({
url: "/schoolTeacherExperimentApply/add",
method: "post",
data,
});
}
// 修改个人实验申请
export function updateExperimentPlan(data) {
return request({
url: "/schoolTeacherExperimentApply/edit",
method: "put",
data,
});
}
// 删除个人实验申请
export function deleteExperimentPlan(id) {
return request({
url: "/schoolTeacherExperimentApply/" + id,
method: "post",
});
}
// 查询实验计划列表
export function getExperimentPlan(query) {
return request({
url: "/experimentPlan/list",
params: query,
});
}
// 查询个人实验申请列表
export function getApplylist(query) {
return request({
url: "/schoolTeacherExperimentApply/list",
method: "get",
params: query,
});
}
//查看详情
export function getListxq(id) {
return request({
url: "/schoolTeacherExperimentApply/" + id,
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/gradeWork/laboratoryManagement/experimentalPlan.js
...@@ -9,9 +9,9 @@ export function getNewYear(data) { ...@@ -9,9 +9,9 @@ export function getNewYear(data) {
}); });
} }
// 查询级部 // 查询级部
export function getGrade(schoolYear) { export function getGrade() {
return request({ return request({
url: "/experimentPlan/getGrade/" + schoolYear, url: "/experimentPlan/getGrade",
method: "get", method: "get",
}); });
} }
......
ruoyi-ui/src/api/smartSchool/laboratoryManagement/experimentApproval.js 0 → 100644
import request from "@/utils/request";
// 查看列表
export function getTeacherList(query) {
return request({
url: "/schoolTeacherExperimentApply/getTeacherList",
method: "get",
params: query,
});
}
// 获取实验室
export function getLabList(plannedStartTime, plannedEndTime) {
return request({
url: `/schoolLabClassYear/getLabList?plannedStartTime=${plannedStartTime}&plannedEndTime=${plannedEndTime}`,
method: "get",
});
}
// 分配实验室
export function getExperimentLabs(data) {
return request({
url: "/schoolTeacherExperimentApply/teacherExperimentLabs",
method: "post",
data,
});
}
// 查看详情
export function getTeacherapplyxq(id) {
return request({
url: "/schoolTeacherExperimentApply/detail/" + id,
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/laboratoryManagement/experimentalRecords.js 0 → 100644
import request from "@/utils/request";
// 查看列表
export function getList(query) {
return request({
url: "/experimentPlan/getExperimentRecord",
method: "get",
params: query,
});
}
ruoyi-ui/src/api/smartSchool/laboratoryManagement/laboratoryCompetition.js 0 → 100644
import request from "@/utils/request";
//新增实验室竞赛
export function addCompetition(data) {
return request({
url: "/schoolLabCompetition/add",
method: "post",
data,
});
}
// 修改实验室竞赛
export function updateCompetition(data) {
return request({
url: "/schoolLabCompetition/edit",
method: "put",
data,
});
}
// 查看实验室竞赛列表
export function getCompetition(query) {
return request({
url: "/schoolLabCompetition/list",
method: "get",
params: query,
});
}
// 查看详情
export function getCompetitionxq(id) {
return request({
url: "/schoolLabCompetition/" + id,
method: "get",
});
}
// 删除实验室
export function deleteCompetition(id) {
return request({
url: "/schoolLabCompetition/" + id,
method: "post",
});
}
ruoyi-ui/src/api/smartSchool/laboratoryManagement/laboratoryExecution.js 0 → 100644
import request from "@/utils/request";
// 查看列表
export function getList(query) {
return request({
url: "/experimentPlan/countExperimentLabAdmin",
method: "get",
params: query,
});
}
// 查看班级完成详情
export function getTeacherxq(query) {
return request({
url: "/experimentPlan/getClassDetails",
method: "get",
params: query,
});
}
//获取当前学年+学期
export function getSemester() {
return request({
url: "/experimentPlan/getSemester",
method: "get",
});
}
//级部下拉框
export function getGrade() {
return request({
url: "/experimentPlan/getGradeList",
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/laboratoryManagement/laboratoryManagementlist.js
...@@ -55,3 +55,11 @@ export function subSchoolLab() { ...@@ -55,3 +55,11 @@ export function subSchoolLab() {
method: "get", method: "get",
}); });
} }
//查看班级完成详情
export function getClassDetails(query) {
return request({
url: "/schoolTeacherLabApply/getLabUserDetial",
method: "get",
params: query,
});
}
ruoyi-ui/src/api/smartSchool/laboratoryManagement/leadlaboratoryCompletion.js 0 → 100644
import request from "@/utils/request";
// 查看列表
export function getList(query) {
return request({
url: "/experimentPlan/countExperiment",
method: "get",
params: query,
});
}
// 查看班级完成详情
export function getTeacherxq(query) {
return request({
url: "/experimentPlan/getClassDetails",
method: "get",
params: query,
});
}
//获取当前学年+学期
export function getSemester() {
return request({
url: "/experimentPlan/getSemester",
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/laboratoryManagement/leadlaboratoryRecords.js 0 → 100644
import request from "@/utils/request";
// 查看列表
export function getList(query) {
return request({
url: "/experimentPlan/getExperimentRecord",
method: "get",
params: query,
});
}
ruoyi-ui/src/components/FileUploadlab/index.vue 0 → 100644
<template>
<div class="upload-file">
<el-upload multiple :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" :limit="limit"
:on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess" :show-file-list="false"
:headers="headers" class="upload-demo" drag ref="fileUpload">
<!-- 上传按钮 -->
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload>
<!-- 文件列表 -->
<transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.fjlj" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
<el-link :href="`${baseUrl}${file.fjlj}`" :underline="false" target="_blank">
<!-- <span class="el-icon-document"> {{ getFileName(file.name) }} </span> -->
<span class="el-icon-document"> {{ file.fjmc }} </span>
</el-link>
<!-- <div class="ele-upload-list__item-content-action">
<el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
</div> -->
<div class="ele-upload-list__item-content-action" style="float: right">
<el-link style="margin-left: 15px" :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
</div>
</li>
</transition-group>
</div>
</template>
<script>
import { getToken } from "@/utils/auth";
export default {
name: "FileUploadNew",
props: {
// 值
value: [String, Object, Array],
// 数量限制
limit: {
type: Number,
default: 5,
},
// 大小限制(MB)
// fileSize: {
// type: Number,
// default: 5,
// },
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf", 'png', 'jpg', 'jpeg'],
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
}
},
data() {
return {
number: 0,
uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
fileList: [],
};
},
watch: {
value: {
handler(val) {
if (val) {
let temp = 1;
// 首先将值转为数组
const list = Array.isArray(val) ? val : this.value.split(',');
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
item = { fjmc: item, fjlj: item };
}
item.uid = item.uid || new Date().getTime() + temp++;
return item;
});
} else {
this.fileList = [];
return [];
}
},
deep: true,
immediate: true
}
},
computed: {
// 是否显示提示
showTip() {
return this.isShowTip && (this.fileType || this.fileSize);
},
},
methods: {
// 上传前校检格式和大小
handleBeforeUpload(file) {
// 校检文件类型
if (this.fileType) {
let fileExtension = "";
if (file.name.lastIndexOf(".") > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
}
const isTypeOk = this.fileType.some((type) => {
if (file.type.indexOf(type) > -1) return true;
if (fileExtension && fileExtension.indexOf(type) > -1) return true;
return false;
});
if (!isTypeOk) {
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
return false;
}
}
// 校检文件大小
if (this.fileSize) {
const isLt = file.size / 1024 / 1024 < this.fileSize;
if (!isLt) {
this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
return false;
}
}
this.$modal.loading("正在上传文件，请稍候...");
this.number++;
return true;
},
// 文件个数超出
handleExceed() {
this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
},
// 上传失败
handleUploadError(err) {
this.$modal.msgError("上传图片失败，请重试");
this.$modal.closeLoading()
},
// 上传成功回调
handleUploadSuccess(res, file) {
console.log('res', res);
console.log('file', file);
if (res.code === 200) {
// this.uploadList.push({ fjmc: file.res.originalFilename, fjlj: file.res.url });
this.uploadList.push({ fjmc: res.originalFilename, fjlj: res.fileName });
this.uploadedSuccessfully();
} else {
this.number--;
this.$modal.closeLoading();
this.$modal.msgError(res.msg);
this.$refs.fileUpload.handleRemove(file);
this.uploadedSuccessfully();
}
},
// 删除文件
handleDelete(index) {
console.log('this.fileList', this.fileList);
this.fileList.splice(index, 1);
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
},
// 上传结束处理
uploadedSuccessfully() {
if (this.number > 0 && this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
this.$modal.closeLoading();
}
},
// 获取文件名称
getFileName(name) {
if (name.lastIndexOf("/") > -1) {
return name.slice(name.lastIndexOf("/") + 1);
} else {
return "";
}
},
// 对象转成指定字符串分隔
listToString(list, separator) {
let strs = "";
separator = separator || ",";
for (let i in list) {
strs += list[i].url + separator;
}
return strs != '' ? strs.substr(0, strs.length - 1) : '';
}
}
};
</script>
<style scoped lang="scss">
.upload-file-uploader {
margin-bottom: 5px;
}
.upload-file-list .el-upload-list__item {
border: 1px solid #e4e7ed;
line-height: 2;
margin-bottom: 10px;
position: relative;
}
.upload-file-list .ele-upload-list__item-content {
display: flex;
justify-content: space-between;
align-items: center;
color: inherit;
}
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
</style>
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/classDetails/index.vue
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%">
<el-table-column align="center" prop="teacher" label="教师" /> <el-table-column align="center" prop="applyName" label="教师" />
<el-table-column align="center" prop="year" label="学年" /> <el-table-column align="center" prop="schoolYear" label="学年" />
<el-table-column align="center" prop="name" label="分组实验" /> <el-table-column align="center" prop="fzcount" label="分组实验" />
<el-table-column align="center" prop="name" label="演示实验" /> <el-table-column align="center" prop="sycount" label="演示实验" />
<el-table-column align="center" prop="name" label="探究实验" /> <el-table-column align="center" prop="sjcount" label="探究实验" />
<el-table-column align="center" prop="name" label="已完成实验数" /> <el-table-column align="center" prop="ywccount" label="已完成实验数" />
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
...@@ -31,6 +31,11 @@ ...@@ -31,6 +31,11 @@
</template> </template>
<script> <script>
import {
getList,
getTeacherxq,
getSemester
} from '@/api/smartSchool/laboratoryManagement/leadlaboratoryRecords'
export default { export default {
name: 'index', name: 'index',
data() { data() {
...@@ -41,7 +46,7 @@ export default { ...@@ -41,7 +46,7 @@ export default {
//表格数据 //表格数据
tableData: [ tableData: [
{ {
} }
], ],
...@@ -49,10 +54,48 @@ export default { ...@@ -49,10 +54,48 @@ export default {
} }
}, },
methods: { methods: {
async getSemesterAndList() {
await this.getSemester(); // 等待获取学年信息
this.getList(); // 获取默认数据
},
getList() { getList() {
const params = {
schoolYear: this.queryForm.schoolYear,
applyName: this.queryForm.applyName,
};
getList(params)
.then(response => {
this.tableData = response.rows;
console.log('response', response);
this.total = response.total;
this.loading = false;
})
.catch(error => {
this.loading = false;
console.log(error);
});
}, },
getSemester() {
return new Promise((resolve, reject) => {
getSemester()
.then(response => {
this.queryForm.schoolYear = response.schoolYear + '';
resolve(); // 成功获取学年信息
})
.catch(error => {
console.log(error);
reject(error);
});
});
},
resetQuery() { resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "",
applyName: "",
};
this.getList(); this.getList();
}, },
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/experimentalPlan/index.vue
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
...@@ -281,6 +282,7 @@ export default { ...@@ -281,6 +282,7 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getGrade();
}, },
...@@ -302,10 +304,10 @@ export default { ...@@ -302,10 +304,10 @@ export default {
console.log('selectedGrade', selectedGrade); console.log('selectedGrade', selectedGrade);
if (gradeValue === 1) { if (gradeValue === 1) {
console.log('gradeValue', gradeValue); console.log('gradeValue', gradeValue);
this.form.classId = this.classList.map(classItem => classItem.classId); // 默认选中所有班级 this.form.classId = this.classList.map(classItem => classItem.classId); // 默认选中所有班级的班级ID
console.log('this.form.classId', this.form.classId); console.log('this.form.classId', this.form.classId);
console.log('this.form.schoolExperimentPlanClassList', this.form.schoolExperimentPlanClassList); console.log('this.form.schoolExperimentPlanClassList', this.form.schoolExperimentPlanClassList);
} else { } else if (gradeValue === 2 || gradeValue === 3) {
this.form.schoolExperimentPlanClassList = []; this.form.schoolExperimentPlanClassList = [];
console.log('gradeValue', gradeValue); console.log('gradeValue', gradeValue);
this.getClass(selectedGrade.id); // 获取班级列表 this.getClass(selectedGrade.id); // 获取班级列表
...@@ -340,7 +342,6 @@ export default { ...@@ -340,7 +342,6 @@ export default {
getNewYear().then((res) => { getNewYear().then((res) => {
this.form.schoolYear = res.schoolYear; this.form.schoolYear = res.schoolYear;
console.log(this.form.schoolYear, typeof this.form.schoolYear); console.log(this.form.schoolYear, typeof this.form.schoolYear);
this.getGrade();
}); });
}, },
//获取当前学期 //获取当前学期
...@@ -353,8 +354,7 @@ export default { ...@@ -353,8 +354,7 @@ export default {
}, },
//查询级部 //查询级部
getGrade() { getGrade() {
const schoolYear = this.form.schoolYear; getGrade().then(response => {
getGrade(schoolYear).then(response => {
this.loading = false; this.loading = false;
this.gradeList = response.data; this.gradeList = response.data;
console.log("this.gradeList", this.gradeList); console.log("this.gradeList", this.gradeList);
...@@ -473,6 +473,9 @@ export default { ...@@ -473,6 +473,9 @@ export default {
}); });
}, },
}, },
} }
</script> </script>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentalPlan/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="学年"> <el-form-item label="学期">
<el-input v-model="queryForm.schoolYear" placeholder="请输入" clearable></el-input> <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年">
</el-date-picker>
<el-select v-model="queryForm.semester" placeholder="请选择学期">
<el-option label="上学期" value="1"></el-option>
<el-option label="下学期" value="2"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="实验级部"> <el-form-item label="实验名称">
<el-input v-model="queryForm.grade" placeholder="请输入实验名称" clearable></el-input> <el-input v-model="queryForm.grade" placeholder="请输入实验名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="实验分类"> <el-form-item label="实验分类">
...@@ -128,8 +133,9 @@ export default { ...@@ -128,8 +133,9 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
schoolYear: '', schoolYear: '',
grade: '', semester: '',
experimentClassify: '', experimentClassify: '',
experimentName: '',
}, },
//表格数据 //表格数据
tableData: [ tableData: [
...@@ -165,9 +171,12 @@ export default { ...@@ -165,9 +171,12 @@ export default {
}, },
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: '', schoolYear: '',
grade: '', semester: '',
experimentClassify: '', experimentClassify: '',
experimentName: '',
}; };
this.getList(); this.getList();
}, },
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index copy.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="88px"> <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="实验级部"> <el-form-item label="实验级部">
<el-input v-model="queryForm.grade" placeholder="请输入"></el-input> <el-input v-model="queryForm.grade" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue
...@@ -409,6 +409,7 @@ export default { ...@@ -409,6 +409,7 @@ export default {
}) })
}, },
resetQuery() { resetQuery() {
this.getList(); this.getList();
}, },
// 保存按钮 // 保存按钮
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryExecution/index copy.vue 0 → 100644
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="60px">
<el-form-item label="级部" prop="">
<el-select v-model="queryParams" placeholder="请选择级部" clearable>
<!-- <el-option v-for="(item, index) in dict.type.exam_type" :key="index" :label="item.label"-->
<!-- :value="item.value"></el-option>-->
</el-select>
</el-form-item>
<el-form-item label="实验名称" prop="" label-width="80px">
<el-input v-model="queryParams" placeholder="请输入实验名称" clearable />
</el-form-item>
<el-form-item label="学年" prop="">
<el-date-picker v-model="queryParams" type="year" placeholder="请选择学年"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleOption(0)">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="!isMultiple"
@click="handleDelete">批量删除</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="tableData" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
<el-table-column label="级部" align="center" prop="totalScore" />
<el-table-column label="实验名称" align="center" prop="totalScore" />
<el-table-column label="学年" align="center" prop="ranking" />
<el-table-column label="总班级数" align="center" prop="language" />
<el-table-column label="已完成班级数" align="center" prop="ywRanking" />
<el-table-column label="未完成班级数" align="center" prop="math" />
<el-table-column label="完成比例" align="center" prop="sxRanking" />
<el-table-column fixed="right" label="操作" align="center" prop="orgname" width="150">
<template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleOption(2, row)">查看班级完成情况</el-button>
</template>
</el-table-column>
</el-table>
<pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 新增、编辑、查看弹窗 -->
<el-dialog :title='`实验名称：${dialogTitle}`' :visible.sync="dialogVisible" width="80%">
<el-form :model="dialogParams" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="实验分类" prop="">
<el-select v-model="dialogParams" placeholder="请选择实验分类" clearable>
<!-- <el-option v-for="(item, index) in dict.type.exam_type" :key="index" :label="item.label"-->
<!-- :value="item.value"></el-option>-->
</el-select>
</el-form-item>
<el-form-item label="班级" prop="">
<el-input v-model="dialogParams" placeholder="请输入班级" clearable />
</el-form-item>
<el-form-item label="实验时间" prop="">
<el-date-picker v-model="dialogParams" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="">重置</el-button>
</el-form-item>
</el-form>
<el-table :data="dialogData" stripe>
<el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
<el-table-column label="实验分类" align="center" prop="math" />
<el-table-column label="班级" align="center" prop="ywRanking" />
<el-table-column label="实验时间" align="center" prop="ywRanking" />
<el-table-column label="节次" align="center" prop="sxRanking" />
<el-table-column label="附件" align="center" prop="orgname" width="150">
<template slot-scope="{ row }">
</template>
</el-table-column>
</el-table>
<pagination ref="pageBlock" v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="dialogParams.pageNum"
:limit.sync="dialogParams.pageSize" @pagination="" />
</el-dialog>
<!-- 新增、编辑、查看弹窗 -->
</div>
</template>
<script>
import {
getList,
getSemester,
getTeacherxq
} from '@/api/smartSchool/laboratoryManagement/laboratoryExecution'
export default {
dicts: ['exam_type'],
data() {
return {
queryParams: {
pageNum: 1,
pageSize: 10,
},
loading: false,
total: 0,
tableData: [],
isMultiple: false, // table是否有选择
dialogTitle: '', //弹窗标题
dialogVisible: false,
dialogParams: {
pageNum: 1,
pageSize: 10,
},
dialogTotal: 0,
dialogData: []
}
},
mounted() {
},
methods: {
//获取列表数据
getList() { },
//重置
resetQuery() { },
//删除
handleDelete() { },
//编辑 0新增 1编辑 2查看
handleOption(type) {
this.nowOption = type
if (type == 0) {
this.dialogTitle = '新增实验室记录'
} else if (type == 1) {
this.dialogTitle = '编辑实验室记录'
} else {
this.dialogTitle = '查看实验室记录'
}
this.dialogVisible = true
},
handleSelectionChange(val) {
this.isMultiple = val.length == 0 ? false : true
}
},
}
</script>
<style lang="scss" scoped></style>
ruoyi-ui/src/views/smartSchool/laboratoryManagement/leader/laboratoryRecords/index.vue
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="教师"> <el-form-item label="教师">
<el-input v-model="queryForm.teacher" placeholder="请输入教师" clearable></el-input> <el-input v-model="queryForm.applyName" placeholder="请输入教师" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="学期"> <el-form-item label="学年">
<el-date-picker v-model="queryForm.semester" type="year" value-format="yyyy" placeholder="选择年"> <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
...@@ -14,12 +15,12 @@ ...@@ -14,12 +15,12 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%">
<el-table-column align="center" prop="teacher" label="教师" /> <el-table-column align="center" prop="applyName" label="教师" />
<el-table-column align="center" prop="year" label="学年" /> <el-table-column align="center" prop="schoolYear" label="学年" />
<el-table-column align="center" prop="name" label="分组实验" /> <el-table-column align="center" prop="fzcount" label="分组实验" />
<el-table-column align="center" prop="name" label="演示实验" /> <el-table-column align="center" prop="sycount" label="演示实验" />
<el-table-column align="center" prop="name" label="探究实验" /> <el-table-column align="center" prop="sjcount" label="探究实验" />
<el-table-column align="center" prop="name" label="已完成实验数" /> <el-table-column align="center" prop="ywccount" label="已完成实验数" />
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
...@@ -31,28 +32,75 @@ ...@@ -31,28 +32,75 @@
</template> </template>
<script> <script>
import {
getList,
getTeacherxq,
getSemester
} from '@/api/smartSchool/laboratoryManagement/leadlaboratoryRecords'
export default { export default {
name: 'index', name: 'index',
data() { data() {
return { return {
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "",
applyName: "",
}, },
//表格数据 //表格数据
tableData: [ tableData: [
{
}
], ],
total: 0, total: 0,
} }
}, },
created() {
this.getSemesterAndList();
},
methods: { methods: {
async getSemesterAndList() {
await this.getSemester(); // 等待获取学年信息
this.getList(); // 获取默认数据
},
getList() { getList() {
const params = {
schoolYear: this.queryForm.schoolYear,
applyName: this.queryForm.applyName,
};
getList(params)
.then(response => {
this.tableData = response.rows;
console.log('response', response);
this.total = response.total;
this.loading = false;
})
.catch(error => {
this.loading = false;
console.log(error);
});
}, },
getSemester() {
return new Promise((resolve, reject) => {
getSemester()
.then(response => {
this.queryForm.schoolYear = response.schoolYear + '';
resolve(); // 成功获取学年信息
})
.catch(error => {
console.log(error);
reject(error);
});
});
},
resetQuery() { resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "",
applyName: "",
};
this.getList(); this.getList();
}, },
......
ruoyi-ui/src/views/smartSchool/logisticsManage/departmentBudgetview/index.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</div> </div>
<div> <div>
<h2 class="title">{{ form.year }}年{{ form.deptName }}科室预算</h2> <h2 class="title">{{ form.year }}年{{ form.deptName }}科室预算</h2>
<div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">单位:万元</div> <div style="display: flex;margin-bottom: 10px;">单位:万元</div>
</div> </div>
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table border :data="lookTable" ref="table" class="lookTable"> <el-table border :data="lookTable" ref="table" class="lookTable">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment