shaogen1995 2 lat temu
rodzic
commit
73d98315e5

+ 1 - 1
src/components/AsyncSpinLoding/index.module.scss

@@ -1,7 +1,7 @@
 .AsyncSpinLoding {
 .AsyncSpinLoding {
   display: none;
   display: none;
   position: fixed;
   position: fixed;
-  z-index: 99;
+  z-index: 9999;
   top: 0;
   top: 0;
   left: 0;
   left: 0;
   width: 100%;
   width: 100%;

+ 1 - 1
src/components/LeftBar/index.module.scss

@@ -13,7 +13,7 @@
         opacity: 0;
         opacity: 0;
       }
       }
       &:hover{
       &:hover{
-        color: #D3B453;
+        color: var(--themeColor);
       }
       }
     }
     }
     .active{
     .active{

+ 2 - 1
src/pages/Home/index.module.scss

@@ -69,7 +69,7 @@
             }
             }
 
 
             &:hover {
             &:hover {
-              color: #D3B453;
+              color: var(--themeColor);
             }
             }
           }
           }
         }
         }
@@ -153,6 +153,7 @@
             margin-bottom: 3%;
             margin-bottom: 3%;
 
 
             .doneRow {
             .doneRow {
+              cursor: pointer;
               padding: 15px;
               padding: 15px;
               width: 50%;
               width: 50%;
               height: 30%;
               height: 30%;

+ 5 - 1
src/pages/Layout/index.tsx

@@ -23,7 +23,11 @@ export default function Layout() {
   const [path, setPath] = useState("");
   const [path, setPath] = useState("");
 
 
   useEffect(() => {
   useEffect(() => {
-    setPath(location.pathname);
+    const arr = location.pathname.split("/");
+    let pathTemp = "/";
+    if (arr[1]) pathTemp = '/'+arr[1];
+
+    setPath(pathTemp);
   }, [location]);
   }, [location]);
 
 
   const userInfo = useMemo(() => {
   const userInfo = useMemo(() => {

+ 14 - 11
src/pages/Object/index.tsx

@@ -7,14 +7,18 @@ import AuthRoute from "@/components/AuthRoute";
 import NotFound from "@/components/NotFound";
 import NotFound from "@/components/NotFound";
 const Object1 = React.lazy(() => import("../Object1"));
 const Object1 = React.lazy(() => import("../Object1"));
 const Object2 = React.lazy(() => import("../Object2"));
 const Object2 = React.lazy(() => import("../Object2"));
+const Object3 = React.lazy(() => import("../Object3"));
+const Object4 = React.lazy(() => import("../Object4"));
+const Object5 = React.lazy(() => import("../Object5"));
+const Object6 = React.lazy(() => import("../Object6"));
 
 
 const data = [
 const data = [
   { id: 1, name: "藏品登记", path: "/object" },
   { id: 1, name: "藏品登记", path: "/object" },
   { id: 2, name: "入库管理", path: "/object/2" },
   { id: 2, name: "入库管理", path: "/object/2" },
-  { id: 3, name: "出库管理", path: "/object3" },
-  { id: 4, name: "藏品总账", path: "/object4" },
-  { id: 5, name: "藏品盘核", path: "/object5" },
-  { id: 6, name: "藏品注销", path: "/object6" },
+  { id: 3, name: "出库管理", path: "/object/3" },
+  { id: 4, name: "藏品总账", path: "/object/4" },
+  { id: 5, name: "藏品盘核", path: "/object/5" },
+  { id: 6, name: "藏品注销", path: "/object/6" },
 ];
 ];
 
 
 export default function Object() {
 export default function Object() {
@@ -27,13 +31,12 @@ export default function Object() {
       <div className="rightMain">
       <div className="rightMain">
         <React.Suspense fallback={<SpinLoding />}>
         <React.Suspense fallback={<SpinLoding />}>
           <Switch>
           <Switch>
-            <AuthRoute path="/object/2" component={Object2} myInd={{ id: 2 }} />
-            <AuthRoute
-              exact
-              path="/object"
-              component={Object1}
-              myInd={{ id: 1 }}
-            />
+            <AuthRoute path="/object/2" component={Object2} />
+            <AuthRoute path="/object/3" component={Object3} />
+            <AuthRoute path="/object/4" component={Object4} />
+            <AuthRoute path="/object/5" component={Object5} />
+            <AuthRoute path="/object/6" component={Object6} />
+            <AuthRoute exact path="/object" component={Object1} />
             <Route path="*" component={NotFound} />
             <Route path="*" component={NotFound} />
           </Switch>
           </Switch>
         </React.Suspense>
         </React.Suspense>