Domů Procházet Nápověda
Registrovat se Přihlásit se
lsj2008bj
/
cgp-sso
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

调整页面逻辑

lishuangjiang@potevio.com před 1 rokem
rodič
4257df4266
revize
9d97824d80
7 změnil soubory, kde provedl 87 přidání a 47 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 15 0
      sso-ui/sso-ui-admin-vue3/index.html
  2. 2 1
      sso-ui/sso-ui-admin-vue3/src/locales/zh-CN.ts
  3. 26 24
      sso-ui/sso-ui-admin-vue3/src/router/modules/remaining.ts
  4. 12 2
      sso-ui/sso-ui-admin-vue3/src/views/Home/Index2.vue
  5. 9 9
      sso-ui/sso-ui-admin-vue3/src/views/Login/components/MobileForm.vue
  6. 17 5
      sso-ui/sso-ui-admin-vue3/src/views/system/user/UserForm.vue
  7. 6 6
      sso-ui/sso-ui-admin-vue3/src/views/system/user/index.vue

+ 15 - 0
sso-ui/sso-ui-admin-vue3/index.html
Zobrazit soubor 

@@ -2,6 +2,9 @@
 
 <html lang="en">
 
   <head>
 
     <meta charset="UTF-8" />
 
+<!--    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">-->
 
+<!--    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />-->
 
+
 
     <link rel="icon" href="/favicon.ico" />
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
@@ -149,3 +152,15 @@
 
     <script type="module" src="/src/main.ts"></script>
 
   </body>
 
 </html>
 
+<script>
 
+  document.addEventListener('mousewheel', function (e) {
 
+    e = e || window.event;
 
+    if ((e.wheelDelta && event.ctrlKey) || e.detail) {
 
+      event.preventDefault();
 
+    }
 
+  }, {
 
+    capture: false,
 
+    passive: false
 
+  });
 
+</script>
 
+

+ 2 - 1
sso-ui/sso-ui-admin-vue3/src/locales/zh-CN.ts
Zobrazit soubor 

@@ -5,6 +5,7 @@ export default {
 
     startTimeText: '开始时间',
 
     endTimeText: '结束时间',
 
     login: '登录',
 
+    navicate: '导航',
 
     required: '该项为必填项',
 
     loginOut: '退出系统',
 
     document: '项目文档',
 
@@ -114,7 +115,7 @@ export default {
 
   },
 
   login: {
 
     welcome: '欢迎使用本系统',
 
-    message: '统一用户管理系统',
 
+    message: '统一用户认证门户',
 
     tenantname: '租户名称',
 
     username: '用户名',
 
     password: '密码',

+ 26 - 24
sso-ui/sso-ui-admin-vue3/src/router/modules/remaining.ts
Zobrazit soubor 

@@ -50,34 +50,37 @@ const remainingRouter: AppRouteRecordRaw[] = [
 
       noTagsView: true
 
     }
 
   },
 
+  {
 
+    path: '/',
 
+    component: Layout,
 
+    redirect: '/Navicate',
 
+    name: 'Home',
 
+    meta: {
 
+      title: '导航页',
 
+      icon: 'ep:home-filled',
 
+    },
 
+    children: []
 
+  },
 
   // {
 
   //   path: '/',
 
   //   component: Layout,
 
-  //   redirect: '/Navicate',
 
+  //   redirect: '/index',
 
   //   name: 'Home',
 
   //   meta: {},
 
-  //   children: []
 
+  //   children: [
 
+  //     {
 
+  //       path: 'index',
 
+  //       component: () => import('@/views/Home/Index.vue'),
 
+  //       name: 'Index',
 
+  //       meta: {
 
+  //         title: t('router.home'),
 
+  //         icon: 'ep:home-filled',
 
+  //         noCache: false,
 
+  //         affix: true
 
+  //       }
 
+  //     }
 
+  //   ]
 
   // },
 
-  {
 
-    path: '/',
 
-    component: Layout,
 
-    redirect: '/index',
 
-    name: 'Home',
 
-    meta: {},
 
-    children: [
 
-      {
 
-        path: 'index',
 
-        component: () => import('@/views/Home/Index.vue'),
 
-        name: 'Index',
 
-        meta: {
 
-          title: t('router.home'),
 
-          icon: 'ep:home-filled',
 
-          noCache: false,
 
-          affix: true
 
-        }
 
-      }
 
-    ]
 
-  },
 
   {
 
     path: '/user',
 
     component: Layout,
 
@@ -135,7 +138,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
 
       }
 
     ]
 
   },
 
-
 
   {
 
     path: '/codegen',
 
     component: Layout,
 
@@ -184,7 +186,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
 
   },
 
   {
 
     path: '/login',
 
-    component: () => import('@/views/Login/Login3.vue'),
 
+    component: () => import('@/views/Login/Login2.vue'),
 
     name: 'Login',
 
     meta: {
 
       hidden: true,

+ 12 - 2
sso-ui/sso-ui-admin-vue3/src/views/Home/Index2.vue
Zobrazit soubor 

@@ -3,7 +3,7 @@
 
     <div class="content">
 
       <div class="title"></div>
 
       <div class="logout_bg">
 
-        <el-image style="width:40px;height:40px;margin-right: 40px" :src="manager" fit="cover"  @click="toProfile" />
 
+        <el-image style="width:40px;height:40px;margin-right: 40px" :src="manager" fit="cover"  @click="toProfile"  v-if="roles.includes('super_admin') || roles.includes('sys_admin')"/>
 
         <el-image style="width:40px;height:40px;margin-right: 20px" :src="logouticon" fit="cover" @click="loginOut"/>
 
       </div>
 
       <div class="main">
 
@@ -89,7 +89,7 @@
 
     } catch {}
 
   }
 
   const toProfile = async () => {
 
-    push('/index')
 
+    push('/system/user')
 
   }
 
 
   const handlerLink = async (id) =>{
 
@@ -105,6 +105,16 @@
 
 
        // window.open("http://web.poteviohealth.com/boss/");
 
   }
 
