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

去除租户模块

This commit is contained in:
jiangzhe 2024-04-09 15:34:09 +08:00
parent 0ce1efda0d
commit 7b39a50b12
8 changed files with 112 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/login.ts
View File

@ -92,14 +92,3 @@ export function getInfo(): AxiosPromise<UserInfo> {
method: 'get'
});
}
// 获取租户列表
export function getTenantList(): AxiosPromise<TenantInfo> {
return request({
url: '/auth/tenant/list',
headers: {
isToken: false
},
method: 'get'
});
}

13
src/api/scale/SysScale/index.ts
View File

@ -16,6 +16,19 @@ export const listSysScale = (query?: SysScaleQuery): AxiosPromise<SysScaleVO[]>
});
};
/**
* 查询所有量表
* @param query
* @returns
*/
export const findAll = (query?: SysScaleQuery): AxiosPromise<SysScaleVO> => {
return request({
url: '/scale/info/findAll',
method: 'get',
params: query
});
};
/**
* 查询心理测评量详细
* @param scaleId

12
src/api/scale/SysScaleQuestion/types.ts
View File

@ -72,14 +72,14 @@ export interface SysScaleQuestionForm extends BaseEntity {
*/
factorName?: string;
scaleAnswerList: ScaleAnswer[]
scaleAnswerList: ScaleAnswer[],
}
export interface ScaleAnswer {
answerId: string;
answerOption: string;
score: number;
type: number;
}
export interface SysScaleQuestionQuery extends PageQuery {
@ -114,10 +114,10 @@ export interface SysScaleQuestionQuery extends PageQuery {
*/
factorName?: string;
/**
* 日期范围参数
*/
params?: any;
/**
* 日期范围参数
*/
params?: any;
}

27
src/layout/components/Navbar.vue
View File

@ -6,20 +6,6 @@
<div class="right-menu flex align-center">
<template v-if="appStore.device !== 'mobile'">
<el-select
v-model="companyName"
clearable
filterable
reserve-keyword
:placeholder="$t('navbar.selectTenant')"
v-if="userId === 1 && tenantEnabled"
@change="dynamicTenantEvent"
@clear="dynamicClearEvent"
>
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
<search-menu ref="searchMenuRef" />
<!-- <el-tooltip content="搜索" effect="dark" placement="bottom">
<div class="right-menu-item hover-effect" @click="openSearchMenu">
@ -80,7 +66,6 @@ import SearchMenu from './TopBar/search.vue';
import useAppStore from '@/store/modules/app';
import useUserStore from '@/store/modules/user';
import useSettingsStore from '@/store/modules/settings';
import { getTenantList } from "@/api/login";
import { dynamicClear, dynamicTenant } from "@/api/system/tenant";
import { ComponentInternalInstance } from "vue";
import { TenantVO } from "@/api/types";
@ -100,8 +85,6 @@ const companyName = ref(undefined);
const tenantList = ref<TenantVO[]>([]);
// 是否切换了租户
const dynamic = ref(false);
// 租户开关
const tenantEnabled = ref(true);
// 搜索菜单
const searchMenuRef = ref<InstanceType<typeof SearchMenu>>();
@ -126,17 +109,7 @@ const dynamicClearEvent = async () => {
proxy?.$router.push('/');
}
/** 租户列表 */
const initTenantList = async () => {
const { data } = await getTenantList();
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = data.voList;
}
}
defineExpose({
initTenantList,
})
const toggleSideBar = () => {

29
src/views/login.vue
View File

@ -6,13 +6,6 @@
<h1 class="title">云舒_心理健康平台</h1>
</div>
<el-form-item prop="tenantId" v-if="tenantEnabled">
<el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName"
:value="item.tenantId"></el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
</el-form-item>
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@ -48,7 +41,7 @@
</template>
<script setup lang="ts">
import { getCodeImg, getTenantList } from '@/api/login';
import { getCodeImg } from '@/api/login';
import { authBinding } from '@/api/system/social/auth';
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
@ -78,9 +71,6 @@ const codeUrl = ref('');
const loading = ref(false);
// 验证码开关
const captchaEnabled = ref(true);
// 租户开关
const tenantEnabled = ref(true);
// 注册开关
const register = ref(false);
@ -155,20 +145,6 @@ const getLoginData = () => {
}
/**
* 获取租户列表
*/
const initTenantList = async () => {
const { data } = await getTenantList();
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = data.voList;
if (tenantList.value != null && tenantList.value.length !== 0) {
loginForm.value.tenantId = tenantList.value[0].tenantId;
}
}
}
//检测租户选择框的变化
watch(() => loginForm.value.tenantId, () => {
localStorage.setItem("tenantId", String(loginForm.value.tenantId))
@ -189,11 +165,8 @@ const doSocialLogin = (type: string) => {
});
};
onMounted(() => {
getCode();
initTenantList();
getLoginData();
});
</script>

