Skip to content

D
dd_school
Commit 28069916 by Cat
Options

Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

parents c2ee14f3 8bf08967
Showing with 218 additions and 218 deletions
ruoyi-ui/src/api/smartSchool/laboratoryManagement/gradeExperimentapp.js
......@@ -9,12 +9,13 @@ export function getLabClassYear(query) {
});
}
// 获取实验室
export function getLabList(plannedStartTime, plannedEndTime) {
export function getLabList(plannedStartTime, plannedEndTime, sub) {
return request({
url: `/schoolLabClassYear/getLabList?plannedStartTime=${plannedStartTime}&plannedEndTime=${plannedEndTime}`,
url: `/schoolLabClassYear/getLabList?plannedStartTime=${plannedStartTime}&plannedEndTime=${plannedEndTime}&sub=${sub}`,
method: "get",
});
}
// 分配实验室
export function getAllocationLab(data) {
return request({
......
ruoyi-ui/src/views/smartSchool/examinationManage/examManage/components/registeProcess.vue
......@@ -9,10 +9,10 @@
<InfoReview ref="InfoReview" :examId="id" @sendStatus="sendStatus"></InfoReview>
</el-tab-pane>
<el-tab-pane label="考场分配" :disabled="disable2" name="2">
<examRoomAllocate ref="examRoomAllocate" :examId="id" @sendStatus="sendStatus"/>
<examRoomAllocate ref="examRoomAllocate" :examId="id" @sendStatus="sendStatus" />
</el-tab-pane>
<el-tab-pane label="成绩管理" :disabled="disable3" name="3">
<scoreManage ref="scoreManage" :examId="id" @sendStatus="sendStatus"/>
<scoreManage ref="scoreManage" :examId="id" @sendStatus="sendStatus" />
</el-tab-pane>
<el-tab-pane label="返回列表" name="4">
</el-tab-pane>
......@@ -118,9 +118,10 @@ export default {
this.isSearch(activeName)
if (activeName == '4') {
// this.$router.go(-1)
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.replace({
path: '/exam/examManage', })
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.replace({
path: '/teachAffairAdministration/exam/examManage',
})
}
},
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/experimentalPlan/index.vue
......@@ -78,7 +78,7 @@
<el-col :span="10">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" :disabled="nowType === 2" clearable
@change="onGradeChange" style="width: 100%;">
style="width: 100%;">
<el-option v-for="(item, index) in subList" :key="index" :label="item.dictLabel"
:value="item.dictValue"></el-option>
</el-select>
......@@ -210,7 +210,7 @@ export default {
experimentClassify: "",
pageNum: 1,
pageSize: 10,
},
classList: [], // 班级列表数据
subList: [],// 学科列表
......@@ -326,22 +326,20 @@ export default {
//选择级部自动获取年级
onGradeChange() {
const selectedGrade = this.gradeList.find(grade => grade.id === this.form.gradeId);
if (selectedGrade) {
const gradeValue = selectedGrade.gradeValue;
console.log('selectedGrade', selectedGrade);
if (gradeValue === 1) {
console.log('gradeValue', gradeValue);
this.form.classId = this.classList.map(classItem => classItem.classId); // 默认选中所有班级的班级ID
console.log('this.form.classId', this.form.classId);
console.log('this.form.schoolExperimentPlanClassList', this.form.schoolExperimentPlanClassList);
} else if (gradeValue === 2 || gradeValue === 3) {
this.form.schoolExperimentPlanClassList = [];
console.log('gradeValue', gradeValue);
this.getClass(selectedGrade.id); // 获取班级列表
this.classList = []; // 清空班级列表
getClass(selectedGrade.id).then(response => {
this.loading = false;
this.classList = response.data;
if (selectedGrade.gradeValue == 1) {
this.form.classId = this.classList.map(classItem => classItem.classId);
} else {
this.form.classId = []
}
}
});
},
//删除按钮操作
handleDelete(id) {
this.$confirm("此操作将永久删除该数据，是否继续？", '提示', {
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment/index.vue
......@@ -118,16 +118,22 @@
</el-col>
<el-col :span="8">
<el-form-item label="学科" prop="sub">
<el-input v-model="form.sub" placeholder="请输入" clearable
:disabled="nowType === 1 || nowType === 2 || nowType === 0" />
<el-select v-model="form.sub" placeholder="请选择" :disabled="nowType === 2" clearable
style="width: 100%;">
<el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="8">
<el-form-item label="实验分类" prop="experimentClassify">
<el-input v-model="form.experimentClassify" placeholder="请输入" clearable
:disabled="nowType === 1 || nowType === 2 || nowType === 0" />
<el-select v-model="form.experimentClassify" placeholder="请选择" clearable style="width: 100%;"
:disabled="nowType === 2">
<el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -261,7 +267,7 @@ export default {
},
created() {
this.getSchholyear();
this.getExperimentName();
},
methods: {
......@@ -276,13 +282,18 @@ export default {
},
// 获取实验名称下拉框
getExperimentName() {
getLabplanxlk().then(response => {
// 在调用getLabplanxlk方法时，将当前学年和学期信息作为参数传递进去
const params = {
schoolYear: this.form.schoolYear,
semester: this.form.semester
};
getLabplanxlk(params).then(response => {
this.tableList = response.data;
console.log('this.tableList', this.tableList);
this.loading = false
})
},
//选择实验名称自动带出信息
getName() {
const selectedExperiment = this.tableList.find(experiment => experiment.experimentName === this.form.experimentName);
......@@ -318,6 +329,7 @@ export default {
// 在获取到学年和学期后，调用getList方法进行表单查询
this.getList();
this.getExperimentName();
});
},
......@@ -362,6 +374,7 @@ export default {
}
this.nowType = type;
this.getSchholyear();
this.getExperimentName();
if (type != 0) {
if (row && row.id) {
const id = row.id;
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentalPlan/index.vue
......@@ -10,7 +10,7 @@
</el-select>
</el-form-item>
<el-form-item label="实验名称">
<el-input v-model="queryForm.grade" placeholder="请输入实验名称" clearable></el-input>
<el-input v-model="queryForm.experimentName" placeholder="请输入实验名称" clearable></el-input>
</el-form-item>
<el-form-item label="实验分类">
<el-select v-model="queryForm.experimentClassify" placeholder="请选择" clearable>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue
......@@ -528,4 +528,4 @@ export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
<style lang="scss" scoped></style>
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryManagementlist/index.vue
......@@ -169,9 +169,9 @@ import {
getSchoolLabxq,
getClassDetails
} from '@/api/smartSchool/laboratoryManagement/laboratoryManagementlist'
import {
getGrade,
} from '@/api/smartSchool/gradeWork/laboratoryManagement/experimentalPlan'
// import {
// getGrade,
// } from '@/api/smartSchool/gradeWork/laboratoryManagement/experimentalPlan'
export default {
name: 'index',
dicts: ['lab_state', 'lab_sub', 'experiment_classify',],
......@@ -248,7 +248,7 @@ export default {
},
created() {
this.getList();
this.getGrade();
// this.getGrade();
this.getListtc();
},
methods: {
......@@ -274,14 +274,14 @@ export default {
});
},
//查询级部
getGrade() {
getGrade().then(response => {
this.loading = false;
this.gradeList = response.data;
console.log("this.gradeList", this.gradeList);
// getGrade() {
// getGrade().then(response => {
// this.loading = false;
// this.gradeList = response.data;
// console.log("this.gradeList", this.gradeList);
});
},
// });
// },
//弹窗搜索
......
ruoyi-ui/src/views/smartSchool/officialWork/purchaseApply/index.vue
......@@ -64,13 +64,13 @@
<ExPagination v-show="total > 0" :total="total" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getList"></ExPagination>
<!-- 新增或修改采购对话框 -->
<el-dialog :title="title" :visible.sync="openForPur" width="55%" @close="refreshValidate">
<el-dialog :title="title" :visible.sync="openForPur" width="1000px" @close="refreshValidate">
<!-- <div> -->
<el-form ref="formPur" :model="formPur" :disabled="formPurDisable" :rules="rules" label-width="120px" inline>
<el-form ref="formPur" :model="formPur" :disabled="formPurDisable" :rules="rules" label-width="110px" inline>
<el-row>
<el-col :span="22">
<el-form-item label="标题" prop="purchaseName">
<el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable style="width: 615px"></el-input>
<el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable style="width: 608px"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -79,20 +79,20 @@
<el-form-item label="申请部门" prop="deptId">
<Treeselect :disabled="formPurDisable" v-model="formPur.deptId" @select="deptIdAndName"
:options="deptOptions" :show-count="true" placeholder="请选择归属部门" :defaultExpandLevel=1
style="width: 193px" />
style="width: 208px" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="期望日期" prop="expectedDate">
<el-date-picker v-model="formPur.expectedDate" placeholder="请选择期望日期" clearable value-format="yyyy-MM-dd"
style="width: 193px"></el-date-picker>
style="width: 208px"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="批复项目" prop="budgetId">
<el-select v-model="formPur.budgetId" @change="getBudgetName" placeholder="请选择批复项目" style="width: 100%">
<el-select v-model="formPur.budgetId" @change="getBudgetName" placeholder="请选择批复项目" style="width: 208px">
<el-option v-for="item in budgetList" :key="item.id" :label="item.budgetName"
:value="item.id"></el-option>
</el-select>
......@@ -100,21 +100,21 @@
</el-col>
<el-col :span="10">
<el-form-item label="采购金额(元)" prop="purchaseMoney">
<el-input :value="purchaseMoney" readonly clearable></el-input>
<el-input :value="purchaseMoney" readonly clearable style="width: 208px"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="分管处室领导" prop="handUserName1">
<el-input placeholder="请选择分管领导" v-model="formPur.handUserName1" clearable
@click.native="selectBoss1(1)"></el-input>
<el-input placeholder="请选择分管领导" v-model="formPur.handUserName1" clearable @click.native="selectBoss1(1)"
style="width: 208px"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="财务领导" prop="handUserName2">
<el-input placeholder="请选择财务领导" v-model="formPur.handUserName2" clearable
@click.native="selectBoss1(2)"></el-input>
<el-input placeholder="请选择财务领导" v-model="formPur.handUserName2" clearable @click.native="selectBoss1(2)"
style="width: 208px"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -122,7 +122,7 @@
<el-col :span="22">
<el-form-item label="采购说明">
<el-input type="textarea" v-model="formPur.remark" placeholder="请输入采购说明" clearable
style="width: 615px"></el-input>
style="width: 208px"></el-input>
</el-form-item>
</el-col>
</el-row>
......
ruoyi-ui/src/views/smartSchool/othersManage/conferenceManage/conferenceInformation/components/selectArea.vue
......@@ -50,7 +50,7 @@
size="small"
row-key="id"
highlight-current-row
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@row-click="handleCurrentChange"
@selection-change="select"
@select-all="selectAll"
......
ruoyi-ui/src/views/smartSchool/othersManage/schoolResources/schoolResourcesBase/index.vue
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
@submit.native.prevent>
@submit.native.prevent>
<el-form-item label="资源名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入资源名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.name" placeholder="请输入资源名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -18,96 +13,55 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:resources:add']"
>新增
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:resources:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:resources:edit']"
>修改
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:resources:edit']">修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:resources:remove']"
>删除
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:resources:remove']">删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:resources:export']"
>导出
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:resources:export']">导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="resourcesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="资源名称" align="center" prop="name">
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<el-link type="primary" :underline="false" @click="handleClick(scope.row)">{{ scope.row.name }}</el-link>
</template>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:resources:edit']"
>修改
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:resources:edit']">修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:resources:remove']"
>删除
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:resources:remove']">删除
</el-button>
</template>
</el-table-column>
</el-table>
<ExPagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改学校资源库对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" @submit.native.prevent>
<el-form-item label="资源名称" prop="name">
<el-input v-model="form.name" placeholder="请输入资源名称"/>
<el-input v-model="form.name" placeholder="请输入资源名称" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -127,7 +81,7 @@ import {
editResource
} from "@/api/smartSchool/schoolResources/resource";
import {getInfo as getDetailInfo} from '@/api/smartSchool/schoolResources/resourceInfo';
import { getInfo as getDetailInfo } from '@/api/smartSchool/schoolResources/resourceInfo';
export default {
name: "Resourcesbase",
......@@ -162,7 +116,7 @@ export default {
// 表单校验
rules: {
name: [
{required: true, message: "资源名称不能为空", trigger: "blur"}
{ required: true, message: "资源名称不能为空", trigger: "blur" }
],
}
};
......@@ -284,7 +238,7 @@ export default {
},
/** 点击资源名称 */
handleClick({id}) {
handleClick({ id }) {
this.$router.push({
path: '/resource/resource-details/' + id,
query: {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairGradeManage/gradeMemberList/index.vue
......@@ -2,28 +2,13 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="教师姓名" prop="teacherName">
<el-input
v-model="queryParams.teacherName"
@keyup.enter.native="handleQuery"
placeholder="请输入教师姓名"
clearable
/>
<el-input v-model="queryParams.teacherName" @keyup.enter.native="handleQuery" placeholder="请输入教师姓名" clearable />
</el-form-item>
<el-form-item label="工号" prop="teacherCode">
<el-input
v-model="queryParams.teacherCode"
placeholder="请输入工号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.teacherCode" placeholder="请输入工号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="职务" prop="teacherPost">
<el-input
v-model="queryParams.teacherPost"
placeholder="请输入职务"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.teacherPost" placeholder="请输入职务" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -33,38 +18,18 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:mentor:add']"
> 新 增
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:mentor:add']"> 新 增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:mentor:edit']"
> 修 改
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:mentor:edit']"> 修 改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:mentor:remove']"
> 删 除
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:mentor:remove']"> 删 除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
......@@ -82,64 +47,59 @@
</el-row>
<el-table v-loading="loading" :data="mentorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="照片" align="center">
<template slot-scope="scope">
<ListImage :image-url="baseUrl + scope.row.picUrl"></ListImage>
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName"/>
<el-table-column label="工号" align="center" prop="teacherCode"/>
<el-table-column label="职务" align="center" prop="teacherPost"/>
<el-table-column label="电话号码" align="center" prop="teacherTel"/>
<el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="工号" align="center" prop="teacherCode" />
<el-table-column label="类型" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :options="dict.type.grade_mentor_type" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="职务" align="center" prop="teacherPost" />
<el-table-column label="学科组" align="center" prop="subGroup">
<template slot-scope="scope">
<dict-tag :options="dict.type.sub_group" :value="scope.row.subGroup" />
</template>
</el-table-column>
<el-table-column label="电话号码" align="center" prop="teacherTel" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:mentor:edit']"
>修改
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:mentor:edit']">修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:mentor:remove']"
>删除
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:mentor:remove']">删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!--选择老师-->
<TeacherSelect
v-if="teacherSelectDialog"
:openSelect.sync="teacherSelectDialog"
:title="teacherSelect"
@getTeacherList="getTeacherList"
@setTeacherInfo="setTeacherInfo"
></TeacherSelect>
<TeacherSelect v-if="teacherSelectDialog" :openSelect.sync="teacherSelectDialog" :title="teacherSelect"
@getTeacherList="getTeacherList" @setTeacherInfo="setTeacherInfo"></TeacherSelect>
<!-- 添加或修改老师与班级关系对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="教师姓名" prop="teacherName">
<el-input :disabled="disableTeacherName" v-model="form.teacherName" @click.native="openTeacherSelect"
placeholder="请输入教师姓名"/>
placeholder="请输入教师姓名" />
</el-form-item>
<el-form-item label="职务" prop="teacherPost">
<el-input v-model="form.teacherPost" placeholder="请输入职务"/>
<el-input v-model="form.teacherPost" placeholder="请输入职务" />
</el-form-item>
<el-form-item label="学科组" prop="subGroup">
<el-select v-model="form.subGroup" placeholder="请输入学科组" clearable style="width: 100%;">
<el-option v-for="(item, index) in dict.type.sub_group" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -159,11 +119,12 @@ import {
updateMentor
} from '@/api/smartSchool/teachAffairAdministration/affairClassManage/gradeMememberList';
import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue'
import {listInform} from "@/api/smartSchool/teacherManage/teacherInformation";
import { listInform } from "@/api/smartSchool/teacherManage/teacherInformation";
export default {
name: "gradeMemberList",
components: {TeacherSelect},
dicts: ['grade_mentor_type', 'sub_group'],
components: { TeacherSelect },
data() {
return {
// 头像显示前缀
......@@ -205,7 +166,7 @@ export default {
// 表单校验
rules: {
delFlag: [
{required: true, message: "$comment不能为空", trigger: "blur"}
{ required: true, message: "$comment不能为空", trigger: "blur" }
],
}
};
......
ruoyi-ui/src/views/smartSchool/venueReservation/useRecordingroom/index.vue
......@@ -10,7 +10,7 @@
<el-date-picker size="small" type="date" v-model="endTime" disabled>
</el-date-picker>
</el-form-item>
<el-form-item prop="studioId" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
<el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
<el-select @change="changeStudio" v-model="queryParams.studioId" placeholder="录播室">
<el-option v-for="item in options" :key="item.id" :label="item.studioName" :value="item.id">
</el-option>
......@@ -214,6 +214,13 @@ export default {
getAppointmentList({}).then((res) => {
this.options = res.rows;
console.log('res', res)
if (this.options.length > 0) {
// 默认选中第一个录播室
this.queryParams.studioId = this.options[0].id;
// 立即执行搜索表单
this.fetchStudioUseData();
}
});
},
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
......@@ -37,6 +37,24 @@ public class TeacherFilesController extends BaseController
public TableDataInfo list(TeacherFiles teacherFiles)
{
startPage();
List<TeacherFiles> list = teacherFilesService.selectTeacherFilesList(teacherFiles);
return getDataTable(list);
}
@PreAuthorize("@ss.hasPermi('teacherFiles:files:list')")
@GetMapping("/gradeList")
public TableDataInfo gradeList(TeacherFiles teacherFiles)
{
List<Long> gradeIds = teacherFilesService.getGradeId(teacherFiles.getGradeTeacherId());
if(gradeIds==null || gradeIds.size()==0){
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(500);
tableDataInfo.setMsg("该用户非级部主任");
return tableDataInfo;
}
teacherFiles.setGradeId(gradeIds.get(0));
startPage();
List<TeacherFiles> list = teacherFilesService.selectTeacherFilesList(teacherFiles);
return getDataTable(list);
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesNoticeController.java
......@@ -41,6 +41,7 @@ public class TeacherFilesNoticeController extends BaseController
return getDataTable(list);
}
/**
* 导出教师档案通知列表
*/
......@@ -115,10 +116,10 @@ public class TeacherFilesNoticeController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:remove')")
@Log(title = "教师档案通知", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable("id") String id)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable("ids") String[] ids)
{
return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeById(id));
return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeById(ids));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFiles.java
......@@ -102,6 +102,16 @@ public class TeacherFiles extends BaseEntity
@Excel(name = "状态 (1未发布 2已发布 3已填写 4已提交 5已确认 9驳回)" )
private String state;
private Long gradeTeacherId;
public Long getGradeTeacherId() {
return gradeTeacherId;
}
public void setGradeTeacherId(Long gradeTeacherId) {
this.gradeTeacherId = gradeTeacherId;
}
public void setId(Long id)
{
this.id = id;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesNotice.java
......@@ -60,5 +60,7 @@ public class TeacherFilesNotice extends BaseEntity
*/
private String state;
private String teacherId;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/TeacherFilesMapper.java
......@@ -73,4 +73,6 @@ public interface TeacherFilesMapper
public int deleteTeacherFilesByNoticeId(String noticeId);
public List<Long> getGradeId(Long teacherId);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesNoticeServiceImpl.java
......@@ -94,6 +94,7 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
return teacherFilesNoticeMapper.selectTeacherFilesNoticeList(teacherFilesNotice);
}
/**
* 新增教师档案通知
*
......@@ -355,14 +356,16 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
/**
* 删除教师档案通知信息
*
* @param id 教室档案通知主键
* @param ids 教室档案通知主键
* @return 结果
*/
@Override
public int deleteTeacherFilesNoticeById(String id)
public int deleteTeacherFilesNoticeById(String[] ids)
{
int i = teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id);
teacherFilesMapper.deleteTeacherFilesByNoticeId(id);
int i = teacherFilesNoticeMapper.deleteTeacherFilesNoticeByIds(ids);
for(String id :ids){
teacherFilesMapper.deleteTeacherFilesByNoticeId(id);
}
return i;
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesServiceImpl.java
......@@ -180,4 +180,9 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
}
return 1;
}
@Override
public List<Long> getGradeId(Long teacherId) {
return teacherFilesMapper.getGradeId(teacherId);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/ITeacherFilesNoticeService.java
......@@ -29,6 +29,7 @@ public interface ITeacherFilesNoticeService
*/
public List<TeacherFilesNoticeTotal> selectTeacherFilesNoticeList(TeacherFilesNotice teacherFilesNotice);
/**
* 新增教室档案通知
*
......@@ -65,5 +66,5 @@ public interface ITeacherFilesNoticeService
* @param id 教室档案通知主键
* @return 结果
*/
public int deleteTeacherFilesNoticeById(String id);
public int deleteTeacherFilesNoticeById(String[] id);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/ITeacherFilesService.java
......@@ -65,4 +65,6 @@ public interface ITeacherFilesService
public int synchronous(Long id);
public List<Long> getGradeId(Long TeacherId);
}
smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesMapper.xml
......@@ -175,4 +175,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<select id="getGradeId" parameterType="Long" resultType="Long">
SELECT grade_id FROM `school_grade_mentor` where teacher_id = #{teacherId} GROUP BY grade_id
</select>
</mapper>
\ No newline at end of file
smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesNoticeMapper.xml
......@@ -43,7 +43,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="endTime != null "> and end_time = #{endTime}</if>
</where>
</select>
<select id="selectTeacherFilesNoticeListByUser" parameterType="TeacherFilesNotice" resultType="TeacherFilesNoticeTotal">
<include refid="selectTeacherFilesNoticeTotalVo"/>
<where>
<if test="noticeRange != null and noticeRange != ''"> and notice_range = #{noticeRange}</if>
<if test="noticeYear != null and noticeYear != ''"> and notice_year = #{noticeYear}</if>
<if test="noticeSemester != null and noticeSemester != ''"> and notice_semester = #{noticeSemester}</if>
<if test="noticeName != null and noticeName != ''"> and notice_name like concat('%', #{noticeName}, '%')</if>
<if test="noticeState != null and noticeState != ''"> and notice_state = #{noticeState}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="teacherId != null and teacherId != '' "> and id in (SELECT notice_id FROM `teacher_files` where teacher_id =#{teacherId})</if>
and notice_state != 1
</where>
</select>
<select id="selectTeacherFilesNoticeById" parameterType="String" resultMap="TeacherFilesNoticeResult">
<include refid="selectTeacherFilesNoticeVo"/>
where id = #{id}
......@@ -120,4 +135,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTeacherByClass" parameterType="Long" resultType="SchoolGradeByClassVo">
select teacher_id,course_name from school_class_mentor where class_id = #{classId} and del_flag = '0'
</select>
</mapper>
\ No newline at end of file
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