ff

package.json

@@ -4,7 +4,7 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "start": "vite --force",
+    "start": "vite --force --port 8000",
     "start:debug": "vite --debug",
     "start:mock": "vite --mode mock",
     "start:production": "vite --mode production",
@@ -27,15 +27,12 @@
     ]
   },
   "dependencies": {
-    "@ant-design/charts": "^1.1.16",
-    "@ant-design/icons": "^5.0.1",
+    "@ant-design/charts": "^1.4.2",
+    "@ant-design/icons": "^5.2.6",
     "@ant-design/pro-form": "^2.18.6",
     "@ant-design/pro-layout": "^6.26.5",
     "@handsontable/react": "^12.1.2",
     "@types/qs": "^6.9.7",
-    "@websee/core": "^4.0.2",
-    "@websee/performance": "^4.0.2",
-    "@websee/recordscreen": "^4.0.2",
     "ahooks": "^3.7.5",
     "amis": "^1.9.1-beta.17",
     "antd": "^4.24.13",
@@ -89,7 +86,6 @@
     "react-style-proptype": "^3.2.2",
     "react-text-loop-next": "^0.0.3",
     "resize-observer-polyfill": "^1.5.1",
-    "rrule": "^2.7.2",
     "socket.io-client": "^4.7.2",
     "swap-array": "^1.0.0",
     "xlsx-js-style": "^1.2.0",
@@ -138,6 +134,7 @@
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-imagemin": "^0.6.1",
-    "vite-plugin-mock": "^2.9.6"
+    "vite-plugin-mock": "^2.9.6",
+    "vite-tsconfig-paths": "^4.2.1"
   }
 }

public/config/combiningMenus.json

@@ -8,115 +8,19 @@
     "closable": false
   },
   {
-    "path": "/groupStructure",
-    "name": "集团架构",
-    "element": "groupStructure",
+    "path": "/test",
+    "name": "测试",
+    "element": "Test",
     "type": "component",
-    "icon": "icon-jituanjiagou",
+    "icon": "icon-jibenxinxiweihu",
     "closable": false
   },
   {
-    "path": "/ReportSys",
-    "name": "报告系统",
-    "element": "reportSys",
-    "type": "component",
-    "closable": false,
-    "hideInMenu": true
-  },
-  {
-    "path": "/ReportSys/StatementData",
-    "element": "statementData",
-    "name": "报表项目基础数据",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "path": "/ReportSys/unFinancialStatements",
-    "element": "unFinancialStatements",
-    "name": "未审财务报表",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "TB汇总",
-    "path": "/ReportSys/trialSys/trialBalance",
-    "element": "trialBalance",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "TB-调整抵消",
-    "path": "/ReportSys/trialSys/AuditAdjust",
-    "element": "auditAdjust",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "TB-模拟调整",
-    "path": "/ReportSys/UnFinancialSys/accountAdjust",
-    "element": "accountAdjust",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "附注与分析",
-    "path": "/ReportSys/reportAnalysis",
-    "element": "reportAnalysis",
-    "type": "component",
-    "hideInMenu": true
-  },
-
-  {
-    "path": "/ReportSys/approvedFinance",
-    "name": "审定报表",
-    "element": "approvedFinance",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "财务报表核对",
-    "path": "/ReportSys/UnFinancialSys/financialStatementsCheck",
-    "element": "financialStatementsCheck",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "长投及关联交易—内部往来统计",
-    "path": "/ReportSys/trialSys/internalTran",
-    "element": "internalTran",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "报告生成",
-    "path": "/ReportSys/reportBuilder",
-    "element": "reportBuilder",
-    "type": "component",
-    "hideInMenu": true
-  },
-  {
-    "name": "集团层统计",
-    "path": "/groupLevelStatistics",
-    "icon": "icon-jituancengtongji",
-    "children": [
-      {
-        "type": "component",
-        "name": "单体分录汇总",
-        "element": "entriesSummary",
-        "path": "/groupLevelStatistics/entriesSummary"
-      },
-      {
-        "type": "component",
-        "name": "往来明细表汇总",
-        "element": "detailsSummary",
-        "path": "/groupLevelStatistics/detailsSummary"
-      },
-      {
+    "path": "/groupStructure",
+    "name": "集团架构",
+    "element": "GroupStructure",
     "type": "component",
-        "name": "函证统计",
-        "element": "correspondenceStatistics",
-        "path": "/groupLevelStatistics/correspondenceStatistics"
-      }
-    ]
+    "icon": "icon-jituanjiagou",
+    "closable": false
   }
 ]

src/components/Nav/index.tsx

@@ -2,7 +2,6 @@ import React, { useEffect, useMemo, lazy, useRef, useState } from 'react'
 import { Empty, Tabs } from 'antd'
 import type { TabsProps } from 'antd'
 import useTabStore from '@/store/tab'
-import { useNavigate } from 'react-router-dom'
 import { routeMap } from '@/router'
 import { NotFound } from '@/router/routes'
 
