Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

2025-12-31 17:40:27 +08:00
parent 74c06bb8a0 ff0c0d4de8
commit fee5e2a6c0
11 changed files with 167 additions and 7 deletions
--- a/src/views/admin/system/role/change-role.vue
+++ b/src/views/admin/system/role/change-role.vue
@@ -0,0 +1,67 @@
+<template>
+  <el-dialog v-model="visible" title="角色切换" width="50%">
+    <el-form>
+<!--      <el-form-item label="学校">-->
+<!--        <el-tag>{{schoolName}}</el-tag>-->
+<!--      </el-form-item>-->
+      <el-form-item label="角色">
+        <el-radio-group v-model="radio">
+          <el-radio-button v-for="(item,index) in allRole"  :key="index" :label="item.roleCode" @click.native="handleChangeRole(item.roleCode)">{{item.roleName}}</el-radio-button>
+        </el-radio-group>
+
+      </el-form-item>
+    </el-form>
+
+
+    <template #footer>
+<!--      <el-button type="primary" @click="handleChangeRole">切换</el-button>-->
+      <el-button  @click="visible=false">关 闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import {listAllRole} from '/@/api/admin/role'
+import {Local, Session} from '/@/utils/storage';
+import {useMessage} from "/@/hooks/message";
+// import {querySchoolName} from "/@/api/admin/tenant"
+
+const visible=ref(false)
+const radio=ref('')
+const allRole=reactive([])
+// const schoolName=ref('')
+
+const open=()=>{
+  visible.value=true
+  // handleQuerySchoolName()
+  listAllRole().then(res=>{
+    Object.assign(allRole,res.data)
+    radio.value=Local.get("roleCode")
+    visible.value=true
+  })
+}
+const handleChangeRole=(label:any)=>{
+  let obj:any=allRole.find((v:any) => v.roleCode == label)
+  Local.set("roleCode",obj.roleCode)
+  Local.set("roleName",obj.roleName)
+  Local.set("roleId",obj.roleId)
+  useMessage().success("操作成功")
+  setTimeout(()=>{
+    window.location.reload()
+  },500)
+}
+
+const handleQuerySchoolName=()=>{
+  // querySchoolName({id:Session.get("tenantId")}).then((res:any)=>{
+  //   schoolName.value=res.data
+  // })
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/admin/system/role/changeRole-fir.vue
+++ b/src/views/admin/system/role/changeRole-fir.vue
@@ -0,0 +1,59 @@
+<template>
+  <el-dialog v-model="visible" width="50%" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" center>
+    <template #title>
+      <div style="margin: 0 auto;width:100%;text-align:center;font-size:18px;font-weight:bold;">
+        登录角色选择
+      </div>
+    </template>
+    <div style="margin: 0 auto;width:100%;text-align:center;font-size:18px;font-weight:bold;">
+      <el-radio-group v-model="radio">
+        <el-radio-button v-for="(item,index) in allRole"  :key="index" :label="item.roleCode" @click.native="handleChangeRole(item.roleCode)">{{item.roleName}}</el-radio-button>
+      </el-radio-group>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import {listAllRole} from '/@/api/admin/role'
+import {Local, Session} from '/@/utils/storage';
+import {useMessage} from "/@/hooks/message";
+// import {querySchoolName} from "/@/api/admin/tenant"
+
+const visible=ref(false)
+const radio=ref('')
+const allRole=reactive([])
+const schoolName=ref('')
+
+const open=()=>{
+  // handleQuerySchoolName()
+  listAllRole().then(res=>{
+    Object.assign(allRole,res.data)
+    radio.value=Local.get("roleCode")
+    visible.value=true
+  })
+}
+const handleChangeRole=(label:any)=>{
+  let obj:any=allRole.find((v:any) => v.roleCode == label)
+  Local.set("roleCode",obj.roleCode)
+  Local.set("roleName",obj.roleName)
+  Local.set("roleId",obj.roleId)
+  useMessage().success("操作成功")
+  setTimeout(()=>{
+    window.location.reload()
+  },500)
+}
+
+// const handleQuerySchoolName=()=>{
+//   querySchoolName({id:Session.get("tenantId")}).then((res:any)=>{
+//     schoolName.value=res.data
+//   })
+// }
+
+defineExpose({
+  open
+})
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/admin/system/role/form.vue
+++ b/src/views/admin/system/role/form.vue
@@ -87,7 +87,7 @@ const dataForm = reactive({
 const dataRules = ref({
 	roleName: [
 		{ required: true, message: '角色名称不能为空', trigger: 'blur' },
-		{ min: 3, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur' },
+		{ min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' },
 		{
 			validator: (rule: any, value: any, callback: any) => {
 				validateRoleName(rule, value, callback, form.roleId !== '');
@@ -97,7 +97,7 @@ const dataRules = ref({
 	],
 	roleCode: [
 		{ required: true, message: '角色标识不能为空', trigger: 'blur' },
-		{ min: 3, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur' },
+		{ min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' },
 		{ validator: rule.validatorCapital, trigger: 'blur' },
 		{
 			validator: (rule: any, value: any, callback: any) => {
--- a/src/views/admin/system/role/i18n/zh-cn.ts
+++ b/src/views/admin/system/role/i18n/zh-cn.ts
@@ -2,7 +2,7 @@ export default {
 	sysrole: {
 		index: '#',
 		roleName: '角色名称',
-		inputRoleNameTip: '请输入角色名称',
+		inputRoleNameTip: '请输入角色或编码名称',
 		permissionTip: '授权',
 		deleteDisabledTip: '角色不允许删除',
 		mustCheckOneTip: '必须选择【分配权限】菜单',
--- a/src/views/admin/system/role/index.vue
+++ b/src/views/admin/system/role/index.vue
@@ -4,7 +4,7 @@
 			<el-row shadow="hover" v-show="showSearch" class="ml10">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 					<el-form-item :label="$t('sysrole.roleName')" prop="roleName">
-						<el-input :placeholder="$t('sysrole.inputRoleNameTip')" v-model="state.queryForm.roleName" />
+						<el-input :placeholder="$t('sysrole.inputRoleNameTip')" v-model="state.queryForm.roleName" clearable />
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -40,7 +40,7 @@
 <!--					</el-col>-->
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.role')" prop="role">
-							<el-select clearable multiple :placeholder="$t('sysuser.selectRole')" v-model="dataForm.role">
+							<el-select clearable multiple :placeholder="$t('sysuser.selectRole')" v-model="dataForm.role" filterable>
 								<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId" v-for="item in roleData" />
 							</el-select>
 						</el-form-item>
--- a/src/views/admin/system/user/personal.vue
+++ b/src/views/admin/system/user/personal.vue
@@ -189,7 +189,7 @@ const validatorPassword2 = (rule: any, value: any, callback: any) => {
 	}
 };
 const validatorScore = (rule: any, value: any, callback: any) => {
-	if (score.value <= 1) {
+	if (score.value <= 2) {
 		callback(new Error(t('personal.passwordScore')));
 	} else {
 		callback();