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

src/api/admin/role.ts

@@ -109,3 +109,11 @@ export function validateRoleName(rule: any, value: any, callback: any, isEdit: b
 		}
 	});
 }
+
+
+export const listAllRole = () => {
+	return request({
+		url: '/admin/role/listAllRole',
+		method: 'get',
+	});
+};

src/layout/navBars/breadcrumb/user.vue

@@ -65,6 +65,7 @@
 				<el-dropdown-menu>
 					<el-dropdown-item command="/home">{{ $t('user.dropdown1') }}</el-dropdown-item>
 					<el-dropdown-item command="personal">{{ $t('user.dropdown2') }}</el-dropdown-item>
+					<el-dropdown-item command="changeRole">切换角色</el-dropdown-item>
 					<el-dropdown-item divided command="logOut">{{ $t('user.dropdown5') }}</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
@@ -73,6 +74,8 @@
 		<global-websocket uri="/admin/ws/info" v-if="websocketEnable" @rollback="rollback" />
         <global-websocket uri="/jsonflow/ws/info" v-if="useFlowJob().jsonFlowEnable()" @rollback="rollback" />
 		<personal-drawer ref="personalDrawerRef"></personal-drawer>
+
+    <change-role ref="ChangeRoleRef" />
 	</div>
 </template>
 
@@ -91,6 +94,9 @@ import { useMsg } from '/@/stores/msg';
 import { fetchUserMessageList } from '/@/api/admin/message';
 import {useFlowJob} from "/@/flow/stores/flowJob";
 
+
+const ChangeRoleRef=ref()
+const ChangeRole = defineAsyncComponent(() => import('/@/views/admin/system/role/change-role.vue'))
 // 引入组件
 const GlobalWebsocket = defineAsyncComponent(() => import('/@/components/Websocket/index.vue'));
 const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/userNews.vue'));
@@ -190,7 +196,10 @@ const onHandleCommandClick = (path: string) => {
 	} else if (path === 'personal') {
 		// 打开个人页面
 		personalDrawerRef.value.open();
-	} else {
+	}else if(path === 'changeRole'){
+    ChangeRoleRef.value.open()
+  }
+  else {
 		router.push(path);
 	}
 };

src/utils/request.ts

@@ -12,6 +12,8 @@ export enum CommonHeaderEnum {
 	'ENC_FLAG' = 'Enc-Flag',
 	'AUTHORIZATION' = 'Authorization',
 	'VERSION' = 'VERSION',
+	'ROLE_CODE'='ROLE_CODE',
+	'RRID'='RRID'
 }
 
 /**
@@ -50,6 +52,15 @@ service.interceptors.request.use(
 		if (tenantId) {
 			config.headers![CommonHeaderEnum.TENANT_ID] = tenantId;
 		}
+		//统一增加 当前角色CODE
+		const roleCode = Session.getRoleCode()
+		if(roleCode){
+			config.headers![CommonHeaderEnum.ROLE_CODE] = roleCode;
+		}
+		const roleId = Session.getRoleId()
+		if(roleId){
+			config.headers![CommonHeaderEnum.RRID] = roleId;
+		}
 
 		// 增加 gray_version 请求头
 		const version = import.meta.env.VITE_GRAY_VERSION;

src/utils/storage.ts

@@ -80,4 +80,10 @@ export const Session = {
 	getTenant() {
 		return Local.get('tenantId') ? Local.get('tenantId') : 1;
 	},
+	getRoleCode(){
+		return Local.get('roleCode') ? Local.get('roleCode') : '';
+	},
+	getRoleId(){
+		return Local.get('roleId') ? Local.get('roleId') : '';
+	}
 };

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>

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>

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) => {

src/views/admin/system/role/i18n/zh-cn.ts

@@ -2,7 +2,7 @@ export default {
 	sysrole: {
 		index: '#',
 		roleName: '角色名称',
-		inputRoleNameTip: '请输入角色名称',
+		inputRoleNameTip: '请输入角色或编码名称',
 		permissionTip: '授权',
 		deleteDisabledTip: '角色不允许删除',
 		mustCheckOneTip: '必须选择【分配权限】菜单',

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">

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>

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();