From ab43548757dee86855061b2d1d458c7db5e6b879 Mon Sep 17 00:00:00 2001
From: sbjw <sbjw.happy@163.com>
Date: Thu, 04 Dec 2025 17:15:27 +0000
Subject: [PATCH] 同步更新1.0.32版本
---
src/example/ExampleXzxxPage.js | 15 ++++
src/example/ExamplePage.js | 1
package.json | 2
src/App.js | 2
public/example/ExampleXzxxPage.md | 1
src/example/Example2DDrawUpdatePage.js | 136 +++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 155 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 23b9368..66ef59a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"@ant-design/icons": "^4.0.0",
"antd": "^4.24.16",
"echarts": "^5.6.0",
- "iclient3d-plot-diy": "^1.0.31",
+ "iclient3d-plot-diy": "^1.0.32",
"iclient3d-plot-diy-attachment": "^1.0.2",
"jquery": "^3.7.1",
"@turf/turf": "^7.2.0",
diff --git a/public/example/ExampleXzxxPage.md b/public/example/ExampleXzxxPage.md
index 22f7312..c2e2b87 100644
--- a/public/example/ExampleXzxxPage.md
+++ b/public/example/ExampleXzxxPage.md
@@ -82,6 +82,7 @@
type: "txdkcxx2",
kcjd: 30,
kcgls: 10,
+ kcwb: '123123',
color: '#0059FFA3',
lon: 103.73554539488224,
lat: 31.005068100060593,
diff --git a/src/App.js b/src/App.js
index 0b14ff3..7b217c7 100644
--- a/src/App.js
+++ b/src/App.js
@@ -26,6 +26,7 @@
import ExampleSelectPage from "./example/ExampleSelectPage";
import ExampleXzxxPage from "./example/ExampleXzxxPage";
import ExampleHtmlBoardPage from "./example/ExampleHtmlBoardPage";
+import Example2DDrawUpdatePage from "./example/Example2DDrawUpdatePage";
function App() {
return (
@@ -54,6 +55,7 @@
<Route path="/example/select" exact component={ExampleSelectPage}/>
<Route path="/example/xzxx" exact component={ExampleXzxxPage}/>
<Route path="/example/htmlBoard" exact component={ExampleHtmlBoardPage}/>
+ <Route path="/example/map2dDrawUpdate" exact component={Example2DDrawUpdatePage}/>
<Route path="/doc" exact component={DocPage}/>
<Route path="/doc/:page" exact component={DocPage}/>
<Route path="/test" exact component={TestPage}/>
diff --git a/src/example/Example2DDrawUpdatePage.js b/src/example/Example2DDrawUpdatePage.js
new file mode 100644
index 0000000..ccb3d71
--- /dev/null
+++ b/src/example/Example2DDrawUpdatePage.js
@@ -0,0 +1,136 @@
+import React, {Component} from 'react'
+import './ExampleDrawPage.css'
+import {GIS} from "iclient3d-plot-diy";
+
+import {Button} from "antd";
+
+export default class Example2DDrawUpdatePage extends Component {
+
+
+ optionObjs = {
+ "目标醒目": {
+ code: '123',
+ type: "2002",
+ xz: true,
+ xzColor: '#00ff00',
+ xx: true,
+ xxColor: '#ff0000',
+ iconColor: '#dddddd',
+ returnHeight: true,
+ useModify: false,
+ lon: 102.23554539488224,
+ lat: 31.005068100060593,
+ height: 0,
+ points: []
+ },
+ }
+ line_star
+ drawOps = [];
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ htmlString: '<h3>正在加载中...</h3>',
+ plotText: ''
+ };
+ }
+
+ componentDidMount() {
+ fetch('./example/Example2DDrawUpdatePage.md')
+ .then(response => response.text())
+ .then(mdText => {
+ this.setState({htmlString: window.marked.parse(mdText)});
+ });
+ this.showOptions();
+
+ let index = 0;
+ let f = () => {
+ index++;
+ this.mapFunction.mapApiService.updateDraw('123', {
+ lon: 102.23554539488224,
+ lat: 31.005068100060593,
+ height: index * 1000
+ })
+ let dd = this.mapFunction.mapApiService.exportDraw('123');
+ this.setState({
+ plotText : JSON.stringify(dd)
+ });
+ if (index < 10) {
+ setTimeout(f, 1000)
+ }
+ }
+ f();
+ }
+
+ showOptions = () => {
+ if (this.mapFunction) {
+ let options = [];
+ for (let key in this.optionObjs) {
+ options.push(this.optionObjs[key]);
+ }
+ this.mapFunction.mapApiService.showDrawDatas(options);
+ }
+ };
+
+
+ async draw(option) {
+ option = JSON.parse(JSON.stringify(option));
+ option.useModify = true;
+ delete option.points;
+ delete option.lon;
+ delete option.lat;
+ delete option.height;
+ let p = await this.mapFunction.mapApiService.draw(option);
+ p.drawEnd.subscribe(value => {
+ // alert(p.export());
+ })
+ this.drawOps.push(p);
+ }
+
+ export() {
+ let op = [];
+ let draws = this.mapFunction.mapApiService.getAllDraw();
+ for (let d of draws) {
+ let dd = this.mapFunction.mapApiService.exportDraw(d.code);
+ if (dd) {
+ op.push(dd);
+ }
+ }
+ console.log(op);
+ }
+
+ render() {
+ let buttons = [];
+ let obs = JSON.parse(JSON.stringify(this.optionObjs));
+ for (let key in obs) {
+ let option = obs[key];
+ buttons.push(<Button type="primary" onClick={this.draw.bind(this, option)} key={key}>{key}</Button>);
+ }
+
+ return (
+ <div className={"example_draw_container"}>
+ <h3>军标绘制/展示已有的军标数据</h3>
+ <div className={"map_wrapper"}>
+ <GIS refs={
+ e => {
+ this.mapFunction = e
+ }
+ }
+ useSvgIcon={true}
+ iconScales={[[0, 2000], [2000, 10000], [10000, 5000000]]}
+ plotUrl={this.state.plotUrl}
+ mapRef={this}
+ map2D={true}
+ showDefaultLayer={false}
+ />
+ </div>
+ {this.state.plotText}
+ <div className={"code_wrapper"}>
+ <div dangerouslySetInnerHTML={{__html: this.state.htmlString}}></div>
+ </div>
+ </div>
+ )
+ }
+}
+
+
diff --git a/src/example/ExamplePage.js b/src/example/ExamplePage.js
index 06da1d3..062eb92 100644
--- a/src/example/ExamplePage.js
+++ b/src/example/ExamplePage.js
@@ -80,6 +80,7 @@
<li><NavLink to='/example/select'>军标选择</NavLink></li>
<li><NavLink to='/example/xzxx'>选中、X图标</NavLink></li>
<li><NavLink to='/example/htmlBoard'>Html标牌</NavLink></li>
+ <li><NavLink to='/example/map2dDrawUpdate'>2d画图更新</NavLink></li>
</ul>
<div className={"button_wrapper"}>
diff --git a/src/example/ExampleXzxxPage.js b/src/example/ExampleXzxxPage.js
index adadaf9..d47e048 100644
--- a/src/example/ExampleXzxxPage.js
+++ b/src/example/ExampleXzxxPage.js
@@ -61,6 +61,7 @@
"双色线": {
type: "line",
bklx: 'double',
+ bkkd: 10,
color: '#64c324',
color2: '#6932cc',
useModify: false,
@@ -76,7 +77,7 @@
},
"通信抗测向线2": {
type: "txdkcxx2",
- kcjd: 30,
+ kcjd: 120,
kcgls: 10,
kcwb: '123123',
color: '#0059FFA3',
@@ -113,6 +114,17 @@
lat: 32.005068100060593,
height: 0,
}]
+ },
+ "干扰波束": {
+ type: "grbs",
+ color: '#D5013A',
+ useModify: false,
+ lon: 102.23554539488224,
+ lat: 31.005068100060593,
+ height: 0,
+ qsjd: 30,
+ zzjd: 130,
+ bj: 100
}
}
line_star
@@ -131,6 +143,7 @@
.then(mdText => {
this.setState({htmlString: window.marked.parse(mdText)});
});
+ this.showOptions();
}
showOptions = () => {
--
Gitblit v1.9.3