fix: 修复菜单及版本相关问题

src/components/UpdateVersion/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-12-10 15:36:04
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-10 17:51:30
+ * @LastEditTime: 2024-12-11 09:18:42
  * @Description: 更新版本弹窗
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -58,10 +58,13 @@ watch(
 )
 
 const handleConfirm = () => {
-  postSaveUserClient({ versionId: props.state?.versionId as string }).finally(() => {
-    visible.value = false
-  })
-  window.location.reload()
+  postSaveUserClient({ versionId: props.state?.versionId as string })
+    .then(() => {
+      window.location.reload()
+    })
+    .finally(() => {
+      visible.value = false
+    })
 }
 </script>
 

src/layouts/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-11 09:38:40
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-10 16:47:46
+ * @LastEditTime: 2024-12-11 09:14:20
  * @Description: 
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -10,7 +10,7 @@
   <t-layout class="layout-container">
     <Header class="layout-header" />
     <t-layout class="layout-content">
-      <t-aside :class="[isCollapse ? 'w-[52px]' : 'w-[208px]']">
+      <t-aside :class="[isCollapse ? '!w-[52px]' : '!w-[208px]']">
         <MenuSearch />
         <Menu />
         <!-- <MiddleBtn /> -->

src/styles/common.less

@@ -79,6 +79,7 @@
   td {
     border: none;
     font-size: 13px;
+    padding: 8px;
   }
 }
 

src/views/customer/institution/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-28 15:01:02
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-10 15:21:08
+ * @LastEditTime: 2024-12-11 09:45:58
  * @Description: 机构管理
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -72,11 +72,10 @@ const router = useRouter()
 onMounted(() => {
   setBreadcrumb([
     {
-      title: '系统权限'
+      title: '客户中心'
     },
     {
-      title: '平台机构',
-      name: 'role'
+      title: '机构管理'
     }
   ])
   getDictData()
@@ -151,7 +150,17 @@ const columns: PrimaryTableCol[] = [
       )
     }
   },
