Merge pull request #42 from paterleng/work_branch

修改向左向右按钮
paterleng · Dec 30, 2024 · ca00271 · ca00271
2 parents 1b689a4 + 3759e73
commit ca00271
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 28 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/activity.log b/activity.log
@@ -2267,3 +2267,15 @@
 {"level":"INFO","time":"2024-12-27T19:34:25.357+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
 {"level":"INFO","time":"2024-12-27T19:34:25.835+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
 {"level":"INFO","time":"2024-12-27T19:34:31.585+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-27T20:34:32.430+0800","caller":"handle/scheduledtasks.go:49","msg":"定时入库成功第%!t(int=1)次上涨"}
+{"level":"INFO","time":"2024-12-30T14:25:32.834+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-30T14:25:32.839+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-30T14:25:33.235+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-30T14:25:37.830+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-30T14:25:55.405+0800","caller":"handle/wshandle.go:95","msg":"用户0xb1b49f717045f0a1a667ccb56e5caaf47d16116f通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-30T14:25:56.944+0800","caller":"handle/wshandle.go:95","msg":"用户0xb1b49f717045f0a1a667ccb56e5caaf47d16116f通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-30T14:25:58.152+0800","caller":"handle/wshandle.go:95","msg":"用户0xb1b49f717045f0a1a667ccb56e5caaf47d16116f通过客户端主动关闭模块%!t(int=3)连接"}
+{"level":"INFO","time":"2024-12-30T14:26:00.176+0800","caller":"handle/wshandle.go:95","msg":"用户0xb1b49f717045f0a1a667ccb56e5caaf47d16116f通过客户端主动关闭模块%!t(int=4)连接"}
+{"level":"INFO","time":"2024-12-30T14:26:01.206+0800","caller":"handle/wshandle.go:95","msg":"用户0xb1b49f717045f0a1a667ccb56e5caaf47d16116f通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-30T14:29:05.398+0800","caller":"handle/wshandle.go:95","msg":"用户0xb1b49f717045f0a1a667ccb56e5caaf47d16116f通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-30T14:31:23.617+0800","caller":"handle/wshandle.go:95","msg":"用户0xb1b49f717045f0a1a667ccb56e5caaf47d16116f通过客户端主动关闭模块%!t(int=1)连接"}
diff --git a/checkerboard/src/components/chessboard/Chess.jsx b/checkerboard/src/components/chessboard/Chess.jsx
@@ -37,7 +37,7 @@ const Chess = () => {
             </div>
             <div className='main'>
                 <UserInfo/>
-                {blockId !== null && gridId !== null && <ChessBoard bId={blockId} gId={gridId} />}
+                {blockId !== null && gridId !== null && <ChessBoard gId={gridId} />}2
             </div>
         </div>
     );

diff --git a/checkerboard/src/components/chessboard/ChessBoard.jsx b/checkerboard/src/components/chessboard/ChessBoard.jsx
@@ -9,7 +9,7 @@ import Shiled from "../shiled/Shiled.jsx";
 import {setPage} from "../../store/store.js";
 import ShiledCountDown from "../shiledcountdown/ShiledCountDown.jsx";
 
-const ChessBoard = ({bId,gId}) => {
+const ChessBoard = ({gId}) => {
     const [selectedBoxes, setSelectedBoxes] = useState([]);
     const [detailBoxes, setDetailBoxes] = useState([]);// 记录多选盒子的详细信息
     const multipleChoice = useRef(false);
@@ -46,7 +46,7 @@ const ChessBoard = ({bId,gId}) => {
         }
     }
     useEffect(()=>{
-        setBlockId(bId);
+        setBlockId(page);
         setGridId(gId);
         // 如果page发生变化，就重新渲染组件数据
         getBoardInfo();

diff --git a/checkerboard/src/components/story/StoryFirst.jsx b/checkerboard/src/components/story/StoryFirst.jsx
@@ -249,7 +249,7 @@ const StoryFirst = () => {
 
             {/*狗的图片*/}
             <div className='first-svg-dog'>
-                <image src='./images/picture/dog.svg'></image>
+                <image src='./images/picture/dog.png'></image>
             </div>
             <div className='first-svg-div'>
                 <svg width="994" height="103" viewBox="0 0 994 103" fill="none" xmlns="http://www.w3.org/2000/svg">