From 1963dbbba143b6960de67c9d08b863dcec36c430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com>
Date: Tue, 28 Apr 2026 18:28:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9B=B8=E5=85=B3=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/auth/index.ts                |  110 ++
 frontend/src/api/user/index.ts                |   19 +-
 .../src/assets/components/shenpibohui.png     |  Bin 0 -> 440 bytes
 .../src/assets/components/shenpitongguo.png   |  Bin 0 -> 431 bytes
 frontend/src/assets/components/审批通过.png   |  Bin 0 -> 553 bytes
 frontend/src/layout/components/AppMain.vue    |    2 +-
 frontend/src/permission.ts                    |    2 +-
 frontend/src/router/index.ts                  |    5 +
 frontend/src/views/login-sjtb/index.vue       |  509 ++++---
 frontend/src/views/register/index.vue         | 1052 ++++++++++----
 frontend/src/views/system/review/index.vue    | 1209 +++++++++++++++++
 frontend/src/views/system/user/index.vue      |  116 +-
 12 files changed, 2514 insertions(+), 510 deletions(-)
 create mode 100644 frontend/src/assets/components/shenpibohui.png
 create mode 100644 frontend/src/assets/components/shenpitongguo.png
 create mode 100644 frontend/src/assets/components/审批通过.png
 create mode 100644 frontend/src/views/system/review/index.vue

diff --git a/frontend/src/api/auth/index.ts b/frontend/src/api/auth/index.ts
index 2a98388..7fddb58 100644
--- a/frontend/src/api/auth/index.ts
+++ b/frontend/src/api/auth/index.ts
@@ -34,3 +34,113 @@ export function getCaptcha(): AxiosPromise<VerifyCode> {
     method: 'get'
   });
 }
+
+/**
+ * 用户注册
+ */
+export function registerUser(data: any): AxiosPromise<any> {
+  return request({
+    url: '/sms/register',
+    method: 'post',
+    data
+  });
+}
+
+/**
+ * 获取流域列表
+ * @param companyId 公司ID(可选),如果传入则根据公司获取流域列表
+ */
+export function getBasinList(): AxiosPromise<any[]> {
+  return request({
+    url: '/env/hbrv/regDropdown',
+    method: 'get',
+    // params: baseid ? { baseid } : {}
+  });
+}
+
+/**
+ * 获取集团列表(无参数,获取全量集团)
+ */
+export function getGroupList(): AxiosPromise<any[]> {
+  return request({
+    url: '/env/hycd/regDropdown',
+    method: 'get',
+    params:{lx:1}
+  });
+}
+
+/**
+ * 根据集团获取公司列表
+ */
+export function getCompanyList(): AxiosPromise<any[]> {
+  return request({
+    url: '/env/hycd/regDropdown',
+    method: 'get',
+    params: { lx:2 }
+  });
+}
+
+/**
+ * 根据流域获取电站列表
+ */
+export function getStationList(params:any): AxiosPromise<any[]> {
+  return request({
+    url: '/env/engInfo/regDropdown',
+    method: 'post',
+    data: params
+  });
+}
+
+/**
+ * 发送短信验证码
+ * @param phone 手机号
+ * @param type 验证码类型：1-注册 2-找回密码
+ */
+export function sendSmsCode(phone: string, type: number = 1): AxiosPromise<any> {
+  return request({
+    url: '/sms/sendCode',
+    method: 'post',
+    data: { phone, type }
+  });
+}
+
+/**
+ * 验证短信验证码
+ * @param phone 手机号
+ * @param code 验证码
+ * @param type 验证码类型：1-注册 2-找回密码
+ */
+export function verifySmsCode(phone: string, code: string, type: number = 1): AxiosPromise<any> {
+  return request({
+    url: '/sms/verifyCode',
+    method: 'post',
+    data: { phone, code, type }
+  });
+}
+
+/**
+ * 短信验证码登录
+ * @param phone 手机号
+ * @param code 验证码
+ */
+export function smsLoginApi(phone: string, code: string): AxiosPromise<TokenResult> {
+  return request({
+    url: '/sms/login',
+    method: 'post',
+    data: { phone, code }
+  });
+}
+
+/**
+ * 重置密码
+ * @param phone 手机号
+ * @param code 验证码
+ * @param password 新密码
+ */
+export function resetPassword(phone: string, code: string, password: string): AxiosPromise<any> {
+  return request({
+    url: '/sms/resetPassword',
+    method: 'post',
+    data: { phone, code, password }
+  });
+}
diff --git a/frontend/src/api/user/index.ts b/frontend/src/api/user/index.ts
index 1a7ab4a..6de151f 100644
--- a/frontend/src/api/user/index.ts
+++ b/frontend/src/api/user/index.ts
@@ -17,6 +17,14 @@ export function gettableData(queryParams:any) {
     params: queryParams
   });
 }
