提交

package.json

@@ -22,6 +22,7 @@
     "@antv/l7-district": "^2.3.11",
     "@antv/l7-maps": "^2.8.31",
     "@antv/l7-three": "^2.8.31",
+    "@solidjs/router": "^0.8.2",
     "d3": "^7.4.4",
     "dayjs": "^1.11.1",
     "solid-app-router": "^0.1.9",

src/base/baseText.js

@@ -1,10 +0,0 @@
-
-export default {
-    bottoms:[
-        {name:'风险态势沙盘', path:"/First", BG: false},
-        {name:'舆论焦点探测', path:"/Second", BG: false},
-        {name:'重点风险分析', path:"/Third", BG: true},
-        {name:'突发预警研判', path:"/Fourth", BG: true},
-        {name:'专项网络监测', path:"/Fifth", BG: true},
-    ]
-}

src/index.jsx

@@ -1,6 +1,21 @@
+import { lazy } from "solid-js";
 import { render } from "solid-js/web";
-import { Router } from "solid-app-router";
-import Routers from "./router/index";
+import { Router, useRoutes, hashIntegration } from "@solidjs/router";
+// import { Router } from "solid-app-router";
+// import Routers from "./router/index";
+
+
+const routes = [
+    {
+        path: "/",
+        component: lazy(() => import("./pages/BigScreen/Home"))
+    },
+    {
+        path: "/common",
+        component: lazy(() => import("./pages/CommonBigScreen/Home"))
+    }
+];
+
 
 import utils from "./utils/index"
 
@@ -31,9 +46,13 @@ window.cancelrequestAnimFrame = (function () {
 render(() => {
     // 初始化根字体
     utils.screenSize()
+    const Routes = useRoutes(routes);
     return (
-        <Router>
-            <Routers />
+        // <Router>
+        //     <Routers />
+        // </Router>
+        <Router source={hashIntegration()}>
+            <Routes />
         </Router>
     )
 }, document.getElementById("root"));

src/pages/CommonBigScreen/Home.jsx

@@ -56,6 +56,7 @@ function BigScreenHome() {
         getWeather().then(r => setTQ(r.data))
         getCommonData().then(r => {
             if (r.code != 0) return
+            console.log(r)
             const d = r.data || {};
             setoriData(d || {})
             setHeadTitle([
@@ -322,11 +323,11 @@ function BigScreenHome() {
                         </div>
                     </div>
                     <div class="mainbody right">
-                        <Show when={eHeight() > 0 && oriData.platform_trend && oriData.platform_trend.name}>
+                        <Show when={eHeight() > 0 && oriData.media_read_trend && oriData.media_read_trend.name}>
                             <div style={{ "margin-bottom": "6px" }}>
                                 <SelfPlatform
-                                    title={oriData.platform_trend.name}
-                                    list={oriData.platform_trend.data}
+                                    title={oriData.media_read_trend.name}
+                                    list={oriData.media_read_trend.data}
                                     width={Math.floor($ele.offsetWidth - 20)}
                                     height={(mainHeight - 104) / 3}
                                 />

src/pages/bigScreen/Home.jsx

@@ -338,11 +338,11 @@ function BigScreenHome() {
                         </div>
                     </div>
                     <div class="mainbody right">
-                        <Show when={eHeight() > 0 && oriData.platform_trend && oriData.platform_trend.name}>
+                        <Show when={eHeight() > 0 && oriData.media_read_trend && oriData.media_read_trend.name}>
                             <div style={{ "margin-bottom": "6px" }}>
                                 <SelfPlatform
-                                    title={oriData.platform_trend.name}
-                                    list={oriData.platform_trend.data}
+                                    title={oriData.media_read_trend.name}
+                                    list={oriData.media_read_trend.data}
                                     width={Math.floor($ele.offsetWidth - 20)}
                                     height={(mainHeight - 104) / 3}
                                 />

src/router/index.jsx

@@ -1,18 +1,15 @@
-import { lazy, createSignal } from "solid-js";
-import { Routes, Route } from "solid-app-router";
+import { lazy } from "solid-js";
+import { Routes, Route , hashIntegration } from "solid-app-router";
 
 
-import baseText from "../base/baseText"
 const BigScreen = lazy(() => import("../pages/BigScreen/Home"))
 const CommonBigScreen = lazy(() => import("../pages/CommonBigScreen/Home"))
 
-const [BottomLi, setBottomLi] = createSignal(baseText.bottoms);
 
 export default function localRouter() {
     // 根据路由选择tab
-    setBottomLi(BottomLi().map(bot => (bot.path === location.pathname ? { ...bot, select: true } : { ...bot, select: false })));
     return <>
-        <Routes>
+        <Routes source={hashIntegration()}>
             <Route path="/" element={<BigScreen />} />
             <Route path="/common" element={<CommonBigScreen />} />
         </Routes>

vite.config.js

@@ -2,6 +2,7 @@ import { defineConfig } from 'vite';
 import solidPlugin from 'vite-plugin-solid';
 
 export default defineConfig({
+  base: './',
   server: {
     // https: true,
     open: false,

yarn.lock

@@ -856,6 +856,11 @@
     estree-walker "^2.0.1"
     picomatch "^2.2.2"
 
+"@solidjs/router@^0.8.2":
+  version "0.8.2"
+  resolved "https://registry.npmmirror.com/@solidjs/router/-/router-0.8.2.tgz#3dd82fd052cb8654a2948989ed3e17cf6b25b04d"
+  integrity sha512-gUKW+LZqxtX6y/Aw6JKyy4gQ9E7dLqp513oB9pSYJR1HM5c56Pf7eijzyXX+b3WuXig18Cxqah4tMtF0YGu80w==
+
 "@turf/along@5.1.x":
   version "5.1.5"
   resolved "https://registry.npmmirror.com/@turf/along/-/along-5.1.5.tgz#61d6e6a6584acddab56ac5584e07bf8cbe5f8beb"