@@ -57,17 +56,25 @@ const Nav: React.FC = props => {
 
   const tabPanes: TabsProps['items'] = useMemo(() => {
     return items.map(item => {
+      let children = <></>
+      if (React.isValidElement(item.element)) {
+        console.log('1111')
+        children = item.element
+      } else {
+        console.log('2222')
         let element = item.element as string
         element = element.slice(0, 1).toUpperCase() + element.slice(1)
         const Element = routeMap[element]
+        console.log(
+          "🚀 ~ file: index.tsx:66 ~ consttabPanes:TabsProps['items']=useMemo ~ Element:",
+          Element,
+        )
+        children = <>导航页</>
+      }
       const pane = {
         key: item.key,
         label: item.label,
-        children: React.isValidElement(<Element></Element>) ? (
-          <Element></Element>
-        ) : (
-          <NotFound></NotFound>
-        ),
+        children,
       }
       return pane
     })

src/layout/index.tsx

@@ -241,7 +241,7 @@ const LayoutPage: React.FC = () => {
       menuDataRender={() => loopMenuItem(menuList)}
     >
       <Nav></Nav>
-      {/* <Outlet /> */}
+      <Outlet />
     </ProLayout>
   )
 }

src/main.tsx

 import React, { Suspense } from 'react'
 import ReactDOM from 'react-dom/client'
 import { HashRouter } from 'react-router-dom'
-import 'devextreme/dist/css/dx.light.css'
+// import 'devextreme/dist/css/dx.light.css'
 import App from './App'
 import SuspenceFallbackLoading from '@/layout/suspenceFallback'
 import Initial from './initial'

src/pages/GroupStructure/service.ts

@@ -15,6 +15,7 @@ import type {
 const baseRequest = async (url: any, params: any) => {
   try {
     const res = await cloudGetApiData(url, params);
+    console.log("🚀 ~ file: service.ts:18 ~ baseRequest ~ res:", res)
     if (res.ok) {
       return Promise.resolve({
         data: res.data,
@@ -37,6 +38,7 @@ export default {
     return await baseRequest(`cs/data.importPartFromCloud`, params);
   },
   getGroupPartTreeList: async (params: GetGroupPartTreeListParams) => {
+    console.log("🚀 ~ file: service.ts:41 ~ getGroupPartTreeList: ~ params:", params)
     return await baseRequest(`cs/data.getGroupPartTreeList`, params);
   },
   // 删除一个单位

src/pages/accountAdjust/components/AdjustGrid/components/AdjustEntry/components/AgingaccountPopup/SimpleDatas.tsx

-import { CheckBox } from "devextreme-react";
-import React from "react";
-import { CpasIcon } from '~/public/cpas-ui';
+import { CheckBox } from 'devextreme-react'
+import React from 'react'
+import { CpasIcon } from 'cpas-ui'
 
 export const bottomColumns = [
   {
-    dataField: "Caption",
-    dataType: "string",
-    caption: "报表项目",
+    dataField: 'Caption',
+    dataType: 'string',
+    caption: '报表项目',
     width: 200,
-    alignment: "left",
-    allowResizing: true
+    alignment: 'left',
+    allowResizing: true,
   },
   {
-    dataField: "code",
-    dataType: "string",
-    caption: "科目编号",
+    dataField: 'code',
+    dataType: 'string',
+    caption: '科目编号',
     width: 200,
-    alignment: "left",
-    allowResizing: true
+    alignment: 'left',
+    allowResizing: true,
   },
 ]
-
-
-

src/pages/test/index.tsx

+import React, { useState, useContext, useEffect, useCallback, useMemo } from 'react'
+// import DxButton from 'devextreme/ui/button'
+// import DxCheckbox from 'devextreme/ui/check_box'
+import DxButton from 'devextreme-react/button'
+
+const Test: React.FC = () => {
+  return (
+    <div>
+      <DxButton text={'测试按钮'} type="danger"></DxButton>
+      {/* <DxCheckbox></DxCheckbox> */}
+    </div>
+  )
+}
+
+export default Test

src/router/routes.tsx

@@ -10,6 +10,7 @@ const ChangePassword = lazy(() => import('../pages/user/ChangePd'))
 //异常组件
 export const NotFound = lazy(() => import('@/pages/404'))
 import ErrorPage from '@/ErrorPage'
+const Test = lazy(() => import('@/pages/test'))
 // 业务
 const Home = lazy(() => import('@/pages/home'))
 const GroupStructure = lazy(() => import('@/pages/groupStructure'))
@@ -29,6 +30,7 @@ const DetailsSummary = lazy(() => import('@/pages/detailsSummary'))
 const CorrespondenceStatistics = lazy(() => import('@/pages/correspondenceStatistics'))
 // 路由枚举
 export const routeMap: Record<string, React.LazyExoticComponent<any>> = {
+  Test,
   Home,
   GroupStructure,
   ReportSys,