修改测试bug

src/styles/view/3dview/markers.scss

@@ -78,8 +78,8 @@
   &.marker-anim {
     .pulse-spread {
       position: absolute;
-      top: -18px;
-      left: -18px;
+      top: -20px;
+      left: -20px;
       width: 64px;
       height: 64px;
       border: 3px solid red;

src/styles/view/3dview/mask.scss

@@ -108,7 +108,7 @@
 }
 
 .control-item-popver {
-  z-index: 5 !important;
+  z-index: 10 !important;
 
   &::after {
     border-right-color: $core-border-color;

src/styles/view/biz/riskModel/riskModel.scss

@@ -341,6 +341,14 @@
   .amos-form-item {
     margin-bottom: 1.5rem;
   }
+
+  .amos-radio-disabled {
+    .amos-radio-status {
+      &::after {
+        background-color: #19afff !important;
+      }
+    }
+  }
 }
 
 .fmea-model {

src/utils/scrollUtil.js

+export const handleScrolling = () => {
+  let elements = document.getElementsByClassName('amos-modal-content');
+  for (var i = 0; i < elements.length; i++) {
+    elements[i].onscroll = function() {
+      let dropdown = document.getElementsByClassName('amos-popover-down');
+      if (dropdown) {
+        for (var j = 0; j < dropdown.length; j++) {
+          dropdown[j].style.display = 'none';
+        }
+      }
+    };
+  }
+};
\ No newline at end of file

src/view/bizview/preControl/paramSet/riskLevel/index.js

@@ -36,14 +36,14 @@ const getColumns = () => {
       className: 'uant-table-thead'
     },
     {
-      title: '上限',
+      title: 'RPN上限',
       dataIndex: 'topLimit',
       key: 'topLimit',
       width: '5%',
       className: 'uant-table-thead'
     },
     {
-      title: '下限',
+      title: 'RPN下限',
       dataIndex: 'downLimit',
       key: 'downLimit',
       width: '5%',

src/view/bizview/preControl/riskModel/index.js

@@ -75,7 +75,11 @@ class RiskModel extends Component {
   }
 
   componentDidMount(){
-    document.addEventListener('click', this._handleClick);//页面增加鼠标单击监听
+    let riskLevelDiv = document.getElementsByClassName('risk-level-map')[0];
+    let riskModelTabDiv = document.getElementsByClassName('risk-model-tab')[0];
+    riskLevelDiv && riskLevelDiv.addEventListener('click', this._handleClick);//页面增加鼠标单击监听
+    riskModelTabDiv && riskModelTabDiv.addEventListener('click', this._handleClick);//页面增加鼠标单击监听
+    // document.addEventListener('click', this._handleClick);//页面增加鼠标单击监听
     window.addEventListener('resize', this._resize);
     this.setOncontextmenu();//移除浏览器自带右键菜单
     let { riskSourceId } = this.props.location.state || {};
@@ -90,7 +94,11 @@ class RiskModel extends Component {
   }
 
   componentWillUnmount() {
-    document.removeEventListener('click', this._handleClick);//页面移除鼠标单击监听
+    let riskLevelDiv = document.getElementsByClassName('risk-level-map')[0];
+    let riskModelTabDiv = document.removeEventListener('risk-model-tab')[0];
+    riskLevelDiv && riskLevelDiv.removeEventListener('click', this._handleClick);//页面移除鼠标单击监听
+    riskModelTabDiv && riskModelTabDiv.addEventListener('click', this._handleClick);//页面移除鼠标单击监听
+    // document.removeEventListener('click', this._handleClick);//页面移除鼠标单击监听
     window.addEventListener('resize', this._resize);
   }
 
@@ -129,10 +137,10 @@ class RiskModel extends Component {
     }
   }
 
-  reload =(risk)=>{
+  reload =(risk, data) => {
     let { activeKey, subActiveKey } = this.state;
     if (risk) {
-      this.queryRiskSourceTree();
+      this.setState({ editRiskSource: data }, () => this.queryRiskSourceTree());
     } else {
       if (activeKey === '1'){//设置：打开弹出框，新增或者维护标记，弹出框类型
         this.fmeaRef.reloadPage();
@@ -145,13 +153,14 @@ class RiskModel extends Component {
   }
 
   queryRiskSourceTree =(riskSourceId)=>{
+    let { editRiskSource } = this.state;
     queryRiskSourceTreeAction().then(data =>{
-      let obj = this.loopTreeNodes(data[0]);
+      // let obj = this.loopTreeNodes(data[0]);
       if (riskSourceId){//3d屏互动
         this.setState({ treeData: data, autoExpandParent: true }, ()=>this.queryRiskSourceDetail(riskSourceId));
       } else {//业务屏刷新
-        if (obj) {
-          this.setState({ treeData: data, autoExpandParent: true }, ()=>this.queryRiskSourceDetail(obj.id));
+        if (editRiskSource) {
+          this.setState({ treeData: data, autoExpandParent: true }, ()=>this.queryRiskSourceDetail(editRiskSource.id));
         } else {
           this.setState({ treeData: data, autoExpandParent: true });
         }
@@ -209,6 +218,8 @@ class RiskModel extends Component {
   queryRiskSourceDetail = (id) =>{
     queryRiskSourceDetailAction(id).then(data =>{
       this.setState({
+        isRegion: data.isRegion,
+        node: data,
         code: data.code,
         level: data.level,
         rpni: data.rpni,
@@ -374,7 +385,7 @@ class RiskModel extends Component {
     riskSourceEditAction(body).then(
       data => {
         AmosAlert.success('提示', '操作成功');
-        this.reload('risk');
+        this.reload('risk', data);
       },
       err => {
         AmosAlert.error('提示', err);
@@ -394,6 +405,7 @@ class RiskModel extends Component {
     bindPointsAction(param).then(
       data => {
         AmosAlert.success('提示', '操作成功');
+        this.setState({ modal: false });
         this.reload();
       },
       err => {
@@ -414,6 +426,7 @@ class RiskModel extends Component {
     bindEquipIndexAction(param).then(
       data => {
         AmosAlert.success('提示', '操作成功');
+        this.setState({ modal: false });
         this.reload();
       },
       err => {
@@ -638,6 +651,7 @@ class RiskModel extends Component {
     } else {
       this.riskSourceDelete(idsArry, childrenLength);
     }
+    this.setState({ rightClickNodeTreeItem: null });
   }
 
   getNodeTreeRightClickMenu = () => {
@@ -889,8 +903,6 @@ class RiskModel extends Component {
           content={this.getContext(modelFlag, toolBarFlag)}
           onCancel={() => this.cancel()}
           onOk={() => this.onOk(modelFlag, toolBarFlag)}
-          // okText="确定"
-          // cancelText="取消"
           footer={this.getModalFooter(modelFlag, toolBarFlag)}
           outterClosable={false}
         />

src/view/bizview/preControl/riskModel/model/EvaluationModel.js

@@ -7,6 +7,7 @@ import {
   queryAllRiskLevelAction,
   queryAllUserAction
 } from '../../../../../services/preControlService';
+import { handleScrolling } from './../../../../../utils/scrollUtil';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -66,8 +67,9 @@ class EvaluationModel extends Component {
     this.getEvaModel('');
     this.getRiskLevel();
     this.getUser();
-  };
 
+    handleScrolling();
+  };
 
   onSelectChange = (key, value, item) => {
     const { form } = this.state;
@@ -147,8 +149,22 @@ class EvaluationModel extends Component {
     });
   };
 
+  handelScrolling() {
+    let elements = document.getElementsByClassName('amos-modal-content');
+    for (var i = 0; i < elements.length; i++) {
+      elements[i].onscroll = function() {
+        let dropdown = document.getElementsByClassName('amos-popover-down');
+        if (dropdown) {
+          for (var j = 0; j < dropdown.length; j++) {
+            dropdown[j].style.display = 'none';
+          }
+        }
+      };
+    }
+  }
+
   render() {
-    const { form, rules, sData, dData, oData, userData } = this.state;
+    const { form, rules, sData, dData, oData, userData, scrolling } = this.state;
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
@@ -246,7 +262,7 @@ class EvaluationModel extends Component {
           </FormItem>
           <span className="fmea-item-span">责任人：</span>
           <div style={{ display: 'flex' }}>
-            <div style={{ width: '50%' }}>
+            <div className="scroll-div" style={{ width: '50%' }} >
               <FormItem label={<span>公司责任人</span>} className="fmea-item-influence" field="companyLeader" {...formItemShortLayout}>
                 <Select
                   className="fmea-model-select short-select"

src/view/bizview/preControl/riskModel/model/RiskSourceModel.js

@@ -17,6 +17,7 @@ class RiskSourceModel extends Component {
     this.state = {
       searchParam: [],
       riskLevelData: [],
+      isEdit: false,
       form: {
         name: '',
         code: '',
@@ -58,6 +59,10 @@ class RiskSourceModel extends Component {
 
   componentDidMount = () => {
     this.getriskLevelEumData();
+    let { selectedRow } = this.props;
+    if (selectedRow) {
+      this.setState({ isEdit: true });
+    }
   };
 
   componentWillReceiveProps = (nextProps) => {
@@ -74,9 +79,10 @@ class RiskSourceModel extends Component {
       form.position3d = selectedRow.position3d;
       form.floor3d = selectedRow.floor3d;
       form.isIndoor = selectedRow.isIndoor;
+      this.setState({ form, isEdit: true });
     }
-    this.setState({ form });
   }
+
   onSelectChange = (key, value) => {
     const { form } = this.state;
     form[key] = value;
@@ -122,9 +128,9 @@ class RiskSourceModel extends Component {
   }
 
   render() {
-    const { form, rules, riskLevelData } = this.state;
+    const { form, rules, riskLevelData, isEdit } = this.state;
     const { treeNodeType, disabled } = this.props;
-    let showIsRegionSelection = (treeNodeType === 3 || treeNodeType === undefined) && form.isRegion === 'TRUE';
+    let showIsRegionSelection = (treeNodeType === 3 || treeNodeType === undefined) && (form.isRegion === 'TRUE' || !isEdit);
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
@@ -153,7 +159,7 @@ class RiskSourceModel extends Component {
           </FormItem>
           }
           { showIsRegionSelection && <FormItem label={<span>是否区域</span>} field="isRegion" {...formItemLayout}>
-            <RadioGroup disabled={disabled} defaultValue={form.isRegion} onChange={e => this.onSelectChange('isRegion', e)}>
+            <RadioGroup disabled={disabled || isEdit} defaultValue={form.isRegion} onChange={e => this.onSelectChange('isRegion', e)}>
               <Radio value="FALSE">否</Radio>
               <Radio value="TRUE">是</Radio>
             </RadioGroup>
@@ -188,7 +194,8 @@ class RiskSourceModel extends Component {
 RiskSourceModel.propTypes = {
   treeNodeType: PropTypes.number,
   parentId: PropTypes.number,
-  selectedRow: PropTypes.array
+  selectedRow: PropTypes.array,
+  disabled: PropTypes.bool
 };
 
 export default RiskSourceModel;