mozhe
/
mental-health-web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交优化代码

This commit is contained in:
jiangzhe 2024-06-06 17:02:19 +08:00
parent e3260087d3
commit 9de121328f
14 changed files with 822 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/scale/scalePublish/index.ts
View File

@ -59,6 +59,13 @@ export const endScalePublish = (data: ScalePublishForm) => {
});
};
export const startScalePublish = (data: ScalePublishForm) => {
return request({
url: '/scale/publish/start',
method: 'post',
data: data
});
};
/**
* 删除量发布
* @param batchNo

2
src/api/system/config/index.ts
View File

@ -20,7 +20,7 @@ export function getConfig(configId: string | number): AxiosPromise<ConfigVO> {
}
// 根据参数键名查询参数值
export function getConfigKey(configKey: string): AxiosPromise<String> {
export function getConfigKey(configKey: string): AxiosPromise<string> {
return request({
url: '/system/config/configKey/' + configKey,
method: 'get'

28
src/layout/components/Sidebar/Logo.vue
View File

@ -1,19 +1,18 @@
<template>
<div
class="sidebar-logo-container"
:class="{ 'collapse': collapse }"
:style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"
>
<div class="sidebar-logo-container" :class="{ 'collapse': collapse }"
:style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
<h1 v-else class="sidebar-title"
:style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
{{ title }}
</h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
<img v-if="logo" :src="logoSrc || logo" class="sidebar-logo" />
<h1 class="sidebar-title"
:style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
{{ title }}
</h1>
</router-link>
@ -22,6 +21,7 @@
</template>
<script setup lang="ts">
import { getConfigKey } from '@/api/system/config';
import variables from '@/assets/styles/variables.module.scss'
import logo from '@/assets/logo/logo.png'
import useSettingsStore from '@/store/modules/settings'
@ -30,14 +30,24 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
defineProps({
collapse: {
type: Boolean,
required: true
}
})
const title = ref('云舒_心理健康平台');
const logoSrc = ref('')
const settingsStore = useSettingsStore();
const sideTheme = computed(() => settingsStore.sideTheme);
onMounted(async () => {
// 获取学校名称学校Logo
const schoolNameRes = await getConfigKey('sys.school.name');
title.value = schoolNameRes.data
const schoolLogoRes = await getConfigKey('sys.school.logo');
logoSrc.value = schoolLogoRes.data
})
</script>
<style lang="scss" scoped>

3
src/views/activity/component/statistics/index.vue
View File

@ -183,7 +183,7 @@ async function getCompleteData() {
name: '未测', data: seriesNoneData, type: 'bar', label: {
show: true,
position: 'top'
},
}
}]
completeBarOption.value.xAxis.data = xAxisData
completeBarOption.value.series = seriesData
@ -318,6 +318,7 @@ function initPieOption(name = '', data = []) {
name: name,
type: 'pie',
radius: '50%',
color: ['#AED88F', '#91ACE0', '#FED961', '#FC7100', '#FF0000'],
data: data,
label: {
normal: {

7
src/views/archive/interveneRecord/index.vue
View File

@ -87,6 +87,9 @@
<el-timeline style="max-width: 600px">
<el-timeline-item :timestamp="item.time" placement="top" v-for="item in timeList" :key="item.id">
{{ item.name }}
<div style="margin-top: 5px;">
<el-button v-if="item.annex" type="text" @click="downloadFile(item.annex)">下载附件</el-button>
</div>
</el-timeline-item>
</el-timeline>
</el-dialog>
@ -377,6 +380,10 @@ function handleExport(row: any) {
}, `${current.value.nickName}.pdf`)
}
function downloadFile(ossId) {
proxy?.$download.oss(ossId)
}
onMounted(() => {
getList();
});

10
src/views/archive/warnRecord/index.vue
View File

@ -62,10 +62,10 @@
</el-card>
<!-- 添加或修改预警记录对话框 -->
<el-dialog title="记录详情" v-model="dialogDesc" width="900px" append-to-body>
<el-dialog title="记录详情" v-model="dialogDesc" width="900px" append-to-body @close="handleResultClose">
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
<el-tab-pane :label="item.scaleName" :name="item.recordId" v-for="item in resultList" :key="item.recordId">
<el-card v-for="des in currentResult">
<el-card v-for="des in currentResult" style="margin-bottom: 10px;">
<el-descriptions title="测评详情" :column="1">
<el-descriptions-item label="总分：">{{ des.score }}</el-descriptions-item>
<el-descriptions-item label="测评项：">{{ des.factorName }}</el-descriptions-item>
@ -242,7 +242,7 @@ async function handleDesc(row: any) {
const res = await getEvaluationRecordList(_warnId);
resultList.value = res.data
if (res.data.length > 0) {
const result = await getEvaluationList({ recordId: res.data[0].recordId, status:1 })
const result = await getEvaluationList({ recordId: res.data[0].recordId, status: 1 })
activeTab.value = res.data[0].recordId
currentResult.value = result.data
}
@ -254,6 +254,10 @@ const handleTabChange = async (recordId: any) => {
currentResult.value = result.data
}
const handleResultClose = () => {
resultList.value = []
}
/** 提交按钮 */
const submitForm = () => {
warnRecordFormRef.value?.validate(async (valid: boolean) => {

71
src/views/index.vue
View File

@ -17,7 +17,7 @@
</el-row>
</el-card>
<el-row :gutter="20">
<el-row :gutter="10">
<el-col :span="6">
<el-card>
<el-row justify="space-between">
@ -103,7 +103,7 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="10">
<el-col :span="10">
<el-card>
<v-chart style="height: 300px;" :option="leftPieOption" autoresize />
@ -203,11 +203,11 @@ const leftPieOption = ref({
}
},
series: [{
name: '预警统计',
name: '风险统计',
type: 'pie',
radius: ['50%', '70%'],
center: ['50%', '50%'],
color: [ '#AED88F', '#91ACE0', '#FED961', '#FC7100', '#FF0000'], //'#FBFE27','rgb(11,228,96)','#FE5050'
color: ['#AED88F', '#91ACE0', '#FED961', '#FC7100', '#FF0000'],
data: [],
roseType: 'radius',
label: {
@ -288,10 +288,8 @@ const centerBarOption = ref({
fontSize: 14,
}
},
yAxis: {
type: 'value',
splitNumber: 4,
axisTick: { show: false },
splitLine: {
show: false,
@ -348,19 +346,45 @@ const rightBarOption = ref({
grid: {
left: '3%',
right: '4%',
bottom: '3%',
bottom: '1%',
containLabel: true
},
xAxis: {
type: 'value',
boundaryGap: [0, 0.01]
},
yAxis: {
type: 'category',
data: [],
splitLine: {
show: false,
},
axisTick: {
alignWithLabel: false
},
axisLabel: {
interval: 0,
rotate: '90',
color: '#95989D',
fontSize: 14,
formatter: function (value: any) {
if (value.length > 6) {
return `${value.slice(0, 6)}...`
}
return value
}
}
},
yAxis: {
type: 'value',
axisTick: { show: false },
splitLine: {
show: false,
lineStyle: {
color: '#95989D'
}
},
axisLabel: {
color: '#95989D',
fontSize: 14,
},
axisLine: { show: false },
},
series: [
@ -369,15 +393,28 @@ const rightBarOption = ref({
async function getPublishNumData() {
const res = await getPublishNum()
let yAxisData: any[] = []
let xAxisData: any[] = []
let data: any[] = []
res.data.forEach((v: any) => {
yAxisData.push(v.name)
data.push(v.value)
});
const newArr = [...res.data.map((item: any) => item.value)]
let one: number = Math.max(...newArr);
let two: number = Math.max(...newArr.filter(item => item !== one));
let three: number = Math.max(...newArr.filter(item => item !== one && item !== two));
res.data.forEach((v: any) => {
xAxisData.push(v.name)
if (v.value == one) {
data.push({ value: v.value, itemStyle: { color: '#FFEDA8' } })
} else if (v.value == two) {
data.push({ value: v.value, itemStyle: { color: '#CDCDCD' } })
} else if (v.value == three) {
data.push({ value: v.value, itemStyle: { color: '#FF9F57' } })
} else {
data.push({ value: v.value, itemStyle: { color: '#99E4DC' } })
}
});
const seriesData = [{ name: '量表使用次数', data: data, type: 'bar' }]
rightBarOption.value.yAxis.data = yAxisData
rightBarOption.value.xAxis.data = xAxisData
rightBarOption.value.series = seriesData
}

2
src/views/login.vue
View File

@ -44,7 +44,7 @@
import { getCodeImg } from '@/api/login';
import { authBinding } from '@/api/system/social/auth';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
import { LoginData } from '@/api/types';
import { to } from 'await-to-js';
import { HttpStatus } from "@/enums/RespEnum";

21
src/views/scale/SysScaleFactor/index.vue
View File

@ -62,9 +62,6 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改测评因子对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="1300px" append-to-body>
@ -201,7 +198,7 @@
import { computed } from 'vue'
import { useRoute } from 'vue-router';
import { nanoid } from 'nanoid'
import { pageSysScaleFactor, getSysScaleFactor, delSysScaleFactor, addSysScaleFactor, updateSysScaleFactor } from '@/api/scale/SysScaleFactor';
import { listSysScaleFactor, getSysScaleFactor, delSysScaleFactor, addSysScaleFactor, updateSysScaleFactor } from '@/api/scale/SysScaleFactor';
import { SysScaleFactorVO, SysScaleFactorQuery, SysScaleFactorForm } from '@/api/scale/SysScaleFactor/types';
import { listSysScaleQuestion } from '@/api/scale/SysScaleQuestion'
@ -221,7 +218,6 @@ const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const SysScaleFactorFormRef = ref<ElFormInstance>();
@ -246,8 +242,6 @@ const initFormData: SysScaleFactorForm = {
const data = reactive<PageData<SysScaleFactorForm, SysScaleFactorQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
factorName: undefined,
scaleId: scaleId,
scaleTitle: undefined,
@ -288,9 +282,8 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询测评因子列表 */
const getList = async () => {
loading.value = true;
const res = await pageSysScaleFactor(queryParams.value);
SysScaleFactorList.value = res.rows;
total.value = res.total;
const res = await listSysScaleFactor(queryParams.value);
SysScaleFactorList.value = res.data;
loading.value = false;
}
@ -318,7 +311,6 @@ const reset = () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
@ -387,13 +379,6 @@ const handleDelete = async (row?: SysScaleFactorVO) => {
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('scale/SysScaleFactor/export', {
...queryParams.value
}, `SysScaleFactor_${new Date().getTime()}.xlsx`)
}
const ruleTypeList = [
{
label: '求和型',

4
src/views/scale/SysScaleList/index.vue
View File

@ -110,6 +110,10 @@
<el-radio value="0">不允许</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="开始日期" prop="startTime">
<el-date-picker v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择开始日期" style="width: 100%" />
</el-form-item>
<el-form-item label="截止日期" prop="expireTime">
<el-date-picker v-model="form.expireTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择截止日期" style="width: 100%" />

19
src/views/scale/SysScalePublish/index.vue
View File

@ -73,7 +73,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="270">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="330">
<template #default="scope">
<el-tooltip content="查看测评结果" placement="top">
<el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"
@ -85,9 +85,13 @@
</el-button>
</el-tooltip>
<el-tooltip content="中止" placement="top">
<el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)"
<el-button link type="primary" icon="Remove" @click="handleEdit(scope.row)"
v-hasPermi="['scale:publish:edit']">中止</el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.status == 0" content="中止" placement="top">
<el-button link type="primary" icon="Open" @click="handleEnable(scope.row)"
v-hasPermi="['scale:publish:edit']">启用</el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['scale:publish:delete']">删除</el-button>
@ -103,7 +107,7 @@
</template>
<script setup name="ScalePublish" lang="ts">
import { listScalePublish, getScalePublish, endScalePublish, delScalePublish } from '@/api/scale/scalePublish';
import { listScalePublish, getScalePublish, endScalePublish, startScalePublish, delScalePublish } from '@/api/scale/scalePublish';
import { ScalePublishVO, ScalePublishQuery, ScalePublishForm } from '@/api/scale/scalePublish/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -228,6 +232,15 @@ const handleEdit = async (row?: any) => {
await getList();
}
/** 启用按钮操作 */
const handleEnable = async (row?: any) => {
const { batchNo, sessionName, expireTime } = row;
await proxy?.$modal.confirm('是否确认启用场次为"' + sessionName + '"的数据项？').finally(() => loading.value = false);
await startScalePublish({ batchNo });
proxy?.$modal.msgSuccess("启用成功");
await getList();
}
const handleDelete = async (row?: any) => {
const { batchNo, sessionName } = row;
await proxy?.$modal.confirm('是否确认删除场次为"' + sessionName + '"的数据项？').finally(() => loading.value = false);

79
src/views/system/oss/index.vue
View File

@ -1,31 +1,30 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div class="mb-[10px]" v-show="showSearch">
<el-card shadow="hover">
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="文件名" prop="fileName">
<el-input v-model="queryParams.fileName" placeholder="请输入文件名" clearable style="width: 200px" @keyup.enter="handleQuery" />
<el-input v-model="queryParams.fileName" placeholder="请输入文件名" clearable style="width: 200px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="原名" prop="originalName">
<el-input v-model="queryParams.originalName" placeholder="请输入原名" clearable style="width: 200px" @keyup.enter="handleQuery" />
<el-input v-model="queryParams.originalName" placeholder="请输入原名" clearable style="width: 200px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="文件后缀" prop="fileSuffix">
<el-input v-model="queryParams.fileSuffix" placeholder="请输入文件后缀" clearable style="width: 200px" @keyup.enter="handleQuery" />
<el-input v-model="queryParams.fileSuffix" placeholder="请输入文件后缀" clearable style="width: 200px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRangeCreateTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
></el-date-picker>
<el-date-picker v-model="dateRangeCreateTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"></el-date-picker>
</el-form-item>
<el-form-item label="服务商" prop="service">
<el-input v-model="queryParams.service" placeholder="请输入服务商" clearable style="width: 200px" @keyup.enter="handleQuery" />
<el-input v-model="queryParams.service" placeholder="请输入服务商" clearable style="width: 200px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
@ -40,56 +39,45 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Upload" @click="handleFile" v-hasPermi="['system:oss:upload']">上传文件</el-button>
<el-button type="primary" plain icon="Upload" @click="handleFile"
v-hasPermi="['system:oss:upload']">上传文件</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="Upload" @click="handleImage" v-hasPermi="['system:oss:upload']">上传图片</el-button>
<el-button type="primary" plain icon="Upload" @click="handleImage"
v-hasPermi="['system:oss:upload']">上传图片</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:oss:remove']">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['system:oss:remove']">
删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
:type="previewListResource ? 'danger' : 'warning'"
plain
@click="handlePreviewListResource(!previewListResource)"
v-hasPermi="['system:oss:edit']"
>预览开关 :
<el-button :type="previewListResource ? 'danger' : 'warning'" plain
@click="handlePreviewListResource(!previewListResource)" v-hasPermi="['system:oss:edit']">预览开关 :
{{
previewListResource ? "禁用" : "启用" }}</el-button
>
previewListResource ? "禁用" : "启用" }}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="Operation" @click="handleOssConfig" v-hasPermi="['system:oss:list']">配置管理</el-button>
<el-button type="info" plain icon="Operation" @click="handleOssConfig"
v-hasPermi="['system:oss:list']">配置管理</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table
v-loading="loading"
:data="ossList"
@selection-change="handleSelectionChange"
:header-cell-class-name="handleHeaderClass"
@header-click="handleHeaderCLick"
v-if="showTable"
>
<el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange"
:header-cell-class-name="handleHeaderClass" @header-click="handleHeaderCLick" v-if="showTable">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="对象存储主键" align="center" prop="ossId" v-if="false" />
<el-table-column label="文件名" align="center" prop="fileName" />
<el-table-column label="原名" align="center" prop="originalName" />
<el-table-column label="url" align="center" prop="url" />
<el-table-column label="文件后缀" align="center" prop="fileSuffix" />
<el-table-column label="文件展示" align="center" prop="url">
<template #default="scope">
<ImagePreview
v-if="previewListResource && checkFileSuffix(scope.row.fileSuffix)"
:width="100"
:height="100"
:src="scope.row.url"
:preview-src-list="[scope.row.url]"
/>
<ImagePreview v-if="previewListResource && checkFileSuffix(scope.row.fileSuffix)" :width="100" :height="100"
:src="scope.row.url" :preview-src-list="[scope.row.url]" />
<span v-text="scope.row.url" v-if="!checkFileSuffix(scope.row.fileSuffix) || !previewListResource" />
</template>
</el-table-column>
@ -103,16 +91,19 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="下载" placement="top">
<el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['system:oss:download']"></el-button>
<el-button link type="primary" icon="Download" @click="handleDownload(scope.row)"
v-hasPermi="['system:oss:download']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']"></el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:oss:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改OSS对象存储对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>

615
src/views/system/teacher/index.vue Normal file
View File

@ -0,0 +1,615 @@
<template>
<div class="p-2">
<el-row :gutter="20">
<!-- 部门树 -->
<el-col :lg="4" :xs="24" style="">
<el-card shadow="hover">
<el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
<el-tree class="mt-2" ref="deptTreeRef" node-key="id" :data="deptOptions"
:props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
:filter-node-method="filterNode" highlight-current default-expand-all @node-click="handleNodeClick" />
</el-card>
</el-col>
<el-col :lg="20" :xs="24">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div class="mb-[10px]" v-show="showSearch">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="老师名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入老师名称" clearable style="width: 240px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="老师状态" clearable style="width: 240px">
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" style="width: 308px;">
<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
<el-button @click="resetQuery" icon="Refresh">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="hover">
<template #header>
<el-row :gutter="10">
<el-col :span="1.5">
<el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:teacher:add']"
icon="Plus">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain @click="handleUpdate()" :disabled="single"
v-has-permi="['system:teacher:add']" icon="Edit">
修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain @click="handleDelete()" :disabled="multiple"
v-has-permi="['system:teacher:delete']" icon="Delete">
删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain @click="importTemplate()" icon="Download">
下载模板
</el-button>
</el-col>
<el-col :span="1.5">
<el-button plain @click="handleImport()" icon="Top">
导入数据
</el-button>
</el-col>
<!-- <el-col :span="1.5" v-if="showStudenExport">
<el-button type="warning" plain @click="handleExport()" icon="Download">
学生密码导出
</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-dropdown class="mt-[1px]">
<el-button plain type="info">
更多
<el-icon class="el-icon--right"><arrow-down /></el-icon></el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="importTemplate" icon="Download">下载模板</el-dropdown-item>
<el-dropdown-item @click="handleImport" icon="Top"> 导入数据</el-dropdown-item>
<el-dropdown-item @click="handleExport" icon="Download"> 学生密码导出</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-col> -->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"
:search="true"></right-toolbar>
</el-row>
</template>
<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 #default="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 #default="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:teacher:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:teacher:remove']"></el-button>
</el-tooltip>
<el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)"
v-hasPermi="['system:teacher:resetPwd']"></el-button>
</el-tooltip>
<el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
v-hasPermi="['system:teacher:edit']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
</el-col>
</el-row>
<!-- 添加或修改老师配置对话框 -->
<el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body
@close="closeDialog">
<el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="老师昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入老师昵称" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<el-tree-select v-model="form.deptId" :data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门"
check-strictly />
</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-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<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>
</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>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="老师性别">
<el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
:disabled="item.status == '1'"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel()">取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 老师导入对话框 -->
<el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<el-icon class="el-icon--upload">
<i-ep-upload-filled />
</el-icon>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<template #tip>
<div class="text-center el-upload__tip">
<!-- <div class="el-upload__tip"><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>
</div>
</template>
</el-upload>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="User" lang="ts">
import api from "@/api/system/user"
import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
import { treeselect } from "@/api/system/dept";
import { DeptVO } from "@/api/system/dept/types";
import { RoleVO } from "@/api/system/role/types";
import { PostVO } from "@/api/system/post/types";
import { to } from "await-to-js";
import { globalHeaders } from "@/utils/request";
const router = useRouter();
const { proxy } = getCurrentInstance() as ComponentInternalInstance
const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
const userList = ref<UserVO[]>();
const loading = ref(true);
const showSearch = ref(true)
const ids = ref<Array<number | string>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
const deptName = ref('');
const deptOptions = ref<DeptVO[]>([]);
const initPassword = ref<String>('');
const postOptions = ref<PostVO[]>([]);
const roleOptions = ref<RoleVO[]>([]);
/*** 老师导入参数 */
const upload = reactive<ImportOption>({
// 是否显示弹出层（老师导入）
open: false,
// 弹出层标题（老师导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的老师数据
updateSupport: 0,
// 设置上传的请求头部
headers: globalHeaders(),
// 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/system/user/teacher/importData"
})
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `老师编号`, visible: false, children: [] },
{ key: 1, label: `老师名称`, visible: true, children: [] },
{ key: 2, label: `老师昵称`, visible: true, children: [] },
{ key: 3, label: `部门`, visible: true, children: [] },
{ key: 4, label: `手机号码`, visible: true, children: [] },
{ key: 5, label: `状态`, visible: true, children: [] },
{ key: 6, label: `创建时间`, visible: true, children: [] },
{ key: 7, label: `老师类型`, visible: true, children: [] }
])
const userTypeOptions = [
{
value: 'teacher',
label: '老师',
},
{
value: 'student',
label: '学生',
}
]
const deptTreeRef = ref<ElTreeInstance>();
const queryFormRef = ref<ElFormInstance>();
const userFormRef = ref<ElFormInstance>();
const uploadRef = ref<ElUploadInstance>();
const formDialogRef = ref<ElDialogInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: UserForm = {
userId: undefined,
deptId: undefined,
userName: '',
nickName: undefined,
password: '',
userType: 'teacher',
phonenumber: undefined,
email: undefined,
sex: undefined,
status: "0",
remark: '',
postIds: [],
roleIds: []
}
const data = reactive<PageData<UserForm, UserQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
userName: '',
userType: 'teacher',
phonenumber: '',
status: '',
deptId: ''
},
rules: {
userName: [{ required: true, message: "老师名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "老师名称长度必须介于 2 和 20 之间", trigger: "blur" }],
nickName: [{ required: true, message: "老师昵称不能为空", trigger: "blur" }],
password: [{ required: true, message: "老师密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "老师密码长度必须介于 5 和 20 之间", trigger: "blur" }],
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
}
})
const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
/** 通过条件过滤节点 */
const filterNode = (value: string, data: any) => {
if (!value) return true
return data.label.indexOf(value) !== -1
}
/** 根据名称筛选部门树 */
watchEffect(
() => { deptTreeRef.value?.filter(deptName.value); },
{
flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
}
);
/** 查询部门下拉树结构 */
const getTreeSelect = async () => {
const res = await api.deptTreeSelect();
deptOptions.value = res.data;
};
/** 查询老师列表 */
const getList = async () => {
loading.value = true;
const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
loading.value = false;
userList.value = res.rows;
total.value = res.total;
}
const showStudenExport = ref(false)
/** 节点单击事件 */
const handleNodeClick = (data: DeptVO) => {
if (!data.hasOwnProperty('children')) {
showStudenExport.value = true
} else {
showStudenExport.value = false
}
queryParams.value.deptId = data.id;
handleQuery()
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
dateRange.value = ['', '']
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.deptId = undefined;
deptTreeRef.value?.setCurrentKey(undefined);
handleQuery();
}
/** 删除按钮操作 */
const handleDelete = async (row?: UserVO) => {
const userIds = row?.userId || ids.value;
const [err] = await to(proxy?.$modal.confirm('是否确认删除老师编号为"' + userIds + '"的数据项？') as any);
if (!err) {
await api.delUser(userIds);
await getList();
proxy?.$modal.msgSuccess("删除成功");
}
}
/** 老师状态修改 */
const handleStatusChange = async (row: UserVO) => {
let text = row.status === "0" ? "启用" : "停用"
try {
await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"老师吗?');
await api.changeUserStatus(row.userId, row.status);
proxy?.$modal.msgSuccess(text + "成功");
} catch (err) {
row.status = row.status === "0" ? "1" : "0";
}
}
/** 跳转角色分配 */
const handleAuthRole = (row: UserVO) => {
const userId = row.userId;
router.push("/system/user-auth/role/" + userId);
}
/** 重置密码按钮操作 */
const handleResetPwd = async (row: UserVO) => {
const [err, res] = await to(ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
inputErrorMessage: "老师密码长度必须介于 5 和 20 之间",
}))
if (!err) {
await api.resetUserPwd(row.userId, res.value);
proxy?.$modal.msgSuccess("修改成功，新密码是：" + res.value);
}
}
/** 选择条数 */
const handleSelectionChange = (selection: UserVO[]) => {
ids.value = selection.map((item) => item.userId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 导入按钮操作 */
const handleImport = () => {
upload.title = "老师导入";
upload.open = true;
}
/** 导出按钮操作 */
const handleExport = () => {
// proxy?.download("system/user/export", {
// ...queryParams.value,
// }, `user_${new Date().getTime()}.xlsx`);
proxy?.download("system/user/export/password", {
deptId: queryParams.value.deptId,
}, `学生信息_${new Date().getTime()}.xlsx`);
};
/** 下载模板操作 */
const importTemplate = () => {
proxy?.download("system/user/teacher/importTemplate", {
}, `teacher_template_${new Date().getTime()}.xlsx`);
}
/**文件上传中处理 */
const handleFileUploadProgress = () => {
upload.isUploading = true;
}
/** 文件上传成功处理 */
const handleFileSuccess = (response: any, file: UploadFile) => {
upload.open = false;
upload.isUploading = false;
uploadRef.value?.handleRemove(file);
ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
getList();
}
/** 提交上传文件 */
function submitFileForm() {
uploadRef.value?.submit();
}
/** 初始化部门数据 */
const initTreeData = async () => {
// 判断部门的数据是否存在，存在不获取，不存在则获取
if (deptOptions.value === undefined) {
const { data } = await treeselect();
deptOptions.value = data;
}
}
/** 重置操作表单 */
const reset = () => {
form.value = { ...initFormData };
userFormRef.value?.resetFields();
}
/** 取消按钮 */
const cancel = () => {
dialog.visible = false;
reset();
}
/** 新增按钮操作 */
const handleAdd = async () => {
reset();
const { data } = await api.getUser();
dialog.visible = true;
dialog.title = "新增老师";
await initTreeData();
postOptions.value = data.posts;
roleOptions.value = data.roles;
form.value.password = initPassword.value.toString();
}
/** 修改按钮操作 */
const handleUpdate = async (row?: UserForm) => {
reset();
const userId = row?.userId || ids.value[0]
const { data } = await api.getUser(userId)
dialog.visible = true;
dialog.title = "修改老师";
await initTreeData();
Object.assign(form.value, data.user);
postOptions.value = data.posts;
roleOptions.value = data.roles;
form.value.postIds = data.postIds;
form.value.roleIds = data.roleIds;
form.value.password = "";
}
/** 提交按钮 */
const submitForm = () => {
userFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
})
}
/**
* 关闭老师弹窗
*/
const closeDialog = () => {
dialog.visible = false;
resetForm();
}
/**
* 重置表单
*/
const resetForm = () => {
userFormRef.value?.resetFields();
userFormRef.value?.clearValidate();
form.value.id = undefined;
form.value.status = '1';
}
onMounted(() => {
getTreeSelect() // 初始化部门数据
getList() // 初始化列表数据
proxy?.getConfigKey("sys.user.initPassword").then(response => {
initPassword.value = response.data;
});
});
</script>
<style lang="scss" scoped></style>

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

@ -16,24 +16,17 @@
<div class="mb-[10px]" v-show="showSearch">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="用户名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
<el-form-item label="学生名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入学生名称" clearable style="width: 240px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="用户类型" prop="userType">
<el-select v-model="queryParams.userType" placeholder="请选择用户类型" style="width: 240px"
@keyup.enter="handleQuery">
<el-option v-for="item in userTypeOptions" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
<el-select v-model="queryParams.status" placeholder="学生状态" clearable style="width: 240px">
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
@ -55,18 +48,18 @@
<template #header>
<el-row :gutter="10">
<el-col :span="1.5">
<el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']"
<el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:student:add']"
icon="Plus">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain @click="handleUpdate()" :disabled="single"
v-has-permi="['system:user:add']" icon="Edit">
v-has-permi="['system:student:add']" icon="Edit">
修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain @click="handleDelete()" :disabled="multiple"
v-has-permi="['system:user:delete']" icon="Delete">
v-has-permi="['system:student:delete']" icon="Delete">
删除
</el-button>
</el-col>
@ -108,18 +101,11 @@
<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"
<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"
<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="userType" prop="userType" v-if="columns[6].visible"
:show-overflow-tooltip="true">
<template #default="scope">
<el-tag v-if="scope.row.userType === 'teacher'" type="primary">老师</el-tag>
<el-tag v-if="scope.row.userType === 'student'" type="success">学生</el-tag>
</template>
</el-table-column>
<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"
@ -141,21 +127,21 @@
<template #default="scope">
<el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"></el-button>
v-hasPermi="['system:student:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"></el-button>
v-hasPermi="['system:student:remove']"></el-button>
</el-tooltip>
<el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)"
v-hasPermi="['system:user:resetPwd']"></el-button>
v-hasPermi="['system:student:resetPwd']"></el-button>
</el-tooltip>
<el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
v-hasPermi="['system:user:edit']"></el-button>
v-hasPermi="['system:student:edit']"></el-button>
</el-tooltip>
</template>
</el-table-column>
@ -167,14 +153,14 @@
</el-col>
</el-row>
<!-- 添加或修改用户配置对话框 -->
<!-- 添加或修改学生配置对话框 -->
<el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body
@close="closeDialog">
<el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
<el-form-item label="学生昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入学生昵称" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -199,19 +185,19 @@
</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>
<el-row>
<el-col :span="12">
<el-form-item label="用户性别">
<el-form-item label="学生性别">
<el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
@ -227,23 +213,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型">
<el-select v-model="form.userType" placeholder="请选择" style="width: 100%">
<el-option v-for="item in userTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
:disabled="item.status == '1'"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
@ -260,7 +229,7 @@
</template>
</el-dialog>
<!-- 用户导入对话框 -->
<!-- 学生导入对话框 -->
<el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
@ -271,7 +240,7 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<template #tip>
<div class="text-center el-upload__tip">
<div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据</div>
<!-- <div class="el-upload__tip"><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>
@ -315,31 +284,31 @@ const deptOptions = ref<DeptVO[]>([]);
const initPassword = ref<String>('');
const postOptions = ref<PostVO[]>([]);
const roleOptions = ref<RoleVO[]>([]);
/*** 用户导入参数 */
/*** 学生导入参数 */
const upload = reactive<ImportOption>({
// 是否显示弹出层（用户导入）
// 是否显示弹出层（学生导入）
open: false,
// 弹出层标题（用户导入）
// 弹出层标题（学生导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
// 是否更新已经存在的学生数据
updateSupport: 0,
// 设置上传的请求头部
headers: globalHeaders(),
// 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
url: import.meta.env.VITE_APP_BASE_API + "/system/user/student/importData"
})
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `用户编号`, visible: false, children: [] },
{ key: 1, label: `用户名称`, visible: true, children: [] },
{ key: 2, label: `用户昵称`, visible: true, children: [] },
{ key: 0, label: `学生编号`, visible: false, children: [] },
{ key: 1, label: `学生名称`, visible: true, children: [] },
{ key: 2, label: `学生昵称`, visible: true, children: [] },
{ key: 3, label: `部门`, visible: true, children: [] },
{ key: 4, label: `手机号码`, visible: true, children: [] },
{ key: 5, label: `状态`, visible: true, children: [] },
{ key: 6, label: `创建时间`, visible: true, children: [] },
{ key: 7, label: `用户类型`, visible: true, children: [] }
{ key: 7, label: `学生类型`, visible: true, children: [] }
])
const userTypeOptions = [
@ -370,6 +339,7 @@ const initFormData: UserForm = {
userName: '',
nickName: undefined,
password: '',
userType: 'student',
phonenumber: undefined,
email: undefined,
sex: undefined,
@ -384,15 +354,15 @@ const data = reactive<PageData<UserForm, UserQuery>>({
pageNum: 1,
pageSize: 10,
userName: '',
userType: '',
userType: 'student',
phonenumber: '',
status: '',
deptId: ''
},
rules: {
userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
userName: [{ required: true, message: "学生名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "学生名称长度必须介于 2 和 20 之间", trigger: "blur" }],
nickName: [{ required: true, message: "学生昵称不能为空", trigger: "blur" }],
password: [{ required: true, message: "学生密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "学生密码长度必须介于 5 和 20 之间", trigger: "blur" }],
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
}
@ -419,7 +389,7 @@ const getTreeSelect = async () => {
deptOptions.value = res.data;
};
/** 查询用户列表 */
/** 查询学生列表 */
const getList = async () => {
loading.value = true;
const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
@ -459,7 +429,7 @@ const resetQuery = () => {
/** 删除按钮操作 */
const handleDelete = async (row?: UserVO) => {
const userIds = row?.userId || ids.value;
const [err] = await to(proxy?.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？') as any);
const [err] = await to(proxy?.$modal.confirm('是否确认删除学生编号为"' + userIds + '"的数据项？') as any);
if (!err) {
await api.delUser(userIds);
await getList();
@ -467,11 +437,11 @@ const handleDelete = async (row?: UserVO) => {
}
}
/** 用户状态修改 */
/** 学生状态修改 */
const handleStatusChange = async (row: UserVO) => {
let text = row.status === "0" ? "启用" : "停用"
try {
await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?');
await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"学生吗?');
await api.changeUserStatus(row.userId, row.status);
proxy?.$modal.msgSuccess(text + "成功");
} catch (err) {
@ -491,7 +461,7 @@ const handleResetPwd = async (row: UserVO) => {
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
inputErrorMessage: "学生密码长度必须介于 5 和 20 之间",
}))
if (!err) {
await api.resetUserPwd(row.userId, res.value);
@ -508,7 +478,7 @@ const handleSelectionChange = (selection: UserVO[]) => {
/** 导入按钮操作 */
const handleImport = () => {
upload.title = "用户导入";
upload.title = "学生导入";
upload.open = true;
}
/** 导出按钮操作 */
@ -523,8 +493,8 @@ const handleExport = () => {
};
/** 下载模板操作 */
const importTemplate = () => {
proxy?.download("system/user/importTemplate", {
}, `user_template_${new Date().getTime()}.xlsx`);
proxy?.download("system/user/student/importTemplate", {
}, `student_template_${new Date().getTime()}.xlsx`);
}
/**文件上传中处理 */
@ -571,7 +541,7 @@ const handleAdd = async () => {
reset();
const { data } = await api.getUser();
dialog.visible = true;
dialog.title = "新增用户";
dialog.title = "新增学生";
await initTreeData();
postOptions.value = data.posts;
roleOptions.value = data.roles;
@ -583,7 +553,7 @@ const handleUpdate = async (row?: UserForm) => {
const userId = row?.userId || ids.value[0]
const { data } = await api.getUser(userId)
dialog.visible = true;
dialog.title = "修改用户";
dialog.title = "修改学生";
await initTreeData();
Object.assign(form.value, data.user);
postOptions.value = data.posts;
@ -607,7 +577,7 @@ const submitForm = () => {
/**
* 关闭用户弹窗
* 关闭学生弹窗
*/
const closeDialog = () => {
dialog.visible = false;