22
src/views/register.vue
View File

@ -2,12 +2,6 @@
<div class="register">
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">云舒_心理健康平台</h3>
<el-form-item prop="tenantId" v-if="tenantEnabled">
<el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
</el-form-item>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@ -56,7 +50,7 @@
</template>
<script setup lang="ts">
import { getCodeImg, register, getTenantList } from '@/api/login';
import { getCodeImg, register } from '@/api/login';
import { RegisterForm, TenantVO } from '@/api/types';
import { to } from 'await-to-js';
@ -72,9 +66,6 @@ const registerForm = ref<RegisterForm>({
userType: "sys_user"
});
// 租户开关
const tenantEnabled = ref(true);
const equalToPassword = (rule: any, value: string, callback: any) => {
if (registerForm.value.password !== value) {
@ -141,20 +132,9 @@ const getCode = async () => {
}
};
const initTenantList = async () => {
const { data } = await getTenantList();
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = data.voList;
if (tenantList.value != null && tenantList.value.length !== 0) {
registerForm.value.tenantId = tenantList.value[0].tenantId;
}
}
}
onMounted(() => {
getCode();
initTenantList();
})
</script>

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

@ -70,7 +70,7 @@
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改测评因子对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="1000px" append-to-body>
<el-dialog :title="dialog.title" v-model="dialog.visible" width="1300px" append-to-body>
<el-form ref="SysScaleFactorFormRef" :model="form" :rules="rules" label-width="150px">
<el-card>
<template #header>
@ -120,32 +120,35 @@
<el-table-column type="index" label="序号" width="55" />
<el-table-column prop="minValue" label="区间起始值">
<template #default="scope">
<el-input v-model="scope.row.minValue" placeholder="请输入区间起始值" />
<el-input-number v-model="scope.row.minValue" placeholder="请输入区间起始值" />
</template>
</el-table-column>
<el-table-column prop="maxValue" label="区间结束值">
<template #default="scope">
<el-input v-model="scope.row.maxValue" placeholder="请输入区间结束值" />
<el-input-number v-model="scope.row.maxValue" placeholder="请输入区间结束值" />
</template>
</el-table-column>
<el-table-column prop="situation" label="严重级别">
<template #default="scope">
<el-input v-model="scope.row.situation" placeholder="请输入区间结束值" />
<el-select v-model="scope.row.situation" placeholder="请选择严重级别">
<el-option v-for="item in yzdList" :key="item.dictCode" :label="item.dictLabel"
:value="item.dictValue" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="rangeName" label="名称">
<template #default="scope">
<el-input v-model="scope.row.rangeName" placeholder="请输入区间结束值" />
<el-input v-model="scope.row.rangeName" placeholder="请输入名称" />
</template>
</el-table-column>
<el-table-column prop="evalDesc" label="说明">
<template #default="scope">
<el-input v-model="scope.row.evalDesc" placeholder="请输入区间结束值" />
<el-input v-model="scope.row.evalDesc" type="textarea" placeholder="请输入说明" />
</template>
</el-table-column>
<el-table-column prop="evalPropose" label="建议">
<template #default="scope">
<el-input v-model="scope.row.evalPropose" placeholder="请输入区间结束值" />
<el-input v-model="scope.row.evalPropose" type="textarea" placeholder="请输入建议" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -181,6 +184,9 @@ import { SysScaleFormulaVO } from '@/api/scale/SysScaleFormula/types';
import { listSysScaleQuestion } from '@/api/scale/SysScaleQuestion'
import { SysScaleQuestionVO } from '@/api/scale/SysScaleQuestion/types';
import { getDicts } from '@/api/system/dict/data';
import { DictDataVO } from '@/api/system/dict/data/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const scaleId = useRoute().params.scaleId;
@ -309,28 +315,25 @@ const handleUpdate = async (row?: SysScaleFactorVO) => {
dialog.title = "修改测评因子";
}
watch(() => dialog.visible, (value) => {
if (value) {
getScaleQuestionList()
}
})
function addRange() {
form.value.factorRangeList.push({ rangeId: nanoid(), minValue: undefined, maxValue: undefined, situation: undefined, rangeName: undefined, evalDesc: undefined, evalPropose: undefined })
console.log('addRange', form.value.factorRangeList)
}
/** 提交按钮 */
const submitForm = () => {
SysScaleFactorFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.factorRangeList.forEach(item => {
if (item.rangeId.length == 21) {
item.rangeId = ''
}
})
if (form.value.factorId) {
await updateSysScaleFactor(form.value).finally(() => buttonLoading.value = false);
} else {
await addSysScaleFactor(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("修改成功");
reset();
form.value.factorRangeList = []
dialog.visible = false;
await getList();
}
@ -365,8 +368,25 @@ async function getScaleQuestionList() {
scaleQuestionList.value = res.rows
}
function handleRangeDelete(row) {
const yzdList = ref<DictDataVO[]>([])
async function getYzdList() {
const res = await getDicts('yzd')
yzdList.value = res.data
}
watch(() => dialog.visible, (value) => {
if (value) {
getScaleQuestionList()
getYzdList()
}
})
function addRange() {
form.value.factorRangeList.push({ rangeId: nanoid(), minValue: undefined, maxValue: undefined, situation: undefined, rangeName: undefined, evalDesc: undefined, evalPropose: undefined })
}
function handleRangeDelete(row: any) {
form.value.factorRangeList = form.value.factorRangeList.filter(item => item.rangeId !== row.rangeId)
}
onMounted(() => {
@ -382,7 +402,7 @@ onMounted(() => {
justify-content: space-between;
.title {
font-size: 18px;
font-size: 16px;
font-weight: bold;
}
}

74
src/views/scale/SysScaleQuestion/index.vue
View File

@ -73,12 +73,12 @@
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改量问题内容对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="700px" append-to-body>
<el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
<el-form ref="SysScaleQuestionFormRef" :model="form" :rules="rules" label-width="120px">
<el-card>
<template #header>
<div class="card-header">
<span>测评量表问题信息</span>
<span class="card-title">测评量表问题信息</span>
</div>
</template>
<el-form-item label="问题序号" prop="questionOrder">
@ -92,33 +92,35 @@
<el-card style="margin-top: 20px;">
<template #header>
<div class="card-header">
<span>测评量表问题信息</span>
<div class="card-title">测评量表问题信息</div>
<div>
<el-button @click="addQuestion">
<el-icon>
<Plus />
</el-icon>
增加
</el-button>
</div>
</div>
</template>
<div style="margin-bottom: 20px;">
<el-button @click="addQuestion">
<el-icon>
<Plus />
</el-icon>
增加
</el-button>
<!-- <el-button>
<el-icon>
<Delete />
</el-icon>
删除</el-button> -->
</div>
<el-table :data="form.scaleAnswerList">
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column type="index" label="序号" width="55" />
<el-table-column prop="answerOption" label="选项">
<el-table-column prop="type" label="选项类型" width="100">
<template #default="scope">
<el-input v-model="scope.row.answerOption" placeholder="请输入选项" />
<el-select v-model="scope.row.type" placeholder="请选择选项类型">
<el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="score" label="得分">
<el-table-column prop="answerOption" label="选项内容">
<template #default="scope">
<el-input-number v-model="scope.row.score" placeholder="请输入得分" />
<image-upload v-if="scope.row.type === 1" v-model="scope.row.answerOption" :limit="1" />
<el-input v-else v-model="scope.row.answerOption" placeholder="请输入选项内容" />
</template>
</el-table-column>
<el-table-column prop="score" label="分值">
<template #default="scope">
<el-input-number v-model="scope.row.score" placeholder="请输入分值" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -143,6 +145,7 @@
</template>
<script setup name="SysScaleQuestion" lang="ts">
import { onMounted } from 'vue'
import { useRoute } from 'vue-router'
import { nanoid } from 'nanoid'
import { listSysScaleQuestion, getSysScaleQuestion, delSysScaleQuestion, addSysScaleQuestion, updateSysScaleQuestion } from '@/api/scale/SysScaleQuestion';
@ -170,6 +173,17 @@ const dialog = reactive<DialogOption>({
title: ''
});
const typeOptions = [
{
label: '文字',
value: 0
},
{
label: '图片',
value: 1
}
]
const initFormData: SysScaleQuestionForm = {
questionId: undefined,
scaleId: scaleId,
@ -221,6 +235,7 @@ const data = reactive<PageData<SysScaleQuestionForm, SysScaleQuestionQuery>>({
const { queryParams, form, rules } = toRefs(data);
/** 查询量问题内容列表 */
const getList = async () => {
loading.value = true;
@ -279,8 +294,7 @@ const handleUpdate = async (row?: SysScaleQuestionVO) => {
}
function addQuestion() {
form.value.scaleAnswerList.push({ answerId: nanoid(), answerOption: '', score: 0 })
console.log('addQuestion', form.value.scaleAnswerList)
form.value.scaleAnswerList.push({ answerId: nanoid(), answerOption: '', score: 0, type: 0 })
}
function handleOptionDelete(row: any) {
@ -296,7 +310,7 @@ const submitForm = () => {
if (item.answerId.length == 21) {
item.answerId = '';
}
});
})
if (form.value.questionId) {
await updateSysScaleQuestion(form.value).finally(() => buttonLoading.value = false);
@ -340,3 +354,15 @@ onMounted(() => {
getScaleFactorList()
});
</script>
<style lang="scss" scoped>
.card-title {
font-size: 16px;
font-weight: bold;
}
.card-header {
display: flex;
justify-content: space-between;
}
</style>