+  const roles = wsCache.get(CACHE_KEY.USER).roles
 
+  console.log("######################",roles)
 
+  // const checkRoles = (value)=>{
 
+  //   const permissionRoles = value
 
+  //   const roles = wsCache.get(CACHE_KEY.USER).roles
 
+  //   const hasRole = roles.some((role) => {
 
+  //     return super_admin === role || permissionRoles.includes(role)
 
+  //   })
 
+  //   return hasRole;
 
+  // }
 
 
 </script>
 
 <style lang="scss" scoped>

+ 9 - 9
sso-ui/sso-ui-admin-vue3/src/views/Login/components/MobileForm.vue
Zobrazit soubor 

@@ -17,15 +17,15 @@
 
         </el-form-item>
 
       </el-col>
 
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
 
-        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
 
-          <el-input
 
-            v-model="loginData.loginForm.tenantName"
 
-            :placeholder="t('login.tenantNamePlaceholder')"
 
-            :prefix-icon="iconHouse"
 
-            type="primary"
 
-            link
 
-          />
 
-        </el-form-item>
 
+<!--        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">-->
 
+<!--          <el-input-->
 
+<!--            v-model="loginData.loginForm.tenantName"-->
 
+<!--            :placeholder="t('login.tenantNamePlaceholder')"-->
 
+<!--            :prefix-icon="iconHouse"-->
 
+<!--            type="primary"-->
 
+<!--            link-->
 
+<!--          />-->
 
+<!--        </el-form-item>-->
 
       </el-col>
 
       <!-- 手机号 -->
 
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">

+ 17 - 5
sso-ui/sso-ui-admin-vue3/src/views/system/user/UserForm.vue
Zobrazit soubor 

@@ -71,6 +71,12 @@
 
           autocomplete="new-password"
 
         />
 
       </el-form-item>
 
+      <el-form-item label="创建用户" prop="roleType">
 
+        <el-radio-group v-model="formData.roleType" >
 
+          <el-radio value="0">是</el-radio>
 
+          <el-radio value="1">否</el-radio>
 
+        </el-radio-group>
 
+      </el-form-item>
 
       <el-form-item label="关联系统" prop="associatedSystem">
 
         <el-select v-model="formData.associatedSystem" multiple  placeholder="请选择关联系统">
 
           <el-option
 
@@ -97,6 +103,7 @@ import * as DeptApi from '@/api/system/dept'
 
 import * as UserApi from '@/api/system/user'
 
 import { FormRules } from 'element-plus'
 
 import * as ClientApi from '@/api/system/oauth2/client'
 
+import { checkPasswordRule,level  } from '@/utils/checkPassword'
 
 
 defineOptions({ name: 'SystemUserForm' })
 
 
@@ -127,13 +134,15 @@ const formData = ref({
 
   postIds: [],
 
   remark: '',
 
   status: CommonStatusEnum.ENABLE,
 
-  roleIds: []
 
+  roleIds: [],
 
+  roleType: '0'
 
 })
 
 const formRules = reactive<FormRules>({
 
   name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
 
   username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
 
   nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
 
-  password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
 
+  roleType: [{ required: true, message: '创建用户权限不能为空', trigger: 'blur' }],
 
+  roleType: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
 
   idNumber: [{pattern:/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '你的身份证格式不正确' }],
 
   email: [
 
     {
 
@@ -163,7 +172,6 @@ const idCardBlur = () => {
 
   }
 
 }
 
 
-
 
 // 身份证号正则表达式
 
 const IdNumberRule = /(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0[1-9]|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/
 
 
@@ -210,7 +218,10 @@ const open = async (type: string, id?: number) => {
 
   if (id) {
 
     formLoading.value = true
 
     try {
 
-      formData.value = await UserApi.getUser(id)
 
+      const result = await UserApi.getUser(id)
 
+      formData.value = result
 
+      formData.value.roleType = result.roleType+""
 
+      if(result.sex==0) formData.value.sex = undefined
 
     } finally {
 
       formLoading.value = false
 
     }
 
@@ -271,7 +282,8 @@ const resetForm = () => {
 
     postIds: [],
 
     remark: '',
 
     status: CommonStatusEnum.ENABLE,
 
-    roleIds: []
 
+    roleIds: [],
 
+    roleType: '0'
 
   }
 
   formRef.value?.resetFields()
 
 }

+ 6 - 6
sso-ui/sso-ui-admin-vue3/src/views/system/user/index.vue
Zobrazit soubor 

@@ -168,12 +168,12 @@
 
                       >
 
                         <Icon icon="ep:key" />重置密码
 
                       </el-dropdown-item>
 
-                      <el-dropdown-item
 
-                        command="handleRole"
 
-                        v-if="checkPermi(['system:permission:assign-user-role'])"
 
-                      >
 
-                        <Icon icon="ep:circle-check" />分配角色
 
-                      </el-dropdown-item>
 
+<!--                      <el-dropdown-item-->
 
+<!--                        command="handleRole"-->
 
+<!--                        v-if="checkPermi(['system:permission:assign-user-role'])"-->
 
+<!--                      >-->
 
+<!--                        <Icon icon="ep:circle-check" />分配角色-->
 
+<!--                      </el-dropdown-item>-->
 
                     </el-dropdown-menu>
 
                   </template>
 
                 </el-dropdown>