feat commit

小组管理功能添加
master
玉安君 2024-04-23 21:42:29 +08:00
parent 86cd9d05e8
commit df766878f9
5 changed files with 607 additions and 20 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询小组管理列表
export function listGroup(query) {
return request({
url: '/data/group/list',
method: 'get',
params: query
})
}
// 查询小组管理详细
export function getGroup(groupId) {
return request({
url: '/data/group/' + groupId,
method: 'get'
})
}
// 新增小组管理
export function addGroup(data) {
return request({
url: '/data/group',
method: 'post',
data: data
})
}
// 修改小组管理
export function updateGroup(data) {
return request({
url: '/data/group/'+data.groupId,
method: 'put',
data: data
})
}
// 删除小组管理
export function delGroup(groupId) {
return request({
url: '/data/group/' + groupId,
method: 'delete'
})
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

View File

@ -42,7 +42,19 @@
size="mini"
@click="handleAdd"
v-hasPermi="['data:clazz:add']"
>新增</el-button>
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="handleGroup"
icon="el-icon-user-solid"
v-hasPermi="['data:clazz:add']"
>小组管理
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -53,7 +65,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['data:clazz:edit']"
>修改</el-button>
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -64,7 +77,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['data:clazz:remove']"
>删除</el-button>
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -74,37 +88,48 @@
size="mini"
@click="handleExport"
v-hasPermi="['data:clazz:export']"
>导出</el-button>
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="clazzList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="班级ID" align="center" prop="clazzId" />
<el-table-column label="班级名称" align="center" prop="clazzName" />
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="班级ID" align="center" prop="clazzId"/>
<el-table-column label="班级名称" align="center" prop="clazzName"/>
<el-table-column label="班级状态" align="center" prop="clazzStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.clazz_status" :value="scope.row.clazzStatus"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="备注" align="center" prop="remark"/>
<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="handleClazzGroup(scope.row)"
v-hasPermi="['data:clazz:edit']"
>小组管理
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['data:clazz:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['data:clazz:remove']"
>删除</el-button>
>删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -121,7 +146,7 @@
<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="clazzName">
<el-input v-model="form.clazzName" placeholder="请输入班级名称" />
<el-input v-model="form.clazzName" placeholder="请输入班级名称"/>
</el-form-item>
<el-form-item label="班级状态" prop="clazzStatus">
<el-select v-model="form.clazzStatus" placeholder="请选择班级状态">
@ -134,23 +159,107 @@
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input v-model="form.remark" placeholder="请输入备注"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
<!-- 小组管理 -->
</el-dialog>
<el-dialog :title="title" :visible.sync="groupOpen" width="1250px" append-to-body>
<group-component></group-component>
</el-dialog>
<!-- 班级内小组管理-->
<el-dialog :title="title" :visible.sync="clazzGroupOpen">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAddGroup"
v-hasPermi="['data:group:add']"
>新增
</el-button>
</el-col>
</el-row>
<el-table :data="clazzGroupList">
<el-table-column label="小组ID" align="center" prop="groupId"/>
<el-table-column label="小组名称" align="center" prop="groupName"/>
<el-table-column label="小组状态" align="center" prop="groupStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.group_status" :value="scope.row.groupStatus"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark"/>
<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="handleUpdateGroup(scope.row)"
v-hasPermi="['data:group:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDeleteGroup(scope.row)"
v-hasPermi="['data:group:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 添加或修改小组管理对话框 -->
<el-dialog :title="title" :visible.sync="clazzGroupOption" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules2" label-width="80px">
<el-form-item label="小组名称" prop="groupName">
<el-input v-model="form.groupName" placeholder="请输入小组名称"/>
</el-form-item>
<el-form-item label="小组状态" prop="groupStatus">
<el-select v-model="form.groupStatus" placeholder="请选择小组状态">
<el-option
v-for="dict in dict.type.group_status"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="groupSubmitForm"> </el-button>
<el-button @click="groupCancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listClazz, getClazz, delClazz, addClazz, updateClazz } from "@/api/data/clazz";
import {listClazz, getClazz, delClazz, addClazz, updateClazz} from "@/api/data/clazz";
import groupComponent from "@/views/data/group/index.vue";
import {addGroup, delGroup, getGroup, listGroup, updateGroup} from "@/api/data/group";
export default {
components: {
groupComponent
},
name: "Clazz",
dicts: ['clazz_status'],
dicts: ['clazz_status', 'group_status'],
data() {
return {
//
@ -167,10 +276,17 @@ export default {
total: 0,
//
clazzList: [],
//
clazzGroupList: [],
//使
nowGroupClazzId: null,
//
title: "",
//
open: false,
groupOpen: false,
clazzGroupOpen: false,
clazzGroupOption: false,
//
queryParams: {
pageNum: 1,
@ -178,13 +294,19 @@ export default {
clazzId: null,
clazzName: null,
clazzStatus: null,
groupStatus: null,
},
//
form: {},
//
rules: {
clazzStatus: [
{ required: true, message: "班级状态不能为空", trigger: "change" }
{required: true, message: "班级状态不能为空", trigger: "change"}
],
},
rules2:{
groupStatus: [
{required: true, message: "小组状态不能为空", trigger: "change"}
],
}
};
@ -193,6 +315,11 @@ export default {
this.getList();
},
methods: {
//
handleGroup() {
this.groupOpen = true;
this.title = "小组管理";
},
/** 查询班级管理列表 */
getList() {
this.loading = true;
@ -207,9 +334,18 @@ export default {
this.open = false;
this.reset();
},
//
groupCancel() {
this.clazzGroupOption = false;
this.reset();
},
//
reset() {
this.form = {
groupId: null,
groupName: null,
groupClazz: null,
groupStatus: null,
clazzId: null,
clazzName: null,
clazzStatus: null,
@ -234,7 +370,7 @@ export default {
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.clazzId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@ -243,6 +379,20 @@ export default {
this.open = true;
this.title = "添加班级管理";
},
/** 班级内小组管理*/
handleClazzGroup(clazz) {
this.nowGroupClazzId = clazz.clazzId
this.title = clazz.clazzName + "班小组管理"
this.getClazzGroupList(this.nowGroupClazzId)
this.clazzGroupOpen = true;
},
/** 查询班级内小组*/
getClazzGroupList(groupClazzId){
listGroup({groupClazz: groupClazzId}).then(response => {
this.clazzGroupList = response.data.rows;
}
)
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
@ -276,19 +426,69 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const clazzIds = row.clazzId || this.ids;
this.$modal.confirm('是否确认删除班级管理编号为"' + clazzIds + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除班级管理编号为"' + clazzIds + '"的数据项?').then(function () {
return delClazz(clazzIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('data/clazz/export', {
...this.queryParams
}, `clazz_${new Date().getTime()}.xlsx`)
}
},
/** 小组修改按钮操作 */
handleUpdateGroup(row) {
this.reset();
const groupId = row.groupId || this.ids
getGroup(groupId).then(response => {
this.form = response.data;
this.clazzGroupOption = true;
this.title = "修改小组管理";
});
},
/** 小组删除按钮操作 */
handleDeleteGroup(row) {
const groupIds = row.groupId || this.ids;
this.$modal.confirm('是否确认删除小组管理编号为"' + groupIds + '"的数据项?').then(function () {
return delGroup(groupIds);
}).then(() => {
this.getClazzGroupList(this.nowGroupClazzId);
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 小组新增操作*/
handleAddGroup() {
this.reset();
this.clazzGroupOption = true;
this.title = "添加小组管理";
},
/** 小组提交按钮 */
groupSubmitForm() {
this.form.groupClazz = this.nowGroupClazzId;
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.groupId != null) {
updateGroup(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.clazzGroupOption = false;
this.getClazzGroupList(this.nowGroupClazzId);
});
} else {
addGroup(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.clazzGroupOption = false;
this.getClazzGroupList(this.nowGroupClazzId);
});
}
}
});
},
}
};
</script>

View File

@ -0,0 +1,335 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="小组ID" prop="groupId">
<el-input
v-model="queryParams.groupId"
placeholder="请输入小组ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="小组名称" prop="groupName">
<el-input
v-model="queryParams.groupName"
placeholder="请输入小组名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="小组状态" prop="groupStatus">
<el-select v-model="queryParams.groupStatus" placeholder="请选择小组状态" clearable>
<el-option
v-for="dict in dict.type.group_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属班级" prop="groupClazz">
<el-select v-model="queryParams.groupClazz" placeholder="请选择所属班级" >
<el-option
v-for="clazz in clazzList"
:key="clazz.clazzId"
:label="clazz.clazzName"
:value="clazz.clazzId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></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="handleAdd"
v-hasPermi="['data:group: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="['data:group: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="['data:group: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="['data:group:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="groupList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="小组ID" align="center" prop="groupId" />
<el-table-column label="小组名称" align="center" prop="groupName" />
<el-table-column label="所属班级" align="center">
<template slot-scope="scope">
<span
v-for="item in clazzList"
v-if="item.clazzId == scope.row.groupClazz"
>{{item.clazzName}}</span>
</template>
</el-table-column>
<el-table-column label="小组状态" align="center" prop="groupStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.group_status" :value="scope.row.groupStatus"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<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="['data:group:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['data:group: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"
/>
<!-- 添加或修改小组管理对话框 -->
<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="groupName">
<el-input v-model="form.groupName" placeholder="请输入小组名称" />
</el-form-item>
<el-form-item label="小组状态" prop="groupStatus">
<el-select v-model="form.groupStatus" placeholder="请选择小组状态">
<el-option
v-for="dict in dict.type.group_status"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属班级" prop="groupClazz">
<el-select v-model="form.groupClazz" placeholder="请选择所属班级" clearable>
<el-option
v-for="clazz in clazzList"
:key="clazz.clazzId"
:label="clazz.clazzName"
:value="clazz.clazzId"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/data/group";
import {listClazz} from "@/api/data/clazz";
export default {
name: "Group",
dicts: ['group_status'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
groupList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
groupId: null,
groupName: null,
groupClazz: null,
groupStatus: null,
},
//
form: {},
//
clazzList:[],
//
rules: {
groupClazz: [
{ required: true, message: "所属班级不能为空", trigger: "change" }
],
groupStatus: [
{ required: true, message: "小组状态不能为空", trigger: "change" }
]
}
};
},
created() {
this.getClazzList();
this.getList();
},
methods: {
getClazzList(){
listClazz({clazzStatus:1}).then(response =>{
this.clazzList = response.data.rows;
})
},
/** 查询小组管理列表 */
getList() {
this.loading = true;
listGroup(this.queryParams).then(response => {
this.groupList = response.data.rows;
this.total = response.data.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
groupId: null,
groupName: null,
groupClazz: null,
groupStatus: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.groupId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加小组管理";
},
/** 小组修改按钮操作 */
handleUpdate(row) {
this.reset();
const groupId = row.groupId || this.ids
getGroup(groupId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改小组管理";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.groupId != null) {
updateGroup(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addGroup(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 小组删除按钮操作 */
handleDelete(row) {
const groupIds = row.groupId || this.ids;
this.$modal.confirm('是否确认删除小组管理编号为"' + groupIds + '"的数据项?').then(function() {
return delGroup(groupIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('data/group/export', {
...this.queryParams
}, `group_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@ -1,6 +1,6 @@
<template>
<div class="app-container home">
<img src="@/assets/images/gogogo.jpg" >
</div>
</template>
@ -22,5 +22,13 @@ export default {
</script>
<style lang="scss" scoped>
img{
position: absolute; /* 或者使用 'fixed',取决于您希望图片相对于哪个元素进行定位 */
top: 0;
left: 0;
width: 100%;
height: 100%;
object-fit: cover; /* 保持图像纵横比并填充整个容器,可能裁剪边缘 */
}
</style>