From b7cc987132f9dbe0b6a705e94fcf8a7472cca476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E5=BD=A6=E6=A3=8B?= <liaoyq@pvc123.com>
Date: Fri, 15 Mar 2024 09:25:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E4=BC=A0=E5=8F=82=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 new-ui/projects/admin/src/router/menu.ts             | 10 ++++++++++
 new-ui/projects/admin/src/router/system.ts           |  3 +++
 .../admin/src/views/ApiKey/ApiKeyContainer.vue       | 12 ------------
 new-ui/projects/admin/src/views/User/UserForm.vue    |  7 ++++---
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/new-ui/projects/admin/src/router/menu.ts b/new-ui/projects/admin/src/router/menu.ts
index 96234192..8913088c 100644
--- a/new-ui/projects/admin/src/router/menu.ts
+++ b/new-ui/projects/admin/src/router/menu.ts
@@ -32,6 +32,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "用户管理",
       icon: IconUser,
+      permission: "api_admin_user_list",
     },
     component: () => import("@/views/User/UserContainer.vue"),
   },
@@ -41,6 +42,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "角色模型",
       icon: IconCodeSandbox,
+      permission: "api_admin_role_list",
     },
     component: () => import("@/views/Role/RoleContainer.vue"),
   },
@@ -50,6 +52,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "语言模型",
       icon: IconCodepen,
+      permission: "api_admin_model_list",
     },
     component: () => import("@/views/ChatModel/ChatModelContainer.vue"),
   },
@@ -59,6 +62,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "充值产品",
       icon: IconWechatpay,
+      permission: "api_admin_product_list",
     },
     component: () => import("@/views/Product/ProductContainer.vue"),
   },
@@ -68,6 +72,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "APIKEY",
       icon: IconLock,
+      permission: "api_admin_apikey_list",
     },
     component: () => import("@/views/ApiKey/ApiKeyContainer.vue"),
   },
@@ -77,6 +82,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "充值订单",
       icon: IconOrderedList,
+      permission: "api_admin_order_list",
     },
     component: () => import("@/views/Order/OrderContainer.vue"),
   },
@@ -87,6 +93,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "众筹管理",
       icon: IconHeartFill,
+      permission: "api_admin_reward_list",
     },
     component: () => import("@/views/Reward/RewardContainer.vue"),
   },
@@ -96,6 +103,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "函数管理",
       icon: IconCodeSquare,
+      permission: "api_admin_function_list",
     },
     component: () => import("@/views/Functions/FunctionsContainer.vue"),
   },
@@ -105,6 +113,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "对话管理",
       icon: IconMessage,
+      permission: "api_admin_chat_list",
     },
     component: () => import("@/views/Chats/ChatsContainer.vue"),
   },
@@ -114,6 +123,7 @@ const menu: RouteRecordRaw[] = [
     meta: {
       title: "网站设置",
       icon: IconSettings,
+      permission: "api_admin_config_get",
     },
     component: () => import("@/views/System/SystemContainer.vue"),
   },
diff --git a/new-ui/projects/admin/src/router/system.ts b/new-ui/projects/admin/src/router/system.ts
index d174c7c5..8a1fb5ba 100644
--- a/new-ui/projects/admin/src/router/system.ts
+++ b/new-ui/projects/admin/src/router/system.ts
@@ -5,6 +5,7 @@ const system: RouteRecordRaw[] = [
     name: "SysAdmin",
     meta: {
       title: "系统管理员",
+      permission: "api_admin_sysUser_list",
     },
     component: () => import("@/views/SysAdmin/SysAdminContainer.vue"),
   },
@@ -13,6 +14,7 @@ const system: RouteRecordRaw[] = [
     name: "SysPermission",
     meta: {
       title: "权限配置",
+      permission: "api_admin_sysPermission_list",
     },
     component: () => import("@/views/SysPermission/SysPermissionContainer.vue"),
   },
@@ -21,6 +23,7 @@ const system: RouteRecordRaw[] = [
     name: "SysRole",
     meta: {
       title: "角色管理",
+      permission: "api_admin_sysRole_list",
     },
     component: () => import("@/views/SysRole/SysRoleContainer.vue"),
   },
diff --git a/new-ui/projects/admin/src/views/ApiKey/ApiKeyContainer.vue b/new-ui/projects/admin/src/views/ApiKey/ApiKeyContainer.vue
index be961dce..e35aaaeb 100644
--- a/new-ui/projects/admin/src/views/ApiKey/ApiKeyContainer.vue
+++ b/new-ui/projects/admin/src/views/ApiKey/ApiKeyContainer.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { getList, save, deleting, setStatus } from "./api";
-import { ref } from "vue";
 import ApiKeyForm from "./ApiKeyForm.vue";
 import useCustomFormPopup from "@/composables/useCustomFormPopup";
 import { Message } from "@arco-design/web-vue";
@@ -55,17 +54,6 @@ const columns = [
   },
 ];
 
-// 数据
-const tableData = ref([]);
-const getData = () => {
-  getList().then(({ code, data }) => {
-    if (code === 0) {
-      tableData.value = data;
-    }
-  });
-};
-getData();
-
 //  新增编辑
 const popup = useCustomFormPopup(ApiKeyForm, save, {
   popupProps: (arg) => ({ title: arg[0].record ? "编辑ApiKey" : "新增ApiKey" }),
diff --git a/new-ui/projects/admin/src/views/User/UserForm.vue b/new-ui/projects/admin/src/views/User/UserForm.vue
index 8d409f3c..2d8a946a 100644
--- a/new-ui/projects/admin/src/views/User/UserForm.vue
+++ b/new-ui/projects/admin/src/views/User/UserForm.vue
@@ -68,6 +68,7 @@
 
 <script setup>
 import { ref, defineExpose, defineProps } from "vue";
+import { dateFormat } from "@chatgpt-plus/packages/utils";
 import { getModel, getRole } from "./api";
 const props = defineProps({
   data: {},
@@ -87,9 +88,9 @@ const form = ref({
 });
 if (props.data?.id) {
   form.value = Object.assign({}, props.data);
-  if (form.value.expired_time === 0) {
-    form.value.expired_time = "";
-  }
+  form.value.expired_time = !form.value.expired_time
+    ? undefined
+    : dateFormat(form.value.expired_time);
 }
 
 //拿选项