From 4aadbd3bf9e507cdf630912d1048e4688f74ee4e Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Thu, 2 Jan 2025 17:54:12 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E9=97=B8=E9=97=A8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/them.jpg | Bin 0 -> 12851 bytes src/views/Home/index.js | 2 +- src/views/Home/index.less | 6 +- src/views/Home/zmjk/Sider.tsx | 4 +- src/views/Home/zmjk/Topper1.tsx | 13 +++- src/views/Home/zmjk/ZmColumn.tsx | 116 ++++++++++++++++++++++------- src/views/Home/zmjk/consts.ts | 2 +- src/views/Home/zmjk/coordinates.ts | 21 +++++- src/views/Home/zmjk/index.js | 22 +++--- src/views/Home/zmjk/index.less | 2 +- 10 files changed, 137 insertions(+), 51 deletions(-) create mode 100644 public/assets/them.jpg diff --git a/public/assets/them.jpg b/public/assets/them.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8c8f5f4fcafa7c627e218ca9a78c962fd1f035e3 GIT binary patch literal 12851 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 J@A)+UzX0rli&p>u literal 0 HcmV?d00001 diff --git a/src/views/Home/index.js b/src/views/Home/index.js index 78b92ec..e75d1df 100644 --- a/src/views/Home/index.js +++ b/src/views/Home/index.js @@ -251,7 +251,7 @@ export default function Home() {
工程简介
- + 盐卡闸位于湖北省荆州市经济开发区，荆江大堤左岸桩 745+614 处，位于观音寺闸上游 5km 处。盐卡闸主要工程任务为引水灌溉，解决四湖中下区农 业灌溉和洪湖生态保障不足的问题。利用盐卡泵站进水渠，反向从长江引水，引水灌溉设计流量55m³/s，水闸级别为 1 级，次要建筑物级别为 3 级。
diff --git a/src/views/Home/index.less b/src/views/Home/index.less index b67cca4..c11a05d 100644 --- a/src/views/Home/index.less +++ b/src/views/Home/index.less @@ -23,7 +23,7 @@ } .title_name{ position: absolute; - top: 230px; + top: 16rem; // left: 41%; width: 350px; height: 70px; @@ -76,7 +76,7 @@ } .content-left{ position: absolute; - top: 120px; + top: 8rem; left:20px; .project-introduce,.runWatch,.safeWatch{ width: 380px; @@ -131,7 +131,7 @@ } .content-right{ position: absolute; - top: 120px; + top: 8rem; right:20px; .operate-log{ width: 380px; diff --git a/src/views/Home/zmjk/Sider.tsx b/src/views/Home/zmjk/Sider.tsx index c443cbd..7c5ccb3 100644 --- a/src/views/Home/zmjk/Sider.tsx +++ b/src/views/Home/zmjk/Sider.tsx @@ -13,10 +13,10 @@ const Sider: React.FC<{ return ( - + diff --git a/src/views/Home/zmjk/Topper1.tsx b/src/views/Home/zmjk/Topper1.tsx index 4a4f291..b7b44ed 100644 --- a/src/views/Home/zmjk/Topper1.tsx +++ b/src/views/Home/zmjk/Topper1.tsx @@ -85,12 +85,17 @@ const Topper1: React.FC<{ return ( - + { - pts.SepsLTLBRBRT.map((s, index) => ( - - )) + pts.SepsLTLBRBRT.map((s, index) => { + if (index == 0 || index == 1 || index == 7 || index == 8) { + return ( + + ) + } + } + ) } { windows.w.map((o, index) => ) diff --git a/src/views/Home/zmjk/ZmColumn.tsx b/src/views/Home/zmjk/ZmColumn.tsx index 6fe46fc..12562d3 100644 --- a/src/views/Home/zmjk/ZmColumn.tsx +++ b/src/views/Home/zmjk/ZmColumn.tsx @@ -13,11 +13,18 @@ const ZmColumn: React.FC<{ pts: ControlPts; waterRatio: number; selected: boolean; - list:any; -}> = ({ kdMax, gtophgt, idx, pts, waterRatio, selected,list }) => { + list: any; +}> = ({ kdMax, gtophgt, idx, pts, waterRatio, selected, list }) => { const renKd = gtophgt; //useLinearAnim(gtophgt); + let a; + if (idx == 0) { + a = pts.ZmArea[idx]; + + } else { + a = pts.ZmArea[idx]; + } + console.log("a", a); - const a = pts.ZmArea[idx]; if (!a || typeof renKd !== 'number') { return null; } @@ -54,9 +61,23 @@ const ZmColumn: React.FC<{ // const b1 = { x: a.lb0.x, y: a.lb0.y - 32 }; - const b6 = { x: a.rb0.x, y: a.rb0.y - 32 }; - const b2 = interpolate(b1, b6, 0.4); - const b5 = interpolate(b1, b6, 0.6); + const b11 = { x: a.lb0.x -22, y: a.lb0.y - 32 }; + const b6 = { x: a.rb0.x , y: a.rb0.y - 32 }; + const b61 = { x: a.rb0.x + 20 , y: a.rb0.y - 32 }; + const b2 = idx == 0 ? interpolate(b1, b6, 0.5) : + idx == 1 ? interpolate(b1, b6, 0.55) : + idx == 2 ? interpolate(b1, b6, 0.55) : + idx == 7 ? interpolate(b1, b6, 0.3) : + idx == 8 ? interpolate(b1, b6, 0.3) : + idx == 9 ? interpolate(b1, b6, 0.3) : + interpolate(b1, b6, 0.4); + const b5 = idx == 0 ? interpolate(b1, b6, 0.7) : + idx == 1 ? interpolate(b1, b6, 0.75) : + idx == 2 ? interpolate(b1, b6, 0.75) : + idx == 7 ? interpolate(b1, b6, 0.5) : + idx == 8 ?interpolate(b1, b6, 0.5) : + idx == 9 ?interpolate(b1, b6, 0.5) : + interpolate(b1, b6, 0.6); const b3 = { x: b2.x, y: b2.y + 12 }; const b4 = { x: b5.x, y: b5.y + 12 }; @@ -67,15 +88,16 @@ const ZmColumn: React.FC<{ const b1_3 = intersection(b3, ViewCenter, { x: b1_2.x, y: undefined }); const b1_4 = intersection(b4, ViewCenter, { x: b1_5.x, y: undefined }); + return ( <> { (idx != 0 && idx != list.length - 1) ? - waterP3 && waterP3R ? ( - - ) : null : null + waterP3 && waterP3R ? ( + + ) : null : null } - {/* */} - {idx != 0 ? : null} - {idx!= list.length - 1 ? : null} - {/* - */} - - {idx != list.length - 1 ? : ''} - {idx!= 0 ? :'' } - - + /> + + { + idx == 0 || idx == 1 || idx == 2 || idx == 3 ? + <> + + + + + + + + : + + idx == 7 || idx == 8 || idx == 9 ? + <> + + + + + + + + : + + <> + + + + + + + + + } + + + - - - + + { + idx == 9 || idx == 8 || idx == 7 ? + + : + + } + { + idx == 0 || idx == 1 || idx == 2 ? + : + + } - - + + + + { + pts.SepsFront1.map((s, index) => ( + + + )) + } { waterP1.y < b1.y ? ( diff --git a/src/views/Home/zmjk/consts.ts b/src/views/Home/zmjk/consts.ts index cd0ef86..d205c33 100644 --- a/src/views/Home/zmjk/consts.ts +++ b/src/views/Home/zmjk/consts.ts @@ -1,5 +1,5 @@ export const CanvasW = 1080; -export const CanvasH = 470; +export const CanvasH = 500; export const Horizontal = CanvasH * 1.4 / 3; export const ViewCenter = { x: CanvasW * 0.5, y: Horizontal }; diff --git a/src/views/Home/zmjk/coordinates.ts b/src/views/Home/zmjk/coordinates.ts index 93bff7e..84bd584 100644 --- a/src/views/Home/zmjk/coordinates.ts +++ b/src/views/Home/zmjk/coordinates.ts @@ -76,6 +76,7 @@ export type ControlPts = { TopRectRB: XY; SepsLTLBRBRT: XY[][]; SepsFront: XYWH[]; + SepsFront1: XYWH[]; ZmArea: { lt0: XY; lt1: XY; lt2: XY; lt3: XY; lb0: XY; lb1: XY; lb2: XY; lb3: XY; @@ -90,7 +91,7 @@ export type ControlPts = { export function contextCoordinates(unitWidth: number, hole: number): ControlPts { const C1 = { x: unitWidth * 0.6, y: GroundBase }; - const L1 = { x: unitWidth, y: GroundBase }; + const L1 = { x: unitWidth* 1, y: GroundBase }; const B1 = { x: unitWidth, y: BottomBase } const C2 = intersection(ViewCenter, C1, { x: 0, y: undefined }); @@ -122,14 +123,28 @@ export function contextCoordinates(unitWidth: number, hole: number): ControlPts const SepsLTLBRBRT: XY[][] = []; const SepsFront: XYWH[] = []; + const SepsFront1: XYWH[] = []; const ZmArea = []; for (let i = 0; i < hole; i++) { const TopBase = TopHoleLT.y; // 隔断 if (i > 0) { - const frontRight = TopHoleLT.x + (PillarWidth + HoleWidth) * i; + const frontRight1 = TopHoleLT.x + (PillarWidth + HoleWidth) * i; + const frontRight = i == 1 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i + 21 : + i == 2 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i + 18 : + i == 3 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i + 12 : + i == 4 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i + 6 : + i == 5 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i + 1 : + i == 6 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i - 5: + i == 7 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i - 12 : + i == 9 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i - 22 : + i == 8 ? TopHoleLT.x + (PillarWidth + HoleWidth) * i - 15 : + TopHoleLT.x + (PillarWidth + HoleWidth) * i + const frontLeft = frontRight - PillarWidth; + const frontLeft1 = frontRight1 - PillarWidth; SepsFront.push({ x: frontLeft, y: TopBase, w: PillarWidth, h: BottomBase - TopBase }); + SepsFront1.push({ x: frontLeft1, y: TopBase, w: PillarWidth, h: BottomBase - TopBase }); if (i < hole / 2) { // 右侧面 const p1 = { x: frontRight, y: TopBase }; @@ -175,6 +190,6 @@ export function contextCoordinates(unitWidth: number, hole: number): ControlPts C1, L1, B1, C2, L2, B2, A1, A2, B3, RoomLT, RoomRT, RoomRB, RoomLB, RoomRTFar, RoomRBFar, RoomLBFar, TopRectLB, TopRectRB, - SepsLTLBRBRT, SepsFront, ZmArea, + SepsLTLBRBRT, SepsFront,SepsFront1, ZmArea, } } \ No newline at end of file diff --git a/src/views/Home/zmjk/index.js b/src/views/Home/zmjk/index.js index 9a89f61..7f61a88 100644 --- a/src/views/Home/zmjk/index.js +++ b/src/views/Home/zmjk/index.js @@ -123,7 +123,7 @@ const Page = () => { const [list, setList ] = useState([]) const hole = 10;//zmobj.gaorNum; - const xunit = CanvasW / (hole - 5); + const xunit = CanvasW / (hole +2); const pts = contextCoordinates(xunit, hole); const eqpnoList = useMemo(() => damList ? new Array(damList.length).fill(0).map((o, index) => index) : [], [damList]); @@ -182,37 +182,37 @@ const Page = () => { - +
-
+
{ eqpnoList.map(o => (
{}} - className='o' style={{ flexGrow: 1, width: 0, display: 'flex', justifyContent: 'center', cursor: 'pointer' }}> -
#{o+1}
+ className='o' style={{ flexGrow: 1, width: 40, display: 'flex', justifyContent: 'center', cursor: 'pointer' }}> +
#{o+1}
)) } -
+
-
-
+
+
{ eqpnoList.map(o => ( -
+
{}} - style={{ width: 60, height: 32, border: '1px solid #4c5dce', backgroundColor: '#315da2', borderRadius: 4, color: '#fff', display: 'flex', justifyContent: 'center', alignItems: 'center', fontSize: 18, cursor: 'pointer' }} + style={{ width: 70, height: 32, border: '1px solid #4c5dce', backgroundColor: '#315da2', borderRadius: 4, color: '#fff', display: 'flex', justifyContent: 'center', alignItems: 'center', fontSize: 18, cursor: 'pointer' }} > {renAperture(damList[o]?.realAperture)}
)) } -
+
diff --git a/src/views/Home/zmjk/index.less b/src/views/Home/zmjk/index.less index 9985900..2b0860a 100644 --- a/src/views/Home/zmjk/index.less +++ b/src/views/Home/zmjk/index.less @@ -3,7 +3,7 @@ display: flex; height: 100%; .sg_zmjk_left{ - top: 250px; + top: 16rem; position: relative; width: 1080px; height: 640px;