Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

mods/components/3dviewConvertor/styles/moduleEdit.scss

@@ -270,6 +270,59 @@
     color:#F0DF2D;
     background-color: rgba(10, 53, 62, 0.8)
   }
+
+}
+.pormpt-modal{
+  height:100%;
+  .amos-modal-container{
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/promptModal.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    height:253px;
+    width: 392px !important;
+    background-color: transparent;
+    box-shadow: none;
+    .amos-modal-content{
+      width: 100%;
+      height: 100%;
+      color: #fff;
+      font-size: 20px;
+      font-weight: normal;
+      .prompt-content{
+        width: 100%;
+        height: 100%;
+        padding-top:40px ;
+        display:flex;
+        flex-direction: column;
+        justify-content: space-around;
+        align-items: center;
+        .prompt-buttons{
+          span {
+            display: inline-block;
+            width: 71px;
+            height: 32px;
+            line-height: 32px;
+            margin: 0 10px;
+            text-align: center;
+          }
+          .promptOk{
+            background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptOk.png') no-repeat 100% 100%;
+          }
+          .promptNo {
+            background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptNo.png') no-repeat 100% 100%;
+          }
+          .promptSave{
+            background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptSave.png') no-repeat 100% 100%;
+          }
+          .promptCancel{
+            background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptCancel.png') no-repeat 100% 100%;
+          }
+        }
+      }
+    }
+  }
+
+
 }
 // .rayd-modal{
 //   background-color:  rgba(25, 86, 147, 0.6) !important;

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

+import React, { Component } from 'react';
+import { Modal ,Button} from 'amos-framework';
+class PromptModal extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+
+    };
+  }
+  cancel = ()=>{
+    const {isback} =this.props.promptData
+    this.props.closePromptModal()
+    if(isback){
+      this.props.handleOutExceptModel()
+    }
+  }
+  saveData=()=>{
+    const {isback,type} =this.props.promptData
+    if(isback){
+      this.props.handleOutExceptModel()
+    }
+    this.props.closePromptModal()
+    if(type=='region')
+    {
+      this.props.saveAreaData()
+    }else{
+      this.props.savePointData()
+    }
+
+  }
+  render() {
+const {promptData} =this.props
+    return (
+        <Modal
+          visible={promptData.promptvisible}
+          className={'pormpt-modal'}
+          content={<div className ='prompt-content'>
+                    <div>{promptData.promptContent}</div>
+                    {promptData.btnType =='isOk'?
+                    <div className='prompt-buttons'>
+                      <span className={'promptOk'} onClick={this.saveData} />
+                      <span className={'promptNo'} onClick={this.cancel} />
+                    </div>:
+                    <div className='prompt-buttons'>
+                      <span className={'promptSave'} onClick={this.saveData} />
+                      <span className={'promptCancel'} onClick={this.cancel} />
+                    </div>
+                    }
+                   </div>
+                  }
+          noDefaultFooter
+          noDefaultHeader
+          destroyContent
+          onCancel={this.cancel}
+          closable={false}
+        />
+    );
+  }
+}
+
+export default PromptModal;

mods/components/3dviewConvertor/view/moduleEditComponent/RightEditRegionPanel.js

@@ -63,6 +63,13 @@ class RightEditRegionPanel extends Component {
       heightInput: value
     });
   }