-  { title: '服务到期时间', colKey: 'serviceTerminationTime' },
+  {
+    title: '服务到期时间',
+    colKey: 'serviceTerminationTime',
+    cell: (h, { row }) => {
+      return (
+        <div class={row.serviceStatus == 2 ? 'ellipsis text-[var(--td-error-color-11)]' : 'ellipsis'}>
+          {row.serviceTerminationTime}
+        </div>
+      )
+    }
+  },
   {
     title: '机构状态',
     colKey: 'companyStatus',
@@ -184,7 +193,7 @@ const columns: PrimaryTableCol[] = [
     cell: (h, { row }) => {
       return (
         <div class='flex items-center justify-between'>
-          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis text-[var(--td-font-gray-3)]' : ''}>
+          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis' : ''}>
             <span class={row.inputUserDelFlag ? 'text-[var(--td-font-gray-3)]' : ''}>{row.inputUserName || '-'}</span>
           </div>
           {row.inputUserDelFlag ? <span class='inputUserName-del'>已删除</span> : ''}

src/views/login/index.vue

@@ -59,9 +59,10 @@
             </t-form-item>
             <t-form-item>
               <t-button
-                class="mt-[60px] h-[48px] w-full text-[16px]"
+                class="mt-[60px] w-full text-[16px]"
                 :disabled="isLoginButtonDisable"
                 type="submit"
+                size="large"
                 shape="round"
                 >登 录</t-button
               >

src/views/sys-config/dictionary/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-11 09:38:40
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-10 17:52:47
+ * @LastEditTime: 2024-12-11 09:34:26
  * @Description: 系统字典
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -163,7 +163,7 @@ const columns: PrimaryTableCol[] = [
     cell: (h, { row }) => {
       return (
         <div class='flex items-center justify-between'>
-          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis text-[var(--td-font-gray-3)]' : ''}>
+          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis' : ''}>
             <span class={row.inputUserDelFlag ? 'text-[var(--td-font-gray-3)]' : ''}>{row.inputUserName || '-'}</span>
           </div>
           {row.inputUserDelFlag ? <span class='inputUserName-del'>已删除</span> : ''}

src/views/sys-config/menu/index.vue

@@ -159,7 +159,7 @@ const columns: PrimaryTableCol[] = [
     cell: (h, { row }) => {
       return (
         <div class='flex items-center justify-between'>
-          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis text-[var(--td-font-gray-3)]' : ''}>
+          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis' : ''}>
             <span class={row.inputUserDelFlag ? 'text-[var(--td-font-gray-3)]' : ''}>{row.inputUserName || '-'}</span>
           </div>
           {row.inputUserDelFlag ? <span class='inputUserName-del'>已删除</span> : ''}

src/views/sys-config/menu/page/menu-edit.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-11 09:38:40
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-10 17:21:10
+ * @LastEditTime: 2024-12-11 09:28:41
  * @Description: 菜单管理-新增编辑菜单
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -151,7 +151,6 @@ const open = (val: ResMenu | null) => {
     for (const key in formData) {
       if (Object.prototype.hasOwnProperty.call(val, key)) {
         ;(formData as any)[key] = val[key] // 使用类型断言
-        console.log(formData.isButton)
       }
     }
     getLevelMenu()

src/views/sys-config/version/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-11 09:38:40
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-10 17:53:27
+ * @LastEditTime: 2024-12-11 09:06:44
  * @Description: 版本管理
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -22,6 +22,7 @@
       :show-tree="true"
       @search-change="handleSearch"
       @page-change="handlePage"
+      @clear="handleSearch(searchParams)"
       table-maxheight="550px"
       class="max-h-[calc(100%-50px)]"
     >
@@ -152,8 +153,8 @@ const columns: PrimaryTableCol[] = [
     cell: (h, { row }) => {
       return (
         <div class='flex items-center justify-between'>
-          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis text-[var(--td-font-gray-3)]' : ''}>
-            <span class={row.inputUserDelFlag ? 'text-[var(--td-font-gray-3)]' : ''}>{row.inputUserName || '-'}</span>
+          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis ' : ''}>
+            <span>{row.inputUserName || '-'}</span>
           </div>
           {row.inputUserDelFlag ? <span class='inputUserName-del'>已删除</span> : ''}
         </div>

src/views/sys-permissions/role/index.vue

@@ -132,7 +132,7 @@ const columns: PrimaryTableCol[] = [
     cell: (h, { row }) => {
       return (
         <div class='flex items-center justify-between'>
-          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis text-[var(--td-font-gray-3)]' : ''}>
+          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis' : ''}>
             <span class={row.inputUserDelFlag ? 'text-[var(--td-font-gray-3)]' : ''}>{row.inputUserName || '-'}</span>
           </div>
           {row.inputUserDelFlag ? <span class='inputUserName-del'>已删除</span> : ''}

src/views/sys-permissions/user/detail.vue

@@ -134,14 +134,14 @@ const dataPermissions = (row: ResUserList) => {
   const rolePermissions = row.rolePermissions || []
   const txt =
     areaPermissions.map((val: { name: string }) => val.name).join(',') +
-    (rolePermissions.length ? '-' + rolePermissions.map((val: { name: string }) => val.name).join(',') : '')
+    (rolePermissions.length ? '(' + rolePermissions.map((val: { name: string }) => val.name).join(',') + ')' : '')
 
   return txt
 }
 
 const functionPermission = (row: ResUserList) => {
   const buttonNames = row.buttonNames || []
-  return row.menuName + (buttonNames.length ? '-' + buttonNames.join(',') : '')
+  return row.menuName + (buttonNames.length ? '(' + buttonNames.join(',') + ')' : '')
 }
 
 // 合并单元格

src/views/sys-permissions/user/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-28 15:01:02
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-10 17:52:05
+ * @LastEditTime: 2024-12-11 09:35:43
  * @Description: 用户管理
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -153,8 +153,8 @@ const columns: PrimaryTableCol[] = [
     cell: (h, { row }) => {
       return (
         <div class='flex items-center justify-between'>
-          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis text-[var(--td-font-gray-3)]' : ''}>
-            <span class={row.inputUserDelFlag ? 'text-[var(--td-font-gray-3)]' : ''}>{row.inputUserName || '-'}</span>
+          <div class={row.inputUserDelFlag ? 'w-[calc(100%-58px)] ellipsis' : ''}>
+            <span>{row.inputUserName || '-'}</span>
           </div>
           {row.inputUserDelFlag ? <span class='inputUserName-del'>已删除</span> : ''}
         </div>