Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/config/website.js

@@ -11,7 +11,7 @@ export default {
   tenantMode: true, // 是否开启租户模式
   tenantId: '000000', // 管理组租户编号
   captchaMode: false, // 是否开启验证码模式
-  switchMode: false, // 是否开启部门切换模式
+  switchMode: true, // 是否开启部门切换模式
   lockPage: '/lock',
   tokenTime: 3000,
   tokenHeader: 'Blade-Auth',

src/views/system/user.vue

@@ -362,7 +362,7 @@ export default {
                     trigger: 'click',
                   },
                 ],
-                span: 24,
+                // span: 24,
               },
               {
                 label: '登录账号',
@@ -375,32 +375,32 @@ export default {
                   },
                 ],
               },
-              {
-                label: '用户平台',
-                type: 'select',
-                dicUrl: '/blade-system/dict/dictionary?code=user_type',
-                props: {
-                  label: 'dictValue',
-                  value: 'dictKey',
-                },
-                dataType: 'number',
-                slot: true,
-                prop: 'userType',
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择用户平台',
-                    trigger: 'blur',
-                  },
-                ],
-              },
+              // {
+              //   label: '用户平台',
+              //   type: 'select',
+              //   dicUrl: '/blade-system/dict/dictionary?code=user_type',
+              //   props: {
+              //     label: 'dictValue',
+              //     value: 'dictKey',
+              //   },
+              //   dataType: 'number',
+              //   slot: true,
+              //   prop: 'userType',
+              //   rules: [
+              //     {
+              //       required: true,
+              //       message: '请选择用户平台',
+              //       trigger: 'blur',
+              //     },
+              //   ],
+              // },
               {
                 label: '密码',
                 prop: 'password',
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,
-                rules: [{ required: true, validator: validatePass, trigger: 'blur' }],
+                // rules: [{ required: true, validator: validatePass, trigger: 'blur' }],
               },
               {
                 label: '确认密码',
@@ -408,7 +408,7 @@ export default {
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,
-                rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
+                // rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
               },
               {
                 label: '停用时间',