xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
shidongli 2022-08-11 09:41:03 +08:00
commit c849d906aa
14 changed files with 3663 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/system/kindergartenInfo.js
View File

@ -2,8 +2,6 @@ import request from '@/utils/request'
//类型
export function tKindergartenInfo(data) {
return request({
url: '/system/dict/data/type/' + data,
@ -11,6 +9,14 @@ export function tKindergartenInfo(data) {
})
}
//查询园长
export function getUserInfoList(query) {
return request({
url: '/system/user/getUserInfoList',
method: 'get',
params: query
})
}
// 查询幼儿园信息管理列表
export function listKindergartenInfo(query) {

53
src/api/system/teacherInfo.js Normal file
View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询教师信息管理列表
export function listTeacherInfo(query) {
return request({
url: '/system/teacherInfo/list',
method: 'get',
params: query
})
}
//教师绑定的班级
export function getClassInfo(query) {
return request({
url: '/system/teacherInfo/getClassInfo',
method: 'get',
params: query
})
}
// 查询教师信息管理详细
export function getTeacherInfo(id) {
return request({
url: '/system/teacherInfo/' + id,
method: 'get'
})
}
// 新增教师信息管理
export function addTeacherInfo(data) {
return request({
url: '/system/teacherInfo/add',
method: 'post',
data: data
})
}
// 修改教师信息管理
export function updateTeacherInfo(data) {
return request({
url: '/system/teacherInfo/edit',
method: 'post',
data: data
})
}
// 删除教师信息管理
export function delTeacherInfo(id) {
return request({
url: '/system/teacherInfo/' + id,
method: 'delete'
})
}

44
src/api/system/testItemCityScore.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询全市平均成绩列表
export function listTestItemCityScore(query) {
return request({
url: '/system/testItemCityScore/list',
method: 'get',
params: query
})
}
// 查询全市平均成绩详细
export function getTestItemCityScore(id) {
return request({
url: '/system/testItemCityScore/' + id,
method: 'get'
})
}
// 新增全市平均成绩
export function addTestItemCityScore(data) {
return request({
url: '/system/testItemCityScore/add',
method: 'post',
data: data
})
}
// 修改全市平均成绩
export function updateTestItemCityScore(data) {
return request({
url: 'system/testItemCityScore/edit',
method: 'POST',
data: data
})
}
// 删除全市平均成绩
export function delTestItemCityScore(id) {
return request({
url: '/system/testItemCityScore/' + id,
method: 'delete'
})
}

44
src/api/system/testItems.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询测试项目列表
export function listTestItems(query) {
return request({
url: '/system/testItems/list',
method: 'get',
params: query
})
}
// 查询测试项目详细
export function getTestItems(id) {
return request({
url: '/system/testItems/' + id,
method: 'get'
})
}
// 新增测试项目
export function addTestItems(data) {
return request({
url: '/system/testItems/add',
method: 'post',
data: data
})
}
// 修改测试项目
export function updateTestItems(data) {
return request({
url: '/system/testItems/edit',
method: 'post',
data: data
})
}
// 删除测试项目
export function delTestItems(id) {
return request({
url: '/system/testItems/' + id,
method: 'delete'
})
}

1
src/views/system/area/index.vue
View File

@ -127,7 +127,6 @@
</el-table>
<!-- 添加或修改区域管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="所属上级区域" prop="parentId" v-if="form.id != 1">

140
src/views/system/itemCategory/index.vue
View File

@ -22,7 +22,6 @@
v-model="queryParams.categoryName"
placeholder="请输入分类名称"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item
@ -127,7 +126,6 @@
v-if="refreshTable"
v-loading="loading"
:data="itemCategoryList"
@selection-change="handleSelectionChange"
row-key="id"
:default-expand-all="isExpandAll"
@ -188,8 +186,7 @@
v-hasPermi="['system:itemCategory:remove']"
>删除</el-button
>
<!-- v-if="scope.row.categoryName != '跳不'" -->
<!-- v-if="scope.row.categoryName != '跳不'" -->
</template>
</el-table-column>
</el-table>
@ -226,18 +223,56 @@
placeholder="请输入分类名称简写"
/>
</el-form-item>
<el-form-item label="项目成绩级别" prop="testItemLevelList">
<div
v-for="(item, index) in form.testItemLevelList"
:key="item.id"
style="margin-bottom: 10px"
>
<el-input
v-model="item.levelName"
placeholder="级别名"
style="width: 75px; margin-right: 20px"
/>
<el-input
v-model.number="item.levelMinScore"
placeholder="最低分"
style="width: 75px; margin-right: 10px"
/><el-input
v-model.number="item.levelMaxScore"
placeholder="最高分"
style="width: 75px; margin-right: 9px"
/>
<el-button
type="info"
circle
plain
icon="el-icon-circle-plus-outline"
@click="addInput"
v-if="index == 0"
></el-button>
<el-button
type="danger"
icon="el-icon-delete"
circle
plain
@click="delInput(index)"
v-if="index != 0"
></el-button>
</div>
</el-form-item>
<el-form-item label="分类排序" prop="sorting">
<el-input v-model.number="form.sorting" placeholder="请输入分类排序" />
<el-input
v-model.number="form.sorting"
placeholder="请输入分类排序"
/>
</el-form-item>
<el-form-item label="备注信息" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注信息" />
</el-form-item>
<!-- <el-form-item label="是否删除，0：否，1：是" prop="delFlag">
<el-input
v-model="form.delFlag"
placeholder="请输入是否删除，0：否，1：是"
/>
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -262,6 +297,39 @@ export default {
name: "ItemCategory",
components: { Treeselect },
data() {
let testItemLevelList = (rule, value, callback) => {
console.log(value);
if (
value.map((e) => {
return e.levelName;
}) == ""
) {
callback();
} else if (
value.map((e) => {
return e.levelMinScore;
}) == ""
) {
callback();
} else if (
value.map((e) => {
return e.levelMaxScore;
}) == ""
) {
callback();
} else if (
value.map((e) => {
return e.levelMaxScore;
}) <=
value.map((e) => {
return e.levelMinScore;
})
) {
callback(new Error("级别最高分必须大于最低分,请重新填写！"));
} else {
callback();
}
};
return {
// 重新渲染表格状态
refreshTable: true,
@ -298,23 +366,30 @@ export default {
form: {},
// 表单校验
rules: {
testItemLevelList: [
{
// required: true,
validator: testItemLevelList,
trigger: "blur",
},
],
parentId: [
{ required: true, message: "父级id不能为空", trigger: "blur" },
],
categoryName: [
{ required: true, message: "分类名称不能为空",trigger: "blur" },
categoryName: [
{ required: true, message: "分类名称不能为空", trigger: "blur" },
// { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
],
categoryNameAbbreviate: [
{ required: true, message: "分类名称简写不能为空",trigger: "blur" },
categoryNameAbbreviate: [
{ required: true, message: "分类名称简写不能为空", trigger: "blur" },
// { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
],
sorting: [
{ required: true, message: "排序不能为空",trigger: "blur" },
{ required: true, message: "排序不能为空", trigger: "blur" },
{ type: "number", message: "排序必须为数字值", trigger: "blur" },
],
remark: [
{ required: true, message: "备注信息不能为空",trigger: "blur" },
remark: [
{ required: true, message: "备注信息不能为空", trigger: "blur" },
// { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
],
// parentId: [
@ -328,6 +403,18 @@ export default {
this.getList();
},
methods: {
delInput(index) {
this.form.testItemLevelList.splice(index, 1);
console.log(this.form.testItemLevelList);
},
addInput() {
console.log(this.form);
this.form.testItemLevelList.push({
levelName: "",
levelMinScore: "",
levelMaxScore: "",
});
},
/** 转换部门数据结构 */
normalizer(node) {
// console.log(node);
@ -353,8 +440,7 @@ export default {
this.loading = true;
listItemCategory(this.queryParams).then((response) => {
this.itemCategoryList = this.handleTree(response.data);
console.log(this.itemCategoryList);
// console.log(this.itemCategoryList);
// this.total = response.data.length;
// console.log(this.total);
this.loading = false;
@ -379,6 +465,9 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
testItemLevelList: [
{ levelName: "", levelMinScore: "", levelMaxScore: "" },
],
};
this.resetForm("form");
},
@ -419,15 +508,20 @@ export default {
this.reset();
const id = row.id || this.ids;
getItemCategory(id).then((response) => {
if (response.data.testItemLevelList == null) {
response.data.testItemLevelList = [
{ levelName: "", levelMinScore: "", levelMaxScore: "" },
];
}
this.form = response.data;
this.open = true;
this.title = "修改测试项目分类";
console.log(this.form)
console.log(this.form);
});
},
/** 提交按钮 */
submitForm() {
console.log(this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
@ -450,7 +544,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认删除测试项目的数据项？')
.confirm("是否确认删除测试项目的数据项？")
.then(function () {
return delItemCategory(ids);
})

49
src/views/system/kindergartenInfo/index.vue
View File

@ -6,7 +6,7 @@
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
label-width="85px"
>
<el-form-item label="幼儿园名称" prop="kindergartenName">
<el-input
@ -34,8 +34,23 @@
style="width: 208px"
/>
</el-form-item>
<el-form-item label="园长" prop="principalName" label-width="40px">
<el-select
v-model="queryParams.principalId"
clearable
placeholder="请选择"
>
<el-option
v-for="item in getUserInfoLists"
:key="item.userId"
:label="item.userName"
:value="item.userId"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="联系人" prop="contacts">
<el-form-item label="联系人" prop="contacts" label-width="60px">
<el-input
v-model="queryParams.contacts"
placeholder="请输入联系人"
@ -148,6 +163,7 @@
scope.row.kindergartenType == type ? "公办" : "私有"
}}</template>
</el-table-column>
<el-table-column label="园长" align="center" prop="principalName" />
<el-table-column label="联系人" align="center" prop="contacts" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="组织名称" align="center" prop="organizeName" />
@ -215,7 +231,22 @@
<el-radio :label="type2">私有</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="园长" prop="principalId">
<el-select
v-model="form.principalId"
clearable
placeholder="请选择"
style="width: 360px"
>
<el-option
v-for="item in getUserInfoLists"
:key="item.userId"
:label="item.userName"
:value="item.userId"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="联系人" prop="contacts">
<el-input v-model="form.contacts" placeholder="请输入联系人" />
</el-form-item>
@ -243,6 +274,7 @@ import {
delKindergartenInfo,
addKindergartenInfo,
updateKindergartenInfo,
getUserInfoList,
} from "@/api/system/kindergartenInfo";
import { list } from "@/api/system/info.js";
import Treeselect from "@riophae/vue-treeselect";
@ -278,6 +310,8 @@ export default {
total: 0,
// 幼儿园信息管理表格数据
kindergartenInfoList: [],
//园长数组
getUserInfoLists: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -332,6 +366,9 @@ export default {
message: "请输入正确的手机号",
},
],
principalId: [
{ required: true, message: "请选择园长", trigger: "blur" },
],
kindergartenType: [{ required: true, message: "请选择幼儿园类型" }],
kindergartenAddress: [
{ required: true, message: "请输入幼儿园地址", trigger: "blur" },
@ -372,6 +409,10 @@ export default {
/** 查询幼儿园信息管理列表 */
getList() {
this.loading = true;
getUserInfoList({ roleKey: "enchou" }).then((res) => {
this.getUserInfoLists = res.data;
console.log(this.getUserInfoLists);
});
list(this.info).then((response) => {
this.infolist = this.handleTree(response.data);
this.infolist2 = response.data;
@ -402,6 +443,7 @@ export default {
kindergartenAddress: null,
kindergartenType: undefined,
phone: "",
principalId: "",
contacts: null,
};
this.resetForm("form");
@ -452,6 +494,7 @@ export default {
},
/** 提交按钮 */
submitForm() {
console.log(this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {

2
src/views/system/parentInfo/index.vue
View File

@ -316,7 +316,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认删除家长信息编号为"' + ids + '"的数据项？')
.confirm("是否确认删除该家长信息吗？")
.then(function () {
return delParentInfo(ids);
})

405
src/views/system/role/index.vue
View File

@ -1,6 +1,12 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
>
<el-form-item label="角色名称" prop="roleName">
<el-input
v-model="queryParams.roleName"
@ -46,8 +52,16 @@
></el-date-picker>
</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-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>
@ -60,7 +74,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>新增</el-button>
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -71,7 +86,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:role:edit']"
>修改</el-button>
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -82,7 +98,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:role:remove']"
>删除</el-button>
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -92,16 +109,34 @@
size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出</el-button>
>导出</el-button
>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="roleList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色编号" prop="roleId" width="120" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
<el-table-column
label="角色名称"
prop="roleName"
:show-overflow-tooltip="true"
width="150"
/>
<el-table-column
label="权限字符"
prop="roleKey"
:show-overflow-tooltip="true"
width="150"
/>
<el-table-column label="显示顺序" prop="roleSort" width="100" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
@ -113,12 +148,21 @@
></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<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-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
@ -126,31 +170,53 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>修改</el-button>
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
<span class="el-dropdown-link">
>删除</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-user"
@click="handleAuthUser(scope.row)"
v-hasPermi="['system:role:edit']"
>分配用户</el-button
>
<!-- <el-dropdown
size="mini"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:role:edit']"
>
<el-dropdown-item
command="handleAuthUser"
icon="el-icon-user"
v-hasPermi="['system:role:edit']"
>分配用户</el-dropdown-item
> -->
<!-- <span class="el-dropdown-link">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown">
</span> -->
<!-- <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
<el-dropdown-item command="handleAuthUser" icon="el-icon-user"
v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-menu> -->
<!-- </el-dropdown> -->
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@ -165,7 +231,10 @@
</el-form-item>
<el-form-item prop="roleKey">
<span slot="label">
<el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
<el-tooltip
content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
placement="top"
>
<i class="el-icon-question"></i>
</el-tooltip>
权限字符
@ -173,7 +242,11 @@
<el-input v-model="form.roleKey" placeholder="请输入权限字符" />
</el-form-item>
<el-form-item label="角色顺序" prop="roleSort">
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
<el-input-number
v-model="form.roleSort"
controls-position="right"
:min="0"
/>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
@ -181,13 +254,26 @@
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="菜单权限">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
<el-checkbox
v-model="menuExpand"
@change="handleCheckedTreeExpand($event, 'menu')"
>展开/折叠</el-checkbox
>
<el-checkbox
v-model="menuNodeAll"
@change="handleCheckedTreeNodeAll($event, 'menu')"
>全选/全不选</el-checkbox
>
<el-checkbox
v-model="form.menuCheckStrictly"
@change="handleCheckedTreeConnect($event, 'menu')"
>父子联动</el-checkbox
>
<el-tree
class="tree-border"
:data="menuOptions"
@ -200,7 +286,11 @@
></el-tree>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -210,7 +300,12 @@
</el-dialog>
<!-- 分配角色数据权限对话框 -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
<el-dialog
:title="title"
:visible.sync="openDataScope"
width="500px"
append-to-body
>
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.roleName" :disabled="true" />
@ -229,9 +324,21 @@
</el-select>
</el-form-item>
<el-form-item label="数据权限" v-show="form.dataScope == 2">
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
<el-checkbox
v-model="deptExpand"
@change="handleCheckedTreeExpand($event, 'dept')"
>展开/折叠</el-checkbox
>
<el-checkbox
v-model="deptNodeAll"
@change="handleCheckedTreeNodeAll($event, 'dept')"
>全选/全不选</el-checkbox
>
<el-checkbox
v-model="form.deptCheckStrictly"
@change="handleCheckedTreeConnect($event, 'dept')"
>父子联动</el-checkbox
>
<el-tree
class="tree-border"
:data="deptOptions"
@ -254,13 +361,27 @@
</template>
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
import {
listRole,
getRole,
delRole,
addRole,
updateRole,
dataScope,
changeRoleStatus,
} from "@/api/system/role";
import {
treeselect as menuTreeselect,
roleMenuTreeselect,
} from "@/api/system/menu";
import {
treeselect as deptTreeselect,
roleDeptTreeselect,
} from "@/api/system/dept";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
dicts: ["sys_normal_disable"],
data() {
return {
// 遮罩层
@ -293,24 +414,24 @@ export default {
dataScopeOptions: [
{
value: "1",
label: "全部数据权限"
label: "全部数据权限",
},
{
value: "2",
label: "自定数据权限"
label: "自定数据权限",
},
{
value: "3",
label: "本部门数据权限"
label: "本部门数据权限",
},
{
value: "4",
label: "本部门及以下数据权限"
label: "本部门及以下数据权限",
},
{
value: "5",
label: "仅本人数据权限"
}
label: "仅本人数据权限",
},
],
// 菜单列表
menuOptions: [],
@ -322,26 +443,26 @@ export default {
pageSize: 10,
roleName: undefined,
roleKey: undefined,
status: undefined
status: undefined,
},
// 表单参数
form: {},
defaultProps: {
children: "children",
label: "label"
label: "label",
},
// 表单校验
rules: {
roleName: [
{ required: true, message: "角色名称不能为空", trigger: "blur" }
{ required: true, message: "角色名称不能为空", trigger: "blur" },
],
roleKey: [
{ required: true, message: "权限字符不能为空", trigger: "blur" }
{ required: true, message: "权限字符不能为空", trigger: "blur" },
],
roleSort: [
{ required: true, message: "角色顺序不能为空", trigger: "blur" }
]
}
{ required: true, message: "角色顺序不能为空", trigger: "blur" },
],
},
};
},
created() {
@ -351,7 +472,8 @@ export default {
/** 查询角色列表 */
getList() {
this.loading = true;
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
(response) => {
this.roleList = response.rows;
this.total = response.total;
this.loading = false;
@ -360,13 +482,13 @@ export default {
},
/** 查询菜单树结构 */
getMenuTreeselect() {
menuTreeselect().then(response => {
menuTreeselect().then((response) => {
this.menuOptions = response.data;
});
},
/** 查询部门树结构 */
getDeptTreeselect() {
deptTreeselect().then(response => {
deptTreeselect().then((response) => {
this.deptOptions = response.data;
});
},
@ -390,14 +512,14 @@ export default {
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
return roleMenuTreeselect(roleId).then((response) => {
this.menuOptions = response.menus;
return response;
});
},
/** 根据角色ID查询部门树结构 */
getRoleDeptTreeselect(roleId) {
return roleDeptTreeselect(roleId).then(response => {
return roleDeptTreeselect(roleId).then((response) => {
this.deptOptions = response.depts;
return response;
});
@ -405,13 +527,17 @@ export default {
// 角色状态修改
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
return changeRoleStatus(row.roleId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === "0" ? "1" : "0";
});
this.$modal
.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？')
.then(function () {
return changeRoleStatus(row.roleId, row.status);
})
.then(() => {
this.$modal.msgSuccess(text + "成功");
})
.catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
// 取消按钮
cancel() {
@ -428,22 +554,22 @@ export default {
if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([]);
}
this.menuExpand = false,
this.menuNodeAll = false,
this.deptExpand = true,
this.deptNodeAll = false,
this.form = {
roleId: undefined,
roleName: undefined,
roleKey: undefined,
roleSort: 0,
status: "0",
menuIds: [],
deptIds: [],
menuCheckStrictly: true,
deptCheckStrictly: true,
remark: undefined
};
(this.menuExpand = false),
(this.menuNodeAll = false),
(this.deptExpand = true),
(this.deptNodeAll = false),
(this.form = {
roleId: undefined,
roleName: undefined,
roleKey: undefined,
roleSort: 0,
status: "0",
menuIds: [],
deptIds: [],
menuCheckStrictly: true,
deptCheckStrictly: true,
remark: undefined,
});
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -459,11 +585,17 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.roleId)
this.single = selection.length!=1
this.multiple = !selection.length
this.ids = selection.map((item) => item.roleId);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
//分配用户
handleCommand(row) {
// this.handleDataScope(row);
this.handleAuthUser(row);
},
// 更多操作触发
handleCommand(command, row) {
switch (command) {
case "handleDataScope":
@ -478,12 +610,12 @@ export default {
},
// 树权限（展开/折叠）
handleCheckedTreeExpand(value, type) {
if (type == 'menu') {
if (type == "menu") {
let treeList = this.menuOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
}
} else if (type == 'dept') {
} else if (type == "dept") {
let treeList = this.deptOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
@ -492,18 +624,18 @@ export default {
},
// 树权限（全选/全不选）
handleCheckedTreeNodeAll(value, type) {
if (type == 'menu') {
this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
} else if (type == 'dept') {
this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
if (type == "menu") {
this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
} else if (type == "dept") {
this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
}
},
// 树权限（父子联动）
handleCheckedTreeConnect(value, type) {
if (type == 'menu') {
this.form.menuCheckStrictly = value ? true: false;
} else if (type == 'dept') {
this.form.deptCheckStrictly = value ? true: false;
if (type == "menu") {
this.form.menuCheckStrictly = value ? true : false;
} else if (type == "dept") {
this.form.deptCheckStrictly = value ? true : false;
}
},
/** 新增按钮操作 */
@ -516,19 +648,19 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const roleId = row.roleId || this.ids
const roleId = row.roleId || this.ids;
const roleMenu = this.getRoleMenuTreeselect(roleId);
getRole(roleId).then(response => {
getRole(roleId).then((response) => {
this.form = response.data;
this.open = true;
this.$nextTick(() => {
roleMenu.then(res => {
let checkedKeys = res.checkedKeys
roleMenu.then((res) => {
let checkedKeys = res.checkedKeys;
checkedKeys.forEach((v) => {
this.$nextTick(()=>{
this.$refs.menu.setChecked(v, true ,false);
})
})
this.$nextTick(() => {
this.$refs.menu.setChecked(v, true, false);
});
});
});
});
this.title = "修改角色";
@ -536,44 +668,45 @@ export default {
},
/** 选择角色权限范围触发 */
dataScopeSelectChange(value) {
if(value !== '2') {
if (value !== "2") {
this.$refs.dept.setCheckedKeys([]);
}
},
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
getRole(row.roleId).then(response => {
this.form = response.data;
this.openDataScope = true;
this.$nextTick(() => {
roleDeptTreeselect.then(res => {
this.$refs.dept.setCheckedKeys(res.checkedKeys);
});
});
this.title = "分配数据权限";
});
},
// handleDataScope(row) {
// this.reset();
// const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
// getRole(row.roleId).then((response) => {
// this.form = response.data;
// this.openDataScope = true;
// this.$nextTick(() => {
// roleDeptTreeselect.then((res) => {
// this.$refs.dept.setCheckedKeys(res.checkedKeys);
// });
// });
// this.title = "分配数据权限";
// });
// },
/** 分配用户操作 */
handleAuthUser: function(row) {
handleAuthUser(row) {
console.log(row);
const roleId = row.roleId;
this.$router.push("/system/role-auth/user/" + roleId);
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys();
updateRole(this.form).then(response => {
updateRole(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();
addRole(this.form).then(response => {
addRole(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -583,10 +716,10 @@ export default {
});
},
/** 提交按钮（数据权限） */
submitDataScope: function() {
submitDataScope: function () {
if (this.form.roleId != undefined) {
this.form.deptIds = this.getDeptAllCheckedKeys();
dataScope(this.form).then(response => {
dataScope(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.openDataScope = false;
this.getList();
@ -596,19 +729,27 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const roleIds = row.roleId || this.ids;
this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
return delRole(roleIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
this.$modal
.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？')
.then(function () {
return delRole(roleIds);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/role/export', {
...this.queryParams
}, `role_${new Date().getTime()}.xlsx`)
}
}
this.download(
"system/role/export",
{
...this.queryParams,
},
`role_${new Date().getTime()}.xlsx`
);
},
},
};
</script>

23
src/views/system/studentInfo/index.vue
View File

@ -444,6 +444,7 @@
title="选择所属班级"
:visible.sync="innerVisible"
append-to-body
:before-close="cancel3"
>
<el-form
:model="classinfoList2"
@ -572,6 +573,7 @@
:visible.sync="innerVisible3"
width="500px"
append-to-body
:before-close="cancel2"
>
<el-form
ref="form"
@ -602,7 +604,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="addparent">确 定</el-button>
<el-button @click="innerVisible3 = false">取 消</el-button>
<el-button @click="cancel2">取 消</el-button>
</div>
</el-dialog>
</el-dialog>
@ -836,6 +838,14 @@ export default {
this.getList();
},
methods: {
cancel2() {
this.innerVisible3 = false;
this.addparentlist = {
parentName: "",
parentSex: "",
phone: "",
};
},
//查看父母
seepraent(row) {
this.reset();
@ -925,6 +935,11 @@ export default {
console.log(res);
this.getList();
this.innerVisible3 = false;
this.addparentlist = {
parentName: "",
parentSex: "",
phone: "",
};
});
},
//家长搜索
@ -1272,6 +1287,10 @@ export default {
this.queryParams.pageNum = 1;
this.getList();
},
cancel3() {
this.resetQuery();
this.innerVisible = false;
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
@ -1354,7 +1373,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认删除学生信息编号为"' + ids + '"的数据项？')
.confirm('是否确认删除该学生信息吗？')
.then(function () {
return delStudentInfo(ids);
})

1061
src/views/system/teacherInfo/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

773
src/views/system/testItemCityScore/index.vue Normal file
View File

@ -0,0 +1,773 @@
<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="所属区域" prop="areaId">
<treeselect
:normalizer="normalizer"
:options="areaList"
placeholder="请选择所属区域"
v-model="queryParams.areaId"
style="width: 228px"
/>
</el-form-item>
<el-form-item label="所属项目" prop="itemId">
<treeselect
:normalizer="normalizer3"
:options="testItemsList2"
placeholder="请选择所属项目"
v-model="queryParams.itemId"
style="width: 228px"
/>
</el-form-item>
<el-form-item label="平均成绩" prop="itemAvgScore">
<el-input
v-model="queryParams.itemAvgScore"
placeholder="请输入平均成绩"
clearable
@keyup.enter.native="handleQuery2"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery2"
>搜索</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="['system:testItemCityScore: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:testItemCityScore: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:testItemCityScore: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:testItemCityScore:export']"
>导出</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="testItemCityScoreList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="所属区域" align="center" prop="name" />
<el-table-column label="所属项目" align="center" prop="itemName" />
<el-table-column label="平均成绩" align="center" prop="itemAvgScore">
<template slot-scope="scope">
{{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }}
{{ scope.row.dictValue == "text" ? scope.row.itemAvgText : "" }}
</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:testItemCityScore:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:testItemCityScore: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
:before-close="cancel"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属区域" prop="areaId">
<treeselect
:normalizer="normalizer"
:options="areaList"
placeholder="请选择所属区域"
v-model="form.areaId"
/>
</el-form-item>
<el-form-item label="所属项目" prop="itemId">
<el-button
@click="innerVisible = true"
style="width: 380px; text-align: left; height: 36px; color: #c0c4cc"
v-if="xmname == '请选择所属项目'"
>
{{ xmname }}
</el-button>
<el-button
@click="innerVisible = true"
style="width: 380px; text-align: left; height: 36px"
v-else
>
{{ xmname }}
</el-button>
</el-form-item>
<el-form-item
label="平均成绩"
:required="true"
v-if="form.resultDictType == ''"
>
<el-input placeholder="请输入平均成绩" />
</el-form-item>
<el-form-item
label="平均成绩"
v-else-if="form.dictValue == ResultType1.dictValue"
key="itemAvgScore"
prop="itemAvgScore"
>
<el-input
v-model.number="form.itemAvgScore"
placeholder="请输入平均成绩"
/>
</el-form-item>
<el-form-item
label="平均成绩"
v-else-if="form.dictValue == ResultType2.dictValue"
key="itemAvgText"
prop="itemAvgText"
>
<el-input v-model="form.itemAvgText" placeholder="请输入平均成绩" />
</el-form-item>
<el-form-item
label="平均成绩"
v-else-if="form.dictValue == 'text'"
key="itemAvgText"
prop="itemAvgText"
>
<el-input v-model="form.itemAvgText" 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="open2"
width="500px"
append-to-body
:before-close="cancel"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属区域" prop="areaId">
<treeselect
:normalizer="normalizer"
:options="areaList"
placeholder="请选择所属区域"
v-model="form.areaId"
/>
</el-form-item>
<el-form-item label="所属项目" prop="itemId">
<el-button
@click="innerVisible = true"
style="width: 380px; text-align: left; height: 36px; color: #c0c4cc"
v-if="xmname == '请选择所属项目'"
>
{{ xmname }}
</el-button>
<el-button
@click="innerVisible = true"
style="width: 380px; text-align: left; height: 36px"
v-else
>
{{ xmname }}
</el-button>
</el-form-item>
<el-form-item
label="平均成绩"
prop="itemAvgScore"
v-if="form.dictValue == 'number'"
>
<el-input
v-model.number="form.itemAvgScore"
placeholder="请输入平均成绩"
/>
</el-form-item>
<el-form-item
label="平均成绩"
prop="itemAvgText"
v-if="form.dictValue == 'text'"
>
<el-input v-model="form.itemAvgText" 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
width="1150px"
title="选择所属项目"
:visible.sync="innerVisible"
append-to-body
:before-close="cancel2"
>
<el-form
:model="queryParams2"
ref="queryForm"
size="small"
:inline="true"
label-width="70px"
>
<el-form-item
label="所属项目分类"
prop="itemCategoryId"
label-width="100px"
>
<treeselect
:normalizer="normalizer2"
:options="itemCategoryList"
placeholder="请选择所属项目分类"
v-model="queryParams2.itemCategoryId"
style="width: 180px"
/>
</el-form-item>
<el-form-item label="项目名称" prop="itemName">
<el-input
style="width: 180px"
v-model="queryParams2.itemName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目编号" prop="itemCode">
<el-input
style="width: 180px"
v-model="queryParams2.itemCode"
placeholder="请输入测试项目编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="排序" prop="sorting">
<el-input
style="width: 180px"
v-model="queryParams2.sorting"
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
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="testItemsList"
@selection-change="handleSelectionChange"
>
<el-table-column width="60" align="center" label="请选择">
<template slot-scope="scope">
<el-button
type="primary"
style="width: 15px; height: 15px"
circle
v-if="scope.row.id == xmid"
@click="xmclick2(scope.row)"
></el-button>
<el-button
v-else
style="width: 15px; height: 15px"
circle
@click="xmclick(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
label="项目所属分类"
align="center"
prop="categoryName"
width="80px"
/>
<el-table-column label="字典类型" align="center" prop="resultDictType">
<template slot-scope="scope">
{{
scope.row.resultDictType == ResultType1.dictCode
? ResultType1.dictLabel
: ""
}}{{
scope.row.resultDictType == ResultType2.dictCode
? ResultType2.dictLabel
: ""
}}</template
>
</el-table-column>
<el-table-column label="项目名称" align="center" prop="itemName" />
<el-table-column label="项目编号" align="center" prop="itemCode" />
<el-table-column label="项目内容" align="center" prop="itemContent" />
<el-table-column label="项目概述" align="center" prop="remark" />
<el-table-column
label="项目度量单位"
align="center"
prop="measureUnit"
/>
<el-table-column
label="大班标准最高得分"
align="center"
prop="largeStandardScore"
/>
<el-table-column
label="中班标准最高得分"
align="center"
prop="middleStandardScore"
/>
<el-table-column
label="小班标准最高得分"
align="center"
prop="smallStandardScore"
/>
<el-table-column
label="统一标准最高得分"
align="center"
prop="unifiedStandardScore"
/>
<el-table-column label="排序" align="center" prop="sorting" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-dialog>
</div>
</template>
<script>
import {
listTestItemCityScore,
getTestItemCityScore,
delTestItemCityScore,
addTestItemCityScore,
updateTestItemCityScore,
} from "@/api/system/testItemCityScore";
import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
import { listItemCategory } from "@/api/system/itemCategory";
import { listTestItems } from "@/api/system/testItems";
import { listArea } from "@/api/system/area.js";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: { Treeselect },
name: "TestItemCityScore",
data() {
return {
// 遮罩层
loading: true,
innerVisible: false,
// 选中数组
ids: [],
//项目分类单
itemCategoryList: [],
//字典类型
itemResultTypelist: [],
ResultType1: "",
ResultType2: "",
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
//项目测试类型
itemResultType: "item_result_type",
// 总条数
total: 0,
// 全市平均成绩表格数据
testItemCityScoreList: [],
//区域列表
areaList: [],
//name
name: [],
//项目列表
testItemsList: [],
testItemsList2: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
open2: false,
//xmname
xmname: "请选择所属项目",
xmid: "",
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
areaId: null,
itemId: null,
itemAvgScore: null,
},
// 查询参数
queryParams2: {
pageNum: 1,
pageSize: 10,
itemCategoryId: null,
itemName: null,
itemCode: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
itemAvgScore: [
{
required: true,
type: "number",
message: "必须填入数字",
trigger: "blur",
},
],
itemAvgText: [
{ required: true, message: "请输入全市平均成绩", trigger: "blur" },
],
areaId: [
{ required: true, message: "请选择所属区域", trigger: "blur" },
],
itemId: [
{ required: true, message: "请选择所属项目", trigger: "blur" },
],
},
};
},
created() {
this.getList();
},
methods: {
normalizer3(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
itemId: node.id,
label: node.itemName,
children: node.children,
};
},
normalizer2(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
itemCategoryId: node.id,
label: node.categoryName,
children: node.children,
};
},
xmclick2(item) {
this.xmname = "请选择所属项目";
this.xmid = "";
this.form.itemId = "";
},
xmclick(item) {
console.log(item);
this.xmname = item.itemName;
this.form.itemId = item.id;
this.xmid = item.id;
console.log(this.ResultType1, this.ResultType2);
if (item.resultDictType == this.ResultType1.dictCode) {
this.form.resultDictType = this.ResultType1.dictValue;
this.form.dictValue = this.ResultType1.dictValue;
}
if (item.resultDictType == this.ResultType2.dictCode) {
this.form.resultDictType = this.ResultType2.dictValue;
this.form.dictValue = this.ResultType2.dictValue;
}
console.log(this.form);
this.innerVisible = false;
},
/** 查询全市平均成绩列表 */
getList() {
this.loading = true;
listArea(this.queryParams2).then((response) => {
// this.areaList = response.data.forEach((e) => {
// e.code = Number(e.code);
// });
this.areaList = this.handleTree(response.data);
// console.log(this.areaList);
});
listTestItemCityScore(this.queryParams).then((response) => {
this.testItemCityScoreList = response.rows;
this.total = response.total;
this.loading = false;
console.log(this.testItemCityScoreList);
});
listTestItems(this.queryParams2).then((response) => {
this.testItemsList = response.rows;
this.testItemsList2 = this.handleTree(response.rows);
// console.log(this.testItemsList);
});
listItemCategory(this.queryParams2).then((response) => {
this.itemCategoryList = this.handleTree(response.data);
// console.log(this.itemCategoryList);
});
tKindergartenInfo(this.itemResultType).then((res) => {
// console.log(res);
this.itemResultTypelist = res.data;
this.ResultType1 = this.itemResultTypelist[0];
this.ResultType2 = this.itemResultTypelist[1];
// console.log(this.ResultType1);
});
},
// 取消按钮
cancel2() {
this.innerVisible = false;
this.queryParams2 = {
pageNum: 1,
pageSize: 10,
itemCategoryId: null,
itemName: null,
itemCode: null,
};
this.getList();
},
cancel() {
this.open = false;
this.open2 = false;
this.reset();
this.xmname = "请选择所属项目";
this.xmid = "";
this.form.itemId = "";
},
// 表单重置
reset() {
this.form = {
id: null,
areaId: null,
itemId: null,
itemAvgScore: null,
resultDictType: "",
};
},
/** 搜索按钮操作 */
handleQuery2() {
console.log(this.queryParams);
listTestItemCityScore(this.queryParams).then((response) => {
this.testItemCityScoreList = response.rows;
this.total = response.total;
this.loading = false;
console.log(this.testItemCityScoreList);
});
},
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10,
areaId: null,
itemId: null,
itemAvgScore: null,
};
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
console.log(selection);
this.ids = selection.map((item) => item.id);
this.name = selection.map((item) => item.itemName);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加全市平均成绩";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getTestItemCityScore(id).then((response) => {
this.form = response.data;
this.open2 = true;
this.title = "修改全市平均成绩";
this.xmname = this.form.itemName;
this.xmid = this.form.itemId;
console.log(this.form);
});
},
/** 提交按钮 */
submitForm() {
if (this.form.resultDictType == this.ResultType1.dictValue) {
console.log(this.ResultType1.dictValue);
this.form.itemAvgText = "";
}
if (this.form.resultDictType == this.ResultType2.dictValue) {
console.log(this.ResultType2.dictValue);
this.form.itemAvgScore = "";
}
console.log(this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateTestItemCityScore(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open2 = false;
this.getList();
});
} else {
addTestItemCityScore(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
this.xmname = "请选择所属项目";
this.xmid = "";
this.form.itemId = "";
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
console.log(row);
const ids = row.id || this.ids;
const name = row.itemName || this.name;
this.$modal
.confirm('是否确认删除项目名称为"' + name + '"的全市平均成绩？')
.then(function () {
return delTestItemCityScore(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
/** 转换部门数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
areaId: node.id,
label: node.name,
children: node.children,
};
},
/** 导出按钮操作 */
handleExport() {
this.download(
"system/testItemCityScore/export",
{
...this.queryParams,
},
`testItemCityScore_${new Date().getTime()}.xlsx`
);
},
},
};
</script>

799
src/views/system/testItems/index.vue Normal file
View File

@ -0,0 +1,799 @@
<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="所属项目分类"
prop="itemCategoryId"
label-width="100px"
>
<treeselect
:normalizer="normalizer"
:options="itemCategoryList"
placeholder="请选择所属项目"
v-model="queryParams.itemCategoryId"
style="width: 300px"
/>
</el-form-item>
<el-form-item label="项目名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目编号" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
placeholder="请输入测试项目编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="排序" prop="sorting">
<el-input
v-model="queryParams.sorting"
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
>
<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="['system:testItems: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:testItems: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:testItems: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:testItems:export']"
>导出</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="testItemsList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="项目所属分类"
align="center"
prop="categoryName"
/>
<!-- <el-table-column label="字典类型" align="center" prop="resultDictType">
<template slot-scope="scope">
{{
scope.row.resultDictType == ResultType1.dictCode
? ResultType1.dictLabel
: ""
}}{{
scope.row.resultDictType == ResultType2.dictCode
? ResultType2.dictLabel
: ""
}}</template
>
</el-table-column> -->
<el-table-column label="项目名称" align="center" prop="itemName" />
<el-table-column label="项目编号" align="center" prop="itemCode" />
<el-table-column label="项目内容" align="center" prop="itemContent" />
<!-- <el-table-column label="项目概述" align="center" prop="remark" /> -->
<el-table-column label="项目度量单位" align="center" prop="measureUnit" />
<el-table-column
label="大班标准最高得分"
align="center"
prop="largeStandardScore"
/>
<el-table-column
label="中班标准最高得分"
align="center"
prop="middleStandardScore"
/>
<el-table-column
label="小班标准最高得分"
align="center"
prop="smallStandardScore"
/>
<el-table-column
label="统一标准最高得分"
align="center"
prop="unifiedStandardScore"
/>
<el-table-column label="排序" align="center" prop="sorting" />
<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:testItems:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:testItems: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="1050px"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="160px"
:inline="true"
>
<el-form-item label="所属分类" prop="itemCategoryId">
<treeselect
:normalizer="normalizer"
:options="itemCategoryList"
placeholder="请选择所属项目分类"
v-model="form.itemCategoryId"
style="width: 300px"
/>
</el-form-item>
<el-form-item label="项目名称" prop="itemName">
<el-input
style="width: 300px"
v-model="form.itemName"
placeholder="请输入项目名称"
/>
</el-form-item>
<el-form-item label="项目编号" prop="itemCode">
<el-input
v-model="form.itemCode"
maxlength="20"
placeholder="请输入测试项目编号"
style="width: 300px"
/>
</el-form-item>
<el-form-item label="排序" prop="sorting">
<el-input
v-model="form.sorting"
placeholder="请输入排序"
style="width: 300px"
/>
</el-form-item>
<el-form-item label="测试项目成绩类型" prop="resultDictType">
<el-select
v-model="form.resultDictType"
clearable
placeholder="请选择字典类型"
style="width: 300px"
>
<el-option
v-for="item in itemResultTypelist"
:key="item.value"
:label="item.dictLabel"
:value="item.dictCode"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="度量单位" prop="measureUnit">
<el-select
v-model="form.measureUnit"
clearable
placeholder="请选择度量单位"
style="width: 300px"
>
<el-option
v-for="item in measureUnitTypelist"
:key="item.value"
:label="item.dictValue"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="最低得分" prop="minScore">
<el-input
v-model.number="form.minScore"
style="width: 300px"
placeholder="请输入最低得分"
/>
</el-form-item>
<el-form-item label="最高得分" prop="maxScore">
<el-input
v-model.number="form.maxScore"
placeholder="请输入最高得分"
style="width: 300px"
/>
</el-form-item>
<el-form-item label="标准最高得分类型" prop="standardType">
<el-select
v-model="form.standardType"
clearable
placeholder="请选择指标类型"
style="width: 300px"
>
<el-option
v-for="item in standardTypelist"
:key="item.value"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="大班标准最高得分"
prop="largeStandardScore"
v-if="form.standardType == fty"
>
<el-input
v-model.number="form.largeStandardScore"
placeholder="请输入大班标准最高得分"
style="width: 300px"
/>
</el-form-item>
<el-form-item
label="中班标准最高得分"
prop="middleStandardScore"
v-if="form.standardType == fty"
>
<el-input
v-model.number="form.middleStandardScore"
placeholder="请输入中班标准最高得分"
style="width: 300px"
/>
</el-form-item>
<el-form-item
label="小班标准最高得分"
prop="smallStandardScore"
v-if="form.standardType == fty"
>
<el-input
v-model.number="form.smallStandardScore"
style="width: 300px"
placeholder="请输入小班标准最高得分"
/>
</el-form-item>
<el-form-item
label="统一标准最高得分"
prop="unifiedStandardScore"
v-if="form.standardType == ty"
>
<el-input
style="width: 300px"
v-model.number="form.unifiedStandardScore"
placeholder="请输入统一标准最高得分"
/>
</el-form-item>
<el-form-item label="级别描述" prop="levelDescription">
<el-input
style="width: 300px"
v-model="form.levelDescription"
placeholder="请输入级别描述"
/>
</el-form-item>
<el-form-item label="项目概述" prop="remark">
<el-input
v-model="form.remark"
placeholder="请输入项目概述"
style="width: 300px"
/>
</el-form-item>
<el-form-item label="项目成绩级别" prop="itemLevelList">
<div
v-for="(item, index) in form.itemLevelList"
:key="item.id"
style="margin-bottom: 10px"
>
<el-input
v-model="item.levelName"
placeholder="级别名"
style="width: 75px; margin-right: 20px"
/>
<el-input
v-model.number="item.levelMinScore"
placeholder="最低分"
style="width: 75px; margin-right: 10px"
/><el-input
v-model.number="item.levelMaxScore"
placeholder="最高分"
style="width: 75px; margin-right: 9px"
/>
<el-button
type="info"
circle
plain
icon="el-icon-circle-plus-outline"
@click="addInput"
v-if="index == 0"
></el-button>
<el-button
type="danger"
icon="el-icon-delete"
circle
plain
@click="delInput(index)"
v-if="index != 0"
></el-button>
</div>
</el-form-item>
<el-form-item label="项目内容" prop="itemContent">
<editor
v-model="form.itemContent"
:min-height="190"
style="margin-left: 80px"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="margin-right: 80px">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listTestItems,
getTestItems,
delTestItems,
addTestItems,
updateTestItems,
} from "@/api/system/testItems";
import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
import { listItemCategory } from "@/api/system/itemCategory";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: { Treeselect },
name: "TestItems",
data() {
let itemLevelList = (rule, value, callback) => {
if (
value.map((e) => {
return e.levelName;
}) == ""
) {
callback();
} else if (
value.map((e) => {
return e.levelMinScore;
}) == ""
) {
callback();
} else if (
value.map((e) => {
return e.levelMaxScore;
}) == ""
) {
callback();
} else if (
value.map((e) => {
return e.levelMaxScore;
}) <=
value.map((e) => {
return e.levelMinScore;
})
) {
callback(new Error("级别最高分必须大于最低分,请重新填写！"));
} else {
callback();
}
};
let minScore = (rule, value, callback) => {
if (!value) {
callback();
} else if (this.form.maxScore <= value) {
callback();
}
callback();
};
let maxScore = (rule, value, callback) => {
if (!value) {
callback();
} else if (this.form.minScore >= value) {
callback(new Error("最高得分必须大于最低得分,请重新填写最高分！"));
} else {
callback();
}
};
return {
//项目测试类型
itemResultType: "item_result_type",
//度量单位
measureUnitType: "measure_unit_type",
//统一与非统一
standardType: "standard_type",
ty: "unified_standard",
fty: "disunity_standard",
standardTypelist: [],
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
//度量单位表
measureUnitTypelist: [],
//字典类型
itemResultTypelist: [],
ResultType1: "",
ResultType2: "",
// 测试项目表格数据
testItemsList: [],
//项目分类单
itemCategoryList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemCategoryId: null,
itemName: null,
itemCode: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
unifiedStandardScore: [
{
// required: true,
type: "number",
message: `必须填入数字`,
trigger: "blur",
// transform: (value) => Number(value)
},
],
largeStandardScore: [
{
// required: true,
type: "number",
message: `必须填入数字`,
trigger: "blur",
// transform: (value) => Number(value)
},
],
middleStandardScore: [
{
// required: true,
type: "number",
message: `必须填入数字`,
trigger: "blur",
// transform: (value) => Number(value)
},
],
smallStandardScore: [
{
// required: true,
type: "number",
message: `必须填入数字`,
trigger: "blur",
// transform: (value) => Number(value)
},
],
itemLevelList: [
{
// required: true,
validator: itemLevelList,
trigger: "blur",
},
],
minScore: [
{
// required: true,
validator: minScore,
trigger: "blur",
},
],
maxScore: [
{
// required: true,
validator: maxScore,
trigger: "blur",
},
],
itemContent: [
{ required: true, message: "项目内容不能为空", trigger: "blur" },
],
itemCategoryId: [
{ required: true, message: "请选择项目所属分类", trigger: "blur" },
],
itemCode: [
{ required: true, message: "项目编号不能为空", trigger: "blur" },
],
itemName: [
{ required: true, message: "项目名称不能为空", trigger: "blur" },
],
sorting: [{ required: true, message: "排序不能为空", trigger: "blur" }],
measureUnit: [
{
required: true,
message: "度量单位不能为空",
trigger: "change",
},
],
resultDictType: [
{
required: true,
message: "所属字典类型不能为空",
trigger: "change",
},
],
},
};
},
created() {
this.getList();
},
methods: {
delInput(index) {
this.form.itemLevelList.splice(index, 1);
console.log(this.form.itemLevelList);
},
addInput() {
console.log(this.form);
this.form.itemLevelList.push({
levelName: "",
levelMinScore: "",
levelMaxScore: "",
});
},
/** 查询测试项目列表 */
getList() {
this.loading = true;
listItemCategory(this.queryParams).then((response) => {
this.itemCategoryList = this.handleTree(response.data);
// console.log(this.itemCategoryList);
});
tKindergartenInfo(this.itemResultType).then((res) => {
// console.log(res);
this.itemResultTypelist = res.data;
this.ResultType1 = this.itemResultTypelist[0];
this.ResultType2 = this.itemResultTypelist[1];
console.log(this.ResultType1);
});
tKindergartenInfo(this.measureUnitType).then((res) => {
// console.log(res);
this.measureUnitTypelist = res.data;
});
tKindergartenInfo(this.standardType).then((res) => {
this.standardTypelist = res.data;
console.log(this.standardTypelist);
});
listTestItems(this.queryParams).then((response) => {
this.testItemsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
itemCategoryId: null,
resultDictType: null,
itemName: "",
itemCode: null,
itemContent: "",
measureUnit: "",
standardType: null,
largeStandardScore: "",
middleStandardScore: "",
smallStandardScore: "",
maxScore: "",
levelDescription: "",
minScore: "",
itemLevelList: [
{ levelName: "", levelMinScore: "", levelMaxScore: "" },
],
sorting: null,
remark: null,
unifiedStandardScore: "",
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加测试项目";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getTestItems(id).then((response) => {
if (response.data.itemLevelList == null) {
response.data.itemLevelList = [
{ levelName: "", levelMinScore: "", levelMaxScore: "" },
];
}
// response.data.unifiedStandardScore = Number(
// response.data.unifiedStandardScore
// );
this.form = response.data;
// console.log(typeof this.form.unifiedStandardScore);
this.open = true;
this.title = "修改测试项目";
});
},
/** 提交按钮 */
submitForm() {
console.log(this.form);
// this.form.unifiedStandardScore = Number(this.form.unifiedStandardScore);
// console.log(typeof this.form.unifiedStandardScore);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateTestItems(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addTestItems(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认该测试项目信息吗？')
.then(function () {
return delTestItems(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
itemCategoryId: node.id,
label: node.categoryName,
children: node.children,
};
},
/** 导出按钮操作 */
handleExport() {
this.download(
"system/testItems/export",
{
...this.queryParams,
},
`testItems_${new Date().getTime()}.xlsx`
);
},
},
};
</script>

572
src/views/system/user/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="4" :xs="24">
<!-- <el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="deptName"
@ -25,10 +25,17 @@
@node-click="handleNodeClick"
/>
</div>
</el-col>
</el-col> -->
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
@ -74,8 +81,16 @@
></el-date-picker>
</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-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>
@ -88,7 +103,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增</el-button>
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -99,7 +115,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
>修改</el-button>
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -110,9 +127,10 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
>删除</el-button>
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="info"
plain
@ -120,7 +138,8 @@
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
>导入</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
@ -130,78 +149,153 @@
size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
>导出</el-button
>
</el-col> -->
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<span class="el-dropdown-link">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
:columns="columns"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="userList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
label="用户编号"
align="center"
key="userId"
prop="userId"
v-if="columns[0].visible"
/>
<el-table-column
label="用户名称"
align="center"
key="userName"
prop="userName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="用户昵称"
align="center"
key="nickName"
prop="nickName"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="部门"
align="center"
key="deptName"
prop="dept.deptName"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/> -->
<el-table-column
label="区域"
align="center"
key="areaName"
prop="areaName"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="手机号码"
align="center"
key="phonenumber"
prop="phonenumber"
v-if="columns[4].visible"
width="120"
/>
<el-table-column
label="状态"
align="center"
key="status"
v-if="columns[5].visible"
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
v-if="columns[6].visible"
width="160"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button
>
<el-dropdown
size="mini"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
>
<span class="el-dropdown-link">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
command="handleResetPwd"
icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']"
>重置密码</el-dropdown-item
>
<el-dropdown-item
command="handleAuthRole"
icon="el-icon-circle-check"
v-hasPermi="['system:user:edit']"
>分配角色</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</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="600px" append-to-body>
@ -209,36 +303,81 @@
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
<el-input
v-model="form.nickName"
placeholder="请输入用户昵称"
maxlength="30"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
<treeselect
v-model="form.deptId"
:options="deptOptions"
:show-count="true"
placeholder="请选择归属部门"
/>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="所属区域" prop="areaId">
<treeselect
:normalizer="normalizer"
:options="areaList"
placeholder="请选择所属区域"
v-model="form.areaId"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
<el-input
v-model="form.phonenumber"
placeholder="请输入手机号码"
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
<el-input
v-model="form.email"
placeholder="请输入邮箱"
maxlength="50"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
<el-form-item
v-if="form.userId == undefined"
label="用户名称"
prop="userName"
>
<el-input
v-model="form.userName"
placeholder="请输入用户名称"
maxlength="30"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
<el-form-item
v-if="form.userId == undefined"
label="用户密码"
prop="password"
>
<el-input
v-model="form.password"
placeholder="请输入用户密码"
type="password"
maxlength="20"
show-password
/>
</el-form-item>
</el-col>
</el-row>
@ -262,15 +401,37 @@
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型" prop="memberGrade">
<el-select
clearable
v-model="form.memberGrade"
placeholder="请选择用户类型"
>
<el-option
v-for="item in memberGrades"
:key="item.memberGrade"
:label="item.name"
:value="item.memberGrade"
></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
<el-select
v-model="form.postIds"
multiple
placeholder="请选择岗位"
>
<el-option
v-for="item in postOptions"
:key="item.postId"
@ -280,10 +441,14 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-select
v-model="form.roleIds"
multiple
placeholder="请选择角色"
>
<el-option
v-for="item in roleOptions"
:key="item.roleId"
@ -298,7 +463,11 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -310,7 +479,12 @@
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
@ -327,10 +501,17 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
@ -342,7 +523,17 @@
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
import { listArea } from "@/api/system/area.js";
import {
listUser,
getUser,
delUser,
addUser,
updateUser,
resetUserPwd,
changeUserStatus,
} from "@/api/system/user";
import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
@ -350,12 +541,17 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex'],
dicts: ["sys_normal_disable", "sys_user_sex"],
components: { Treeselect },
data() {
return {
// 遮罩层
loading: true,
//用户类型
memberGrades: [
{ memberGrade: "COMMON", name: "普通" },
{ memberGrade: "MEMBER", name: "会员" },
],
// 选中数组
ids: [],
// 非单个禁用
@ -384,11 +580,13 @@ export default {
postOptions: [],
// 角色选项
roleOptions: [],
//区域
areaList: [],
// 表单参数
form: {},
defaultProps: {
children: "children",
label: "label"
label: "label",
},
// 用户导入参数
upload: {
@ -403,16 +601,21 @@ export default {
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData"
url: process.env.VUE_APP_BASE_API + "/system/user/importData",
},
// 查询参数
//chaxuncanshu
queryParams2: {
name: "",
code: "",
},
queryParams: {
pageNum: 1,
pageSize: 10,
userName: undefined,
phonenumber: undefined,
status: undefined,
deptId: undefined
deptId: undefined,
},
// 列信息
columns: [
@ -422,66 +625,111 @@ export default {
{ key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true }
{ key: 6, label: `创建时间`, visible: true },
],
// 表单校验
rules: {
memberGrade: [
{ required: true, message: "用户类型不能为空", trigger: "blur" },
],
userName: [
{ required: true, message: "用户名称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
{
min: 2,
max: 20,
message: "用户名称长度必须介于 2 和 20 之间",
trigger: "blur",
},
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
{ required: true, message: "用户昵称不能为空", trigger: "blur" },
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" },
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
{
min: 5,
max: 20,
message: "用户密码长度必须介于 5 和 20 之间",
trigger: "blur",
},
],
email: [
{
type: "email",
message: "请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
trigger: ["blur", "change"],
},
],
phonenumber: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
]
}
trigger: "blur",
},
],
},
};
},
watch: {
// 根据名称筛选部门树
deptName(val) {
this.$refs.tree.filter(val);
}
},
},
created() {
this.getList();
this.getTreeselect();
this.getConfigKey("sys.user.initPassword").then(response => {
this.usermemberGrade();
this.getArea();
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
});
},
methods: {
//字典用户类型
usermemberGrade() {
tKindergartenInfo("user_type").then((res) => {
console.log(res);
});
},
//下拉
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
areaId: node.id,
label: node.name,
children: node.children,
};
},
/** 查询用户列表 */
getList() {
this.loading = true;
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
(response) => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
//查询区域
getArea() {
listArea(this.queryParams2).then((response) => {
// this.areaList = response.data.forEach((e) => {
// e.code = Number(e.code);
// });
this.areaList = this.handleTree(response.data);
console.log(this.areaList);
this.loading = false;
});
},
/** 查询部门下拉树结构 */
getTreeselect() {
treeselect().then(response => {
treeselect().then((response) => {
this.deptOptions = response.data;
console.log(this.deptOptions);
});
},
// 筛选节点
@ -497,13 +745,17 @@ export default {
// 用户状态修改
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
return changeUserStatus(row.userId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === "0" ? "1" : "0";
});
this.$modal
.confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
.then(function () {
return changeUserStatus(row.userId, row.status);
})
.then(() => {
this.$modal.msgSuccess(text + "成功");
})
.catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
// 取消按钮
cancel() {
@ -514,17 +766,19 @@ export default {
reset() {
this.form = {
userId: undefined,
areaId: undefined,
deptId: undefined,
userName: undefined,
nickName: undefined,
password: undefined,
phonenumber: undefined,
memberGrade: undefined,
email: undefined,
sex: undefined,
status: "0",
remark: undefined,
postIds: [],
roleIds: []
roleIds: [],
};
this.resetForm("form");
},
@ -541,7 +795,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.userId);
this.ids = selection.map((item) => item.userId);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
@ -562,7 +816,7 @@ export default {
handleAdd() {
this.reset();
this.getTreeselect();
getUser().then(response => {
getUser().then((response) => {
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.open = true;
@ -575,7 +829,7 @@ export default {
this.reset();
this.getTreeselect();
const userId = row.userId || this.ids;
getUser(userId).then(response => {
getUser(userId).then((response) => {
this.form = response.data;
this.postOptions = response.posts;
this.roleOptions = response.roles;
@ -593,30 +847,33 @@ export default {
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
}).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => {
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
})
.then(({ value }) => {
resetUserPwd(row.userId, value).then((response) => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
});
}).catch(() => {});
})
.catch(() => {});
},
/** 分配角色操作 */
handleAuthRole: function(row) {
handleAuthRole: function (row) {
const userId = row.userId;
this.$router.push("/system/user-auth/role/" + userId);
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
submitForm: function () {
console.log(this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.userId != undefined) {
updateUser(this.form).then(response => {
updateUser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addUser(this.form).then(response => {
addUser(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -628,18 +885,26 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const userIds = row.userId || this.ids;
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
return delUser(userIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
this.$modal
.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
.then(function () {
return delUser(userIds);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/user/export', {
...this.queryParams
}, `user_${new Date().getTime()}.xlsx`)
this.download(
"system/user/export",
{
...this.queryParams,
},
`user_${new Date().getTime()}.xlsx`
);
},
/** 导入按钮操作 */
handleImport() {
@ -648,8 +913,11 @@ export default {
},
/** 下载模板操作 */
importTemplate() {
this.download('system/user/importTemplate', {
}, `user_template_${new Date().getTime()}.xlsx`)
this.download(
"system/user/importTemplate",
{},
`user_template_${new Date().getTime()}.xlsx`
);
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
@ -660,13 +928,19 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
}
}
},
},
};
</script>