优化

src/api/index.ts

@@ -130,7 +130,9 @@ request.interceptors.response.use(
   },
   (error) => {
     NProgress.done();
-    if (error.response.status === 424) {
+    const status = error.response.status;
+    const msg = error.response.data.msg;
+    if (status === 424) {
       ElMessageBox.confirm("令牌状态已过期，请点击重新登录", "系统提示", {
         confirmButtonText: "重新登录",
         cancelButtonText: "取消",
@@ -143,17 +145,18 @@ request.interceptors.response.use(
       });
       return Promise.reject(error);
     }
+
     // let { message } = error;
     // if (message === "Network Error") {
     //   message = "后端接口连接异常";
     // } else if (message.includes("timeout")) {
     //   message = "系统接口请求超时";
     // } else if (message.includes("Request failed with status code")) {
-    // ElMessage({
-    //   message: message,
-    //   type: "error",
-    //   duration: 5 * 1000
-    // });
+    ElMessage({
+      message: msg,
+      type: "error",
+      duration: 5 * 1000
+    });
     // }
     return Promise.reject(error);
   }

src/permission.ts

@@ -42,9 +42,9 @@ router.beforeEach(async (to, from, next) => {
     if (to.path === "/login" || to.path === "/shuju") {
       next();
     } else {
-      if (to.path !== "/") {
-        ElMessage.warning("请先登录后再访问其他页面!");
-      }
+      // if (to.path !== "/") {
+      //   ElMessage.warning("请先登录后再访问其他页面!");
+      // }
       next(`/login`); // 否则全部重定向到登录页
     }
     NProgress.done();

src/styles/diyClass.scss

@@ -32,5 +32,9 @@
     margin: 0;
     margin-left: 5px;
     padding: 0;
+    border-color: transparent;
+    background: 0 0;
+    color: var(--el-color-primary);
   }
 }
+

src/views/admin/dept/index.vue

@@ -42,22 +42,20 @@
         <el-table-column label="操作" width="220" align="center" class-name="small-padding fixed-width">
           <template #default="{ row }">
             <div class="table_btn">
-              <el-button size="small" type="text" :icon="Plus" @click="addOrUpdateHandle(false, row.id)">
-                新增
-              </el-button>
-              <el-button size="small" type="text" :icon="Edit" @click="addOrUpdateHandle(true, row.id)">编辑</el-button>
-              <el-button size="small" type="text" :icon="Delete" @click="handleDelete(row)">删除</el-button>
+              <el-button size="small" :icon="Plus" @click="addOrUpdateHandle(false, row.id)"> 新增 </el-button>
+              <el-button size="small" :icon="Edit" @click="addOrUpdateHandle(true, row.id)">编辑</el-button>
+              <el-button size="small" :icon="Delete" @click="handleDelete(row)">删除</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
+      <!-- <pagination
         v-show="tablePage.total > 0"
         v-model:page="tablePage.currentPage"
         v-model:limit="tablePage.pageSize"
         :total="tablePage.total"
         @pagination="getList"
-      />
+      /> -->
 
       <el-dialog v-model="dialogVisible" :title="title" width="50%" :before-close="dialogClose">
         <el-form :model="form" ref="formRef" :rules="formRules" label-width="80px">
@@ -171,8 +169,8 @@ import type { FormInstance, FormRules } from "element-plus";
 import { Search, EditPen, Plus, Edit, Delete } from "@element-plus/icons-vue";
 
 import { useDict } from "@/hooks/dict";
-import { timestampToTime, getValueLabel, getValueListLabel } from "@/utils/util";
 import { ITablePage } from "@/const/interface_type";
+import { timestampToTime, getValueLabel, getValueListLabel } from "@/utils/util";
 import { getDeptList, getDeptObj, addDeptObj, putDeptObj, delDeptObj } from "@/api/admin";
 
 interface ISearchList {
@@ -224,7 +222,7 @@ const getList = () => {
   getDeptList(payload).then((res: any) => {
     if (res.code === 0) {
       tableData.value = res.data;
-      tablePage.value.total = res.data.total;
+      // tablePage.value.total = res.data.total;
       tableLoading.value = false;
     }
   });
@@ -252,8 +250,12 @@ const deptTypeChange = (val: string) => {
 const addOrUpdateHandle = (isEdit: boolean, id?: string) => {
   // 获取菜单信息
   getDeptList().then((res: any) => {
-    const menu = [{ id: "0", name: "根菜单", children: res.data }];
-    deptOptions.value = filterList(menu);
+    if (res.data[0].parentId === "0") {
+      const menu = [{ id: "0", name: "根菜单", children: res.data }];
+      deptOptions.value = filterList(menu);
+    } else {
+      deptOptions.value = filterList(res.data);
+    }
   });
   if (isEdit && id) {
     title.value = "修改";

src/views/admin/dict/index.vue

@@ -40,9 +40,9 @@
         <el-table-column label="操作" width="220" align="center" class-name="small-padding fixed-width">
           <template #default="{ row }">
             <div class="table_btn">
-              <el-button size="small" type="text" :icon="EditPen" @click="addOrUpdateHandle(row)">编辑</el-button>
-              <el-button size="small" type="text" :icon="Delete" @click="handleDelete(row)">删除</el-button>
-              <el-button size="small" type="text" :icon="Menu" @click="openDictItem(row)">字典项</el-button>
+              <el-button size="small" :icon="EditPen" @click="addOrUpdateHandle(row)">编辑</el-button>
+              <el-button size="small" :icon="Delete" @click="handleDelete(row)">删除</el-button>
+              <el-button size="small" :icon="Menu" @click="openDictItem(row)">字典项</el-button>
             </div>
           </template>
         </el-table-column>
@@ -115,8 +115,8 @@
           <el-table-column label="操作" width="160" align="center" class-name="small-padding fixed-width">
             <template #default="{ row }">
               <div class="table_btn">
-                <el-button size="small" type="text" :icon="EditPen" @click="openDictItemDialog(row)">编辑</el-button>
-                <el-button size="small" type="text" :icon="Delete" @click="deldictItem(row)">删除</el-button>
+                <el-button size="small" :icon="EditPen" @click="openDictItemDialog(row)">编辑</el-button>
+                <el-button size="small" :icon="Delete" @click="deldictItem(row)">删除</el-button>
               </div>
             </template>
           </el-table-column>

src/views/admin/menu/index.vue

@@ -42,11 +42,9 @@
       <el-table-column label="操作" width="170" align="center" class-name="small-padding fixed-width">
         <template #default="{ row }">
           <div class="table_btn">
-            <el-button size="small" type="text" :icon="Plus" @click="addOrUpdateHandle(false, row.id)">
-              新增
-            </el-button>
-            <el-button size="small" type="text" :icon="Edit" @click="addOrUpdateHandle(true, row.id)">修改 </el-button>
-            <el-button size="small" type="text" :icon="Delete" @click="handleDelete(row)">删除 </el-button>
+            <el-button size="small" :icon="Plus" @click="addOrUpdateHandle(false, row.id)"> 新增 </el-button>
+            <el-button size="small" :icon="Edit" @click="addOrUpdateHandle(true, row.id)">修改 </el-button>
+            <el-button size="small" :icon="Delete" @click="handleDelete(row)">删除 </el-button>
           </div>
         </template>
       </el-table-column>

src/views/admin/role/index.vue

@@ -45,10 +45,10 @@
         <el-table-column label="操作" width="220" align="center" class-name="small-padding fixed-width">
           <template #default="{ row }">
             <div class="table_btn">
-              <el-button size="small" type="text" :icon="View" @click="addOrUpdateHandle(1, row)">查看</el-button>
-              <el-button size="small" type="text" :icon="Edit" @click="addOrUpdateHandle(2, row)">编辑</el-button>
-              <el-button size="small" type="text" :icon="Delete" @click="handleDelete(row)">删除</el-button>
-              <el-button size="small" type="text" :icon="Plus" @click="handlePermission(row)">权限</el-button>
+              <el-button size="small" :icon="View" @click="addOrUpdateHandle(1, row)">查看</el-button>
+              <el-button size="small" :icon="Edit" @click="addOrUpdateHandle(2, row)">编辑</el-button>
+              <el-button size="small" :icon="Delete" @click="handleDelete(row)">删除</el-button>
+              <el-button size="small" :icon="Plus" @click="handlePermission(row)">权限</el-button>
             </div>
           </template>
         </el-table-column>

src/views/admin/user/index.vue

@@ -82,10 +82,10 @@
           <el-table-column label="操作" width="220" align="center" class-name="small-padding fixed-width">
             <template #default="{ row }">
               <div class="table_btn">
-                <el-button size="small" type="text" @click="addOrUpdateHandle(row)">修改</el-button>
-                <el-button size="small" type="text" @click="handleDelete(row)">删除</el-button>
-                <!-- <el-button size="small" type="text" @click="handleDelete(row)">重置密码</el-button>
-                <el-button size="small" type="text" @click="handleDelete(row)">角色分配</el-button> -->
+                <el-button size="small" @click="addOrUpdateHandle(row)">修改</el-button>
+                <el-button size="small" @click="handleDelete(row)">删除</el-button>
+                <!-- <el-button size="small"  @click="handleDelete(row)">重置密码</el-button>
+                <el-button size="small"  @click="handleDelete(row)">角色分配</el-button> -->
               </div>
             </template>
           </el-table-column>
@@ -103,8 +103,8 @@
       <el-form :model="dialogForm" ref="dialogFormRef" :rules="dialogFormRules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="username">
-              <el-input v-model="dialogForm.username" clearable placeholder="请输入用户昵称" />
+            <el-form-item label="用户昵称" prop="name">
+              <el-input v-model="dialogForm.name" clearable placeholder="请输入用户名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -127,8 +127,13 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户名称" prop="name">
-              <el-input v-model="dialogForm.name" clearable placeholder="请输入用户名称" />
+            <el-form-item label="用户名称" prop="username">
+              <el-input
+                v-model="dialogForm.username"
+                clearable
+                placeholder="请输入用户昵称"
+                :disabled="title === '修改'"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/dataStatistics/droughtResistant/index.vue

@@ -24,7 +24,6 @@
                 :key="item.deptId"
                 :label="item.abbreviationName"
                 :value="item.deptId"
-                ·
               />
             </el-select>
           </el-form-item>
@@ -51,7 +50,7 @@
     <el-table :data="tableData" stripe border :span-method="arraySpanMethod">
       <el-table-column type="index" label="序号" header-align="center" align="center" />
       <el-table-column prop="upidName" label="省份" header-align="center" align="center" />
-      <el-table-column prop="username" label="储备仓库" header-align="center" align="center" />
+      <el-table-column prop="username" label="储备仓库" header-align="center" align="center" width="120" />
       <template v-for="item in headerName" :key="item">
         <el-table-column :label="item.dmUpname" header-align="center" align="center">
           <template v-for="iten in item.children" :key="iten">

src/views/dataStatistics/reliefMaterial/index.vue

@@ -50,7 +50,7 @@
     <el-table :data="tableData" stripe border :span-method="arraySpanMethod">
       <el-table-column type="index" label="序号" header-align="center" align="center" />
       <el-table-column prop="upidName" label="省份" header-align="center" align="center" />
-      <el-table-column prop="username" label="储备仓库" header-align="center" align="center" />
+      <el-table-column prop="username" label="储备仓库" header-align="center" align="center" width="120" />
       <template v-for="item in headerName" :key="item">
         <el-table-column :label="item.dmUpname" header-align="center" align="center">
           <template v-for="iten in item.children" :key="iten">

src/views/login/index.vue

@@ -14,7 +14,13 @@
         <el-row>
           <el-col :span="24">
             <el-form-item prop="username">
-              <el-input :prefix-icon="UserFilled" v-model="loginForm.username" placeholder="请输入您的账号" clearable />
+              <el-input
+                :prefix-icon="UserFilled"
+                v-model="loginForm.username"
+                placeholder="请输入您的账号"
+                clearable
+                @keyup.enter="loginSubmit(form)"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -28,29 +34,26 @@
                 v-model="loginForm.password"
                 placeholder="请输入密码"
                 clearable
+                @keyup.enter="loginSubmit(form)"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-form-item prop="code">
-            <el-col :span="16">
-              <el-input v-model="loginForm.code" placeholder="请输入验证码">
-                <template #prefix>
-                  <el-icon><Picture /></el-icon>
-                </template>
-              </el-input>
-            </el-col>
-            <el-col :span="8">
-              <div class="login-code">
-                <span v-if="verificationCode.type == 'text'" class="login-code-img" @click="refreshCode">
-                  {{ verificationCode.value }}
-                </span>
-                <img v-else :src="verificationCode.src" class="login-code-img" @click="refreshCode" />
-              </div>
-            </el-col>
-          </el-form-item>
-        </el-row> -->
+        <el-row class="login-code">
+          <el-col :span="16">
+            <el-form-item prop="code">
+              <el-input
+                :prefix-icon="Picture"
+                v-model="loginForm.code"
+                placeholder="请输入验证码"
+                @keyup.enter="loginSubmit(form)"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <img :src="verificationCode.src" class="login-code-img" @click="refreshCode" />
+          </el-col>
+        </el-row>
         <el-row class="login_btn">
           <el-button type="primary" @click="loginSubmit(form)">登录</el-button>
         </el-row>
@@ -71,7 +74,7 @@ import { UserFilled, Lock, Picture } from "@element-plus/icons-vue";
 const loginForm = ref<ILogin>({
   username: "",
   password: "",
-  code: "1890",
+  code: "",
   randomStr: ""
 });
 const form = ref<FormInstance>();
@@ -91,9 +94,7 @@ const router = useRouter();
 
 const refreshCode = () => {
   loginForm.value.randomStr = randomLenNum(verificationCode.value.lenth, true);
-  verificationCode.value.type === "text"
-    ? (verificationCode.value.value = randomLenNum(verificationCode.value.lenth))
-    : (verificationCode.value.src = `${process.env.VUE_APP_BASE_URL}/admin/api/code?randomStr=${loginForm.value.randomStr}`);
+  verificationCode.value.src = `${process.env.VUE_APP_BASE_URL}/admin/api/code?randomStr=${loginForm.value.randomStr}`;
 };
 
 const loginSubmit = async (formRef?: FormInstance) => {
@@ -105,8 +106,8 @@ const loginSubmit = async (formRef?: FormInstance) => {
         .then(() => {
           router.push(store.getters.tagWel.value);
         })
-        .catch((err) => {
-          ElMessage.warning("请检查用户名/密码后再次尝试");
+        .catch(() => {
+          refreshCode();
         });
     }
   });
@@ -185,16 +186,14 @@ refreshCode();
       height: 40px;
       border-radius: 20px;
       margin: 30px 20px 0 20px;
-      background-color: #4a4996;
-      border-color: #4a4996;
+      background-color: linear-gradient(270deg, #2fa1ff 0%, #174df5 100%);
+      border-color: linear-gradient(270deg, #2fa1ff 0%, #174df5 100%);
     }
     .login-code {
       display: flex;
       align-items: center;
       justify-content: space-around;
-      margin-left: 10px;
       .login-code-img {
-        margin-top: 2px;
         width: 100px;
         height: 38px;
         background-color: #fdfdfd;
@@ -206,6 +205,7 @@ refreshCode();
         line-height: 38px;
         text-indent: 5px;
         text-align: center;
+        margin-bottom: 16px;
       }
     }
   }