From 544f0f9139b22a22da96f57ad661fd9e1fc42d79 Mon Sep 17 00:00:00 2001
From: taoran <taoran@wuji.pro>
Date: Tue, 22 Apr 2025 18:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                 |  3 ++-
 src/api/login.js                 | 12 -----------
 src/layout/components/Navbar.vue |  6 +++---
 src/views/login.vue              | 34 --------------------------------
 src/views/system/user/index.vue  | 27 ++++++++++++++-----------
 5 files changed, 21 insertions(+), 61 deletions(-)

diff --git a/.env.development b/.env.development
index d8cd593..761feb0 100644
--- a/.env.development
+++ b/.env.development
@@ -8,4 +8,5 @@ VITE_PUBLIC_PATH = /
 VITE_APP_ENV = 'development'
 
 # 多麦管理系统/开发环境
-VITE_APP_BASE_API = 'http://192.168.0.192:8080/'
+# VITE_APP_BASE_API = 'http://192.168.0.192:8080/'
+VITE_APP_BASE_API = 'https://www.saas.duomailianmeng.com/srv'
diff --git a/src/api/login.js b/src/api/login.js
index 7b7388f..ee97960 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -46,15 +46,3 @@ export function logout() {
     method: 'post'
   })
 }
-
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    url: '/captchaImage',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
-}
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index f4e944d..6be006f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -30,9 +30,9 @@
           </div>
           <template #dropdown>
             <el-dropdown-menu>
-              <router-link to="/user/profile">
+              <!-- <router-link to="/user/profile">
                 <el-dropdown-item>个人中心</el-dropdown-item>
-              </router-link>
+              </router-link> -->
               <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
                 <span>布局设置</span>
               </el-dropdown-item>
@@ -89,7 +89,7 @@ function logout() {
     type: 'warning'
   }).then(() => {
     userStore.logOut().then(() => {
-      location.href = '/admin/index';
+      location.href = '/admin';
     })
   }).catch(() => { });
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index b093f5c..830fa1f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -28,21 +28,6 @@
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          size="large"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter="handleLogin"
-        >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
@@ -68,7 +53,6 @@
 </template>
 
 <script setup>
-import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user'
@@ -90,13 +74,9 @@ const loginForm = ref({
 const loginRules = {
   username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
   password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
-  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
 };
 
-const codeUrl = ref("");
 const loading = ref(false);
-// 验证码开关
-const captchaEnabled = ref(true);
 // 注册开关
 const register = ref(false);
 const redirect = ref(undefined);
@@ -132,24 +112,11 @@ function handleLogin() {
         router.push({ path: redirect.value || "/", query: otherQueryParams });
       }).catch(() => {
         loading.value = false;
-        // 重新获取验证码
-        if (captchaEnabled.value) {
-          getCode();
-        }
       });
     }
   });
 }
 
-function getCode() {
-  getCodeImg().then(res => {
-    captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
-    if (captchaEnabled.value) {
-      codeUrl.value = "data:image/gif;base64," + res.img;
-      loginForm.value.uuid = res.uuid;
-    }
-  });
-}
 
 function getCookie() {
   const username = Cookies.get("username");
@@ -162,7 +129,6 @@ function getCookie() {
   };
 }
 
-getCode();
 getCookie();
 </script>
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4b9bf9a..83cf331 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -17,8 +17,8 @@
         <pane size="84">
           <el-col>
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              <el-form-item label="团长名称" prop="userName">
+                <el-input v-model="queryParams.userName" placeholder="请输入团长名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
               </el-form-item>
               <el-form-item label="手机号码" prop="phonenumber">
                 <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter="handleQuery" />
@@ -56,12 +56,12 @@
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" :data="filteredUserList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="账号名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="团长" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+              <!-- <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> -->
               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
               <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
                 <template #default="scope">
@@ -73,7 +73,7 @@
                   ></el-switch>
                 </template>
               </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="240">
                 <template #default="scope">
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
@@ -106,8 +106,8 @@
       <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+            <el-form-item label="团长名称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入团长名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -130,8 +130,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined" label="账号名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入账号名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -288,6 +288,11 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
+//过滤部分ID
+const filteredUserList = computed(() => {
+  return userList.value.filter(item => item.userId !== 1&&item.userId !== 150);
+});
+
 /** 通过条件过滤节点  */
 const filterNode = (value, data) => {
   if (!value) return true;