Commit 9d998c56 authored by 吴江's avatar 吴江

规则修改适配

parent 0c28219d
...@@ -26,14 +26,11 @@ export const getObjFromNet = (url, callback) => { ...@@ -26,14 +26,11 @@ export const getObjFromNet = (url, callback) => {
* @param {string} type * @param {string} type
*/ */
export const initView3DAction = (type,riskSourceId) => { export const initView3DAction = (type,riskSourceId) => {
let param = {}; if (!riskSourceId) {
if (riskSourceId) { riskSourceId="";
param = { type, riskSourceId };
} }
else {
param = { type }; const url = formatUrl(FscSerUrl.view3dInitUrl, {type,riskSourceId});
}
const url = formatUrl(FscSerUrl.view3dInitUrl, param);
return commonGet(url); return commonGet(url);
}; };
......
...@@ -114,7 +114,7 @@ class MaskContent extends Component { ...@@ -114,7 +114,7 @@ class MaskContent extends Component {
<TopMsg alarmStart={alarmStart} /> <TopMsg alarmStart={alarmStart} />
{!isShowActionBar && <ModelHeader headerName={headerName} handleExceptModel={this.handleExceptModel} />} {!isShowActionBar && <ModelHeader headerName={headerName} handleExceptModel={this.handleExceptModel} />}
{isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation}/> } {isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation}/> }
{/*{alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />}*/} {alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />}
</div> </div>
); );
} }
......
...@@ -787,7 +787,6 @@ class View3D extends Component { ...@@ -787,7 +787,6 @@ class View3D extends Component {
renderAreas = () => { renderAreas = () => {
this.areas = []; this.areas = [];
this.getAreas(this.state.treeData); this.getAreas(this.state.treeData);
console.log(this.areas)
return this.areas; return this.areas;
} }
onRegionCreated = (polygonRegion,item) => { onRegionCreated = (polygonRegion,item) => {
......
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