+  onNumberChange = (value) => {
+    const newForm = Object.assign({}, this.state.form, { 'positionZ': value });
+    this.setState({
+      form: newForm,
+      heightInput: value
+    });
+  }
   onRadioChange = (value) => {
     const newForm = Object.assign({}, this.state.form, { 'isIndoor': value });
     this.setState({
@@ -186,10 +193,11 @@ class RightEditRegionPanel extends Component {
                       </div> */}
                       <div className='positionItem'>
                         <FormItem label="高"  field="positionZ" {...formItemLayout}>
-                        <Input
+                        <InputNumber
                           placeholder={detailData.routePath && JSON.parse(detailData.routePath).regionHeigth || rightHeight}
                           value={heightInput}
-                          onChange={(e) => this.onChange('positionZ', e)}/>
+                          min={0}
+                          onChange={(e) => this.onNumberChange(e)}/>
                           {/* <Input value={detailData.ue4Location && detailData.ue4Location[2]}  /> */}
                         </FormItem>
                       </div>

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

@@ -9,7 +9,7 @@ export default class Panoramic extends Component {
   render() {
     return (
       <div className="sys-view-panoramic">
-        <Statistical/>
+        {/* <Statistical/> */}
       </div>
     );
   }

mods/components/3dviewConvertor/view/panoramic/statistical/SafetyIndex.js

@@ -138,7 +138,7 @@ export default class SafetyIndex extends Component {
           <div className='safetyIndex-content-row'>
             <div className='number-large'>{safetyIndexData.safetyIndex}</div>
             <span className='number-unit'>&nbsp;分&nbsp;
-              <img src={panoramicIcon.safetyup} className="row-up" alt="up" />
+              {/* <img src={panoramicIcon.safetyup} className="row-up" alt="up" /> */}
             </span>
           </div>
           {

mods/components/3dviewConvertor/view/panoramic/statistical/index.js

@@ -14,6 +14,11 @@ import SysWsURL, { completeToken } from './../../../consts/wsUrlConsts';
  */
 export default class Statistical extends Component {
 
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
   handleData = (data = {}) => {
     console.log('ws data:', data);
     data = JSON.parse(JSON.stringify(data));
@@ -69,7 +74,7 @@ export default class Statistical extends Component {
     const wsURL = completeToken(SysWsURL.convertorView3d);
     return (
       <div className="statistical">
-        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
+        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData.bind(this)} reconnect debug />
         <div className="statistical-left">
           <SafetyIndex ref={node => this.safetyIndex = node} />
           <SafetyExecuteList ref={node => this.safetyExecute = node} />

mods/components/3dviewConvertor/view/points/marker3DFactory.js

@@ -52,7 +52,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
             marker.object2DPipe.toggleDisplay(true);
           }
           if(marker.extData.type === 'riskSource'){
-            marker.node.baseObjHelper.title = marker.extData.name;
+            marker.baseObjHelper.title = marker.extData.name;
             marker.object2DPipe && marker.object2DPipe.toggleDisplay(true);
           }
         },
@@ -63,7 +63,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
             marker.object2DPipe.toggleDisplay(false);
           }
           if(marker.extData.type === 'riskSource'){
-            marker.node.baseObjHelper.title = marker.extData.title;
+            marker.baseObjHelper.title = marker.extData.title;
             marker.object2DPipe.toggleDisplay(false);
           }
         }

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

@@ -68,9 +68,9 @@ const getMsgColumns = () => {
 
 const getRecordColumns = () => {
   return [
-    {title: '名称',dataIndex: 'pointName',key: 'pointName',width: '33%'},
-    {title: '时间',dataIndex: 'checkTime',key: 'checkTime',width: '33%'},
-    {title: '路线名称',dataIndex: 'routeName',key: 'status',width: '33%'}
+    {title: '名称',dataIndex: 'fire_Equipment_Name',key: 'name',width: '33%'},
+    {title: '时间',dataIndex: 'create_time',key: 'create_time',width: '33%'},
+    {title: '重点设备',dataIndex: 'equipment_Name',key: 'equipment_Name',width: '33%'}
   ]
 }
 
@@ -78,14 +78,14 @@ const getTrajectoryColumns = () => {
   return [
     {title: '巡检人',dataIndex: 'userName',key: 'userName',width: '33%'},
     {title: '时间',dataIndex: 'checkTime',key: 'checkTime',width: '33%'},
-    {title: '轨迹',dataIndex: 'traName',key: 'traName',width: '33%'}
+    {title: '轨迹',dataIndex: 'pointName',key: 'pointName',width: '33%'}
   ]
 }
 
 const tabs = [
   { id: '1', key: 'search', closable: false, title: '检索' },
   { id: '2', key: 'message', closable: false, title: '消息' },
-  { id: '3', key: 'record', closable: false, title: '预案' },
+  { id: '3', key: 'record', closable: false, title: '步骤' },
   { id: '4', key: 'trajectory', closable: false, title: '轨迹' },
 ];
 
@@ -164,14 +164,14 @@ class SearchPane extends Component {
   //轨迹
   fetchTrajectoryData = () => {
     const { filter } = this.state;
-    trajectoryAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
+    recordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
       this.setState({trajectoryDataList:d.content,totalCount: d.totalElements});
     });
   }
-  //预案
+  //步骤
   fetchRecordData = () => {
     const { filter } = this.state;
-    recordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
+    exeRecordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
       this.setState({recordDataList:d.content,totalCount: d.totalElements});
     });
   }

mods/components/3dviewConvertor/view/searchPane/paramsHeader.js

@@ -139,6 +139,7 @@ class paramsHeader extends Component {
     }
   }
 
+  //检索
   getSearchContent = () => {
     const { showRiskLevel, showImpEquiList, impEquiList,filter  } = this.state;
     let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight:'14px' };
@@ -187,6 +188,7 @@ class paramsHeader extends Component {
 
   }
 
+  //消息
   getMessageContent = () => {
     const { filter } = this.state;
     return (<Group style={groupStyle}>
@@ -220,22 +222,23 @@ class paramsHeader extends Component {
 
   }
 
+  //步骤
   getRecordContent = () =>{
-    const { recordFilter } = this.state;
+    const { recordFilter,impEquiList  } = this.state;
     return (<Group style={groupStyle}>
-      {/* <Select
+      <Select
         key="recordImpl"
         style={selectStyle}
         data={impEquiList}
         renderOption={item => <Option key={item.id+item.name} value={item.id}>{item.name}</Option>}
         defaultOption={<Option>重点设备</Option>}
         onChange={(v) => this.paramsTypeonChange('equipmentId', v , SingleQueryEnum.EQUAL)}
-      /> */}
+      />
       <div className="params-input" style={inputStyle}>
         <Input
           key="recordTextValue"
           value={this.state.recordTextValue}
-          onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE,'record')}
+          onChange={(e) => this.paramsTypeonChange('contingencyName', e.target.value, SingleQueryEnum.LIKE,'record')}
           placeholder="输入关键字"
         />
         <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=> this.props.paramsOnChange(recordFilter)}/>
@@ -246,11 +249,12 @@ class paramsHeader extends Component {
         style={datePickerStyle}
         placeholder="时间"
         format="YYYY/MM/DD"
-        onChange={(v) => this.paramsTypeonChange('checkTime', v, SingleQueryEnum.EQUAL)}
+        onChange={(v) => this.paramsTypeonChange('createTime', v, SingleQueryEnum.EQUAL)}
         />
     </Group>);
   }
 
+  //轨迹
   getTrajectoryContent = () => {
     const { statusList,recordFilter } = this.state;
     return (<Group style={groupStyle}>