1.修改样式

mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss

@@ -121,7 +121,6 @@
           width: 90%;
 
           span{
-            position: absolute;
             margin-top: 3px;
             font-size: 14px;
             color: rgba(255,255,255,1);
@@ -487,48 +486,54 @@
     display: flex;
     height: calc(100% - 50px);
 
-    .model-line{
-      float: left;
-      display: inline;
-      width: 32%;
+    .model-line {
       height: 88%;
-      text-align: center;
-      padding-left: 35px;
       margin-top: 5px;
-      margin-left: 10px;
-      overflow: auto;
+      text-align: center;
+      flex: 1;
+
+      &-img {
+        height: 30px;
+      }
 
-      .model-title{
+      .model-title {
         height: 30px;
-        font-size:16px;
+        font-size: 16px;
         color:rgba(240,223,45,1);
-        padding-top: 10px;
       }
-      .model-content{
 
-        .content-div{
+      .model-content {
+        height: calc(100% - 60px);
+        padding-left: 10px;
+        overflow: auto;
+
+        .content-div {
           min-width: 80px;
           min-height: 120px;
-          text-align: left;
           padding-top: 20px;
+          text-align: left;
 
-          .title{
+          .title {
             height: 30px;
             font-size: 16px;
             color:rgba(240,223,45,1);
           }
-          .next-title{
+
+          .next-title {
             padding-left: 5px;
           }
-          .rows{
+
+          .rows {
             padding-left: 15px;
             font-size: 14px;
             color:rgba(255,255,255,1);
-            .row{
+
+            .row {
               display: inline-block;
               height: 28px;
             }
-            .date{
+
+            .date {
               padding-left: 25px;
             }
           }

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

 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { safetyIndexDetailAction } from './../../../services/panoramicService';
 import moment from 'moment';
-const format = 'YYYY-MM-dd';
 
 
 export default class ModelContent extends Component {
@@ -14,18 +14,10 @@ export default class ModelContent extends Component {
   }
 
   componentDidMount(){
-    let { type } = this.props;
+    const { type } = this.props;
     this.safetyIndexDetail(type);
   }
 
-  safetyIndexDetail = (type) => {
-    safetyIndexDetailAction(type).then(data => {
-      this.setState({
-        alarmData: data
-      });
-    });
-  }
-
   /**
    * 获取标题
    *
@@ -41,6 +33,14 @@ export default class ModelContent extends Component {
     return titleParams[v];
   }
 
+  safetyIndexDetail = (type) => {
+    safetyIndexDetailAction(type).then(data => {
+      this.setState({
+        alarmData: data
+      });
+    });
+  }
+
   formatData = (str) => {
     let date = str.split(' ')[0];
     return date;
@@ -63,12 +63,12 @@ export default class ModelContent extends Component {
 
   render() {
     let { alarmData } = this.state;
-    let { type } = this.props;
+    const { type } = this.props;
     return (
       <div className='model-content'>
         {(alarmData || []).map(item => {
           return (
-            <div className='content-div'>
+            <div key={item.typeCode} className='content-div'>
               <div className='title'>
                 <span>|</span>
                 <span className='next-title'>{ type === 'risk' ? this.getTitle(item.typeCode) : item.typeName }</span>
@@ -81,3 +81,7 @@ export default class ModelContent extends Component {
     );
   }
 }
+
+ModelContent.propTypes = {
+  type: PropTypes.string
+};

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

@@ -81,7 +81,8 @@ export default class SafetyExecuteList extends Component {
       datas.map((item, index) => {
         return (
           <div key={item.id} className="title-child">
-            <span className="title-text" >{item.label}</span>
+            <span className="title-text" >{item.label}</span>&nbsp;&nbsp;
+            <span className="title-text" >{item.changeDate}</span>
           </div>
         );
       })

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

@@ -109,7 +109,7 @@ export default class SafetyIndex extends Component {
           {warnController.map(item => {
             return (
               <div key={item.key} className='model-line'>
-                <div>
+                <div className='model-line-img'>
                   <img src={getIcon(item.icon)} alt='' />
                 </div>
                 <div className='model-title'>{item.label}</div>

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

@@ -2,7 +2,7 @@
  * 告警控制
  */
 export const warnController = [
-  { key: 'fire', icon: 'model_fire', type: 'fire', label: '故障告警' },
+  { key: 'equip', icon: 'model_fire', type: 'equip', label: '故障告警' },
   { key: 'risk', icon: 'model_risk', type: 'risk', label: '风险异常' },
   { key: 'check', icon: 'model_patrol', type: 'check', label: '巡检异常' }
 ];