Merge branch 'dev_upgrade' of 172.16.10.76:station/amos-convertor-view into dev_upgrade

src/styles/view/biz/equipmentLedger/fireResource.scss

@@ -17,7 +17,7 @@
       .amos-tabs-tabitem-inner {
         height: 35px;
         margin-left: 0 !important;
-        color: #108ee9 !important;
+        color: #fff !important;
         border-bottom: 1px solid #108ee9 !important;
       }
     }

src/styles/view/biz/precontrol.scss

@@ -20,7 +20,7 @@
       .amos-tabs-tabitem-inner {
         height: 35px;
         margin-left: 0 !important;
-        color: #108ee9 !important;
+        color: #fff !important;
         border-bottom: 1px solid #108ee9 !important;
       }
     }

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

@@ -12,6 +12,7 @@ const getColumns = () => {
   return [
     {
       title: '序号',
+      width: '5%',
       render: (text, record, index) => `${index + 1}`
     },
     {
@@ -35,13 +36,6 @@ const getColumns = () => {
       width: '10%',
       className: 'uant-table-thead'
     },
-    // {
-    //   title: '管控级别',
-    //   dataIndex: 'manageLevelName',
-    //   key: 'manageLevelName',
-    //   width: '10%',
-    //   className: 'uant-table-thead'
-    // },
     {
       title: '图标颜色',
       dataIndex: 'color',
@@ -74,7 +68,7 @@ const getColumns = () => {
       title: '维护日期',
       dataIndex: 'createDate',
       key: 'createDate',
-      width: '15%',
+      width: '20%',
       render: text =>moment(text).format('YYYY-MM-DD HH:mm:ss'),
       className: 'uant-table-thead'
     }

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

@@ -139,6 +139,7 @@ class RiskModel extends Component {
   }
 
   reload =(risk, data) => {
+    debugger
     let { activeKey, subActiveKey } = this.state;
     if (risk) {
       this.setState({ editRiskSource: data }, () => this.queryRiskSourceTree());
@@ -160,7 +161,7 @@ class RiskModel extends Component {
         selectedKeys.push(data[0].id + '');
         this.setState({ node: data[0], selectedKeys });
       } else {
-        const node = data[0].children.filter(e => e.id === selectedKeys);
+        const node = data[0].children.filter(e => e.id === selectedKeys[0]);
         this.setState({ node });
       }
       if (riskSourceId){//3d屏互动
@@ -227,16 +228,18 @@ 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,
-        riskSourceId: data.id,
-        expandedKeys: (data.parentId + '').split(','),
-        selectedKeys: (data.id + '').split(',') ,
-        searchParam: [{ name: 'riskSourceId', value: data.id, type: '' }] },() => this.questStatistiscData(this.pageConfig));
+      if (data){
+        this.setState({
+          isRegion: data.isRegion,
+          node: data,
+          code: data.code,
+          level: data.level,
+          rpni: data.rpni,
+          riskSourceId: data.id,
+          expandedKeys: (data.parentId + '').split(','),
+          selectedKeys: (data.id + '').split(',') ,
+          searchParam: [{ name: 'riskSourceId', value: data.id, type: '' }] },() => this.questStatistiscData(this.pageConfig));
+      }
     });
   }
 
@@ -418,6 +421,7 @@ class RiskModel extends Component {
     riskSourceEditAction(body).then(
       data => {
         AmosAlert.success('提示', '操作成功');
+        this.setState({ selectedKeys: [] });
         this.reload('risk', data);
       },
       err => {
@@ -549,6 +553,7 @@ class RiskModel extends Component {
           riskSourceDeleteAction(id).then(
             data => {
               AmosAlert.success('提示', '删除成功');
+              this.setState({ selectedKeys: [] });
               this.reload('risk');
             },
             err => {

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

@@ -40,6 +40,7 @@ class RiskSourceModel extends Component {
   }
 
   componentWillMount = () => {
+    debugger
     let { form } = this.state;
     let { selectedRow } = this.props;
     if (selectedRow) {