Skip to content

D
dd_school
Commit bdf3df57 by xuwenhao
Options

Merge remote-tracking branch 'origin/master'

parents e8322aed adb58c54
Showing with 506 additions and 197 deletions
ruoyi-ui/src/api/system/dict/data.js
import request from '@/utils/request' import request from "@/utils/request";
// 查询字典数据列表 // 查询字典数据列表
export function listData(query) { export function listData(query) {
return request({ return request({
url: '/system/dict/data/list', url: "/system/dict/data/list",
method: 'get', method: "get",
params: query params: query,
}) });
}
// 查询字典数据列表
export function listDatakm(query) {
return request({
url: "/curricula/variable/selectXkTypeList",
method: "get",
params: query,
});
} }
// 查询字典数据详细 // 查询字典数据详细
export function getData(dictCode) { export function getData(dictCode) {
return request({ return request({
url: '/system/dict/data/' + dictCode, url: "/system/dict/data/" + dictCode,
method: 'get' method: "get",
}) });
} }
// 根据字典类型查询字典数据信息 // 根据字典类型查询字典数据信息
export function getDicts(dictType) { export function getDicts(dictType) {
return request({ return request({
url: '/system/dict/data/type/' + dictType, url: "/system/dict/data/type/" + dictType,
method: 'get' method: "get",
}) });
} }
// 新增字典数据 // 新增字典数据
export function addData(data) { export function addData(data) {
return request({ return request({
url: '/system/dict/data', url: "/system/dict/data",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 修改字典数据 // 修改字典数据
export function updateData(data) { export function updateData(data) {
return request({ return request({
url: '/system/dict/data', url: "/system/dict/data",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 删除字典数据 // 删除字典数据
export function delData(dictCode) { export function delData(dictCode) {
return request({ return request({
url: '/system/dict/data/' + dictCode, url: "/system/dict/data/" + dictCode,
method: 'delete' method: "delete",
}) });
} }
ruoyi-ui/src/api/system/dict/type.js
import request from '@/utils/request' import request from "@/utils/request";
// 查询字典类型列表 // 查询字典类型列表
export function listType(query) { export function listType(query) {
return request({ return request({
url: '/system/dict/type/list', url: "/system/dict/type/list",
method: 'get', method: "get",
params: query params: query,
}) });
}
// 查询字典类型列表
export function listTypekm(query) {
return request({
url: "/curricula/variable/selectXkTypeList",
method: "get",
params: query,
});
} }
// 查询字典类型详细 // 查询字典类型详细
export function getType(dictId) { export function getType(dictId) {
return request({ return request({
url: '/system/dict/type/' + dictId, url: "/system/dict/type/" + dictId,
method: 'get' method: "get",
}) });
} }
// 新增字典类型 // 新增字典类型
export function addType(data) { export function addType(data) {
return request({ return request({
url: '/system/dict/type', url: "/system/dict/type",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 修改字典类型 // 修改字典类型
export function updateType(data) { export function updateType(data) {
return request({ return request({
url: '/system/dict/type', url: "/system/dict/type",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 删除字典类型 // 删除字典类型
export function delType(dictId) { export function delType(dictId) {
return request({ return request({
url: '/system/dict/type/' + dictId, url: "/system/dict/type/" + dictId,
method: 'delete' method: "delete",
}) });
} }
// 刷新字典缓存 // 刷新字典缓存
export function refreshCache() { export function refreshCache() {
return request({ return request({
url: '/system/dict/type/refreshCache', url: "/system/dict/type/refreshCache",
method: 'delete' method: "delete",
}) });
} }
// 获取字典选择框列表 // 获取字典选择框列表
export function optionselect() { export function optionselect() {
return request({ return request({
url: '/system/dict/type/optionselect', url: "/system/dict/type/optionselect",
method: 'get' method: "get",
}) });
} }
\ No newline at end of file
ruoyi-ui/src/assets/icons/svg/科目管理 (1).svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1701237948149" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4379" width="200" height="200" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M329 923.5H171c-11.7 0-21.1-9.5-21.1-21.1V321.7c0-11.7 9.5-21.1 21.1-21.1h158c11.7 0 21.1 9.5 21.1 21.1v580.6c0 11.7-9.5 21.2-21.1 21.2z m-139.1-40h120.2V340.6H189.9v542.9zM739.8 923.5c-16.4 0-31.3-9-39-23.4-0.1-0.1-0.1-0.2-0.2-0.3L483.6 421c-11.3-21.5-3.1-48.2 18.3-59.6l102.3-50.1c6.4-3.4 13.6-5.2 20.8-5.2 16.4 0 31.3 9 39 23.4 0.1 0.1 0.1 0.2 0.2 0.3l219 473.3c11.3 21.5 3.1 48.2-18.3 59.6l-104.3 55.6c-6.4 3.4-13.6 5.2-20.8 5.2z m-3.6-42.2c0.9 1.6 2.5 2.1 3.7 2.1 0.7 0 1.3-0.2 1.9-0.5l104.3-55.6c2-1.1 2.8-3.6 1.7-5.7-0.1-0.1-0.1-0.2-0.2-0.3l-219-473.2c-0.9-1.6-2.5-2.1-3.7-2.1-0.7 0-1.3 0.2-1.9 0.5l-102.3 50.1c-2 1.1-2.8 3.6-1.7 5.7 0.1 0.1 0.1 0.2 0.2 0.3l217 478.7z" fill="#008dd2" p-id="4380"></path><path d="M494.4 923.5H336.5c-11.7 0-21.1-9.5-21.1-21.1V128.1c0-11.7 9.5-21.1 21.1-21.1h157.9c11.7 0 21.1 9.5 21.1 21.1v774.2c0 11.7-9.4 21.2-21.1 21.2z m-139.1-40h120.2V147H355.3v736.5z" fill="#008dd2" p-id="4381"></path><path d="M985.4 938.5H52.8c-11 0-20-9-20-20s9-20 20-20h932.6c11 0 20 9 20 20s-9 20-20 20z" fill="#008dd2" p-id="4382"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1701237948149" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4379" width="200" height="200" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M329 923.5H171c-11.7 0-21.1-9.5-21.1-21.1V321.7c0-11.7 9.5-21.1 21.1-21.1h158c11.7 0 21.1 9.5 21.1 21.1v580.6c0 11.7-9.5 21.2-21.1 21.2z m-139.1-40h120.2V340.6H189.9v542.9zM739.8 923.5c-16.4 0-31.3-9-39-23.4-0.1-0.1-0.1-0.2-0.2-0.3L483.6 421c-11.3-21.5-3.1-48.2 18.3-59.6l102.3-50.1c6.4-3.4 13.6-5.2 20.8-5.2 16.4 0 31.3 9 39 23.4 0.1 0.1 0.1 0.2 0.2 0.3l219 473.3c11.3 21.5 3.1 48.2-18.3 59.6l-104.3 55.6c-6.4 3.4-13.6 5.2-20.8 5.2z m-3.6-42.2c0.9 1.6 2.5 2.1 3.7 2.1 0.7 0 1.3-0.2 1.9-0.5l104.3-55.6c2-1.1 2.8-3.6 1.7-5.7-0.1-0.1-0.1-0.2-0.2-0.3l-219-473.2c-0.9-1.6-2.5-2.1-3.7-2.1-0.7 0-1.3 0.2-1.9 0.5l-102.3 50.1c-2 1.1-2.8 3.6-1.7 5.7 0.1 0.1 0.1 0.2 0.2 0.3l217 478.7z" fill="#008dd2" p-id="4380"></path><path d="M494.4 923.5H336.5c-11.7 0-21.1-9.5-21.1-21.1V128.1c0-11.7 9.5-21.1 21.1-21.1h157.9c11.7 0 21.1 9.5 21.1 21.1v774.2c0 11.7-9.4 21.2-21.1 21.2z m-139.1-40h120.2V147H355.3v736.5z" fill="#008dd2" p-id="4381"></path><path d="M985.4 938.5H52.8c-11 0-20-9-20-20s9-20 20-20h932.6c11 0 20 9 20 20s-9 20-20 20z" fill="#008dd2" p-id="4382"></path></svg>
\ No newline at end of file
ruoyi-ui/src/router/index.js
...@@ -129,7 +129,13 @@ export const constantRoutes = [ ...@@ -129,7 +129,13 @@ export const constantRoutes = [
component: () => import("@/views/error/401"), component: () => import("@/views/error/401"),
hidden: true, hidden: true,
}, },
//科目数据
// {
// path: "/gradeWork/subjectManagement/data",
// component: () =>
// import("@/views/smartSchool/gradeWork/subjectManagement/data"),
// hidden: true,
// },
{ {
path: "", path: "",
component: Layout, component: Layout,
...@@ -203,6 +209,22 @@ export const dynamicRoutes = [ ...@@ -203,6 +209,22 @@ export const dynamicRoutes = [
}, },
], ],
}, },
//科目数据
// {
// path: "/subjectManagement/data",
// component: Layout,
// hidden: true,
// permissions: ["system:dict:list"],
// children: [
// {
// path: "index/:dictId(\\d+)",
// component: () =>
// import("@/views/smartSchool/gradeWork/subjectManagement/data"),
// name: "Data",
// meta: { title: "字典数据", activeMenu: "/system/dict" },
// },
// ],
// },
{ {
path: "/monitor/job-log", path: "/monitor/job-log",
component: Layout, component: Layout,
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/springView/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryForm" size="small" :inline="true" label-width="80px"> <el-form :model="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item prop="studentsName" label="学生姓名"> <el-form-item prop="studentsName" label="学生姓名">
<el-input clearable v-model="queryForm.studentName" placeholder="学生姓名"></el-input> <el-input clearable v-model="queryForm.studentName" placeholder="学生姓名"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="classId" label="班级"> <el-form-item prop="classId" label="班级">
<el-select v-model="queryForm.classId" placeholder="请选择学生班级" clearable> <el-select v-model="queryForm.classId" placeholder="请选择学生班级" clearable>
<el-option v-for="(item,index) in classList" :key="index" <el-option v-for="(item, index) in classList" :key="index" :label="item.className"
:label="item.className" :value="item.classId"></el-option> :value="item.classId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="selectedMajor" label="已选专业"> <el-form-item prop="selectedMajor" label="已选专业">
<el-select v-model="queryForm.selectedMajor" placeholder="请选择学生已选专业" clearable> <el-select v-model="queryForm.selectedMajor" placeholder="请选择学生已选专业" clearable>
<el-option v-for="(item,index) in dict.type.specialty" :key="index" <el-option v-for="(item, index) in dict.type.specialty" :key="index" :label="item.label" :value="item.value">
:label="item.label" :value="item.value"> </el-option>
</el-option> </el-select>
</el-select> </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> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
<el-button type="warning" icon="el-icon-upload2" size="mini" @click="handleExport">导出</el-button> </el-form-item>
</el-form-item> </el-form>
</el-form>
<!-- 表单信息 --> <!-- 表单信息 -->
<el-table v-loading="loading" :data="studentsList" stripe> <el-table v-loading="loading" :data="studentsList" stripe>
<el-table-column label="班级" prop="className" align="center" width="150px" /> <el-table-column label="班级" prop="className" align="center" width="150px" />
<el-table-column label="学生姓名" prop="studentName" align="center" width="150px" /> <el-table-column label="学生姓名" prop="studentName" align="center" width="150px" />
<el-table-column label="学号" prop="studentNumber" align="center" /> <el-table-column label="学号" prop="studentNumber" align="center" />
<el-table-column label="身份证号" prop="idCard" width="300px" align="center" /> <el-table-column label="身份证号" prop="idCard" width="300px" align="center" />
<el-table-column label="课程类型" prop="courseType" align="center"> <el-table-column label="课程类型" prop="courseType" align="center">
<!-- 1春季选课 2夏季选课 3艺体 --> <!-- 1春季选课 2夏季选课 3艺体 -->
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.course_type,row.courseType) }}</div> <div>{{ selectDictLabel(dict.type.course_type, row.courseType) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="选课时间" prop="curriculaTime" align="center" /> <el-table-column label="选课时间" prop="curriculaTime" align="center" />
<el-table-column label="已选专业" prop="selectedMajor" align="center"> <el-table-column label="已选专业" prop="selectedMajor" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabels(dict.type.specialty,row.selectedMajor) }}</div> <div>{{ selectDictLabels(dict.type.specialty, row.selectedMajor) }}</div>
</template> </template>
</el-table-column> </el-table-column>
</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"
@pagination="getList" /> @pagination="getList" />
</div> </div>
</template> </template>
<script> <script>
...@@ -56,24 +55,24 @@ import { courseSelectionSpringList } from "../../../../../api/smartSchool/gradeW ...@@ -56,24 +55,24 @@ import { courseSelectionSpringList } from "../../../../../api/smartSchool/gradeW
export default { export default {
name: "springView", name: "springView",
dicts: ['specialty','course_type'], dicts: ['specialty', 'course_type'],
data() { data() {
return { return {
majorList: [], majorList: [],
classList: [], classList: [],
queryForm: { // 查询表单 queryForm: { // 查询表单
curriculaId:'', curriculaId: '',
studentName: '', studentName: '',
classId: '', classId: '',
selectedMajor: '', selectedMajor: '',
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}, },
loading: false, // 遮罩层 loading: false, // 遮罩层
total: 0, total: 0,
studentsList: [], // 信息列表 studentsList: [], // 信息列表
} }
}, },
mounted() { mounted() {
this.getClassList() this.getClassList()
...@@ -81,10 +80,10 @@ export default { ...@@ -81,10 +80,10 @@ export default {
}, },
methods: { methods: {
//获取班级下拉框数据 //获取班级下拉框数据
getClassList(){ getClassList() {
let grade = this.$route.query.grade let grade = this.$route.query.grade
classList(grade).then(res=>{ classList(grade).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.classList = res.data this.classList = res.data
} }
}) })
...@@ -94,8 +93,8 @@ export default { ...@@ -94,8 +93,8 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
this.queryForm.curriculaId = this.$route.query.id this.queryForm.curriculaId = this.$route.query.id
courseSelectionSpringList({...this.queryForm}).then(res=>{ courseSelectionSpringList({ ...this.queryForm }).then(res => {
if(res.code == 200){ if (res.code == 200) {
this.studentsList = res.rows this.studentsList = res.rows
this.total = res.total this.total = res.total
this.loading = false this.loading = false
...@@ -105,27 +104,26 @@ export default { ...@@ -105,27 +104,26 @@ export default {
// 重置按钮 // 重置按钮
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
curriculaId: '', curriculaId: '',
studentName: '', studentName: '',
classId: '', classId: '',
selectedMajor: '', selectedMajor: '',
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}; };
this.getList() this.getList()
}, },
// 导出 // 导出
handleExport() { handleExport() {
this.download('/curricula/student/exportCj', { this.download('/curricula/student/exportCj', {
...this.queryForm ...this.queryForm
}, `学生春季选课信息_${new Date().getTime()}.xlsx`) }, `学生春季选课信息_${new Date().getTime()}.xlsx`)
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped></style>
</style>
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
...@@ -85,6 +85,42 @@ ...@@ -85,6 +85,42 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="16">
<el-form-item label="春季" prop="cjkmList">
<el-select v-model="form.cjkmList" multiple placeholder="请选择" :style="{ width: '100%' }"
@change="handleCjkmChange">
<el-option v-for="(item, index) in dict.type.specialty" :key="index" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="夏季" prop="xjkmList">
<el-select v-model="form.xjkmList" multiple placeholder="请选择" :style="{ width: '100%' }"
@change="handleXjkmChange">
<el-option v-for="(item, index) in dict.type.summer_course" :key="index"
:label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="艺体" prop="ytkmList">
<el-select v-model="form.ytkmList" multiple placeholder="请选择" :style="{ width: '100%' }"
@change="handleYtkmChange">
<el-option v-for="(item, index) in dict.type.art_subject" :key="index"
:label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div> </div>
</el-form> </el-form>
<div style="text-align: center"> <div style="text-align: center">
...@@ -103,6 +139,7 @@ import { dataCurricula, addCurricula, updateCurricula, getCurricula, getDept } ...@@ -103,6 +139,7 @@ import { dataCurricula, addCurricula, updateCurricula, getCurricula, getDept }
from "@/api/smartSchool/gradeWork/courseSelection/taskPublishing.js"; from "@/api/smartSchool/gradeWork/courseSelection/taskPublishing.js";
export default { export default {
name: 'taskPublishing', name: 'taskPublishing',
dicts: ['specialty', 'art_subject', 'summer_course'],
data() { data() {
return { return {
tasks: [], tasks: [],
...@@ -118,6 +155,10 @@ export default { ...@@ -118,6 +155,10 @@ export default {
grade: "", grade: "",
startTime: "", startTime: "",
endTime: "", endTime: "",
cjkmList: [],
xjkmList: [],
ytkmList: [],
}, },
//新增弹窗 //新增弹窗
open: false, open: false,
...@@ -135,8 +176,88 @@ export default { ...@@ -135,8 +176,88 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
handleCjkmChange(val) {
console.log('val', val);
console.log('dict', this.dict.type.specialty);
let arr = []
const newArr = val.map(i => {
this.dict.type.specialty.filter(item => {
if (i == item.value) {
console.log('i == item.value ', i == item.value);
console.log('item', item);
arr.push(item)
this.cjkmList = arr.map(item => {
return {
dictType: item.raw.dictType,
dictLabel: item.raw.dictLabel,
dictValue: item.raw.dictValue,
dictSort: item.raw.dictSort,
}
})
}
})
})
console.log('this.cjkmList', this.cjkmList);
},
handleXjkmChange(val) {
console.log('val', val);
console.log('dict', this.dict.type.specialty);
let arr = []
const newArr = val.map(i => {
this.dict.type.summer_course.filter(item => {
if (i == item.value) {
console.log('i == item.value ', i == item.value);
console.log('item', item);
arr.push(item)
this.xjkmList = arr.map(item => {
return {
dictType: item.raw.dictType,
dictLabel: item.raw.dictLabel,
dictValue: item.raw.dictValue,
dictSort: item.raw.dictSort,
}
})
}
})
})
console.log('this.xjkmList', this.xjkmList);
},
handleYtkmChange(val) {
console.log('val', val);
console.log('dict', this.dict.type.specialty);
let arr = []
const newArr = val.map(i => {
this.dict.type.art_subject.filter(item => {
if (i == item.value) {
console.log('i == item.value ', i == item.value);
console.log('item', item);
arr.push(item)
this.ytkmList = arr.map(item => {
return {
dictType: item.raw.dictType,
dictLabel: item.raw.dictLabel,
dictValue: item.raw.dictValue,
dictSort: item.raw.dictSort,
}
})
}
})
})
console.log('this.ytkmList', this.ytkmList);
},
/** 获取列表数据 */ /** 获取列表数据 */
getList() { getList() {
const params = { const params = {
...@@ -245,7 +366,6 @@ export default { ...@@ -245,7 +366,6 @@ export default {
}, },
// 提交表单 // 提交表单
submitForm() { submitForm() {
// console.log('object', this.dateRange);
this.throttle(() => { this.throttle(() => {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
...@@ -255,7 +375,10 @@ export default { ...@@ -255,7 +375,10 @@ export default {
id: this.form.id, id: this.form.id,
taskName: this.form.taskName, taskName: this.form.taskName,
startTime: this.dateRange[0], startTime: this.dateRange[0],
endTime: this.dateRange[1] endTime: this.dateRange[1],
cjkmList: this.cjkmList,
xjkmList: this.xjkmList,
ytkmList: this.ytkmList,
}; };
updateCurricula(params).then(response => { updateCurricula(params).then(response => {
...@@ -266,7 +389,7 @@ export default { ...@@ -266,7 +389,7 @@ export default {
this.open = false; this.open = false;
this.getList(); this.getList();
}).catch(err => { }).catch(err => {
// 处理错误
}); });
} else { } else {
// 新增 // 新增
...@@ -274,26 +397,42 @@ export default { ...@@ -274,26 +397,42 @@ export default {
taskName: this.form.taskName, taskName: this.form.taskName,
grade: this.form.grade, grade: this.form.grade,
startTime: this.dateRange[0], startTime: this.dateRange[0],
endTime: this.dateRange[1] endTime: this.dateRange[1],
cjkmList: this.cjkmList,
xjkmList: this.xjkmList,
ytkmList: this.ytkmList,
}; };
console.log(params, 'params');
addCurricula(params).then(response => { addCurricula(params).then(response => {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}).catch(err => { }).catch(err => {
// Handle error if necessary
}); });
} }
} }
}); });
}) })
}, },
// 编辑按钮 // 编辑按钮
handleUpdate(task) { handleUpdate(task) {
this.title = '修改'; this.title = '修改';
this.open = true; this.open = true;
getCurricula(task.id).then(response => { getCurricula(task.id).then(response => {
this.form = response.data; this.form = response.data;
console.log(this.form, 'this.form ');
this.form.cjkmList = response.data.cjkmList.map(item => {
return item.dictValue
})
this.form.xjkmList = response.data.xjkmList.map(item => {
return item.dictValue
})
this.form.ytkmList = response.data.ytkmList.map(item => {
return item.dictValue
})
this.dateRange = [response.data.startTime, response.data.endTime]; this.dateRange = [response.data.startTime, response.data.endTime];
this.$modal.closeLoading(); this.$modal.closeLoading();
}).catch(err => { }).catch(err => {
......
ruoyi-ui/src/views/smartSchool/gradeWork/subjectManagement/index.vue 0 → 100644
<template>
<div class="app-container">
<el-table v-loading="loading" :data="typeList">
<el-table-column label="科目名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="科目类型" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="{ path: '/gradeWork/subjectManagement/data', query: { dictId: scope.row.dictId } }"
class="link-type">
<span>{{ scope.row.dictType }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import { listTypekm, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 字典表格数据
typeList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
dictName: undefined,
dictType: undefined,
status: undefined
},
// 表单参数
form: {},
// 表单校验
rules: {
dictName: [
{ required: true, message: "字典名称不能为空", trigger: "blur" }
],
dictType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 查询字典类型列表 */
getList() {
this.loading = true;
listTypekm(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.typeList = response.data;
this.total = response.total;
this.loading = false;
}
);
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
dictId: undefined,
dictName: undefined,
dictType: undefined,
status: "0",
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
}
};
</script>
ruoyi-ui/src/views/smartSchool/officialWork/purchaseApply/index.vue
...@@ -51,16 +51,16 @@ ...@@ -51,16 +51,16 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="100" key="operate"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="100" key="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.instanceId == null" size="mini" type="text" icon="el-icon-s-promotion" <el-button v-if="scope.row.tjzt == '0'" size="mini" type="text" icon="el-icon-s-promotion"
@click="submitApply(scope.row)" v-hasPermi="['system:teacherLeave:edit']">提交申请 @click="submitApply(scope.row)" v-hasPermi="['system:teacherLeave:edit']">提交申请
</el-button> </el-button>
<el-button v-if="scope.row.instanceId != null" size="mini" type="text" icon="el-icon-view" <el-button v-if="scope.row.tjzt == '1'" size="mini" type="text" icon="el-icon-view"
@click="handleView(scope.row)" v-hasPermi="['system:teacherLeave:edit']">查看 @click="handleView(scope.row)" v-hasPermi="['system:teacherLeave:edit']">查看
</el-button> </el-button>
<el-button v-if="scope.row.instanceId == null" size="mini" type="text" icon="el-icon-edit" <el-button v-if="scope.row.tjzt == '0'" size="mini" type="text" icon="el-icon-edit"
@click="handleUpdate(scope.row)" v-hasPermi="['system:teacherLeave:edit']">修改 @click="handleUpdate(scope.row)" v-hasPermi="['system:teacherLeave:edit']">修改
</el-button> </el-button>
<el-button v-if="scope.row.instanceId == null" size="mini" type="text" icon="el-icon-delete" <el-button v-if="scope.row.tjzt == '0'" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['system:teacherLeave:remove']">删除 @click="handleDelete(scope.row)" v-hasPermi="['system:teacherLeave:remove']">删除
</el-button> </el-button>
</template> </template>
...@@ -377,6 +377,7 @@ export default { ...@@ -377,6 +377,7 @@ export default {
this.loading = true; this.loading = true;
purchaseList(this.queryParams).then(response => { purchaseList(this.queryParams).then(response => {
this.purchaseList = response.rows; this.purchaseList = response.rows;
console.log(this.purchaseList, ' this.purchaseList');
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}).catch(() => { }).catch(() => {
...@@ -384,6 +385,7 @@ export default { ...@@ -384,6 +385,7 @@ export default {
}, },
/** 切换tab标签 */ /** 切换tab标签 */
handleClick({ name }) { handleClick({ name }) {
console.log(name, 'name');
this.$set(this.queryParams, 'submitState', name); this.$set(this.queryParams, 'submitState', name);
// console.log(name, 123); // console.log(name, 123);
if (name == 0) { if (name == 0) {
......
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