+// 审核用户列表
+export function queryPendingAuditUsers(queryParams:any) {
+  return request({
+    url: '/system/user/queryPendingAuditUsers',
+    method: 'get',
+    params: queryParams
+  });
+}
 //用户-禁用，启用
 export function DataStatus (queryParams:any) {
   return request({
@@ -105,7 +113,7 @@ export function updatePassword (queryParams:any) {
 //获取过鱼设施权限树
 export function getFishtree(queryParams:any) {
   return request({
-    url: '/env/tree/rvcdEng',
+    url: '/env/tree/hbrvEng',
     method: 'get',
     params: queryParams
   });
@@ -127,6 +135,15 @@ export function getuserdata(queryParams:any) {
   });
 }
 
+// 审计用户（审批通过/驳回）
+export function auditUser(data: any) {
+  return request({
+    url: '/system/user/auditUser',
+    method: 'post',
+    data
+  });
+}
+
 /**
  * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
  */
diff --git a/frontend/src/assets/components/shenpibohui.png b/frontend/src/assets/components/shenpibohui.png
new file mode 100644
index 0000000000000000000000000000000000000000..28147e674fd9ac5bb23a7588bb5782b4487a76af
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004hNkl<Zc$|fj
z4OPQH5QOIxkSd@!2oA0aNF4+WP#gpWprE-rsDs1-MM2L2R6+RmlJ=$aZ{EAy&g|Um
zB`;1F;Oj1To$e^rIqlkKx1l`2NdO05)oDR#y{H~jk;AIm7q?<Rz_AiIm|<xscc>K;
zTa7^9)2}3+PILOd)RY7KvioBDW<seez!xOl<D0Sf0i-X;^@s)ZCJ1Rc8MsC01D4%Z
zPBVlk0RM!WVFR@RIRi=tETG0cyoNtGh&2Nwr<X8jYeEXBs2l1x0)qxHB%&1-;4xGL
zc#VKwpx2bbcy!o6K#N{o3&_zMN@29u+fW@a4ltv=&m(%mprva=Mg2j26hgq(wEahn
z5RV}W!0r9l@E|~7Nl3wv0&3jD1AN*Cm_d5tz?}Ui7|_URg+HVK17a(u2Jszw5e%!D
zK4E&gjbkOy$Y|Krf1vi&qeh@VmG~AN4#z+7|5x4vV~MGfQcyC1j5WbsaWH6vlYl)4
i%GolOA#yP44E_Mmzrk6^18c+p0000<MNUMnLSTZy#Jy4g

literal 0
HcmV?d00001

diff --git a/frontend/src/assets/components/shenpitongguo.png b/frontend/src/assets/components/shenpitongguo.png
new file mode 100644
index 0000000000000000000000000000000000000000..de9621cf4fc25afacad816d190765e097f4fc007
GIT binary patch
literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004YNkl<Zc$|%s
z-BH6Z5QJA9xC253m<n(@Fcpx{KuiUM3UC?-=>T_tsK8DII2Di%#CIYO{$<#V=1zOJ
zdm34B8X$WM3rQOVWs*{sp^=l9wDW7%s)L>Z;#Y(P>5ht*)an-t_)KQ(RATZ(9^qIK
z**??+$1kU$)dUz|MiuF|e{@SC?ErCU0Wu~22}}}9yd+P5;ULWQ3#;q7$wPEC?lN8G
zMwkVngz&(S9nnsGkaRYK8mAWu6~rW>IOv1)$e@(~Tn_ha1_6Ux3>tVVY{=sj1N(%=
zp4b4N!q;PieXws{vtQGc&@>VosHN1RfeE$<DtId-6g*r_Orb_%1ARI5tr?W;dzVNt
zq3Fd6gkNa_=njgP*!d)!qSZgp)pQ@y9mEooGx;nK+v)6HJ~>?x4Gfqxgn-FCCaorb
zctOWI=?QU8q`d=7O2P*A;CS=F>BL^-SL8Y3mH49}E{GA1)x%|qHDr=*ScW6Z(_Icv
Z_XDgV#rU|nyp{j}002ovPDHLkV1nt(wvqq<

literal 0
HcmV?d00001

diff --git a/frontend/src/assets/components/审批通过.png b/frontend/src/assets/components/审批通过.png
new file mode 100644
index 0000000000000000000000000000000000000000..53cecf20d5b7d14775072075220f3b14f02ff0a8
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005rNkl<ZcmaG;
zJ4>8V6r6K~5J(r0G%4~2Vv{O_C0|I$FG!I<2)mnv5NwhVA>FQ3NE1*HLDv-@g}t33
zezseQg&-(c*w_jd>+3jkcdvfy>*LOzd*;lX``UmjUpDWLUpBpxP5F4%^z8`FBgfhm
zIeHqrYWja1VcmdHHw?hBENCuHwWz`6chP_=xdT68SR|gVRqaLo*}e;!iz61Lkv6r6
z4YG#67m-)Z@`_c6UFAiHBP!B}PoD6+;SYI`za)o<J4ZI{Pr8C3dE^cE1KyGB?>ogD
z<E?|2T6f3T+gX3m)%MF994OJXx$@Qa8E+gi^ZYe)94vjZ!>)EyUfn?nhK=Nm;*>DP
z+)(3mh8OyQu`@cJk{X=g498-VI7SjN(#(}6czI<~m!so33E*4nomJrqb>_p|Q7xG{
zAK^28Q@x1jp*L{S;-6$7-Egr94gdIbKNx$4wDQOs>>id`Z4){t0}z`S>fH99NL>Gs
zwk>bSKiVF<&2sDIqK+#M7xSLEqb!fSx<ss2?HBmzFG~D=J?W2__6%{V5w1e=#0Da`
zUE^!$nFde$utQ;sXKh3@y(NyiL206viN-|(CHWUyXrJL3x2GL#@mOynfGu&VNh58-
rIRF3v|NjL^4j}*l00v1!K~w_(k)qu1bXpNx00000NkvXXu0mjf>umfm

literal 0
HcmV?d00001

diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue
index f441f08..1be0a29 100644
--- a/frontend/src/layout/components/AppMain.vue
+++ b/frontend/src/layout/components/AppMain.vue
@@ -12,7 +12,7 @@ const routeKey = computed(() => router.path + Math.random());
 
 <template>
   <section class="app-main">
-    <GisView />
+    <!-- <GisView /> -->
     <div class="gi-panels">
       <router-view v-slot="{ Component, route }" :key="routeKey">
         <transition name="router-fade" mode="out-in">
diff --git a/frontend/src/permission.ts b/frontend/src/permission.ts
index 4f9ddba..f18e04e 100644
--- a/frontend/src/permission.ts
+++ b/frontend/src/permission.ts
@@ -9,7 +9,7 @@ NProgress.configure({ showSpinner: false });
 const permissionStore = usePermissionStoreHook();
 
 // 白名单路由
-const whiteList = ['/login']; //login
+const whiteList = ['/login','/register']; //login
 
 // 查找第一个可用路由
 function findFirstAvailableRoute(routes: any[]): string | undefined {
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index eda82d7..b07315d 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -26,6 +26,11 @@ export const constantRoutes: RouteRecordRaw[] = [
     component: () => import('@/views/login-sjtb/index.vue'),
     meta: { hidden: true }
   },
+  {
+    path: '/register',
+    component: () => import('@/views/register/index.vue'),
+    meta: { hidden: true }
+  },
   {
     path: '/404',
     component: () => import('@/views/error-page/404.vue'),
diff --git a/frontend/src/views/login-sjtb/index.vue b/frontend/src/views/login-sjtb/index.vue
index 47c86b9..b4b3235 100644
--- a/frontend/src/views/login-sjtb/index.vue
+++ b/frontend/src/views/login-sjtb/index.vue
@@ -25,14 +25,9 @@
             <!-- <h3 class="forgot-password-title">忘记密码</h3> -->
           </div>
 
-          <a-form
-            :model="forgotPasswordForm"
-            :rules="forgotPasswordRules"
-            layout="vertical"
-            class="form-container"
-          >
+          <a-form :model="forgotPasswordForm" :rules="forgotPasswordRules" layout="vertical" class="form-container">
             <a-form-item label="" name="phone">
-              <a-input placeholder="请输入手机号" size="large">
+              <a-input v-model:value="forgotPasswordForm.phone" placeholder="请输入手机号" size="large">
                 <template #prefix>
                   <MobileOutlined />
                 </template>
@@ -41,23 +36,13 @@
 
             <a-form-item label="" name="captcha">
               <div class="captcha-row">
-                <a-input
-                  v-model="forgotPasswordForm.captcha"
-                  placeholder="请输入验证码"
-                  size="large"
-                  class="captcha-input"
-                >
+                <a-input v-model:value="forgotPasswordForm.captcha" placeholder="请输入验证码" size="large" class="captcha-input">
                   <template #prefix>
                     <LockOutlined />
                   </template>
                   <template #suffix>
-                    <a-button
-                      type="text"
-                      size="small"
-                      @click="sendForgotPasswordSms"
-                      :disabled="smsButtonDisabled"
-                      :loading="loading"
-                    >
+                    <a-button type="text" size="small" @click="sendForgotPasswordSms" :disabled="smsButtonDisabled"
+                      :loading="loading">
                       {{
                         smsCountdown > 0 ? `${smsCountdown}秒后重新获取` : "获取验证码"
                       }}
@@ -68,24 +53,22 @@
             </a-form-item>
 
             <a-form-item label="" name="newPassword">
-              <a-input-password
-                v-model="forgotPasswordForm.newPassword"
-                placeholder="请输入新密码"
-                size="large"
-              >
+              <a-input-password v-model:value="forgotPasswordForm.newPassword" placeholder="请输入新密码" size="large">
                 <template #prefix>
                   <LockOutlined />
                 </template>
               </a-input-password>
             </a-form-item>
 
-            <a-button
-              type="primary"
-              size="large"
-              block
-              @click="handleResetPassword"
-              :loading="loading"
-            >
+            <a-form-item label="" name="confirmPassword">
+              <a-input-password v-model:value="forgotPasswordForm.confirmPassword" placeholder="请再次输入密码" size="large">
+                <template #prefix>
+                  <LockOutlined />
+                </template>
+              </a-input-password>
+            </a-form-item>
+
+            <a-button type="primary" size="large" block @click="handleResetPassword" :loading="loading">
               <span>提交</span>
             </a-button>
           </a-form>
@@ -96,23 +79,12 @@
           <!-- Tabs 切换：账号登录 / 短信登录 -->
           <a-tabs v-model:activeKey="activeTab" class="login-tabs">
             <a-tab-pane key="account" tab="账号登录">
-              <a-form
-                :model="loginData"
-                :rules="loginRules"
-                layout="vertical"
-                class="form-container"
-                @finish="onFinish"
-              >
+              <a-form :model="loginData" :rules="loginRules" layout="vertical" class="form-container"
+                @finish="onFinish">
                 <!-- 用户名/账号/手机号输入框 -->
                 <a-form-item label="" name="username">
-                  <a-input
-                    ref="username"
-                    v-model:value="loginData.username"
-                    clearable
-                    type="text"
-                    placeholder="请输入用户账号/身份证号/手机号"
-                    size="large"
-                  >
+                  <a-input ref="username" v-model:value="loginData.username" clearable type="text"
+                    placeholder="请输入用户账号/身份证号/手机号" size="large">
                     <template #prefix>
                       <UserOutlined />
                     </template>
@@ -121,12 +93,7 @@
 
                 <!-- 密码输入框 -->
                 <a-form-item label="" name="password">
-                  <a-input-password
-                    type="password"
-                    v-model:value="loginData.password"
-                    placeholder="请输入密码"
-                    size="large"
-                  >
+                  <a-input-password type="password" v-model:value="loginData.password" placeholder="请输入密码" size="large">
                     <template #prefix>
                       <LockOutlined />
                     </template>
@@ -136,65 +103,38 @@
                 <a-form-item label="" name="captcha">
                   <div class="captcha-row">
                     <a-row :gutter="24" align="middle">
-                      <a-col :span="10"
-                        ><a-input
-                          v-model:value="loginData.code"
-                          placeholder="请输入验证码"
-                          size="large"
-                          class="captcha-input"
-                      /></a-col>
-                      <a-col :span="10"
-                        ><img :src="codeUrl" alt="验证码" class="captcha-img"
-                      /></a-col>
+                      <a-col :span="10"><a-input v-model:value="loginData.code" placeholder="请输入验证码" size="large"
+                          class="captcha-input" /></a-col>
+                      <a-col :span="10"><img :src="codeUrl" alt="验证码" class="captcha-img" /></a-col>
                       <a-col :span="4"> <a @click="getCode">换一张</a></a-col>
                     </a-row>
                   </div>
                 </a-form-item>
-                <a-button
-                  type="primary"
-                  size="large"
-                  block
-                  htmlType="submit"
-                  :loading="loading"
-                >
+                <a-button type="primary" size="large" block htmlType="submit" :loading="loading">
                   <span>登录</span>
                 </a-button>
-                <!-- <a-button
-                  type="link"
-                  size="mini"
-                  block
-                  @click="showForgotPasswordPage"
-                  :style="{ marginTop: '10px', border: 'none' }"
-                >
-                  忘记密码
-                </a-button> -->
-                <a-button
-                  type="link"
-                  size="mini"
-                  block
-                  :style="{ marginTop: '10px', border: 'none' }"
-                >
-                  注册
-                </a-button>
+                <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
+                  <a-button type="link" size="mini" block @click="showForgotPasswordPage"
+                    :style="{ marginTop: '10px', border: 'none' }">
+                    忘记密码
+                  </a-button>
+                  <a-button type="link" size="mini" block @click="goRegister"
+                    :style="{ marginTop: '10px', border: 'none' }">
+                    注册
+                  </a-button>
+                </div>
+
 
                 <!-- 忘记密码 -->
               </a-form>
             </a-tab-pane>
 
             <!-- 短信登录 Tab (占位) -->
-            <!-- <a-tab-pane key="sms" tab="短信登录">
-              <a-form
-                :model="loginData"
-                :rules="loginRules"
-                layout="vertical"
-                class="form-container"
-              >
+            <a-tab-pane key="sms" tab="短信登录">
+              <a-form :model="loginData" :rules="state.smsLoginRules" layout="vertical" class="form-container"
+                @finish="onSmsLogin">
                 <a-form-item label="" name="username">
-                  <a-input
-                    v-model:value="loginData.username"
-                    placeholder="请输入手机号"
-                    size="large"
-                  >
+                  <a-input v-model:value="loginData.username" placeholder="请输入手机号" size="large">
                     <template #prefix>
                       <MobileOutlined />
                     </template>
@@ -202,23 +142,13 @@
                 </a-form-item>
                 <a-form-item label="" name="captcha">
                   <div class="captcha-row">
-                    <a-input
-                      v-model="loginData.code"
-                      placeholder="请输入验证码"
-                      size="large"
-                      class="captcha-input"
-                    >
+                    <a-input v-model:value="loginData.code" placeholder="请输入验证码" size="large" class="captcha-input">
                       <template #prefix>
                         <LockOutlined />
                       </template>
                       <template #suffix>
-                        <a-button
-                          type="text"
-                          size="small"
-                          @click="sendSms"
-                          :disabled="smsButtonDisabled"
-                          :loading="loading"
-                        >
+                        <a-button type="text" size="small" @click="sendSms" :disabled="smsButtonDisabled"
+                          :loading="loading">
                           {{
                             smsCountdown > 0
                               ? `${smsCountdown}秒后重新获取`
@@ -229,17 +159,21 @@
                     </a-input>
                   </div>
                 </a-form-item>
-                <a-button
-                  type="primary"
-                  size="large"
-                  block
-                  htmlType="submit"
-                  :loading="loading"
-                >
+                <a-button type="primary" size="large" block htmlType="submit" :loading="loading">
                   <span>登录</span>
                 </a-button>
+                <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
+                  <a-button type="link" size="mini" block @click="showForgotPasswordPage"
+                    :style="{ marginTop: '10px', border: 'none' }">
+                    忘记密码
+                  </a-button>
+                  <a-button type="link" size="mini" block @click="goRegister"
+                    :style="{ marginTop: '10px', border: 'none' }">
+                    注册
+                  </a-button>
+                </div>
               </a-form>
-            </a-tab-pane> -->
+            </a-tab-pane>
           </a-tabs>
         </div>
       </div>
@@ -251,7 +185,7 @@
 import { onMounted, reactive, ref, toRefs, watch } from "vue";
 import loginImg from "@/assets/images/logo.png";
 import { UserOutlined, LockOutlined, MobileOutlined } from "@ant-design/icons-vue";
-import { getCaptcha } from "@/api/auth";
+import { getCaptcha, sendSmsCode, smsLoginApi, resetPassword } from "@/api/auth";
 import { message } from "ant-design-vue";
 import { setPath } from "@/utils/auth";
 // 组件依赖
@@ -285,6 +219,7 @@ const forgotPasswordForm = ref({
   phone: "",
   captcha: "",
   newPassword: "",
+  confirmPassword: "",
 });
 // 忘记密码
 const showForgotPassword = ref(false);
@@ -304,6 +239,10 @@ const state = reactive({
     password: [{ required: true, trigger: "blur", message: t("login.rulesPassword") }],
     code: [{ required: true, trigger: "blur", message: "请输入验证码" }],
   },
+  smsLoginRules: {
+    username: [{ required: true, trigger: "blur", message: "请输入手机号" }],
+    code: [{ required: true, trigger: "blur", message: "请输入验证码" }]
+  },
   loginImg: loginImg[0],
   loading: false,
   passwordType: "password",
@@ -325,7 +264,67 @@ const forgotPasswordRules = ref({
   captcha: [{ required: true, message: "验证码不能为空", trigger: "blur" }],
   newPassword: [
     { required: true, message: "新密码不能为空", trigger: "blur" },
-    { min: 6, message: "密码长度不能少于6位", trigger: "blur" },
+    { min: 10, message: "密码长度不能少于10位", trigger: "blur" },
+    { 
+      validator: (rule: any, value: string) => {
+        if (!value) return Promise.resolve();
+        
+        // 检查密码复杂度：至少包含四类字符中的三类
+        const hasUpperCase = /[A-Z]/.test(value);
+        const hasLowerCase = /[a-z]/.test(value);
+        const hasNumber = /\d/.test(value);
+        const hasSpecialChar = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(value);
+        
+        const typeCount = [hasUpperCase, hasLowerCase, hasNumber, hasSpecialChar].filter(Boolean).length;
+        
+        if (typeCount < 3) {
+          return Promise.reject(new Error('密码必须包含大写字母、小写字母、数字、特殊字符中的至少三种'));
+        }
+        
+        // 检查连续重复字符
+        if (/(.)\1{1,}/.test(value)) {
+          return Promise.reject(new Error('密码不能包含连续重复字符'));
+        }
+        
+        // 检查连续递增/递减数字
+        for (let i = 0; i < value.length - 1; i++) {
+          if (/\d/.test(value[i]) && /\d/.test(value[i + 1])) {
+            const diff = value.charCodeAt(i + 1) - value.charCodeAt(i);
+            if (Math.abs(diff) === 1) {
+              return Promise.reject(new Error('密码不能包含连续递增或递减的数字'));
+            }
+          }
+        }
+        
+        // 检查连续递增/递减字母
+        for (let i = 0; i < value.length - 1; i++) {
+          if (/[a-zA-Z]/.test(value[i]) && /[a-zA-Z]/.test(value[i + 1])) {
+            const diff = value.charCodeAt(i + 1) - value.charCodeAt(i);
+            if (Math.abs(diff) === 1) {
+              return Promise.reject(new Error('密码不能包含连续递增或递减的字母'));
+            }
+          }
+        }
+        
+        return Promise.resolve();
+      },
+      trigger: "blur"
+    }
+  ],
+  confirmPassword: [
+    { required: true, message: "请再次输入密码", trigger: "blur" },
+    {
+      validator: (rule: any, value: string) => {
+        if (!value) {
+          return Promise.reject(new Error('请再次输入密码'));
+        }
+        if (value !== forgotPasswordForm.value.newPassword) {
+          return Promise.reject(new Error('两次输入的密码不一致'));
+        }
+        return Promise.resolve();
+      },
+      trigger: "blur"
+    }
   ],
 });
 
@@ -382,6 +381,50 @@ function onFinish() {
     });
 }
 
+/**
+ * 短信验证码登录
+ */
+const onSmsLogin = async () => {
+  // 对短信登录表单进行验证
+  try {
+    // 验证手机号格式
+    const phoneRegex = /^1[3-9]\d{9}$/;
+    if (!loginData.value.username || !phoneRegex.test(loginData.value.username)) {
+      message.error("请输入正确的手机号");
+      return;
+    }
+
+    // 验证验证码
+    if (!loginData.value.code || loginData.value.code.trim() === '') {
+      message.error("请输入验证码");
+      return;
+    }
+    // console.log()
+    // debugger
+    state.loading = true;
+
+    // 调用短信登录接口
+    await smsLoginApi(
+      loginData.value.username,  // 手机号
+      loginData.value.code       // 验证码
+    );
+
+    // 登录成功处理
+    const res: any = setPath("/login-sjtb");
+    if (res.code == 0) {
+      message.success("登录成功");
+
+      // 跳转到首页
+      router.push({ path: "/" });
+    }
+  } catch (error: any) {
+    // console.error("短信登录失败", error);
+    // message.error(error.message || "登录失败，请重试");
+  } finally {
+    state.loading = false;
+  }
+};
+
 watch(
   route,
   () => {
@@ -426,9 +469,9 @@ const startCountdown = () => {
 };
 
 // 显示忘记密码页面
-// const showForgotPasswordPage = () => {
-//   showForgotPassword.value = true;
-// };
+const showForgotPasswordPage = () => {
+  showForgotPassword.value = true;
+};
 //注册用户页面
 const goRegister = () => {
   router.push({ path: "/register" });
@@ -441,49 +484,53 @@ const backToLogin = () => {
     phone: "",
     captcha: "",
     newPassword: "",
+    confirmPassword: "",
   };
 };
 
 // 发送短信验证码
-// const sendSms = async () => {
-//   // 检查手机号是否为空
-//   if (!loginData.value.username) {
-//     message.error("请输入手机号");
-//     return;
-//   }
+const sendSms = async () => {
+  // 检查手机号是否为空
+  if (!loginData.value.username) {
+    message.error("请输入手机号");
+    return;
+  }
 
-//   // 检查手机号格式
-//   const phoneRegex = /^1[3-9]\d{9}$/;
-//   if (!phoneRegex.test(loginData.value.username)) {
-//     message.error("请输入正确的手机号");
-//     return;
-//   }
+  // 检查手机号格式
+  const phoneRegex = /^1[3-9]\d{9}$/;
+  if (!phoneRegex.test(loginData.value.username)) {
+    message.error("请输入正确的手机号");
+    return;
+  }
 
-//   // 如果正在倒计时，不允许重复发送
-//   if (smsCountdown.value > 0) {
-//     return;
-//   }
+  // 如果正在倒计时，不允许重复发送
+  if (smsCountdown.value > 0) {
+    return;
+  }
 
-//   loading.value = true;
-//   smsButtonDisabled.value = true;
+  loading.value = true;
+  smsButtonDisabled.value = true;
 
-//   try {
-//     // 模拟发送短信验证码接口
-//     // await axios.post('/sms/send', { phone: loginForm.value.username })
+  try {
+    // 调用发送短信验证码接口，type默认为1（注册类型）
+    const res: any = await sendSmsCode(loginData.value.username, 3);
+    if (res.code == 1) {
+      message.success(res.msg);
+      return
+    }
+    // 发送成功
+    message.success("验证码发送成功");
 
-//     // 模拟发送成功
-//     message.success("验证码发送成功");
-
-//     // 开始倒计时
-//     startCountdown();
-//   } catch (error) {
-//     console.error("发送验证码失败", error);
-//     message.error("验证码发送失败，请重试");
-//     smsButtonDisabled.value = false;
-//   } finally {
-//     loading.value = false;
-//   }
-// };
+    // 开始倒计时
+    startCountdown();
+  } catch (error) {
+    console.error("发送验证码失败", error);
+    message.error("验证码发送失败，请重试");
+    smsButtonDisabled.value = false;
+  } finally {
+    loading.value = false;
+  }
+};
 // 发送忘记密码短信验证码
 const sendForgotPasswordSms = async () => {
   // 检查手机号是否为空
@@ -508,17 +555,23 @@ const sendForgotPasswordSms = async () => {
   smsButtonDisabled.value = true;
 
   try {
-    // 模拟发送短信验证码接口
-    // await axios.post('/sms/forgot-password', { phone: forgotPasswordForm.value.phone })
-
-    // 模拟发送成功
+    // 调用发送短信验证码接口，type=3表示找回密码类型
+    const res: any = await sendSmsCode(forgotPasswordForm.value.phone, 2);
+    
+    if (res.code == 1) {
+      message.error(res.msg);
+      smsButtonDisabled.value = false;
+      return;
+    }
+    
+    // 发送成功
     message.success("验证码发送成功");
 
     // 开始倒计时
     startCountdown();
-  } catch (error) {
-    console.error("发送验证码失败", error);
-    message.error("验证码发送失败，请重试");
+  } catch (error: any) {
+    // console.error("发送验证码失败", error);
+    // message.error(error.message || "验证码发送失败，请重试");
     smsButtonDisabled.value = false;
   } finally {
     loading.value = false;
@@ -526,23 +579,111 @@ const sendForgotPasswordSms = async () => {
 };
 // 处理密码重置
 const handleResetPassword = async () => {
-  loading.value = true;
+  // 先进行表单验证
   try {
-    // 2. 模拟接口请求 (实际替换为真实重置密码接口)
-    // await axios.post('/user/reset-password', {
-    //   phone: forgotPasswordForm.value.phone,
-    //   captcha: forgotPasswordForm.value.captcha,
-    //   newPassword: forgotPasswordForm.value.newPassword
-    // })
-
-    // 3. 模拟重置成功
-    message.success("密码重置成功");
-
-    // 4. 返回登录页面
-    backToLogin();
+    // 手动验证各个字段
+    const phoneRegex = /^1[3-9]\d{9}$/;
+    if (!forgotPasswordForm.value.phone || !phoneRegex.test(forgotPasswordForm.value.phone)) {
+      message.error("请输入正确的手机号");
+      return;
+    }
+    
+    if (!forgotPasswordForm.value.captcha) {
+      message.error("请输入验证码");
+      return;
+    }
+    
+    if (!forgotPasswordForm.value.newPassword) {
+      message.error("请输入新密码");
+      return;
+    }
+    
+    // 验证确认密码
+    if (!forgotPasswordForm.value.confirmPassword) {
+      message.error("请再次输入密码");
+      return;
+    }
+    
+    // 验证两次密码是否一致
+    if (forgotPasswordForm.value.newPassword !== forgotPasswordForm.value.confirmPassword) {
+      message.error("两次输入的密码不一致");
+      return;
+    }
+    
+    // 密码复杂度校验
+    const password = forgotPasswordForm.value.newPassword;
+    if (password.length < 10) {
+      message.error("密码长度不能少于10位");
+      return;
+    }
+    
+    const hasUpperCase = /[A-Z]/.test(password);
+    const hasLowerCase = /[a-z]/.test(password);
+    const hasNumber = /\d/.test(password);
+    const hasSpecialChar = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password);
+    
+    const typeCount = [hasUpperCase, hasLowerCase, hasNumber, hasSpecialChar].filter(Boolean).length;
+    if (typeCount < 3) {
+      message.error('密码必须包含大写字母、小写字母、数字、特殊字符中的至少三种');
+      return;
+    }
+    
+    // 检查连续重复字符
+    if (/(.)\1{1,}/.test(password)) {
+      message.error('密码不能包含连续重复字符');
+      return;
+    }
+    
+    // 检查连续递增/递减数字
+    for (let i = 0; i < password.length - 1; i++) {
+      if (/\d/.test(password[i]) && /\d/.test(password[i + 1])) {
+        const diff = password.charCodeAt(i + 1) - password.charCodeAt(i);
+        if (Math.abs(diff) === 1) {
+          message.error('密码不能包含连续递增或递减的数字');
+          return;
+        }
+      }
+    }
+    
+    // 检查连续递增/递减字母
+    for (let i = 0; i < password.length - 1; i++) {
+      if (/[a-zA-Z]/.test(password[i]) && /[a-zA-Z]/.test(password[i + 1])) {
+        const diff = password.charCodeAt(i + 1) - password.charCodeAt(i);
+        if (Math.abs(diff) === 1) {
+          message.error('密码不能包含连续递增或递减的字母');
+          return;
+        }
+      }
+    }
+    
   } catch (error) {
-    console.error("密码重置失败", error);
-    message.error("密码重置失败，请重试");
+    console.error("表单验证失败", error);
+    return;
+  }
+  
+  loading.value = true;
+  
+  try {
+    // 对密码进行 RSA 加密
+    const encryptedPassword = encrypt(forgotPasswordForm.value.newPassword);
+    
+    // 调用重置密码接口，使用加密后的密码
+    const res: any = await resetPassword(
+      forgotPasswordForm.value.phone,
+      forgotPasswordForm.value.captcha,
+      encryptedPassword
+    );
+    
+    if (res.code == 0 ) {
+      message.success("密码重置成功");
+      // 返回登录页面
+      backToLogin();
+    } else {
+      message.error(res.msg || "密码重置失败");
+    }
+  } catch (error: any) {
+    // console.error("密码重置失败", error);
+    // message.error(error.message || "密码重置失败，请重试");
   } finally {
     loading.value = false;
   }
@@ -632,7 +773,7 @@ onMounted(() => {
     left: 74%;
     top: 30%;
     width: 20%;
-    max-height: 402px;
+    max-height: 420px;
     max-width: 400px;
     min-height: 362px;
     border-radius: 3px;
@@ -647,10 +788,12 @@ onMounted(() => {
   /* 验证码布局 */
   .captcha-row {
     display: flex;
+
     .ant-row {
       display: flex;
       align-items: start;
     }
+
     /* gap: 12px;
     align-items: center; */
 
@@ -717,4 +860,4 @@ onMounted(() => {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/frontend/src/views/register/index.vue b/frontend/src/views/register/index.vue
index 612f417..910f9d3 100644
--- a/frontend/src/views/register/index.vue
+++ b/frontend/src/views/register/index.vue
@@ -1,326 +1,828 @@
 <template>
-  <div class="register-container">
-    <div class="register-wrapper">
-      <!-- 左侧：背景图区域 -->
-      <div class="left-section">
-        <div class="slogan">
-          <p>{{ $t("login.titleSjtb") }}</p>
+    <div class="register-container">
+        <div class="register-wrapper">
+            <!-- 左侧：背景图区域 -->
+            <div class="left-section">
+                <div class="slogan">
+                    <p>{{ $t("login.titleSjtb") }}</p>
+                </div>
+            </div>
+
+            <!-- 右侧：注册表单区域 -->
+            <div class="right-section">
+                <a-tabs v-model:activeKey="activeTab" class="register-tabs">
+                    <a-tab-pane key="register" tab="用户注册">
+                        <a-form :model="registerData" :rules="registerRules" layout="horizontal"
+                            :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" class="form-container"
+                            @finish="handleFormFinish">
+                            <!-- 账号信息 -->
+                            <div class="form-section">
+                                <div class="section-title">账号信息</div>
+
+                                <!-- 账号 -->
+                                <a-form-item name="username" label="账&nbsp;&nbsp;号">
+                                    <a-input v-model:value="registerData.username" placeholder="请输入登录账号（4-20个字符）" />
+                                </a-form-item>
+
+                                <!-- 密码 -->
+                                <a-form-item name="password" label="密&nbsp;&nbsp;码">
+                                    <a-input-password v-model:value="registerData.password"
+                                        placeholder="请设置密码（6-20个字符）" />
+                                </a-form-item>
+
+                                <!-- 确认密码 -->
+                                <a-form-item name="confirmPassword" label="确认密码">
+                                    <a-input-password v-model:value="registerData.confirmPassword"
+                                        placeholder="请再次输入密码" />
+                                </a-form-item>
+                            </div>
+
+                            <!-- 个人信息 -->
+                            <div class="form-section">
+                                <div class="section-title">个人信息</div>
+
+                                <!-- 真实姓名 -->
+                                <a-form-item name="realName" label="真实姓名">
+                                    <a-input v-model:value="registerData.realName" placeholder="请输入真实姓名" />
+                                </a-form-item>
+
+                                <!-- 所属单位 -->
+                                <a-form-item name="belongingUnit" label="所属单位">
+                                    <a-input v-model:value="registerData.belongingUnit" placeholder="请输入所属单位（选填）" />
+                                </a-form-item>
+
+                                <!-- 手机号 -->
+                                <a-form-item name="phone" label="手 机 号">
+                                    <a-row :gutter="8">
+                                        <a-col :span="16">
+                                            <a-input v-model:value="registerData.phone" placeholder="请输入11位手机号" />
+                                        </a-col>
+                                        <a-col :span="8">
+                                            <a-button type="primary" :disabled="smsCountdown > 0" @click="handleSendSms"
+                                                style="width: 100%">
+                                                {{ smsCountdown > 0 ? `${smsCountdown}s` : '获取验证码' }}
+                                            </a-button>
+                                        </a-col>
+                                    </a-row>
+                                </a-form-item>
+
+                                <!-- 短信验证码 -->
+                                <a-form-item name="smsCode" label="验证码">
+                                    <a-input v-model:value="registerData.smsCode" placeholder="请输入短信验证码" />
+                                </a-form-item>
+                            </div>
+
+                            <!-- 注册按钮 -->
+                            <a-form-item style="display: flex;align-items: center;justify-content: center;width: 100%;">
+                                <a-button type="primary" size="large" block htmlType="submit" :loading="loading"
+                                    style="margin-left: 20px;">
+                                    <span>立即注册</span>
+                                </a-button>
+                            </a-form-item>
+
+                            <!-- 返回登录 -->
+                            <a-form-item style="display: flex;align-items: center;justify-content: center;width: 100%;">
+
+                                <a-button type="link" size="small" block @click="backToLogin"
+                                    style="margin-left: 20px;">
+                                    已有账号？返回登录
+                                </a-button>
+
+
+                            </a-form-item>
+                        </a-form>
+                    </a-tab-pane>
+                </a-tabs>
+
+                <!-- 注册确认弹框 -->
+                <a-modal v-model:open="modalVisible" title="选择所属组织" width="600px" :confirm-loading="loading"
+                    @ok="onRegister" @cancel="handleModalCancel">
+                    <a-form :model="organizationData" :rules="organizationRules" layout="horizontal"
+                        ref="organizationFormRef" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
+
+                        <!-- 集团（单选，字符串） -->
+                        <a-form-item name="groupCode" label="集  团">
+                            <a-select v-model:value="organizationData.groupCode" placeholder="请选择集团" style="width: 100%"
+                                show-search :filter-option="filterOption">
+                                <a-select-option v-for="item in groupList" :key="item.hycd" :value="item.hycd" :label="item.hynm">
+                                    {{ item.hynm }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+
+                        <!-- 公司（单选，字符串） -->
+                        <a-form-item name="companyCode" label="公  司">
+                            <a-select v-model:value="organizationData.companyCode" placeholder="请选择公司"
+                                style="width: 100%" show-search :filter-option="filterOption" allow-clear>
+                                <a-select-option v-for="item in companyList" :key="item.hycd" :value="item.hycd"
+                                    :label="item.hynm">
+                                    {{ item.hynm }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+
+                        <!-- 流域（多选，数组，必填） -->
+                        <a-form-item name="rvcdCode" label="流  域" required>
+                            <a-select v-model:value="organizationData.rvcdCode" mode="multiple" placeholder="请选择流域"
+                                style="width: 100%" show-search :filter-option="filterOption" @change="onRvcdChange">
+                                <a-select-option v-for="item in basinList" :key="item.hbrvcd" :value="item.hbrvcd"
+                                    :label="item.hbrvnm">
+                                    {{ item.hbrvnm }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+
+                        <!-- 电站（多选，数组，必填，依赖流域） -->
+                        <a-form-item name="stationCode" label="电  站" required>
+                            <a-select v-model:value="organizationData.stationCode" mode="multiple" placeholder="请先选择流域"
+                                :disabled="organizationData.rvcdCode.length === 0" style="width: 100%" show-search
+                                :filter-option="filterOption">
+                                <a-select-option v-for="item in stationList" :key="item.stcd" :value="item.stcd"
+                                    :label="item.ennm">
+                                    {{ item.ennm }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-form>
+                </a-modal>
+            </div>
         </div>
-      </div>
-
-      <!-- 右侧：注册表单区域 -->
-      <div class="right-section">
-        <a-tabs v-model:activeKey="activeTab" class="register-tabs">
-          <a-tab-pane key="register" tab="用户注册">
-            <a-form
-              :model="registerData"
-              :rules="registerRules"
-              layout="vertical"
-              class="form-container"
-              @finish="onRegister"
-            >
-              <!-- 登录账号 -->
-              <a-form-item name="username" label="登录账号">
-                <a-input 
-                  v-model:value="registerData.username" 
-                  placeholder="请输入登录账号（4-20个字符）"
-                  :prefix="h(UserOutlined)"
-                />
-              </a-form-item>
-
-              <!-- 真实姓名 -->
-              <a-form-item name="realName" label="真实姓名">
-                <a-input 
-                  v-model:value="registerData.realName" 
-                  placeholder="请输入真实姓名"
-                />
-              </a-form-item>
-
-              <!-- 手机号 -->
-              <a-form-item name="phone" label="手机号">
-                <a-input 
-                  v-model:value="registerData.phone" 
-                  placeholder="请输入11位手机号"
-                  :prefix="h(MobileOutlined)"
-                />
-              </a-form-item>
-
-              <!-- 密码 -->
-              <a-form-item name="password" label="密码">
-                <a-input-password 
-                  v-model:value="registerData.password" 
-                  placeholder="请设置密码（6-20个字符）"
-                  :prefix="h(LockOutlined)"
-                />
-              </a-form-item>
-
-              <!-- 确认密码 -->
-              <a-form-item name="confirmPassword" label="确认密码">
-                <a-input-password 
-                  v-model:value="registerData.confirmPassword" 
-                  placeholder="请再次输入密码"
-                  :prefix="h(LockOutlined)"
-                />
-              </a-form-item>
-
-              <!-- 验证码 -->
-              <a-form-item name="code" label="验证码">
-                <a-row :gutter="8">
-                  <a-col :span="16">
-                    <a-input 
-                      v-model:value="registerData.code" 
-                      placeholder="请输入验证码"
-                    />
-                  </a-col>
-                  <a-col :span="8">
-                    <img 
-                      v-if="captchaImg"
-                      :src="captchaImg" 
-                      @click="refreshCaptcha" 
-                      style="cursor: pointer; width: 100%; height: 36px;"
-                    />
-                  </a-col>
-                </a-row>
-              </a-form-item>
-
-              <!-- 注册按钮 -->
-              <a-button
-                type="primary"
-                size="large"
-                block
-                htmlType="submit"
-                :loading="loading"
-              >
-                <span>立即注册</span>
-              </a-button>
-
-              <!-- 返回登录 -->
-              <a-button
-                type="link"
-                size="small"
-                block
-                @click="backToLogin"
-                :style="{ marginTop: '10px' }"
-              >
-                已有账号？返回登录
-              </a-button>
-            </a-form>
-          </a-tab-pane>
-        </a-tabs>
-      </div>
     </div>
-  </div>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, onMounted, h } from "vue";
-import { UserOutlined, LockOutlined, MobileOutlined } from "@ant-design/icons-vue";
-import { getCaptcha, 
-  // registerUser
- } from "@/api/auth";
+import { reactive, ref, onMounted, onUnmounted } from "vue";
+import {
+    getBasinList,
+    getGroupList,
+    getCompanyList,
+    getStationList,
+    sendSmsCode,
+    verifySmsCode,
+    registerUser
+} from "@/api/auth";
 import { message } from "ant-design-vue";
 import router from "@/router";
 import { encrypt } from "@/utils/rsaEncrypt";
 
 // 注册表单数据
 const registerData = reactive({
-  // 必填字段
-  username: "",
-  realName: "",
-  phone: "",
-  password: "",
-  confirmPassword: "",
-  code: "",
-  uuid: "",
-  
-  // 系统字段
-  userType: 1,
-  status: 1,
-  regStatus: 0
+
+    // 用户信息
+    username: "",
+    password: "",
+    confirmPassword: "",
+    realName: "",
+    belongingUnit: "",
+    phone: "",
+    smsCode: "",
 });
 
+// 下拉选项数据
+const basinList = ref<any[]>([]);
+const groupList = ref<any[]>([]);
+const companyList = ref<any[]>([]);
+const stationList = ref<any[]>([]);
+
+// 短信验证码倒计时
+const smsCountdown = ref(0);
+let smsTimer: any = null;
+
+// ==================== 组织表单数据 ====================
+const organizationData = reactive({
+    groupCode: '',        // 集团（单选，字符串）
+    companyCode: '',      // 公司（单选，字符串）
+    rvcdCode: [],         // 流域（多选，数组）
+    stationCode: []       // 电站（多选，数组）
+});
+
+// 组织表单引用
+const organizationFormRef = ref();
+
+// ==================== 组织表单验证规则 ====================
+const organizationRules = {
+    rvcdCode: [
+        {
+            validator: (rule: any, value: any[]) => {
+                if (!value || value.length === 0) {
+                    return Promise.reject("请至少选择一个流域");
+                }
+                return Promise.resolve();
+            },
+            trigger: "change"
+        }
+    ],
+    stationCode: [
+        {
+            validator: (rule: any, value: any[]) => {
+                if (!value || value.length === 0) {
+                    return Promise.reject("请至少选择一个电站");
+                }
+                return Promise.resolve();
+            },
+            trigger: "change"
+        }
+    ]
+};
+
 // 表单验证规则
 const registerRules = {
-  // 登录账号
-  username: [
-    { required: true, message: "请输入登录账号", trigger: "blur" },
-    { min: 4, max: 20, message: "账号长度4-20个字符", trigger: "blur" },
-    { pattern: /^[a-zA-Z0-9_]+$/, message: "只能包含字母、数字和下划线", trigger: "blur" }
-  ],
-  
-  // 真实姓名
-  realName: [
-    { required: true, message: "请输入真实姓名", trigger: "blur" },
-    { min: 2, max: 20, message: "姓名长度2-20个字符", trigger: "blur" }
-  ],
-  
-  // 手机号
-  phone: [
-    { required: true, message: "请输入手机号", trigger: "blur" },
-    { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的11位手机号", trigger: "blur" }
-  ],
-  
-  // 密码
-  password: [
-    { required: true, message: "请输入密码", trigger: "blur" },
-    { min: 6, max: 20, message: "密码长度6-20个字符", trigger: "blur" }
-  ],
-  
-  // 确认密码
-  confirmPassword: [
-    { required: true, message: "请再次输入密码", trigger: "blur" },
-    {
-      validator: (rule: any, value: string) => {
-        if (value && value !== registerData.password) {
-          return Promise.reject("两次输入的密码不一致");
+    // 登录账号
+    username: [
+        { required: true, message: "请输入登录账号", trigger: "blur" },
+        { min: 4, max: 20, message: "账号长度4-20个字符", trigger: "blur" },
+        { pattern: /^[a-zA-Z0-9_]+$/, message: "只能包含字母、数字和下划线", trigger: "blur" }
+    ],
+
+    // 密码
+    password: [
+        { required: true, message: "请输入密码", trigger: "blur" },
+        {
+            validator: (rule: any, value: string) => {
+                if (!value) {
+                    return Promise.reject("请输入密码");
+                }
+
+                // 1. 长度检查：不低于10位
+                if (value.length < 10) {
+                    return Promise.reject("密码长度不能少于10位");
+                }
+
+                // 2. 复杂度检查：四类字符中至少包含三类
+                const hasUpperCase = /[A-Z]/.test(value);
+                const hasLowerCase = /[a-z]/.test(value);
+                const hasNumber = /[0-9]/.test(value);
+                const hasSpecial = /[^a-zA-Z0-9]/.test(value);
+                const typeCount = [hasUpperCase, hasLowerCase, hasNumber, hasSpecial].filter(Boolean).length;
+
+                if (typeCount < 3) {
+                    return Promise.reject("密码必须包含大写字母、小写字母、数字、特殊字符中的至少三类");
+                }
+
+                // 3. 禁止连续重复序列检查
+                // 3.1 检查是否有2位及以上相同字符重复
+                for (let i = 0; i <= value.length - 2; i++) {
+                    if (value[i] === value[i + 1]) {
+                        return Promise.reject("密码不能包含2位及以上相同字符的连续重复（如11、aa）");
+                    }
+                }
+
+                // 3.2 检查是否有2位及以上连续递增/递减的数字
+                for (let i = 0; i <= value.length - 2; i++) {
+                    const char1 = value.charCodeAt(i);
+                    const char2 = value.charCodeAt(i + 1);
+
+                    // 检查是否都是数字
+                    if (/\d/.test(value[i]) && /\d/.test(value[i + 1])) {
+                        // 检查递增或递减
+                        if (Math.abs(char2 - char1) === 1) {
+                            return Promise.reject("密码不能包含2位及以上连续递增或递减的数字（如12、21）");
+                        }
+                    }
+                }
+
+                // 3.3 检查是否有2位及以上连续递增/递减的字母
+                for (let i = 0; i <= value.length - 2; i++) {
+                    const char1 = value.charCodeAt(i);
+                    const char2 = value.charCodeAt(i + 1);
+
+                    // 检查是否都是字母
+                    if (/[a-zA-Z]/.test(value[i]) && /[a-zA-Z]/.test(value[i + 1])) {
+                        // 检查递增或递减
+                        if (Math.abs(char2 - char1) === 1) {
+                            return Promise.reject("密码不能包含2位及以上连续递增或递减的字母（如ab、ba）");
+                        }
+                    }
+                }
+
+                // 4. 用户名关联检查（严格模式，忽略大小写）
+                const username = registerData.username.toLowerCase();
+                const passwordLower = value.toLowerCase();
+
+                // 4.1 检查密码是否完整包含用户名
+                if (passwordLower.includes(username)) {
+                    return Promise.reject("密码不能包含用户名");
+                }
+
+                // 4.2 提取密码中的字母部分
+                const passwordLetters = passwordLower.replace(/[^a-z]/g, '');
+
+                // 4.3 如果密码字母部分长度 >= 3，检查是否是用户名的子串
+                if (passwordLetters.length >= 3 && username.includes(passwordLetters)) {
+                    return Promise.reject("密码的字母部分不能是用户名的子串");
+                }
+
+                // 4.4 检查用户名中是否包含密码的任意连续3位字母
+                for (let i = 0; i <= passwordLetters.length - 3; i++) {
+                    const substring = passwordLetters.substring(i, i + 3);
+                    if (username.includes(substring)) {
+                        return Promise.reject("密码不能与用户名存在明显关联");
+                    }
+                }
+
+                return Promise.resolve();
+            },
+            trigger: "blur"
         }
-        return Promise.resolve();
-      },
-      trigger: "blur"
-    }
-  ],
-  
-  // 验证码
-  code: [
-    { required: true, message: "请输入验证码", trigger: "blur" }
-  ]
+    ],
+
+    // 确认密码
+    confirmPassword: [
+        { required: true, message: "请再次输入密码", trigger: "blur" },
+        {
+            validator: (rule: any, value: string) => {
+                if (value && value !== registerData.password) {
+                    return Promise.reject("两次输入的密码不一致");
+                }
+                return Promise.resolve();
+            },
+            trigger: "blur"
+        }
+    ],
+
+    // 真实姓名
+    realName: [
+        { required: true, message: "请输入真实姓名", trigger: "blur" },
+        { min: 2, max: 20, message: "姓名长度2-20个字符", trigger: "blur" }
+    ],
+
+    // 所属单位（选填，无验证规则）
+
+    // 手机号
+    phone: [
+        { required: true, message: "请输入手机号", trigger: "blur" },
+        { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的11位手机号", trigger: "blur" }
+    ],
+
+    // 短信验证码
+    smsCode: [
+        { required: true, message: "请输入短信验证码", trigger: "blur" },
+        { len: 6, message: "验证码为6位数字", trigger: "blur" }
+    ]
 };
 
 const loading = ref(false);
-const captchaImg = ref("");
 const activeTab = ref("register");
+const modalVisible = ref(false);
 
-// 获取验证码
-const refreshCaptcha = async () => {
-  try {
-    const res = await getCaptcha();
-    registerData.uuid = res.data.verifyCodeKey;
-    captchaImg.value = res.data.verifyCodeImg; // base64图片
-  } catch (error) {
-    message.error("获取验证码失败");
-  }
+// 初始化加载集团列表
+const loadGroupList = async () => {
+    try {
+        const res = await getGroupList();
+        groupList.value = res.data || [];
+    } catch (error) {
+        console.error("加载集团列表失败", error);
+    }
+};
+
+// 集团变化
+const onGroupChange = async () => {
+    // 加载公司列表
+    // if (value) {
+    try {
+        const res = await getCompanyList();
+        companyList.value = res.data || [];
+    } catch (error) {
+        message.error("加载公司列表失败");
+    }
+    // }
+};
+
+// 公司变化
+const onCompanyChange = async () => {
+    // 加载流域列表
+    // if (value) {
+    try {
+        const res = await getBasinList();
+        basinList.value = res.data || [];
+    } catch (error) {
+        message.error("加载流域列表失败");
+    }
+    // }
+};
+
+// 流域变化
+const onBasinChange = async (ids: any) => {
+    // 加载电站列表
+    // if (value) {
+    try {
+        const res = await getStationList(ids);
+        stationList.value = res.data || [];
+    } catch (error) {
+        message.error("加载电站列表失败");
+    }
+    // }
+};
+
+// ==================== 流域变化处理（弹框内） ====================
+const onRvcdChange = () => {
+    // 清空电站选择
+    organizationData.stationCode = [];
+    // 获取当前选中的所有流域ID，加载对应的电站列表
+    if (organizationData.rvcdCode && organizationData.rvcdCode.length > 0) {
+        onBasinChange({ hbrvcds: organizationData.rvcdCode });
+    } else {
+        // 如果没有选择流域，清空电站列表
+        stationList.value = [];
+    }
+};
+
+// 发送短信验证码
+const handleSendSms = async () => {
+    // 验证手机号格式
+    if (!/^1[3-9]\d{9}$/.test(registerData.phone)) {
+        message.error("请输入正确的手机号");
+        return;
+    }
+
+    try {
+        await sendSmsCode(registerData.phone, 1); // type=1 表示注册
+        message.success("验证码已发送");
+
+        // 启动60秒倒计时
+        smsCountdown.value = 60;
+        smsTimer = setInterval(() => {
+            smsCountdown.value--;
+            if (smsCountdown.value <= 0) {
+                clearInterval(smsTimer);
+                smsTimer = null;
+            }
+        }, 1000);
+    } catch (error: any) {
+        message.error(error.message || "发送失败，请重试");
+    }
+};
+
+// 表单验证通过后的处理
+const handleFormFinish = async () => {
+    // 第一步：验证短信验证码
+    // const res: any = await verifySmsCode(registerData.phone, registerData.smsCode, 1);
+    // if (res.code == 1) {
+    //     message.error('短信验证码错误，请重试')
+    //     return
+    // }
+    // 打开确认弹框
+    modalVisible.value = true;
+};
+
+// 弹框取消
+const handleModalCancel = () => {
+    // 关闭弹框，不做任何操作
+    modalVisible.value = false;
+    // 重置组织表单数据
+    organizationData.groupCode = '';
+    organizationData.companyCode = '';
+    organizationData.rvcdCode = [];
+    organizationData.stationCode = [];
+    // 清除表单验证状态
+    organizationFormRef.value?.clearValidate();
 };
 
 // 注册提交
 const onRegister = async () => {
-  loading.value = true;
-  
-  try {
-    // 密码加密
-    const encryptedPassword = encrypt(registerData.password);
-    
-    // 构造注册数据
-    const registerParams = {
-      username: registerData.username,
-      realName: registerData.realName,
-      phone: registerData.phone,
-      password: encryptedPassword,
-      
-      // 系统字段
-      userType: 1,
-      status: 1,
-      regStatus: 0,
-      
-      // 验证码相关
-      code: registerData.code,
-      uuid: registerData.uuid
-    };
-    
-    // 调用注册接口
-    // await registerUser(registerParams);
-    
-    message.success("注册成功，等待管理员审核");
-    
-    // 延迟跳转到登录页
-    setTimeout(() => {
-      router.push({ path: "/login" });
-    }, 1500);
-    
-  } catch (error: any) {
-    message.error(error.message || "注册失败，请重试");
-    // 刷新验证码
-    refreshCaptcha();
-  } finally {
-    loading.value = false;
-  }
+    // 先验证组织表单
+    try {
+        await organizationFormRef.value.validate();
+    } catch (error) {
+        message.error("请完善组织信息");
+        return; // 验证失败，阻止提交
+    }
+
+    loading.value = true;
+
+    try {
+
+        // 第二步：密码加密
+        const encryptedPassword = encrypt(registerData.password);
+
+        // 第三步：构造注册数据（包含组织信息）
+        const registerParams: any = {
+            type: 1,                                    // 固定值：注册类型
+            phone: registerData.phone,                  // 手机号（必填）
+            code: registerData.smsCode,                 // 短信验证码（必填，字段改名）
+            username: registerData.username,            // 用户名（必填）
+            password: encryptedPassword,                // 加密后的密码（必填）
+            realName: registerData.realName,            // 真实姓名（必填）
+        };
+
+        // 可选字段：所属单位（如果有值才传）
+        if (registerData.belongingUnit) {
+            registerParams.belongingUnit = registerData.belongingUnit;
+        }
+
+        // 可选字段：集团（如果有值才传）
+        if (organizationData.groupCode) {
+            registerParams.groupCode = organizationData.groupCode;
+        }
+
+        // 可选字段：公司（如果有值才传）
+        if (organizationData.companyCode) {
+            registerParams.companyCode = organizationData.companyCode;
+        }
+
+        // 可选字段：流域（如果有值才传，数组转逗号分隔字符串）
+        if (organizationData.rvcdCode && organizationData.rvcdCode.length > 0) {
+            registerParams.rvcdCode = organizationData.rvcdCode.join(',');
+        }
+
+        // 可选字段：电站（如果有值才传，数组转逗号分隔字符串）
+        if (organizationData.stationCode && organizationData.stationCode.length > 0) {
+            registerParams.stationCode = organizationData.stationCode.join(',');
+        }
+
+        // 第四步：调用注册接口
+        const res1: any = await registerUser(registerParams);
+        if (res1.code == 1) {
+            message.error('注册失败，请重试')
+            return
+        }
+
+        message.success("注册成功，等待管理员审核");
+
+        // 关闭弹框
+        modalVisible.value = false;
+
+        // 延迟跳转到登录页
+        setTimeout(() => {
+            router.push({ path: "/login-sjtb" });
+        }, 1500);
+
+    } catch (error: any) {
+        // 区分验证码错误和注册错误
+        // if (error.message && error.message.includes('验证码')) {
+        //     message.error("验证码错误，请重试");
+        // } else {
+        //     message.error(error.message || "注册失败，请重试");
+        // }
+    } finally {
+        loading.value = false;
+    }
 };
 
 // 返回登录
 const backToLogin = () => {
-  router.push({ path: "/login" });
+    router.push({ path: "/login-sjtb" });
 };
 
-// 初始化
+// 组件挂载时加载集团列表
 onMounted(() => {
-  refreshCaptcha();
+    loadGroupList()
+    onGroupChange()
+    onCompanyChange()
+
 });
+
+// 组件卸载时清除定时器
+onUnmounted(() => {
+    if (smsTimer) {
+        clearInterval(smsTimer);
+        smsTimer = null;
+    }
+});
+const filterOption = (inputValue: string, option: any) => {
+    if (!option.label) return false;
+    return option.label.indexOf(inputValue) !== -1;
+};
 </script>
 
 <style scoped lang="scss">
 .register-container {
-  margin: 0 auto;
-  position: relative;
-  width: 100%;
-  height: 100%;
-  min-width: 1500px;
-  background-color: #fff;
-
-  .register-wrapper {
+    margin: 0 auto;
     position: relative;
     width: 100%;
     height: 100%;
-    min-height: 600px;
-    background: url("@/assets/images/bg_sjtb.png");
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-  }
-
-  // 左侧背景区域
-  .left-section {
-    .slogan {
-      position: absolute;
-      top: 20%;
-      left: 18%;
-      width: 700px;
-      height: 112px;
-      color: #040504;
-      font-size: 40px;
-    }
-  }
-
-  // 右侧注册卡片区域
-  .right-section {
-    position: absolute;
-    left: 70%;
-    top: 15%;
-    width: 25%;
-    // max-height: 650px;
-    // max-width: 400px;
-    min-height: 650px;
-    border-radius: 3px;
-    padding: 20px 24px 24px;
+    min-width: 1200px; // 降低最小宽度要求
     background-color: #fff;
-    overflow-y: auto;
 
-    :deep(.ant-form-item) {
-      margin-bottom: 14px;
+    .register-wrapper {
+        position: relative;
+        width: 100%;
+        height: 100%;
+        min-height: 600px;
+        background: url("@/assets/images/bg_sjtb.png");
+        background-repeat: no-repeat;
+        background-size: cover; // 改为cover以更好地适配不同尺寸
+        background-position: center; // 居中显示背景图
     }
 
-    :deep(.ant-form-item-label > label) {
-      font-size: 13px;
+    // 左侧背景区域
+    .left-section {
+        .slogan {
+            position: absolute;
+            top: 20%;
+            left: 5%; // 减小左边距，更靠左
+            width: 40vw; // 使用视口宽度百分比
+            max-width: 700px; // 保持最大宽度限制
+            min-width: 300px; // 设置最小宽度
+            color: #040504;
+            font-size: clamp(24px, 3vw, 40px); // 响应式字体大小
+            line-height: 1.5;
+            
+            p {
+                margin: 0;
+                word-wrap: break-word; // 允许长文本换行
+            }
+        }
     }
 
+    // 右侧注册卡片区域
+    .right-section {
+        position: absolute;
+        right: 5%; // 改用right定位，更合理
+        top: 50%; // 垂直居中
+        transform: translateY(-50%); // 垂直居中对齐
+        width: clamp(380px, 30vw, 500px); // 响应式宽度
+        min-height: 600px; // 降低最小高度
+        max-height: 90vh; // 限制最大高度为视口的90%
+        border-radius: 8px; // 稍微增大圆角
+        padding: clamp(15px, 2vw, 24px) clamp(15px, 2vw, 24px); // 响应式内边距
+        background-color: rgba(255, 255, 255, 0.98); // 轻微透明效果
+        overflow-y: auto;
+        box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1); // 添加阴影提升层次感
 
-    :deep(.ant-input-prefix) {
-      display: flex;
-      width: 26px;
+        // 自定义滚动条样式
+        &::-webkit-scrollbar {
+            width: 6px;
+        }
+        
+        &::-webkit-scrollbar-thumb {
+            background-color: rgba(0, 0, 0, 0.2);
+            border-radius: 3px;
+        }
+        
+        &::-webkit-scrollbar-track {
+            background-color: transparent;
+        }
 
-      svg {
-        width: 18px;
-        height: 18px;
-        margin-right: 4px;
-      }
+        :deep(.ant-tabs-nav) {
+            height: auto; // 自动高度
+            margin-bottom: 16px;
+        }
+
+        // 表单分区样式
+        .form-section {
+            margin-bottom: clamp(12px, 1.5vh, 20px); // 响应式间距
+
+            .section-title {
+                font-size: clamp(13px, 1.2vw, 15px); // 响应式字体
+                font-weight: 600;
+                color: #333;
+                margin-bottom: clamp(8px, 1vh, 12px);
+                padding-bottom: clamp(6px, 0.8vh, 10px);
+                border-bottom: 1px solid #e8e8e8;
+            }
+        }
+
+        :deep(.ant-form-item) {
+            margin-bottom: clamp(10px, 1.2vh, 16px); // 响应式表单项间距
+        }
+
+        :deep(.ant-form-item-label) {
+            text-align: right !important;
+
+            >label {
+                font-size: clamp(12px, 1vw, 14px); // 响应式标签字体
+                color: #333;
+                white-space: nowrap;
+                display: inline-block;
+
+                &::after {
+                    content: ':';
+                }
+            }
+        }
+
+        :deep(.ant-input),
+        :deep(.ant-input-password) {
+            font-size: clamp(12px, 1vw, 14px); // 输入框字体响应式
+        }
+
+        :deep(.ant-btn) {
+            font-size: clamp(12px, 1vw, 14px); // 按钮字体响应式
+        }
+
+        :deep(.ant-radio-group) {
+            display: flex;
+            gap: clamp(12px, 1.5vw, 20px); // 响应式间距
+        }
+
+        :deep(.ant-form-item-control-input-content) {
+            display: flex;
+            align-items: center;
+        }
     }
-  }
 }
-</style>
+
+// 响应式媒体查询 - 小屏幕适配
+@media (max-width: 1400px) {
+    .register-container {
+        .left-section {
+            .slogan {
+                left: 3%;
+                width: 45vw;
+                font-size: clamp(20px, 2.5vw, 32px);
+            }
+        }
+
+        .right-section {
+            right: 3%;
+            width: clamp(350px, 35vw, 450px);
+        }
+    }
+}
+
+// 中等屏幕适配
+@media (min-width: 1401px) and (max-width: 1920px) {
+    .register-container {
+        .left-section {
+            .slogan {
+                left: 5%;
+                width: 40vw;
+            }
+        }
+
+        .right-section {
+            right: 5%;
+            width: clamp(380px, 30vw, 480px);
+        }
+    }
+}
+
+// 大屏幕适配
+@media (min-width: 1921px) {
+    .register-container {
+        .left-section {
+            .slogan {
+                left: 8%;
+                width: 35vw;
+                font-size: clamp(32px, 3.5vw, 48px);
+            }
+        }
+
+        .right-section {
+            right: 8%;
+            width: clamp(420px, 28vw, 550px);
+            padding: 24px 32px;
+        }
+    }
+}
+
+// 超小屏幕适配
+@media (max-width: 1200px) {
+    .register-container {
+        .left-section {
+            .slogan {
+                display: none; // 小屏幕隐藏标语，聚焦表单
+            }
+        }
+
+        .right-section {
+            left: 50%;
+            right: auto;
+            transform: translate(-50%, -50%); // 水平垂直都居中
+            width: clamp(320px, 90vw, 420px);
+        }
+    }
+}
+
+// 高缩放比例适配（125%、150%等）
+@media (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) {
+    .register-container {
+        .right-section {
+            padding: clamp(12px, 1.5vw, 20px);
+            
+            .form-section {
+                margin-bottom: clamp(10px, 1.2vh, 16px);
+            }
+            
+            :deep(.ant-form-item) {
+                margin-bottom: clamp(8px, 1vh, 14px);
+            }
+        }
+    }
+}
+
+// 横屏模式优化
+@media (orientation: landscape) and (max-height: 700px) {
+    .register-container {
+        .right-section {
+            max-height: 95vh;
+            padding: 10px 15px;
+            
+            .form-section {
+                margin-bottom: 8px;
+                
+                .section-title {
+                    margin-bottom: 6px;
+                    padding-bottom: 6px;
+                    font-size: 13px;
+                }
+            }
+            
+            :deep(.ant-form-item) {
+                margin-bottom: 8px;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/views/system/review/index.vue b/frontend/src/views/system/review/index.vue
new file mode 100644
index 0000000..1d5ed55
--- /dev/null
+++ b/frontend/src/views/system/review/index.vue
@@ -0,0 +1,1209 @@
+<script lang="ts">
+export default {
+    name: "review",
+};
+</script>
+
+<script setup lang="ts">
+import { ref, onMounted, nextTick, watch } from "vue";
+import {
+    queryPendingAuditUsers,
+    deltableData,
+    getRole,
+    addUsers,
+    updataUser,
+    setpass,
+    delChoise,
+    getFishtree,
+    saveFishqvan,
+    getuserdata,
+    auditUser
+} from "@/api/user";
+import {
+    getDictItemsByCode
+} from "@/api/dict";
+import { ElMessageBox, ElMessage } from "element-plus";
+import Page from '@/components/Pagination/page.vue'
+import { Search } from '@element-plus/icons-vue'
+// 表格加载
+const loading = ref(false);
+// 搜索框
+const queryParams = ref({
+    current: 1,
+    size: 10,
+    querystr: '',
+    regStatus: ''
+});
+//分页 总条数
+const total = ref()
+const dialog = ref(false)
+const fishTreeRef = ref();
+const infoForm = ref();
+
+//新建
+const dialogVisible = ref(false);
+const title = ref("");
+function addClick() {
+    title.value = "新增用户";
+    dialogVisible.value = true;
+    info.value = {
+        id: "",
+        username: "",
+        nickname: "",
+        email: "",
+        phone: "",
+        belongingUnit: "",
+        roleinfo: [],
+    };
+    getrole();
+}
+//用户列表
+const multipleSelection = ref([]);
+const tableData = ref([]);
+const orgId = ref("");
+//获取用户列表信息
+function getdata() {
+    const params = {
+        current: queryParams.value.current,
+        size: queryParams.value.size,
+        // orgid: orgId.value,
+        name: queryParams.value.querystr,
+        regStatus: queryParams.value.regStatus
+    }
+    loading.value = true;
+    queryPendingAuditUsers(params).then((res => {
+        total.value = res.data.total
+        tableData.value = res.data.records
+        queryParams.value.size = res.data.size
+        queryParams.value.current = res.data.current
+        dialog.value = true
+        loading.value = false;
+    })).catch(() => {
+        loading.value = false;
+    })
+}
+
+
+
+
+//新建用户弹窗
+const info = ref({
+    id: "",
+    username: "",
+    nickname: "",
+    email: "",
+    phone: "",
+    belongingUnit: "",
+    roleinfo: [] as any[],
+});
+//修改-用户
+function editdepartment(row: any) {
+    const selectID: any = []
+    if (row?.roles?.length > 0) {
+        row.roles.forEach((item: any) => {
+            selectID.push(item.id)
+        })
+    }
+
+    info.value = JSON.parse(JSON.stringify(row));
+    info.value.roleinfo = selectID;
+    rolesdata.value = row.roles
+    title.value = "修改用户";
+    dialogVisible.value = true;
+    getrole();
+}
+//用户弹窗-所属角色
+const rolesdata: any = ref([]);
+//用户弹窗-保存
+function confirmClick(formEl: any) {
+    formEl.validate((valid: any) => {
+        if (valid) {
+            if (info.value.id) {
+                const params = {
+                    id: info.value.id,
+                    username: info.value.username,
+                    nickname: info.value.nickname,
+                    email: info.value.email,
+                    phone: info.value.phone,
+                    belongingUnit: info.value.belongingUnit,
+                };
+                const roleids = String(info.value.roleinfo)
+                updataUser(params, roleids).then(() => {
+
+                    getdata();
+                    dialogVisible.value = false;
+                    ElMessage({
+                        type: "success",
+                        message: "修改成功",
+                    });
+                });
+            } else {
+                const params = {
+                    username: info.value.username,
+                    nickname: info.value.nickname,
+                    email: info.value.email,
+                    phone: info.value.phone,
+                    belongingUnit: info.value.belongingUnit,
+                    orgid: orgId.value,
+                };
+                const roleids = info.value.roleinfo;
+                addUsers(params, roleids).then((res) => {
+                    getdata();
+                    dialogVisible.value = false;
+                    ElMessage({
+                        type: 'success',
+                        message: res.data.msg,
+                    });
+                });
+            }
+        }
+    })
+}
+//用户弹窗规则定义
+const moderules = ref({
+    username: [{ required: true, message: "请输入用户账号", trigger: "blur" }],
+    nickname: [{ required: true, message: "请输入用户名称", trigger: "blur" }],
+});
+
+//弹窗关闭
+function handleClose() {
+    infoForm.value.resetFields();
+    dialogVisible.value = false;
+}
+
+//重置密码
+const userid = ref("");
+function setpassword(row: any) {
+    ElMessageBox.confirm(
+        '确定将该账号密码重置为123456吗？',
+        '重置密码',
+        {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        }
+    )
+        .then(() => {
+            const params = {
+                id: userid.value
+            }
+            setpass(params).then(() => {
+                ElMessage({
+                    type: 'success',
+                    message: '密码重置成功',
+                })
+            })
+        })
+    userid.value = row.id
+
+}
+
+//过去设施权限维护
+const fishway = ref(false)
+const userId = ref('')
+// 回显的权限ID数组
+const fishhui = ref<any[]>([])
+const fishTreeDialog = ref(false)
+
+// 添加标志位，标识数据是否已加载完成
+const isFishDataLoaded = ref(false)
+
+async function openFishway(row: any) {
+    fishway.value = true
+    userId.value = row.id
+
+    // 重置状态
+    fishhui.value = []
+    tableDatafish.value = []
+    isFishDataLoaded.value = false
+
+    try {
+        // 使用 Promise.all 并行等待两个请求都完成
+        await Promise.all([
+            getFishTree(),  // 获取树形数据
+            getuserdata({ userId: userId.value }).then((res: any) => {
+                console.log('用户权限数据:', res)
+                if (res.code == 0) {
+                    res.data.forEach((item: any) => {
+                        fishhui.value.push(item.orgId)
+                        tableDatafish.value.push({
+                            name: item.orgName,
+                            type: item.orgType,
+                            id: item.orgId.toString(),
+                            code: item.orgId,
+                            path: item.path,
+                            userId: item.userId,
+                            parentId: item.parentId,
+                            orgLevel: item.orgLevel,
+                            permissionType: item.permissionType
+                        })
+                    })
+                }
+            })
+        ])
+
+        // 两个请求都完成后，标记数据已加载
+        isFishDataLoaded.value = true
+        console.log('所有数据加载完成，准备回显')
+
+    } catch (error) {
+        console.error('加载数据失败:', error)
+        ElMessage.error('加载数据失败，请重试')
+    }
+}
+
+// 监听fishway对话框打开,延迟回显
+watch([fishway, isFishDataLoaded], ([newFishway, newDataLoaded]) => {
+    if (newFishway && newDataLoaded) {
+        // 确保两个数据都已加载完成后再执行回显
+        console.log('开始回显, fishTreeRef:', fishTreeRef.value);
+        console.log('回显ID:', fishhui.value);
+        console.log('树数据:', fishData.value);
+
+        // 使用 nextTick 确保 DOM 已更新
+        nextTick(() => {
+            if (fishTreeRef.value && fishhui.value.length > 0) {
+                // 清除所有选中状态
+                fishTreeRef.value.setCheckedKeys([], false);
+
+                // 再设置新的选中状态
+                setTimeout(() => {
+                    fishTreeRef.value.setCheckedKeys(fishhui.value, false);
+
+                    // 验证回显结果
+                    const checkedKeys = fishTreeRef.value.getCheckedKeys();
+                    const halfCheckedKeys = fishTreeRef.value.getHalfCheckedKeys();
+                    console.log('回显完成 - 全选节点:', checkedKeys);
+                    console.log('回显完成 - 半选节点:', halfCheckedKeys);
+
+                    // 同步表格数据
+                    fishTableData.value = tableDatafish.value
+                }, 100);
+            } else if (fishTreeRef.value) {
+                // 如果fishhui.value为空，也需要清空表格数据
+                setTimeout(() => {
+                    fishTreeRef.value.setCheckedKeys([], false);
+                    fishTableData.value = [];
+                }, 100);
+            }
+        });
+    } else if (!newFishway) {
+        // 关闭时清空回显数据
+        console.log('关闭对话框，清理数据');
+        fishhui.value = [];
+        isFishDataLoaded.value = false;
+        // 清除tree选中状态
+        setTimeout(() => {
+            if (fishTreeRef.value) {
+                fishTreeRef.value.setCheckedKeys([], false);
+            }
+            fishTableData.value = [];
+        }, 300);
+    }
+});
+
+function fishHandleClose() {
+    fishway.value = false
+    isFishDataLoaded.value = false
+    fishTableData.value = []
+    fishData.value = []
+}
+//获取过鱼设施权限
+const treeInput = ref('')
+const fishProps = {
+    children: 'children',
+    label: 'name',
+}
+const fishData: any = ref([])
+//获取左侧树的数据
+// const huixiandata = ref([])
+let tableDatafish: any = []
+// 修改为返回 Promise，便于外部等待
+function getFishTree() {
+    fishTreeDialog.value = true
+    const params = {
+        // type:'1',
+        engName: treeInput.value
+    }
+    return getFishtree(params).then((res: any) => {
+        if (res.code == 0) {
+            fishData.value = res.data
+            fishTreeDialog.value = false
+        }
+    }).catch(() => {
+        fishTreeDialog.value = false
+    })
+}
+
+// 过鱼设施权限维护 - 获取所有子节点ID的辅助函数
+function getAllChildrenIds(node: any): number[] {
+    const ids: number[] = [];
+    if (node.children && node.children.length > 0) {
+        node.children.forEach((child: any) => {
+            ids.push(child.code);
+            if (child.children && child.children.length > 0) {
+                ids.push(...getAllChildrenIds(child));
+            }
+        });
+    }
+    return ids;
+}
+
+// 过鱼设施权限维护 - 检查父节点下所有子节点是否都被选中
+function areAllChildrenChecked(parentNode: any, checkedKeysArray: any[]): boolean {
+    const allChildrenIds = getAllChildrenIds(parentNode);
+    if (allChildrenIds.length === 0) {
+        return false;
+    }
+    // 检查所有子节点ID是否都在已选中的keys中
+    return allChildrenIds.every(code => checkedKeysArray.includes(code));
+}
+
+// 过鱼设施权限维护 - 检查节点是否被其他父节点包含
+function isNodeContainedByOtherParent(nodeId: number, parentIds: number[], allCheckedNodes: any[]): boolean {
+    // 遍历所有被标记为"全选"的父节点
+    for (const parentId of parentIds) {
+        const parentNode = allCheckedNodes.find((n: any) => n.code === parentId);
+        if (parentNode) {
+            const childrenIds = getAllChildrenIds(parentNode);
+            // 如果当前节点是某个父节点的子节点,则返回true
+            if (childrenIds.includes(nodeId)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// 统一处理选中IDs的过滤逻辑：如果父节点的所有子节点都被选中，只保留父节点ID
+function filterSelectedIds(checkedKeysArray: number[], allCheckedNodes: any[]): number[] {
+    const resultIds: number[] = [];
+    const fullySelectedParentIds: number[] = [];
+    const filteredNodeIds = new Set<number>();
+
+    // 第一阶段:找出所有"子节点全部被选中"的父节点
+    allCheckedNodes.forEach((node: any) => {
+        if (node.children && node.children.length > 0) {
+            if (areAllChildrenChecked(node, checkedKeysArray)) {
+                fullySelectedParentIds.push(node.code);
+                const childrenIds = getAllChildrenIds(node);
+                childrenIds.forEach(childId => {
+                    filteredNodeIds.add(childId);
+                });
+            }
+        }
+    });
+
+    // 第二阶段:添加结果
+    // 1. 先添加所有"全选"的父节点(但要排除被其他父节点包含的)
+    fullySelectedParentIds.forEach(parentId => {
+        if (!isNodeContainedByOtherParent(parentId, fullySelectedParentIds, allCheckedNodes)) {
+            resultIds.push(parentId);
+        }
+    });
+
+    // 2. 添加未被过滤的独立节点(叶子节点或未全选的父节点)
+    allCheckedNodes.forEach((node: any) => {
+        if (!filteredNodeIds.has(node.code) && !resultIds.includes(node.code)) {
+            if (!isNodeContainedByOtherParent(node.code, fullySelectedParentIds, allCheckedNodes)) {
+                resultIds.push(node.code);
+            }
+        }
+    });
+
+    console.log('过滤后的IDs:', resultIds);
+    return resultIds;
+}
+
+// 过鱼设施权限维护 - 处理复选框选中事件
+function handleFishCheckChange(checkedNode: any, checkedInfo: any) {
+    const treeInstance = fishTreeRef.value;
+    if (!treeInstance) return;
+
+    // 从 checkedInfo 中获取选中的keys数组和节点
+    const checkedKeysArray = checkedInfo.checkedKeys || [];
+    const allCheckedNodes = checkedInfo.checkedNodes || [];
+
+    // 使用统一的过滤逻辑处理IDs
+    const resultIds = filterSelectedIds(checkedKeysArray, allCheckedNodes);
+
+    console.log('最终获取的IDs:', resultIds);
+
+    // 更新表格数据
+    getFishTableData(resultIds);
+    tableids.value = resultIds;
+}
+//过鱼设施权限
+const fishTableData: any = ref([])
+const fishDialog = ref(false)
+const fishTableSelection = ref([])
+//获取过鱼设施权限数据
+function getFishTableData(ids: any[]) {
+
+    // 提取fishData.value中code在ids数组中的所有数据项
+    const extractedData: any[] = [];
+
+    function extractMatchingNodes(nodes: any[]) {
+        for (const node of nodes) {
+            if (ids.includes(node.code)) {
+                // 如果当前节点的code在ids中，则添加到结果数组
+                extractedData.push({
+                    name: node.name,
+                    type: node.type, // 默认类型为'站点'
+                    id: node.code.toString(), // 使用code作为id
+                    code: node.code,
+                    path: node.path,
+                    userId: userId.value,
+                    parentId: node.parentId,
+                    orgLevel: node.orgLevel,
+                    permissionType: 'READ' // 默认选择读权限
+                });
+            }
+
+            // 递归检查子节点
+            if (node.children && node.children.length > 0) {
+                extractMatchingNodes(node.children);
+            }
+        }
+    }
+
+    extractMatchingNodes(fishData.value);
+    fishTableData.value = extractedData;
+}
+//权限给予
+const tableids: any = ref([])
+//选中的过鱼权限
+function fishDataHandleSelectionChange(val: any) {
+    console.log('选中的行数据:', val);
+    fishTableSelection.value = val
+}
+
+//移除权限
+function delFishTable() {
+    ElMessageBox.confirm("确定移除选中权限吗？", "删除提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+    })
+        .then(() => {
+            // 获取选中的ID数组
+            const selectedIds = fishTableSelection.value.map((item: any) => item.id);
+
+            // 过滤fishTableData，删除与选中ID一致的项
+            fishTableData.value = fishTableData.value.filter((item: any) => {
+                return !selectedIds.includes(item.id);
+            });
+
+            // 同步更新树形控件的选中状态
+            if (fishTreeRef.value) {
+                // 获取树形数据，用于遍历子节点
+                const treeData = fishData.value;
+
+                // 收集所有需要取消选中的节点（包括选中的节点及其所有子节点）
+                const nodesToUncheck = new Set<any>();
+
+                // 对于每个选中的ID，找到其在树中的节点及其所有子节点
+                selectedIds.forEach((id: any) => {
+                    nodesToUncheck.add(id);
+                    // 查找该节点的所有子节点
+                    findAllChildNodes(treeData, id, nodesToUncheck);
+                });
+
+                // 将收集到的所有节点取消选中
+                nodesToUncheck.forEach((nodeId: any) => {
+                    fishTreeRef.value.setChecked(nodeId, false, false);
+                });
+            }
+
+            ElMessage({
+                type: "success",
+                message: "删除成功",
+            });
+
+            // 清空选中状态
+            fishTableSelection.value = [];
+        })
+        .catch(() => {
+            // 用户取消删除
+        });
+}
+
+// 递归查找指定节点的所有子节点
+function findAllChildNodes(nodes: any[], targetNodeId: any, result: Set<any>) {
+    for (const node of nodes) {
+        if (node.code == targetNodeId) {
+            // 找到了目标节点，递归收集它的所有子节点
+            if (node.children && node.children.length > 0) {
+                for (const child of node.children) {
+                    result.add(child.code);
+                    // 递归处理子节点的子节点
+                    findAllChildNodes([child], child.code, result);
+                }
+            }
+            break; // 找到目标节点后就跳出循环
+        } else if (node.children && node.children.length > 0) {
+            // 继续在子节点中查找
+            findAllChildNodes(node.children, targetNodeId, result);
+        }
+    }
+}
+//权限确定
+function fishSure() {
+    let params: any = []
+    fishTableData.value.forEach((item: any) => {
+        params.push({
+            engName: item.name,
+            userId: item.userId,
+            orgType: item.type,
+            orgId: item.code,
+            parentId: item.parentId,
+            orgLevel: item.orgLevel,
+            path: item.path,
+            permissionType: item.permissionType,
+        })
+    })
+    saveFishqvan({ userId: userId.value, dataScopeList: params }).then((res: any) => {
+        console.log(res);
+        if (res.code == 0) {
+            ElMessage({
+                message: '保存成功',
+                type: 'success',
+            })
+            fishHandleClose()
+        }
+    })
+}
+//删除用户
+function delclick(row: any) {
+    ElMessageBox.confirm("确定删除此用户吗？", "删除提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+    })
+        .then(() => {
+            const params = {
+                id: row.id,
+            };
+            deltableData(params).then(() => {
+                ElMessage({
+                    type: "success",
+                    message: "删除成功",
+                });
+                getdata();
+            });
+        })
+}
+//获取角色
+function getrole() {
+    const params = {
+        rolename: "",
+    };
+    getRole(params).then((res) => {
+        rolesdata.value = res;
+    });
+}
+
+//多选删除
+const ids = ref([])
+function handleSelectionChange(val: any) {
+    multipleSelection.value = val;
+    ids.value = val
+}
+function delchoice() {
+    const choice: any = []
+    ids.value.forEach((item: any) => {
+        choice.push(item.id)
+    })
+    ElMessageBox.confirm("确定删除此用户吗？", "删除提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+    })
+        .then(() => {
+            const params = {
+                id: String(choice)
+            };
+            delChoise(params).then(() => {
+                ElMessage({
+                    type: "success",
+                    message: "删除成功",
+                });
+                getdata();
+            });
+        })
+}
+
+function dateFormat(row: any) {
+    const daterc = row;
+    if (daterc != null) {
+        var date = new Date(daterc);
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+        date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+        var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+        var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+        var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+        var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+        // 拼接
+        return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+    }
+}
+
+//分页
+//分类名字
+function getName(arr: any[], type: any): string {
+    if (!arr || !Array.isArray(arr) || type === undefined || type === null) {
+        return ''
+    }
+    const items = arr.find((item: any) => item?.itemCode == type)
+    console.log(items);
+    return items?.dictName || ''
+}
+
+// ==================== 审批相关功能 ====================
+// 审批对话框显示状态
+const auditDialogVisible = ref(false);
+// 审批类型：1-通过，2-驳回
+const auditType = ref(1);
+// 当前审批的用户ID
+const currentAuditUserId = ref('');
+// 审批意见表单
+const auditForm = ref({
+    commentInfo: ''
+});
+// 审批意见表单引用
+const auditFormRef = ref();
+
+// 审批意见表单验证规则
+const auditRules = ref({
+    commentInfo: [
+        { required: true, message: '请输入审批意见', trigger: 'blur' }
+    ]
+});
+
+// 打开审批通过对话框
+function handleAuditPass(row: any) {
+    currentAuditUserId.value = row.id;
+    auditType.value = 1;
+    auditForm.value.commentInfo = '';
+    auditDialogVisible.value = true;
+}
+
+// 打开审批驳回对话框
+function handleAuditReject(row: any) {
+    currentAuditUserId.value = row.id;
+    auditType.value = 2;
+    auditForm.value.commentInfo = '';
+    auditDialogVisible.value = true;
+}
+
+// 关闭审批对话框
+function handleAuditClose() {
+    auditDialogVisible.value = false;
+    auditForm.value.commentInfo = '';
+    if (auditFormRef.value) {
+        auditFormRef.value.resetFields();
+    }
+}
+
+// 提交审批
+function submitAudit(formEl: any) {
+    formEl.validate((valid: boolean) => {
+        if (valid) {
+            const params = {
+                userId: currentAuditUserId.value,
+                regStatus: auditType.value,
+                commentInfo: auditForm.value.commentInfo
+            };
+
+            auditUser(params).then(() => {
+                ElMessage({
+                    type: 'success',
+                    message: auditType.value === 1 ? '审批通过成功' : '审批驳回成功'
+                });
+                handleAuditClose();
+                getdata(); // 刷新列表
+            }).catch(() => {
+                ElMessage({
+                    type: 'error',
+                    message: '审批操作失败，请重试'
+                });
+            });
+        }
+    });
+}
+
+onMounted(() => {
+    getdictdata()
+    getdata()
+});
+const dictData = ref([])
+const regStatusArr = ref([])
+function getdictdata() {
+    getDictItemsByCode({ dictCode: 'resourceType' }).then(res => {
+        dictData.value = res.data
+    })
+    getDictItemsByCode({ dictCode: 'regStatus' }).then(res => {
+        regStatusArr.value = res.data
+    })
+}
+const vMove = {
+    mounted(el: any) {
+        el.onmousedown = function (e: any) {
+            var init = e.clientX;
+            var parent: any = document.getElementById("silderLeft");
+            const initWidth: any = parent.offsetWidth;
+            document.onmousemove = function (e) {
+                var end = e.clientX;
+                var newWidth = end - init + initWidth;
+                parent.style.width = newWidth + "px";
+            };
+            document.onmouseup = function () {
+                document.onmousemove = document.onmouseup = null;
+            };
+        };
+    }
+}
+// 递归获取树形数据中所有节点的code
+function getAllNodeCodes(nodes: any[]): number[] {
+    const codes: number[] = [];
+    nodes.forEach((node: any) => {
+        codes.push(node.code);
+        if (node.children && node.children.length > 0) {
+            codes.push(...getAllNodeCodes(node.children));
+        }
+    });
+    return codes;
+}
+
+// 全选：选中树中所有节点
+function handleSelectAll() {
+    if (!fishTreeRef.value || !fishData.value || fishData.value.length === 0) {
+        ElMessage.warning('暂无数据可全选');
+        return;
+    }
+    const allCodes = getAllNodeCodes(fishData.value);
+    console.log('全选 - 所有节点codes:', allCodes);
+    fishTreeRef.value.setCheckedKeys(allCodes, true);
+
+    // 手动更新表格数据（使用统一过滤逻辑）
+    setTimeout(() => {
+        // 获取当前选中的节点信息
+        const checkedKeys = fishTreeRef.value.getCheckedKeys();
+        const checkedNodes = fishTreeRef.value.getCheckedNodes(false, false); // 只获取完全选中的节点
+
+        // 使用统一的过滤逻辑
+        const filteredIds = filterSelectedIds(checkedKeys, checkedNodes);
+
+        getFishTableData(filteredIds);
+        tableids.value = filteredIds;
+        console.log('全选 - 表格数据已更新，过滤后IDs:', filteredIds);
+    }, 100);
+
+    ElMessage.success('已全选所有节点');
+}
+
+// 反选：反转当前选中状态
+function handleInvertSelection() {
+    if (!fishTreeRef.value || !fishData.value || fishData.value.length === 0) {
+        ElMessage.warning('暂无数据可操作');
+        return;
+    }
+
+    // 获取当前完全选中的节点keys
+    const checkedKeys = fishTreeRef.value.getCheckedKeys();
+    // 获取当前半选的节点keys（父节点部分子节点被选中）
+    const halfCheckedKeys = fishTreeRef.value.getHalfCheckedKeys();
+
+    console.log('反选前 - 已选中codes:', checkedKeys);
+    console.log('反选前 - 半选codes:', halfCheckedKeys);
+
+    // 合并完全选中和半选的节点，这些是需要取消选中的
+    const currentSelectedKeys = [...new Set([...checkedKeys, ...halfCheckedKeys])];
+    console.log('反选前 - 当前有效选中状态:', currentSelectedKeys);
+
+    // 获取所有节点codes
+    const allCodes = getAllNodeCodes(fishData.value);
+
+    // 计算需要选中的节点：所有节点 - 当前有效选中状态
+    const invertedCodes = allCodes.filter(code => !currentSelectedKeys.includes(code));
+    console.log('反选后 - 新的选中codes:', invertedCodes);
+
+    // 先清空所有选中状态，避免级联影响
+    fishTreeRef.value.setCheckedKeys([], false);
+
+    // 然后设置新的选中状态
+    setTimeout(() => {
+        fishTreeRef.value.setCheckedKeys(invertedCodes, true);
+
+        // 手动更新表格数据（使用统一过滤逻辑）
+        setTimeout(() => {
+            // 获取当前选中的节点信息
+            const newCheckedKeys = fishTreeRef.value.getCheckedKeys();
+            const newCheckedNodes = fishTreeRef.value.getCheckedNodes(false, false);
+
+            // 使用统一的过滤逻辑
+            const filteredIds = filterSelectedIds(newCheckedKeys, newCheckedNodes);
+
+            getFishTableData(filteredIds);
+            tableids.value = filteredIds;
+            console.log('反选 - 表格数据已更新，过滤后IDs:', filteredIds);
+        }, 100);
+    }, 50);
+
+    ElMessage.success('已反选操作');
+}
+
+// 取消选中：清空所有选中状态
+function handleClearSelection() {
+    if (!fishTreeRef.value) {
+        return;
+    }
+    console.log('取消选中 - 清空所有选中');
+    fishTreeRef.value.setCheckedKeys([], true);
+
+    // 手动清空表格数据
+    setTimeout(() => {
+        getFishTableData([]);
+        tableids.value = [];
+        console.log('取消选中 - 表格数据已清空');
+    }, 100);
+
+    ElMessage.success('已取消所有选中');
+}
+
+</script>
+
+<template>
+    <div class="faulttemplate-box">
+        <section class="silderRight">
+            <el-row>
+                <el-col :span="24">
+                    <div
+                        style="margin-bottom:10px;display: flex;display: -webkit-flex; justify-content: space-between;-webkit-justify-content: space-between; width: 100%;">
+                        <div>
+                            <el-input v-model="queryParams.querystr" placeholder="请输入用户姓名" clearable
+                                style="width: 200px" @keyup.enter="getdata" />
+                            <el-select v-model="queryParams.regStatus" placeholder="请选择审核状态" clearable
+                                style="width: 160px; margin-left: 10px;">
+                                <el-option v-for="item in regStatusArr" :key="item.itemCode" :label="item.dictName"
+                                    :value="item.itemCode" />
+                            </el-select>
+                            <el-button type="primary" style="margin-left: 10px;" @click="getdata">搜索</el-button>
+                        </div>
+                        <!-- <div>
+              <el-button v-hasPerm="['add:user']" type="primary" @click="addClick">
+                <img src="@/assets/MenuIcon/jscz_xz.png" alt="" style="margin-right: 5px;">
+                新增</el-button>
+              <el-button v-hasPerm="['del:user']" @click="delchoice" :disabled="multipleSelection.length <= 0"
+                :type="multipleSelection.length > 0 ? 'primary' : ''"><el-icon style="margin-right: 5px;">
+                  <Delete />
+                </el-icon>删除</el-button>
+            </div> -->
+                    </div>
+                </el-col>
+            </el-row>
+
+            <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="id" border default-expand-all
+                :v-loading="dialog" @selection-change="handleSelectionChange"
+                :header-cell-style="{ background: 'rgb(250 250 250)', color: ' #383838', height: '50px' }">
+                <!-- <el-table-column type="selection" width="50" align="center" /> -->
+                <el-table-column type="index" label="序号" width="70" align="center" />
+                <el-table-column prop="nickname" label="用户姓名" width="140"></el-table-column>
+                <!-- <el-table-column prop="avatar" label="头像"></el-table-column> -->
+                <el-table-column prop="email" label="邮箱"></el-table-column>
+                <el-table-column prop="phone" label="手机号" min-width="90"></el-table-column>
+                <el-table-column prop="username" label="登录账号" width="120"></el-table-column>
+                <!-- <el-table-column prop="custom1" label="登录账号"></el-table-column> -->
+                <el-table-column prop="rolename" label="所属角色" width="120">
+                    <template #default="scope">
+                        <span v-for="(item, index) in scope.row.roles" :key="index">{{ item.rolename }} <span></span>
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="rolename" label="审核状态" width="120" align="center">
+                    <template #default="scope">
+                        {{ getName(regStatusArr, scope.row.regStatus) }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="lastmodifier" label="最近修改者" width="120"></el-table-column>
+                <el-table-column prop="lastmodifydate" label="最近修改日期" width="205">
+                    <template #default="scope">
+                        {{ dateFormat(scope.row.lastmodifydate) }}
+                    </template>
+                </el-table-column>
+                <el-table-column fixed="right" label="操作" width="160">
+                    <template #default="scope">
+                        <span
+                            style="display: flex;display: -webkit-flex;justify-content: space-around;-webkit-justify-content: space-around; ">
+                            <img src="@/assets/MenuIcon/lbcz_xg.png" alt="" title="修改"
+                                @click="editdepartment(scope.row)" style="cursor: pointer;">
+                            <!-- frontend/src/assets/components/fish.png -->
+                            <img src="@/assets/components/fish.png" alt="" title="过鱼设施权限维护"
+                                @click="openFishway(scope.row)" style="cursor: pointer;">
+                            <img src="@/assets/components/shenpitongguo.png" alt="" title="审批通过"
+                                @click="handleAuditPass(scope.row)" style="cursor: pointer;">
+                            <img src="@/assets/components/shenpibohui.png" alt="" title="审批驳回"
+                                @click="handleAuditReject(scope.row)" style="cursor: pointer;">
+                            <img src="@/assets/MenuIcon/lbcz_czmm.png" alt="" title="重置密码"
+                                @click="setpassword(scope.row)" style="cursor: pointer;">
+                            <!-- <img src="@/assets/MenuIcon/lbcz_sc.png" alt="" title="删除" @click="delclick(scope.row)"
+                                style="cursor: pointer;"> -->
+                        </span>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <Page :total="total" v-model:size="queryParams.size" v-model:current="queryParams.current"
+                @pagination="getdata()">
+            </Page>
+        </section>
+        <!-- 用户 弹框-->
+        <el-dialog v-model="dialogVisible" :close-on-click-modal="false" :before-close="handleClose" :title="title"
+            append-to-body width="620px" draggable>
+            <el-form ref="infoForm" :model="info" :rules="moderules" label-width="90px">
+                <el-form-item label="用户姓名" prop="nickname">
+                    <el-input v-model="info.nickname" style="width: 100%" placeholder="请输入用户姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="所属单位">
+                    <el-input v-model="info.belongingUnit" style="width: 100%" placeholder="请输入所属单位"></el-input>
+                </el-form-item>
+                <el-form-item label="联系邮箱">
+                    <el-input v-model="info.email" style="width: 100%" placeholder="请输入联系邮箱"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="info.phone" style="width: 100%" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item label="登录账号" prop="username">
+                    <el-input v-model="info.username" style="width: 100%" placeholder="请输入登录账号"></el-input>
+                </el-form-item>
+                <el-form-item label="所属角色">
+                    <el-select v-model="info.roleinfo" placeholder=" " style="width: 100%" multiple>
+                        <el-option v-for="item in rolesdata" :key="item.id" :label="item.rolename" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <span class="dialog-footer"
+                style="display: flex;display: -webkit-flex; justify-content: flex-end;-webkit-justify-content: flex-end;">
+                <el-button @click="handleClose">取 消</el-button>
+                <el-button type="primary" @click="confirmClick(infoForm)">保存</el-button>
+            </span>
+        </el-dialog>
+        <!-- 过鱼设施权限维护 -->
+        <el-dialog v-model="fishway" :close-on-click-modal="false" :before-close="fishHandleClose" title="过鱼设施权限维护"
+            append-to-body width="1600px" draggable>
+            <!-- <el-scrollbar height="610px"> -->
+            <!-- <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+          <el-tab-pane label="基地" name="1" :disabled="isBaseDisabled"></el-tab-pane>
+          <el-tab-pane label="公司" name="2" :disabled="isCompanyDisabled"></el-tab-pane>
+        </el-tabs> -->
+            <div class="fishBody">
+                <div class="fishTree">
+                    <div style="width: 100%;padding: 0px 10px; box-sizing: border-box;">
+                        <el-input v-model="treeInput" style="width: 100%" placeholder="请输入电站名称" clearable
+                            class="input-with-select">
+                            <template #append>
+                                <el-button :icon="Search" @click="getFishTree()" />
+                            </template>
+                        </el-input>
+                        <div class="button_div">
+                            <el-button type="primary" @click="handleSelectAll">全选</el-button>
+                            <el-button type="primary" @click="handleInvertSelection">反选</el-button>
+                            <el-button type="primary" @click="handleClearSelection">取消选中</el-button>
+                        </div>
+                    </div>
+
+                    <el-scrollbar height="450px" style="margin-top: 10px;">
+                        <el-tree ref="fishTreeRef" style="max-width: 300px" :data="fishData" show-checkbox
+                            default-expand-all v-loading="fishTreeDialog" node-key="code" highlight-current
+                            :props="fishProps" @check="handleFishCheckChange" />
+                    </el-scrollbar>
+                </div>
+                <div class="fishTable">
+                    <div class="topTable">
+                        <el-button type="danger" :disabled="fishTableSelection.length == 0"
+                            @click="delFishTable">移除权限</el-button>
+                    </div>
+                    <el-table :data="fishTableData" style="width: 100%;" row-key="id" border default-expand-all
+                        :v-loading="fishDialog" @selection-change="fishDataHandleSelectionChange" max-height="600"
+                        :header-cell-style="{ background: 'rgb(250 250 250)', color: ' #383838', height: '50px' }">
+                        <el-table-column type="selection" width="50" align="center" />
+                        <el-table-column type="index" label="序号" width="70" align="center" />
+                        <el-table-column prop="name" label="名称"></el-table-column>
+                        <el-table-column prop="type" label="类型" width="200" align="center">
+                            <template #default="scope">
+                                <span>{{ getName(dictData, scope.row.type) }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="id" label="权限" align="center" width="200">
+                            <template #default="scope">
+                                <el-radio-group v-model="scope.row.permissionType">
+                                    <el-radio value="READ" size="large">读</el-radio>
+                                    <el-radio value="WRITE" size="large">写</el-radio>
+                                </el-radio-group>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+            <!-- </el-scrollbar> -->
+            <span class="dialog-footer"
+                style="display: flex;display: -webkit-flex; justify-content: flex-end;-webkit-justify-content: flex-end;margin-top: 20px;">
+                <el-button @click="fishHandleClose">取 消</el-button>
+                <el-button type="primary" @click="fishSure">保存</el-button>
+            </span>
+        </el-dialog>
+
+        <!-- 审批意见对话框 -->
+        <el-dialog v-model="auditDialogVisible" :title="auditType === 1 ? '审批通过' : '审批驳回'" width="500px" append-to-body
+            :before-close="handleAuditClose">
+            <el-form ref="auditFormRef" :model="auditForm" :rules="auditRules" label-width="80px">
+                <el-form-item label="审批意见" prop="commentInfo">
+                    <el-input v-model="auditForm.commentInfo" type="textarea" :rows="4" placeholder="请输入审批意见" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="handleAuditClose">取消</el-button>
+                    <el-button type="primary" @click="submitAudit(auditFormRef)">确定</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<style scoped lang="scss">
+.fishBody {
+    // height: 620px;
+    width: 100%;
+    display: flex;
+    // align-items: center;
+    justify-content: space-between;
+
+    .fishTree {
+        width: 300px;
+        // height: 620px;
+        margin-right: 10px;
+        border-right: #409eff 1px solid;
+
+        .button_div {
+            // width: 100%;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-top: 10px;
+        }
+    }
+
+    .fishTable {
+        width: 100%;
+        height: 100%;
+
+        .topTable {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: end;
+            margin-bottom: 10px;
+        }
+    }
+}
+
+.silderLeft-default {
+    :deep(.el-tree-node__label) {
+        font-size: 16px !important;
+    }
+}
+
+.faulttemplate-box {
+    height: 100%;
+    display: flex;
+    display: -webkit-flex;
+    background-color: #f2f4f9;
+
+}
+
+#silderLeft {
+    width: 300px;
+    padding: 5px 0px 10px;
+    box-sizing: border-box;
+    background: #fff;
+    border-radius: 3px;
+    position: relative;
+
+    &:hover {
+        .moveBtn {
+            opacity: 1;
+        }
+    }
+}
+
+/* 拖动条 */
+.moveBtn {
+    height: 100%;
+    width: 15px;
+    padding: 0 6px;
+    opacity: 0;
+    position: absolute;
+    right: -15px;
+    top: 0;
+}
+
+.moveBtn-line {
+    width: 100%;
+    height: 100%;
+    cursor: col-resize;
+    user-select: none;
+    background-color: #60bfff;
+}
+
+.silderRight {
+    flex: 1;
+    width: 100%;
+    height: calc(100vh - 130px);
+    overflow: auto;
+    background-color: rgba(255, 255, 255, 1);
+    border-radius: 3px;
+    padding: 15px;
+    padding-bottom: 0px;
+    box-sizing: border-box;
+    margin-left: 15px;
+}
+
+.avatar {
+    width: 86px;
+    height: 86px;
+    display: block;
+}
+
+.fishTree {
+    :deep(.el-tree-node.is-current>.el-tree-node__content) {
+        width: 100%;
+        height: 40px;
+        background-color: #ecf5ff !important;
+        // color: #fff !important;
+    }
+
+    :deep(.el-tree-node__content) {
+        width: 100% !important;
+        height: 40px !important;
+        margin: auto !important;
+    }
+}
+
+:deep(.el-tree-node.is-current>.el-tree-node__content) {
+    width: 100%;
+    height: 40px;
+    background-color: #409eff !important;
+    color: #fff !important;
+}
+
+:deep(.el-tree-node__content) {
+    width: 100% !important;
+    height: 40px !important;
+    margin: auto !important;
+}
+
+.el-message-box {
+    width: 300px !important;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index d81d66e..88aed23 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -282,57 +282,80 @@ const userId = ref('')
 // 回显的权限ID数组
 const fishhui = ref<any[]>([])
 const fishTreeDialog = ref(false)
-function openFishway(row: any) {
+
+// 添加标志位，标识数据是否已加载完成
+const isFishDataLoaded = ref(false)
+
+async function openFishway(row: any) {
   fishway.value = true
   userId.value = row.id
-  // 临时模拟数据
-  getFishTree()
-  // 打开对话框，watch 会处理回显逻辑  
+  
+  // 重置状态
   fishhui.value = []
   tableDatafish.value = []
-  getuserdata({ userId: userId.value }).then((res: any) => {
-    console.log(res)
-    if (res.code == 0) {
-      res.data.forEach((item: any) => {
-        fishhui.value.push(item.orgId)
-        tableDatafish.value.push({
-          name: item.orgName,
-          type: item.orgType, // 默认类型为'站点'
-          id: item.orgId.toString(), // 使用code作为id
-          code: item.orgId,
-          path: item.path,
-          userId: item.userId,
-          parentId: item.parentId,
-          orgLevel: item.orgLevel,
-          permissionType: item.permissionType // 默认选择读权限
-        })
+  isFishDataLoaded.value = false
+  
+  try {
+    // 使用 Promise.all 并行等待两个请求都完成
+    await Promise.all([
+      getFishTree(),  // 获取树形数据
+      getuserdata({ userId: userId.value }).then((res: any) => {
+        console.log('用户权限数据:', res)
+        if (res.code == 0) {
+          res.data.forEach((item: any) => {
+            fishhui.value.push(item.orgId)
+            tableDatafish.value.push({
+              name: item.orgName,
+              type: item.orgType,
+              id: item.orgId.toString(),
+              code: item.orgId,
+              path: item.path,
+              userId: item.userId,
+              parentId: item.parentId,
+              orgLevel: item.orgLevel,
+              permissionType: item.permissionType
+            })
+          })
+        }
       })
-
-    }
-  })
-
+    ])
+    
+    // 两个请求都完成后，标记数据已加载
+    isFishDataLoaded.value = true
+    console.log('所有数据加载完成，准备回显')
+    
+  } catch (error) {
+    console.error('加载数据失败:', error)
+    ElMessage.error('加载数据失败，请重试')
+  }
 }
 
 // 监听fishway对话框打开,延迟回显
-watch(fishway, (newVal) => {
-  if (newVal) {
-    // dialog打开后,延迟回显确保tree组件完全渲染
-    setTimeout(() => {
-      console.log('开始回显, fishTreeRef:', fishTreeRef.value);
-      console.log('回显ID:', fishhui.value);
+watch([fishway, isFishDataLoaded], ([newFishway, newDataLoaded]) => {
+  if (newFishway && newDataLoaded) {
+    // 确保两个数据都已加载完成后再执行回显
+    console.log('开始回显, fishTreeRef:', fishTreeRef.value);
+    console.log('回显ID:', fishhui.value);
+    console.log('树数据:', fishData.value);
 
+    // 使用 nextTick 确保 DOM 已更新
+    nextTick(() => {
       if (fishTreeRef.value && fishhui.value.length > 0) {
         // 清除所有选中状态
         fishTreeRef.value.setCheckedKeys([], false);
 
-        // 延迟一点再设置,确保清除生效
+        // 再设置新的选中状态
         setTimeout(() => {
           fishTreeRef.value.setCheckedKeys(fishhui.value, false);
+          
           // 验证回显结果
           const checkedKeys = fishTreeRef.value.getCheckedKeys();
           const halfCheckedKeys = fishTreeRef.value.getHalfCheckedKeys();
           console.log('回显完成 - 全选节点:', checkedKeys);
           console.log('回显完成 - 半选节点:', halfCheckedKeys);
+          
+          // 同步表格数据
+          fishTableData.value = tableDatafish.value
         }, 100);
       } else if (fishTreeRef.value) {
         // 如果fishhui.value为空，也需要清空表格数据
@@ -341,20 +364,12 @@ watch(fishway, (newVal) => {
           fishTableData.value = [];
         }, 100);
       }
-      fishTableData.value = tableDatafish.value
-      // if (fishhui.value.length > 0 && activeName.value == '1') {
-      //   isCompanyDisabled.value = true
-      // } else if (fishhui.value.length > 0 && activeName.value == '2') {
-      //   isBaseDisabled.value = true
-      // } else {
-      //   isCompanyDisabled.value = false
-      //   isBaseDisabled.value = false
-      // }
-    }, 500);
-  } else {
+    });
+  } else if (!newFishway) {
     // 关闭时清空回显数据
     console.log('关闭对话框，清理数据');
     fishhui.value = [];
+    isFishDataLoaded.value = false;
     // 清除tree选中状态
     setTimeout(() => {
       if (fishTreeRef.value) {
@@ -367,6 +382,7 @@ watch(fishway, (newVal) => {
 
 function fishHandleClose() {
   fishway.value = false
+  isFishDataLoaded.value = false
   fishTableData.value = []
   fishData.value = []
 }
@@ -406,19 +422,21 @@ const fishData: any = ref([])
 //获取左侧树的数据
 // const huixiandata = ref([])
 let tableDatafish: any = []
+// 修改为返回 Promise，便于外部等待
 function getFishTree() {
   fishTreeDialog.value = true
   const params = {
     // type:'1',
     engName: treeInput.value
   }
-  getFishtree(params).then((res: any) => {
+  return getFishtree(params).then((res: any) => {
     if (res.code == 0) {
       fishData.value = res.data
+      fishTreeDialog.value = false
     }
+  }).catch(() => {
+    fishTreeDialog.value = false
   })
-  fishTreeDialog.value = false
-
 }
 
 // 过鱼设施权限维护 - 获取所有子节点ID的辅助函数
@@ -1000,7 +1018,7 @@ function handleClearSelection() {
     <!-- 过鱼设施权限维护 -->
     <el-dialog v-model="fishway" :close-on-click-modal="false" :before-close="fishHandleClose" title="过鱼设施权限维护"
       append-to-body width="1600px" draggable>
-      <el-scrollbar height="610px">
+      <!-- <el-scrollbar height="610px"> -->
         <!-- <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
           <el-tab-pane label="基地" name="1" :disabled="isBaseDisabled"></el-tab-pane>
           <el-tab-pane label="公司" name="2" :disabled="isCompanyDisabled"></el-tab-pane>
@@ -1021,9 +1039,9 @@ function handleClearSelection() {
               </div>
             </div>
 
-            <el-scrollbar height="460px">
+            <el-scrollbar height="450px" style="margin-top: 10px;">
               <el-tree ref="fishTreeRef" style="max-width: 300px" :data="fishData" show-checkbox default-expand-all
-                :v-loading="fishTreeDialog" node-key="code" highlight-current :props="fishProps"
+                v-loading="fishTreeDialog" node-key="code" highlight-current :props="fishProps"
                 @check="handleFishCheckChange" />
             </el-scrollbar>
           </div>
@@ -1053,7 +1071,7 @@ function handleClearSelection() {
             </el-table>
           </div>
         </div>
-      </el-scrollbar>
+      <!-- </el-scrollbar> -->
       <span class="dialog-footer"
         style="display: flex;display: -webkit-flex; justify-content: flex-end;-webkit-justify-content: flex-end;margin-top: 20px;">
         <el-button @click="fishHandleClose">取 消</el-button>