Commit cd7ae4fb authored by 邓晓峰's avatar 邓晓峰

fix: 修复arcgis参数

parent 3720288d
Pipeline #46934 skipped with stages
...@@ -4,17 +4,17 @@ export function genActiveRule(routerPrefix) { ...@@ -4,17 +4,17 @@ export function genActiveRule(routerPrefix) {
export default { export default {
dev: [ dev: [
// { // {
// name: 'civ_energy', // name: 'dosing-web',
// entry: `//${window.location.hostname}:8081/civ_energy`, // entry: `//${window.location.hostname}:8080/dosing-web`,
// container: '#micro-container', // container: '#micro-container',
// activeRule: '/civbase/civ_energy', // activeRule: '/civbase/dosing-web',
// },
// {
// name: 'civ_water',
// entry: `//${window.location.hostname}:8080/civ_water`,
// container: '#micro-container',
// activeRule: '/civbase/civ_water',
// }, // },
{
name: 'civ_water',
entry: `//${window.location.hostname}:8080/civ_water`,
container: '#micro-container',
activeRule: '/civbase/civ_water',
},
// { // {
// name: 'civ_configuration', // name: 'civ_configuration',
// entry: `//${window.location.hostname}:8080/civ_configuration`, // entry: `//${window.location.hostname}:8080/civ_configuration`,
......
/* eslint-disable */ /* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = 'https://work.panda-water.cn'; // const proxyURL = 'https://work.panda-water.cn';
const proxyURL = 'https://panda-water.cn'; const proxyURL = 'http://192.168.12.47:8082';
module.exports = { module.exports = {
......
/* eslint-disable */
import React from 'react'; import React from 'react';
import { Spin } from 'antd';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { actionCreators } from '@/containers/App/store'; import { actionCreators } from '@/containers/App/store';
import _ from 'lodash'; import MapComponent from '@/components/mapView';
// import { AMapScene } from '@wisdom-map/Amap';
import { ArcGISMap } from '@wisdom-map/arcgismap'; class CreateMap extends React.Component {
// import arcgisConfig from '@wisdom-map/arcgismap/lib/arcgisapi/4.20/@arcgis/core/config';
// import pkg from '../../../package.json';
// arcgisConfig.assetsPath = `${window.location.origin}/${pkg.name.toLocaleLowerCase()}/assets`;
// window.arcgisAssetsPath = arcgisConfig.assetsPath;
class Map extends React.PureComponent {
constructor(props) { constructor(props) {
super(props); super(props);
this.options = _.merge({}, props.options); this.mapManganerRef = React.createRef();
this.state = {
type: props.options.type,
loading: true,
options: this.transformMapsetting(window.globalConfig.mapsettings),
widgets: window.globalConfig.uiwidgets,
}
}
transformMapsetting(mapsettings) {
let layers = mapsettings.layers;
layers = layers.map(item => {
item.url = /^\//.test(item.url) ? `/${item.url}`: item.url;
return item;
})
return Object.assign({}, mapsettings, {
layers: layers
});
}
destroyAMap() {
// const mapKey = [
// '_AMap_AMap.MapType',
// '_AMap_labelcanvas',
// '_AMap_imagelayer',
// '_AMap_anole',
// '_AMap_AMap.Scale',
// '_AMap_rbush',
// '_AMap_AMap.IndoorMap',
// '_AMap_AMap.CustomLayer',
// '_AMap_AMap.MarkerClusterer',
// '_AMap_vectorlayer',
// '_AMap_AMap.OverView',
// '_AMap_sync',
// '_AMap_AMap.PlaceSearch',
// '_AMap_AMap.DistrictSearch',
// '_AMap_Map3D',
// '_AMap_AMap.Autocomplete',
// '_AMap_AMap.Heatmap',
// '_AMap_wgl',
// '_AMap_overlay',
// '_AMap_cvector',
// '_AMap_AMap.ToolBar',
// '_AMap_mouse',
// '_AMap_AMap.RangingTool',
// '_AMap_data.tileKeys'
// ];
// // eslint-disable-next-line no-plusplus
// for (let i = 0; i < mapKey.length; i++) {
// localStorage.removeItem(mapKey[i]);
// }
// delete window.AMap;
// delete window.AMapUI;
// delete window.AMapUI_DEBUG;
}
componentWillMount() {
// this.destroyAMap()
}
getAMap(AMapObj, AMap) {
// this.props.updageMapView({
// AMapObj,
// AMap
// });
} }
getArcGISMap(map) { state = {
this.props.updageMapView(map); loading: true,
} config: window.globalConfig.mapsettings,
widgets: window.globalConfig.uiwidgets,
show() { };
}
hide() {
} getView = view => {
this.props.updageMapView(view);
destroy() { };
}
render() { render() {
return ( return (
<> <>
{ <MapComponent {...this.state} getMapInfo={this.getView} />
this.state.type === 'AMap' ? (
<div {...this.state} getMapInfo={this.getAMap.bind(this)}/>
) : (
<ArcGISMap config={this.state.options} getMapInfo={this.getArcGISMap.bind(this)}/>
)
}
</> </>
) );
} }
} }
const mapStateToProps = state => ({}); const mapStateToProps = state => ({});
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({
...@@ -120,4 +41,4 @@ const mapDispatchToProps = dispatch => ({ ...@@ -120,4 +41,4 @@ const mapDispatchToProps = dispatch => ({
export default connect( export default connect(
mapStateToProps, mapStateToProps,
mapDispatchToProps, mapDispatchToProps,
)(Map); )(CreateMap);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment