1.修改进入故障模式字段

mods/components/3dviewConvertor/consts/urlConsts.js

@@ -18,7 +18,7 @@ export const FscSerUrl = {
   //*******************************************************************************
   // 3D视图
   //*******************************************************************************
-  view3dInitUrl: completePrefix(view3dURI, 'api/view3d/init3dViewNode?type={type}'), // 初始化三维视图 get
+  view3dInitUrl: completePrefix(view3dURI, 'api/view3d/init3dViewNode?type={type}&riskSourceId={riskSourceId}'), // 初始化三维视图 get
   view3dInitLinkUrl: completePrefix(view3dURI, 'view3d/initViewLink'), // 初始化三维视图 获取link get
   searchRegionListUrl: completePrefix(patrolURI, 'api/group/queryDept'), //右侧菜单-检索-区域集合
   searchViewUrl: completePrefix(view3dURI, 'api/view3d/retrieve/all?inputText={inputText}&dataLevel={dataLevel}&orgCode={orgCode}&nodeState={nodeState}&type={type}&current={page}&pageSize={pageSize}&routeName={routeName}&protectObjName={protectObjName}'), // 右侧菜单-检索

mods/components/3dviewConvertor/services/3dService.js

@@ -25,8 +25,8 @@ export const getObjFromNet = (url, callback) => {
  * 获取各个类型的marker
  * @param {string} type
  */
-export const initView3DAction = (type) => {
-  const url = formatUrl(FscSerUrl.view3dInitUrl, { type });
+export const initView3DAction = (type,riskSourceId) => {
+  const url = formatUrl(FscSerUrl.view3dInitUrl, { type, riskSourceId });
   return commonGet(url);
 };
 
@@ -166,8 +166,8 @@ export const queryContingencyWater = () => {
 
 /**
  * 颗粒/重点设备 模式点查询
- * @param {模式} model 
+ * @param {模式} model
  */
 export const pointModelistAction = ( model ) => {
   return commonGet(formatUrl(FasSerUrl.pointModelistUrl, { model }));
-};
\ No newline at end of file
+};

mods/components/3dviewConvertor/view/ConvertorView3DRoot.js

@@ -107,7 +107,6 @@ class ConvertorView3DRoot extends Basic {
 
   render() {
     const { isEdit } = this.state;
-    debugger
     const wsURL = completeToken(SysWsURL.convertorView3dws);
     return (
       <div>

mods/components/3dviewConvertor/view/MaskContent.js

@@ -76,7 +76,8 @@ class MaskContent extends Component {
       planQuit,
       sideControlShow,
       isShowActionBar,
-      headerName
+      headerName,
+      errorAreaId
     } = this.props;
     const wsURL = completeToken(SysWsURL.convertorRulews);
     const controlAnimation = {
@@ -108,7 +109,7 @@ class MaskContent extends Component {
     return (
       <div className="mask-content">
         <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        { sideControlShow && <SideControl multiple={multiple} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
+        { sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
         { sideControlShow && <DataPane animationProps={datapaneAnim} />}
         <TopMsg alarmStart={alarmStart} />
         {!isShowActionBar && <ModelHeader headerName={headerName} handleExceptModel={this.handleExceptModel} />}
@@ -139,7 +140,8 @@ MaskContent.propTypes = {
   isShowActionBar: PropTypes.bool,
   headerName: PropTypes.string,
   setHeaderName: PropTypes.string,
-  handleExceptModel: PropTypes.func
+  handleExceptModel: PropTypes.func,
+  errorAreaId: PropTypes.number
 };
 
 MaskContent.defaultProps = {

mods/components/3dviewConvertor/view/exceptionArea/ExceptionArea.js

@@ -46,8 +46,7 @@ class ExceptionArea extends Component {
 
   onMarkerClick = (marker) => {
     const { extData } = marker;
-    lsTool.write('errorAreaId',extData.id);
-    this.props.handleExceptModel && this.props.handleExceptModel('into_except_model');
+    this.props.handleExceptModel && this.props.handleExceptModel('into_except_model',extData.id);
   }
 
   setTopCardConf = (obj,{ safetyIndex })=>{

mods/components/3dviewConvertor/view/sideControl/index.js

@@ -27,12 +27,13 @@ class SideControl extends Component {
    * control 点击，第二次点击则取消
    */
   onBizItemClick = (item, e) => {
+    const { errorAreaId: riskSourceId } = this.props;
     const alreadyActive = this.isActive(item.key);
     const newKeys = this.getActiveControl(item.key, alreadyActive);
     this.setState({
       activeControl: newKeys
     });
-    this.props.onItemClick && this.props.onItemClick(item, alreadyActive);
+    this.props.onItemClick && this.props.onItemClick({ ...item, riskSourceId }, alreadyActive);
   };
 
   getActiveControl = (key, alreadyActive) => {
@@ -53,7 +54,7 @@ class SideControl extends Component {
   };
 
   render() {
-    const { layerConfig, animationProps } = this.props;
+    const { layerConfig, animationProps  } = this.props;
     let _bizControls = bizControls;
     if (filterUser.includes(loginUserName)) {
       let target = _bizControls.find(item => item.key === 'fireResource-point');
@@ -80,7 +81,8 @@ SideControl.propTypes = {
   onItemClick: PropTypes.func,
   write: PropTypes.func,
   toStr: PropTypes.func,
-  animationProps: PropTypes.object
+  animationProps: PropTypes.object,
+  errorAreaId: PropTypes.number
 };
 
 export default SideControl;