冲突

amos.config.js

@@ -11,22 +11,22 @@
       objModelURI: '/a3dres',
       // 根url
       // baseURI: 'http://172.16.11.30:9008/',
-      baseURI: 'http://172.16.3.122:8083/',
+      baseURI: 'http://172.16.3.63:8083/',
       // convertorURI: 'http://172.16.3.122:8083/',
-      convertorURI: 'http://172.16.3.122:8083/',
+      convertorURI: 'http://172.16.3.63:8083/',
       patrolURI: 'http://172.16.3.122:8082/',
       rulesConfigURI: 'http://172.16.10.91:8080/',
       // plugin URI
       pluginURI: 'http://172.16.11.40:8099/',
-      studioURI: 'http://172.16.11.40:8099/',
+      studioURI: 'http://172.16.11.40:8099/'
     },
     // websocket 地址
     wsURI: {
       pluginURI: 'ws://172.16.11.40:10600/',
       studioURI: 'ws://172.16.11.40:10600/',
-      convertorView3dURI: 'ws://172.16.10.91:8080/',//换流站websocket
       securityBaseURI: 'ws://172.16.10.91:10600/',
-      baseURI: 'ws://172.16.10.91:10600/'
+      convertorView3dURI: 'ws://172.16.10.91:10600/',
+      ruleURI: 'ws://172.16.10.91:8080/'
     },
     // 外部链接地址
     outterURI: {

example/Unknown.js

+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+const Unknown = props => {
+  const { className } = props;
+  const cls = classNames('sketch-component-unknown', className);
+  return (
+    <div className={cls}>未知控件</div>
+  );
+};
+
+Unknown.propTypes = {
+  className: PropTypes.string
+};
+
+export default Unknown;

example/sketch.js

-import { commonRegister } from 'amos-viz/lib/widgets';
-import { getSketchCompnents } from './../mods';
+import { IModularHub, INNER_MODULAR_TYPE } from 'amos-viz/lib/widgets';
+import Unknown from './Unknown';
+import * as mods from './../mods';
+// 测试发布
+// import * as mods from './../lib/graphmod';
 
-const innerModularType = commonRegister.innerModularType;
+/**
+ * hybrid 创建自己独立的 modular
+ * 注册 所有的 mod
+ */
+export const hybridModular = new IModularHub();
+
+// 注册未知组件
+hybridModular.registerSketchComponent('unknown', Unknown);
+
+Object.keys(mods).forEach(k => {
+  // 需要排除 default
+  if (k !== 'default'){
+    hybridModular.registerSketchComponent(k, mods[k]);
+  }
+});
 
 export function getComponentKeyList(){
-  return Object.keys(commonRegister.getModularsByType(innerModularType.sketchComponent));
+  const sc = hybridModular.getModularsByType(INNER_MODULAR_TYPE.sketchComponent);
+  // const sc = hybridModular.getObjModularsByType(INNER_MODULAR_TYPE.sketchComponent);
+  return [...sc.keys()].map(item => item.replace(`${INNER_MODULAR_TYPE.sketchComponen}/`, ''));
 }
 
-export default getSketchCompnents;
+export default function getSketchCompnents(alias){
+  return hybridModular.getModularClass(INNER_MODULAR_TYPE.sketchComponent, alias, Unknown);
+}

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/consts/wsUrlConsts.js

@@ -6,10 +6,9 @@ const lsTool = Store.lsTool;
 const completePrefix = endConf.completePrefix;
 
 const AmosConfig = endConf.AmosConfig;
-const ConvertorView3dURI = AmosConfig.wsURI.convertorView3dURI;
 
-const baseURI = AmosConfig.wsURI.baseURI;
-const view3dURI = AmosConfig.wsURI.view3dURI;
+const convertorView3dURI = AmosConfig.wsURI.convertorView3dURI;
+const ruleURI = AmosConfig.wsURI.ruleURI;
 
 const getToken = () => {
   return lsTool.read(SysConsts.token);
@@ -17,13 +16,8 @@ const getToken = () => {
 
 
 export default {
-  convertorRulews: completePrefix(ConvertorView3dURI, 'rule.ws?token={token}'),
-  convertorView3dws: completePrefix(ConvertorView3dURI, 'view3d.ws?token={token}'),
-
-
-  rulews: completePrefix(view3dURI, 'rule.ws?token={token}'),
-  view3dws: completePrefix(view3dURI, 'view3d.ws?token={token}'),
-  viewIndexws: completePrefix(baseURI, '3dViewMessage')
+  rulews: completePrefix(ruleURI, 'rule.ws?token={token}'),
+  convertorView3d: completePrefix(convertorView3dURI, '3dViewMessage')
 };
 
 export const completeToken = (url) => {
@@ -31,7 +25,3 @@ export const completeToken = (url) => {
   const result = formatUrl(url, { token });
   return result;
 };
-
-
-
-

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

@@ -25,8 +25,12 @@ export const getObjFromNet = (url, callback) => {
  * 获取各个类型的marker
  * @param {string} type
  */
-export const initView3DAction = (type) => {
-  const url = formatUrl(FscSerUrl.view3dInitUrl, { type });
+export const initView3DAction = (type,riskSourceId) => {
+  if (!riskSourceId) {
+    riskSourceId="";
+  }
+
+  const url = formatUrl(FscSerUrl.view3dInitUrl, {type,riskSourceId});
   return commonGet(url);
 };
 
@@ -166,8 +170,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/styles/actionbar.scss

 .action-pane-data{
+  position: absolute;
+  bottom: 5%;
+  left: 50%;
+  transform: translateX(-50%);
 
-    position: absolute;
-    left: 45% !important;
-    top: 90% !important;
-
-    .action-list{
+    .action-list {
         height: 40px;
         padding: 0 1rem;
         border-radius: 6px;
@@ -49,4 +49,4 @@
             background: linear-gradient(180deg,rgba(0,96,154,0.8) 0%,rgba(0,54,105,0.5) 100%);
         }
     }
-}
+}
\ No newline at end of file

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

@@ -20,17 +20,19 @@
 .common-footer {
   text-align: center;
   background: transparent;//$core-color;
-  border: 1px solid $core-border-color;
-  border-radius: $core-border-radius;
+  // border: 1px solid $core-border-color;
+  // border-radius: $core-border-radius;
 
   .common-footer-item {
     display: inline-block;
-    width: $dialog-footer-width;
+    //width: $dialog-footer-width;
+    width: 100px;
     height: $dialog-footer-height;
     overflow: hidden;
     cursor: pointer;
-    background: $dialog-footer-item-bg;
-    border: 1px solid $core-border-color;
+    padding-top: 10px;
+    background: transparent;
+    //border: 1px solid $core-border-color;
     border-top: 0;
     box-sizing: border-box;
 
@@ -84,21 +86,32 @@
 
     .dialog-body-min {
       position: relative;
-      width: $dialog-min-width;
-      height: $dialog-height;
+      // width: $dialog-min-width;
+      // height: $dialog-height;
+      height:497px;
+      width: 866px !important;
       min-width: $dialog-min-width;
-      color: black;
-      background: $content-color;
-      border: 1px solid $core-border-color;
-      border-radius: $core-border-radius;
-      box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-      box-sizing: border-box;
+      //color: black;
+      // background: $content-color;
+      // border: 1px solid $core-border-color;
+      // border-radius: $core-border-radius;
+      // box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+      // box-sizing: border-box;
+      background-image: url('/mods/components/3dviewConvertor/assets/convertor/3dview/dialogbg.png');
+      background-color: rgba(25, 86, 147, 0.5);
 
       .body-min-header {
         position: relative;
         height: 2.5rem;
         margin-left: 1rem;
-
+        .dialog-min-title{
+          position: absolute;
+          line-height: 2.5rem;
+          padding-top: 1rem;
+          left: 9px;
+          font-size: 18px;
+          color: #fff;
+        }
         .common-close {
           position: absolute;
           right: 0;
@@ -112,6 +125,7 @@
       }
 
       .body-min-content {
+        margin-top: 2.5rem;
         height: calc(35% - 50px - 2.5rem);
         margin-right: 1rem;
         margin-left: 1rem;
@@ -122,6 +136,7 @@
         margin-right: 1rem;
         margin-left: 1rem;
 
+
         .ant-table-title {
           display: none;
         }
@@ -129,9 +144,11 @@
         .ant-table-thead {
           tr {
             th {
-              color: $biz-table-font-color;
-              background: $biz-table-title-color;//rgba(40, 40, 40, 1);
-              border-color: $core-border-color;
+              // color: $biz-table-font-color;
+              // background: $biz-table-title-color;//rgba(40, 40, 40, 1);
+              // border-color: $core-border-color;
+              color:#fff;
+              background-color: transparent;
             }
         }
       }
@@ -139,18 +156,23 @@
         .ant-table-body {
           tr {
             td {
-              color: $biz-table-font-color;//#ffffff;
-              background: $content-color;//rgba(51, 51, 51, 1);
-              border-color: $core-border-color;//#252525;
+              // color: $biz-table-font-color;//#ffffff;
+              // background: $content-color;//rgba(51, 51, 51, 1);
+              // border-color: $core-border-color;//#252525;
+              color:#fff;
+              background-color: transparent;
             }
           }
           max-height: 273px !important;
           overflow-y: scroll;
+
         }
 
         .ant-table-placeholder {
-          color: $biz-table-font-color;
-          background-color: $content-color;//rgba(40, 40, 40, 1);
+          //color: $biz-table-font-color;
+          //background-color: $content-color;//rgba(40, 40, 40, 1);
+          background-color: transparent;
+          color: #fff;
         }
 
         .highlight-row {

mods/components/3dviewConvertor/styles/index.js

-import './index.scss'
+import './index.scss';
 import './../assets/bizFont/iconfont.js';
-import './view/index.scss';
+import './view/index.scss';
\ No newline at end of file

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

@@ -4,7 +4,8 @@
     .topBox {
         position: absolute;
         top: 34px;
-        left: 40%;
+        left: 50%;
+        transform: translateX(-50%);
         span {
             display: inline-block;
         }
@@ -17,7 +18,7 @@
             text-align: center;
             color: #fff;
             vertical-align: top;
-            
+
             .titleText {
                 width: 100%;
                 height: 100%;
@@ -37,7 +38,8 @@
     .bottomBox {
         position: absolute;
         bottom: 34px;
-        left: 40%;
+        left: 50%;
+        transform: translateX(-50%);
         span {
             display: inline-block;
             width: 177px;
@@ -198,10 +200,10 @@
             }
         }
     }
-    
+
     .editButton {
         position: absolute;
         bottom: 100px;
         left: 50%;
     }
-}
+}
\ No newline at end of file

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

@@ -3,7 +3,7 @@
     width: 216px !important;
     height: 100% !important;
     padding: 0px;
-    background: url('./../assets/convertor/3dview/prePlan/detail-info.png') no-repeat;
+    background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/detail-info.png') no-repeat;
     background-size: 100%;
     background-repeat: round;
     position: relative;
@@ -108,7 +108,7 @@
 
   .carImg {
     width: 35px;
-    background: url('./../assets/convertor/3dview/plan/car.png') no-repeat top;
+    background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/car.png') no-repeat top;
   }
 
   .carHead {
@@ -131,7 +131,7 @@
     width: 81px !important;
     margin-left: 5px !important;
     font-size: 5px !important;
-    background-image: url('./../assets/convertor/3dview/plan/post.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/post.png');
     text-align: center !important;
     line-height: 27px !important;
   }
@@ -147,7 +147,7 @@
     margin-left: 0px;
     height: 25px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/plan/detail-title.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/detail-title.png');
     background-size: 100%;
     background-repeat: round;
   }
@@ -156,7 +156,7 @@
     margin-left: 3px;
     height: 25px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/prePlan/zhuyibar.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/zhuyibar.png');
     background-size: 100%;
     background-repeat: round;
   }
@@ -165,7 +165,7 @@
     margin-left: 3px;
     height: 25px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/prePlan/jianyibar.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jianyibar.png');
     background-size: 100%;
     background-repeat: round;
   }
@@ -174,7 +174,7 @@
     margin-left: 3px;
     height: 25px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/prePlan/jinggaobar.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jinggaobar.png');
     background-size: 100%;
     background-repeat: round;
   }
@@ -436,7 +436,7 @@
     width: 316px !important;
     height: 100% !important;
     padding: 0px;
-    background: url('./../assets/convertor/3dview/prePlan/detail-info.png') no-repeat;
+    background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/detail-info.png') no-repeat;
     background-size: 100%;
     background-repeat: round;
     position: relative;
@@ -534,7 +534,7 @@
 
   .carImg {
     width: 59px;
-    background: url('./../assets/convertor/3dview/plan/car.png') no-repeat top;
+    background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/car.png') no-repeat top;
   }
 
   .carHead {
@@ -557,7 +557,7 @@
     width: 81px !important;
     margin-left: 45px !important;
     font-size: 13px !important;
-    background-image: url('./../assets/convertor/3dview/plan/post.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/post.png');
     text-align: center !important;
     line-height: 27px !important;
   }
@@ -571,7 +571,7 @@
     margin-left: 5px;
     height: 35px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/plan/detail-title.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/detail-title.png');
     background-size: 100%;
     background-repeat: round;
   }
@@ -580,7 +580,7 @@
     margin-left: 5px;
     height: 35px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/prePlan/zhuyibar.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/zhuyibar.png');
     background-size: 100%;
     background-repeat: round;
   }
@@ -589,7 +589,7 @@
     margin-left: 5px;
     height: 35px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/prePlan/jianyibar.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jianyibar.png');
     background-size: 100%;
     background-repeat: round;
   }
@@ -598,7 +598,7 @@
     margin-left: 5px;
     height: 35px;
     color: white;
-    background-image: url('./../assets/convertor/3dview/prePlan/jinggaobar.png');
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jinggaobar.png');
     background-size: 100%;
     background-repeat: round;
   }

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

@@ -110,7 +110,8 @@
   display: inline;
   font-size: 7px;
   line-height: 40px;
-  color: $biz-table-font-color;//white;
+  //color: $biz-table-font-color;//white;
+  color:#fff;
 
   .colTitle {
     padding-left: 8px;
@@ -124,21 +125,22 @@
     display: flex;
     border: 1px solid $core-border-color;
     border-bottom: 0;
-    border-left: 0;
+
   }
 
   .point-detail-table-row2 {
     display: flex;
     border: 1px solid $core-border-color;
-    border-left: 0;
+
   }
 
   .colTitle {
     float: left;
     width: 131px;//9.84%;
     height: 40px;
-    background: $biz-table-title-color;//#333;
-    border-left: 1px solid $core-border-color;
+    //background: $biz-table-title-color;//#333;
+    background: rgba(25, 86, 147, 1);
+   // border-left: 1px solid $core-border-color;
     box-sizing: border-box;
     flex: 1;
   }
@@ -147,17 +149,21 @@
     float: left;
     width: 131px;//9.83%;
     height: 40px;
-    background: $content-color;//rgb(97, 96, 96);
+    //background: $content-color;//rgb(97, 96, 96);
+    background: transparent;
     flex: 1;
-    border-left: 1px solid $core-border-color;
+    //border-left: 1px solid $core-border-color;
   }
 }
-
 .point-dialog-modal{
   width: 100%;
   height: 100%;
   .amos-modal-container{
-    // width: 310px !important;
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/toolmodalbg.png');
+    background-repeat: no-repeat;
+    height:262px;
+    width: 452px !important;
+    background-color: rgba(255,255,255,0);
     .amos-modal-close{
       color: white;
       background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
@@ -168,35 +174,43 @@
       }
     }
     .amos-modal-header{
-      background: $model-header-color-3d;
-      height: 30px;
+      background: rgba(255,255,255,0);
+      height: 50px;
       padding: 0;
+      border-width: 0em;
       .amos-modal-title{
-        line-height: 30px;
+        line-height: 50px;
         padding-left: 9px;
+        color: #fff;
+        font-size: 18px;
       }
     }
     .amos-modal-content{
       padding: 0;
       .point-dialog-body{
+        margin:10px;
+        max-height: 180px;
+        color: #fff;
         .point-dialog-modal-row {
+          border: solid 1px rgba(234, 234, 234, 0.3);
           display: flex;
-          background: $model-body-color-3d;
+          background: transparent;
           .colTitle {
             float: left;
             font-weight: bold;
             height: 40px;
             padding-left: 8px;
-            border-left: 1px solid $core-border-color;
+            line-height: 40px;
             box-sizing: border-box;
             flex: 1;
+            background-color: rgba(25, 86, 147, 0.6);
           }
           .colValue {
             float: left;
             height: 40px;
             padding-left: 8px;
-            flex: 1;
-            border-left: 1px solid $core-border-color;
+            line-height: 40px;
+            flex: 1.5;
           }
         }
       }
@@ -206,9 +220,29 @@
 }
 
 .risk-warn-modal{
-  height: 100%;
+  ::-webkit-scrollbar {             /* 血槽宽度 */
+    width: 14px;
+    height: 8px;
+  }
+  ::-webkit-scrollbar-thumb {           /* 拖动条 */
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/scrollslider.png') ;
+    background-repeat: no-repeat;
+    height: 10px;
+  }
+  ::-webkit-scrollbar-track {          /* 背景槽 */
+    background-color:rgba(17, 44, 88, 0.2);
+  }
+  ::-webkit-scrollbar-button{
+    background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/scrollbutton.png') ;
+    background-repeat: no-repeat;
+  }
+
+   height:100%;
   .amos-modal-container{
-     width: 740px !important;
+     background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/modalbg.png');
+     height:497px;
+     width: 866px !important;
+     background-color: rgba(255,255,255,0);
     .amos-modal-close{
       color: white;
       background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
@@ -219,37 +253,69 @@
       }
     }
     .amos-modal-header{
-      background: $model-header-color-3d;
-      height: 30px;
+      background: rgba(255,255,255,0);
+      height: 50px;
       padding: 0;
+      border-width: 0em;
       .amos-modal-title{
-        line-height: 30px;
+        line-height: 50px;
         padding-left: 9px;
+        color: #fff;
+        font-size: 18px;
       }
     }
     .amos-modal-content{
-      padding: 1rem 2rem 2rem 2rem;
-      max-height: 45rem;
       .risk-warn{
         .risk-warn-header{
-          padding-bottom: 1rem;
-          padding-top: 0.5rem;
-          padding-left: 0.5rem;
-          border: 1px solid $core-border-color;
           margin-bottom: 1rem;
+          color:#fff;
         }
         .risk-warn-table{
+          background-color: transparent;
           .ant-table-title{
             display: none;
           }
+          span{
+            font-size: 14px;
+          }
+
+          .ant-table-placeholder {
+            //color: $biz-table-font-color;
+            //background-color: $content-color;//rgba(40, 40, 40, 1);
+            background-color: transparent;
+            color: #fff;
+          }
+          .ant-table-thead {
+            tr {
+              th {
+                color:#fff;
+                background-color: rgba(25, 86, 147, 1);
+              }
+          }
+        }
+          .ant-table-body {
+            tr {
+              td {
+                color:#fff;
+                background-color: transparent;
+              }
+            }
+
+
+          }
           .ant-table-body{
             max-height: 35rem !important;
+            background-color:transparent;
           }
         }
         .risk-warn-content{
-          padding-bottom: 2rem;
-          border: 1px solid $core-border-color;
+          padding: 15px;
+          border: 1px solid rgba(255, 255, 255, 0.3);;
           margin-top: 1rem;
+          margin-bottom: 2em;
+          span{
+            color: #fff;
+          }
         }
       }
     }

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

@@ -59,22 +59,22 @@
       width: 260px;
       height: 206px;
       padding: 20px;
-      background: url('./../assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat;
+      background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat;
 
       .step-trace {
         height: 144px;
-        background: url('./../assets/convertor/3dview/prePlan/step-trace.png') no-repeat;
+        background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/step-trace.png') no-repeat;
 
         .next-step {
           width: 24px;
           height: 24px;
-          background: url('./../assets/convertor/3dview/prePlan/buzhouqu-xiayibu.png') no-repeat;
+          background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu-xiayibu.png') no-repeat;
         }
 
         .previous-step {
           width: 24px;
           height: 24px;
-          background: url('./../assets/convertor/3dview/prePlan/buzhouqu-dangqianbu.png') no-repeat;
+          background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu-dangqianbu.png') no-repeat;
         }
       }
 
@@ -130,7 +130,7 @@
         width: 840px;
         height: 60px;
         margin: 0 auto;
-        background-image: url('./../assets/convertor/3dview/prePlan/dingbu.png');
+        background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/dingbu.png');
         background-repeat: no-repeat;
         background-size: 100% 100%;
 
@@ -155,7 +155,7 @@
         height: 30px;
         margin: 0 auto;
         margin-top: 10px;
-        background-image: url('./../assets/convertor/3dview/prePlan/baojing.png');
+        background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/baojing.png');
         background-repeat: no-repeat;
         background-size: 100% 100%;
 
@@ -179,7 +179,7 @@
         height: 60px;
         margin-bottom: 7px;
         text-align: center;
-        background: url('./../assets/convertor/3dview/prePlan/shujuqu.png');
+        background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu.png');
 
         .text-icon {
           width: 36px;
@@ -200,7 +200,7 @@
 
           .text-icon {
             // flex: 1 0 16%;
-            background: url('./../assets/convertor/3dview/prePlan/shujuqu-shijian.png');
+            background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shijian.png');
             background-repeat: no-repeat;
           }
 
@@ -214,7 +214,7 @@
 
           .text-icon {
             // flex: 1 0 16%;
-            background: url('./../assets/convertor/3dview/prePlan/shujuqu-shuichi.png');
+            background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuichi.png');
             background-repeat: no-repeat;
           }
 
@@ -228,7 +228,7 @@
 
           .text-icon {
             // flex: 1 0 8%;
-            background: url('./../assets/convertor/3dview/prePlan/shujuqu-shuiwei.png');
+            background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuiwei.png');
             background-repeat: no-repeat;
           }
 
@@ -243,7 +243,7 @@
 
           .text-icon {
             // flex: 1 0 7%;
-            background: url('./../assets/convertor/3dview/prePlan/shujuqu-gongshu.png');
+            background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-gongshu.png');
             background-repeat: no-repeat;
           }
 
@@ -257,7 +257,7 @@
 
           .text-icon {
             // flex: 1 0 7%;
-            background: url('./../assets/convertor/3dview/prePlan/shujuqu-paomo.png');
+            background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-paomo.png');
             background-repeat: no-repeat;
           }
 
@@ -279,7 +279,7 @@
 .amos-modal-confirm-confirm {
   .amos-modal-container {
     text-align: center;
-    background: url('./../assets/convertor/3dview/prePlan/tishitanchuang.png') no-repeat;
+    background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/tishitanchuang.png') no-repeat;
     background-size: 100% 100%;
     box-shadow: unset;
 
@@ -305,7 +305,7 @@
       .amos-btn {
         width: 95px;
         height: 44px;
-        background: url('./../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png') no-repeat;
+        background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png') no-repeat;
         background-size: 100% 100%;
         border: 0;
       }
@@ -315,7 +315,7 @@
         height: 40px;
         margin-top: -5px;
         color: white;
-        background: url('./../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-lan-chang.png') no-repeat;
+        background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jiaohuqu-2anniu-lan-chang.png') no-repeat;
         border: 0;
       }
     }
@@ -454,7 +454,7 @@
 .precontrol-water-view {
   width: 260px;
   text-align: center;
-  background: url('./../assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat;
+  background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat;
   background-size: 100% 100%;
   padding-bottom: 10px;
   padding-top: 10px;
@@ -493,7 +493,7 @@
     height: 20px;
     width: 20px;
     float: left;
-    background: url('./../assets/convertor/3dview/prePlan/shujuqu-shuiwei.png');
+    background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuiwei.png');
     background-size: cover;
     // background-repeat: no-repeat;
   }
@@ -502,7 +502,7 @@
     height: 17px;
     width: 20px;
     float: left;
-    background: url('./../assets/convertor/3dview/prePlan/shujuqu-shuichi.png');
+    background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuichi.png');
     background-size: cover;
   }
 }

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

 .search-pane-bg{
     position: absolute;
-    // right: 20px;
-    // bottom: 20px;
-    top: 64px;
-    left: 10px;
+    right: 20px;
+    bottom: 20px;
     width: 460px;
     height: 600px;
     background: url('./../assets//convertor//3dview//searchpane-background.png');
@@ -15,10 +13,10 @@
 
 .search-pane{
     position: absolute !important;
-    top: 64px;
-    left: 10px;
-    // right: 20px !important;
-    // bottom: 20px !important;
+    right: 20px !important;
+    bottom: 20px !important;
+    left: unset !important;
+    top: unset !important;
     width: 460px;
     height: 600px;
     color: white;
@@ -131,16 +129,14 @@
         
             .ant-table-body {
                 color: white;
-                max-height: 465px !important ;
-                min-height: 465px !important ;
+                max-height: 500px !important ;
+                min-height: 500px !important ;
                 overflow-y: auto !important; 
                 overflow-x: hidden;
                 background:transparent!important;
-                margin-top: 20px;
                 border:1px solid rgba(234,234,234,0.3);
         
                 table {
-                    width: 300px;
                     border-color: transparent !important;
         
                     td {

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

 @import './statistical.scss';
 
-.sys-view-panoramic{
-    position: absolute;
-    top: 40px;
-    height: calc(100% - 40px);
-    width: 100%;
-    //background: black
+.sys-view-panoramic {
+  position: absolute;
+  top: 40px;
+  width: 100%;
+  height: calc(100% - 40px);
 }

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

@@ -10,11 +10,13 @@
     float: left;
     z-index: 1;
     color: white;
+    display: flex;
+    flex-direction: column;
 
     .equipStatusList{
       padding-left: 97px;
       padding-top: 10px;
-      height: 33.3%;
+      flex-grow: 1;
 
       .title-child{
         width: 100%;
@@ -31,7 +33,7 @@
     }
 
     .safetyExecuteList{
-      height: 40%;
+      flex: 2;
       margin-left: 37px;
       .up{
         height: 90px;
@@ -67,7 +69,7 @@
         width: 98%;
         height: 245px;
         margin-left: 30px;
-        background-image: url('../../assets/panoramic/main_bg_warning.png');
+        background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_warning.png');
         background-repeat: repeat;
         background-size: 100% 100%;
         margin-top: 10px;
@@ -131,10 +133,10 @@
     }
 
     .safetyIndex {
-      height: 33.3%;
       display: flex;
       margin-left: 37px;
       padding-top: 65px;
+      flex: 1;
 
       .safetyIndex-icon {
         width: 36px;
@@ -185,7 +187,7 @@
       }
 
       .safetyIndex-content-chart {
-        background-image: url('../../assets/panoramic/main_bg_dashboard.png') !important;
+        background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_dashboard.png') !important;
         background-repeat: no-repeat !important;
         margin-top: -25px !important;
         width: 125px !important;
@@ -208,7 +210,7 @@
     .echart-week {
       width: 321px !important;
       height: 248px !important;
-      background-image: url('../../assets/panoramic/main_bg_line_bg.png') !important;
+      background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_line_bg.png') !important;
       background-repeat: no-repeat !important;
       background-position: 31px 47px !important;
       left: 24px;
@@ -223,8 +225,7 @@
     }
 
     .safetyIndexWeek {
-      height: 33.3%;
-      margin-bottom: -5%;
+       height: 33.3%;
       .content-week-font-style {
         width: 146px;
         height: 18px;
@@ -238,7 +239,6 @@
 
     .statisticsCheck {
       height: 50%;
-      margin-bottom: -106px;
       .check-content {
         height: 100%;
         .content-xj-top {
@@ -278,7 +278,7 @@
           }
 
           .yellow-div {
-            background-image: url('../../assets/panoramic/main_bg_tag_buhege.png') !important;
+            background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_buhege.png') !important;
             background-repeat: no-repeat !important;
             width: 100%;
 
@@ -289,7 +289,7 @@
             }
           }
           .green-div {
-            background-image: url('../../assets/panoramic/main_bg_tag_hege.png') !important;
+            background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_hege.png') !important;
             background-repeat: no-repeat !important;
             width: 100%;
 
@@ -301,7 +301,7 @@
           }
 
           .red-div {
-            background-image: url('../../assets/panoramic/main_bg_tag_louyan.png') !important;
+            background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_louyan.png') !important;
             background-repeat: no-repeat !important;
             width: 100%;
 
@@ -312,7 +312,7 @@
             }
           }
           .grey-div {
-            background-image: url('../../assets/panoramic/main_bg_tag_weizhixing.png') !important;
+            background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_weizhixing.png') !important;
             background-repeat: no-repeat !important;
             width: 100%;
 
@@ -326,26 +326,24 @@
       }
 
       .div-echars {
-        margin-left: 17px;
-        background-image: url('../../assets/panoramic/circle_bg.png') !important;
-        background-repeat: no-repeat !important;
         height: 200px !important;
+        background-image: url('/mods/components/3dviewConvertor/assets/panoramic/circle_bg.png') !important;
         background-position: 60px 14px !important;
+        background-repeat: no-repeat !important;
       }
     }
 
     .statisticsDuty {
+      display: flex;
       height: 16.7%;
+      flex-direction: column;
       .content-duty-font-style {
         width: 146px;
-        height: 18px;
-        font-size: 18px;
         font-family: SourceHanSansCN-Medium, SourceHanSansCN;
+        font-size: 18px;
         font-weight: 500;
-        color: rgba(112, 238, 255, 1);
         line-height: 65px;
-        margin-top: 25%;
-        margin-bottom: 14%;
+        color: rgba(112, 238, 255, 1);
       }
 
       .content-picture-div {
@@ -358,7 +356,7 @@
           display: inline-flex;
 
           .content-image {
-            background-image: url('../../assets/panoramic/main_icon_baoan.png') !important;
+            background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_icon_baoan.png') !important;
             background-repeat: no-repeat !important;
             height: 42px !important;
             width: 100%;
@@ -391,7 +389,7 @@
           float: left;
           display: inline-flex;
           .content-image {
-            background-image: url('../../assets/panoramic/main_icon_baoan.png') !important;
+            background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_icon_baoan.png') !important;
             background-repeat: no-repeat !important;
             height: 42px !important;
             width: 100%;
@@ -423,7 +421,7 @@
           float: left;
           display: inline-flex;
           .content-image {
-            background-image: url('../../assets/panoramic/main_icon_baoan.png') !important;
+            background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_icon_baoan.png') !important;
             background-repeat: no-repeat !important;
             height: 42px !important;
             width: 100%;
@@ -466,7 +464,7 @@
   bottom: 250px;
   left: 250px;
   right: 250px;
-  background-image: url('../../assets/panoramic/main_bg_model.png');
+  background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_model.png');
   background-repeat: repeat;
   background-size: 100% 100%;
   .close{

mods/components/3dviewConvertor/utils/request.js

@@ -13,8 +13,8 @@ const defaultPageable = {
 };
 
 const defaultHeaders = {
-  // appKey: 'CONVERTER_STATION',
-  // product: 'CONVERTER_STATION_WEB',
+  appKey: 'CONVERTER_STATION',
+  product: 'CONVERTER_STATION_WEB',
   channelType: '3dpage'
 };
 
@@ -36,8 +36,8 @@ const getToken = () => {
 
 /**
  * 删除全局变量requests中的地址
- * @param {*} url 
- * @param {*} method 
+ * @param {*} url
+ * @param {*} method
  */
 const delRequest = (url, method) => {
   if (window.requests && window.requests.length > 0) {
@@ -70,8 +70,8 @@ const convertDatalist = (dataList = [], key = 'content') => {
 
 export function commonGet(url) {
   window.setLoading && window.setLoading(true);
-  return amosRequest(url, { 
-    timeout: 10000000 , 
+  return amosRequest(url, {
+    timeout: 10000000 ,
     method: 'GET',
     headers: compleHeaders(),
     reject(error){

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

@@ -2,15 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Connect, Modal } from 'amos-framework';
 import Basic from 'amos-designer/lib/pages/sketchs';
-import AmosWebSocket from 'amos-websocket';
 import * as endConf from 'amos-processor/lib/config/endconf';
 import PilotController from 'amos-viz/lib/board/PilotController';
-import SysWsURL, { completeToken } from './../consts/wsUrlConsts';
-import { eventTopics } from './consts';
 import ScreenSaverView from './screenSaver/ScreenSaverView';
 import View3D from './View3D';
-import PanoramicLeft from './../view/panoramic/statistical/indexLeft';
-import PanoramicRight from './../view/panoramic/statistical/indexRight';
+import Statistical from './../view/panoramic/statistical';
 
 // 引入换流站3dview模块主体样式文件
 import './../styles';
@@ -45,9 +41,7 @@ class ConvertorView3DRoot extends Basic {
       this.pushTimeOutId = null;
     }
   }
-  // componentWillReceiveProps = nextProps => {
-  //   this.setState({ alarmStarted: nextProps.alarmStarted });
-  // }
+
   editModelChange = (status) => {
     this.setState({
       isEdit: status
@@ -95,33 +89,24 @@ class ConvertorView3DRoot extends Basic {
     }
   }
 
-  /**
-   * 监控视图消息 (view3d ws)
-   */
-  handleData = (data = {}) => {
-    console.log('view3d ws data:', data);
-    const topic = data.topic || eventTopics.base3d_view;
-    this.props.trigger(topic, data);
-  };
-
+  refshExceptAreaData = ()=>{
+    this.view3d.initExceptionAreasData && this.view3d.initExceptionAreasData();
+  }
 
   render() {
     const { isEdit } = this.state;
-    debugger
-    const wsURL = completeToken(SysWsURL.convertorView3dws);
     return (
-      <div>
-        {
-          isEdit ? '' : <PanoramicLeft />
-        }
+      <div style={{ height: '100%' }}>
+        { isEdit ? '' : <Statistical refshExceptAreaData={this.refshExceptAreaData} /> }
         <div className="sys-view-3d">
-          <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-          <View3D onLoadCompleted={this.onLoadCompleted} hiddenScreenSaver={this.hiddenScreenSaver} editModelChange={this.editModelChange}/>
+          <View3D
+            ref={node => this.view3d = node}
+            onLoadCompleted={this.onLoadCompleted}
+            hiddenScreenSaver={this.hiddenScreenSaver}
+            editModelChange={this.editModelChange}
+          />
           {this.getScreenSaver()}
         </div>
-        {
-          isEdit ? '' : <PanoramicRight />
-        }
       </div>
     );
   }

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

@@ -62,6 +62,7 @@ class MaskContent extends Component {
   }
 
   changeSearchPaneVisible = () => {
+      debugger;
     const { searchPaneVisible } = this.state;
     this.setState({ searchPaneVisible: !searchPaneVisible });
   }
@@ -87,9 +88,10 @@ class MaskContent extends Component {
       planQuit,
       sideControlShow,
       isShowActionBar,
-      headerName
+      headerName,
+      errorAreaId
     } = this.props;
-    const wsURL = completeToken(SysWsURL.convertorRulews);
+    const wsURL = completeToken(SysWsURL.rulews);
     const controlAnimation = {
       animateName: 'zoom-comb-left',
       visible: !planStarted,
@@ -119,13 +121,13 @@ 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} />}
         <SearchPane visible={searchPaneVisible} changeSearchPaneVisible={() => this.changeSearchPaneVisible}/>
         <TopMsg alarmStart={alarmStart} />
         {!isShowActionBar && <ModelHeader headerName={headerName} handleExceptModel={this.handleExceptModel} />}
         {isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation}/> }
-        {/*{alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />}*/}
+        {alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />}
       </div>
     );
   }
@@ -151,7 +153,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/actionbar/index.js

@@ -27,7 +27,7 @@ class ActionBar extends Component {
   render() {
     const { animationProps, activeAction = 'panoramic' } = this.props;
     return (
-      <SidePane className="action-pane-data" {...animationProps}>
+      <SidePane className="action-pane-data" left={false} top={false} {...animationProps}>
         <div className="action-list">
           {
             actionBars.map( a => {

mods/components/3dviewConvertor/view/common/Footer.js

@@ -13,7 +13,7 @@ const Footer = props => {
           return (
             <div key={f.key} className={cls} onClick={(e) => onItemClick(f.key, e)}>
               <Icon icon={f.icon} />
-              <p className="footer-item-text">{f.text}</p>
+              <span className="footer-item-text">{f.text}</span>
             </div>
           );
         })

mods/components/3dviewConvertor/view/common/tableComponent/table/AmosGridTable.js

@@ -235,14 +235,13 @@ class AmosGridTable extends Component {
                 </div>
               )}
               rowKey={isTreeTable ? 'key' : this.generateRowkey}
-              loading={loading}
+
               rowSelection={rowSelection}
               columns={columns}
               dataSource={dataList}
               pagination={_pagination}
               size={size}
               bordered={bordered}
-              scroll={{ y: maxHeight }}
               rowClassName={rowClassName}
               onRowDoubleClick={onRowDoubleClick}
             />

mods/components/3dviewConvertor/view/dialog/MinInfo.js

@@ -9,6 +9,7 @@ class MinInfo extends Component {
     return (
       <div className="dialog-body-min">
         <div className="body-min-header">
+        <div className='dialog-min-title'>巡检触发预警详情</div>
           <Close onClose={onClose} />
         </div>
         <div className="body-min-content">

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/panoramic/index.js

 import React, { Component } from 'react';
-import Statistical from './statistical'
+import Statistical from './statistical';
 
 /**
  * 全景监控

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

 import React, { Component } from 'react';
-
+import PropTypes from 'prop-types';
 import EquipStatusList from './EquipStatusList';
 import SafetyExecuteList from './SafetyExecuteList';
 import SafetyIndex from './SafetyIndex';
@@ -35,6 +35,7 @@ export default class Statistical extends Component {
         break;
       case 'error_status':
         console.log('异常区域刷新~~~~~~~~~~~~~~~~~~~~');
+        this.props.refshExceptAreaData && this.props.refshExceptAreaData();
         break;
       case 'week_safety_index':
         console.log('一周安全指数趋势刷新~~~~~~~~~~~~~~~~~~~~');
@@ -52,6 +53,7 @@ export default class Statistical extends Component {
         console.log('首页刷新~~~~~~~~~~~~~~~~~~~~');
         this.safetyIndex.getSafetyIndex();
         this.safetyExecute.safetyExecuteList();
+        this.safetyExecute.onlineDayData();
         this.equipStatus.equipStatusList();
         this.safetyIndexWeek.safetyIndexWeekData();
         this.statisticsCheck.statisticsCheckData();
@@ -64,7 +66,7 @@ export default class Statistical extends Component {
 
 
   render() {
-    const wsURL = completeToken(SysWsURL.viewIndexws);
+    const wsURL = completeToken(SysWsURL.convertorView3d);
     return (
       <div className="statistical">
         <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
@@ -82,3 +84,7 @@ export default class Statistical extends Component {
     );
   }
 }
+
+Statistical.propTypes = {
+  refshExceptAreaData: PropTypes.func
+};

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

-import React, { Component } from 'react';
-
-import EquipStatusList from './EquipStatusList';
-import SafetyExecuteList from './SafetyExecuteList';
-import SafetyIndex from './SafetyIndex';
-import AmosWebSocket from 'amos-websocket';
-import SysWsURL, { completeToken } from './../../../consts/wsUrlConsts';
-
-/**
- * 全景监控统计
- */
-export default class StatisticalLeft extends Component {
-
-  handleData = (data = {}) => {
-    console.log('ws data:', data);
-    data = JSON.parse(JSON.stringify(data));
-    console.log(data);
-    let refreshType = data.refreshType;
-    let content = data.content;
-    switch (refreshType){
-      case 'today_safety_index':
-        console.log('今日安全指数刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndex.getSafetyIndex();
-        break;
-      case 'fire_safety':
-        console.log('消防安全执行刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyExecute.safetyExecuteList();
-        break;
-      case 'monitor_data':
-        console.log('设备状态检测数据刷新~~~~~~~~~~~~~~~~~~~~');
-        this.equipStatus.equipStatusList();
-        break;
-      case 'error_status':
-        console.log('异常区域刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'all':
-        console.log('首页左侧刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndex.getSafetyIndex();
-        this.safetyExecute.safetyExecuteList();
-        this.equipStatus.equipStatusList();
-        break;
-      default:
-        console.log(refreshType,'：类型不支持');
-    }
-  }
-
-
-  render() {
-    const wsURL = completeToken(SysWsURL.viewIndexws);
-    return (
-      <div className="statistical-left">
-        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        <SafetyIndex ref={node => this.safetyIndex = node} />
-        <SafetyExecuteList ref={node => this.safetyExecute = node} />
-        <EquipStatusList ref={node => this.equipStatus = node} />
-      </div>
-    );
-  }
-}

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

-import React, { Component } from 'react';
-
-import SafetyIndexWeek from './SafetyIndexWeek';
-import StatisticsCheck from './StatisticsCheck';
-import StatisticsDuty from './StatisticsDuty';
-import AmosWebSocket from 'amos-websocket';
-import SysWsURL, { completeToken } from '../../../consts/wsUrlConsts';
-
-/**
- * 全景监控统计
- */
-export default class StatisticalRight extends Component {
-
-  handleData = (data = {}) => {
-    console.log('ws data:', data);
-    data = JSON.parse(JSON.stringify(data));
-    console.log(data);
-    let refreshType = data.refreshType;
-    let content = data.content;
-    switch (refreshType){
-      case 'error_status':
-        console.log('异常区域刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'week_safety_index':
-        console.log('一周安全指数趋势刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndexWeek.safetyIndexWeekData();
-        break;
-      case 'today_check_status':
-        console.log('今日巡检情况刷新~~~~~~~~~~~~~~~~~~~~');
-        this.statisticsCheck.statisticsCheckData();
-        break;
-      case 'today_duty':
-        this.statisticsDuty.statisticsDutyData();
-        console.log('今日值班刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'all':
-        console.log('首页右侧刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndexWeek.safetyIndexWeekData();
-        this.statisticsCheck.statisticsCheckData();
-        this.statisticsDuty.statisticsDutyData();
-        break;
-      default:
-        console.log(refreshType,'：类型不支持');
-    }
-  }
-
-
-  render() {
-    const wsURL = completeToken(SysWsURL.viewIndexws);
-    return (
-      <div className="statistical-right">
-        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        <SafetyIndexWeek ref={node => this.safetyIndexWeek = node} />
-        <StatisticsCheck ref={node => this.statisticsCheck = node} />
-        <StatisticsDuty ref={node => this.statisticsDuty = node} />
-      </div>
-    );
-  }
-}

mods/components/3dviewConvertor/view/points/dialogModel/FireEquipmentModal.js

@@ -47,8 +47,8 @@ class FireEquipmentModal extends Component {
             <Col className="colTitle">安装位置：</Col>
             <Col className="colValue">{position}</Col>
           </Row>
-        </Row> 
-      );  
+        </Row>
+      );
     }else {
       return (
         <Row className="point-dialog-body">

mods/components/3dviewConvertor/view/points/dialogModel/RiskContentTable.js

@@ -42,7 +42,7 @@ const checkListColumns = (self) => {
       key: 'status',
       width: '10%',
       render: function( text, record, index) {
-        return <span><a href="javascript:;" onClick={function() { self.onCheckStatusClick(record)} }>{text}</a></span>;
+        return <span ><a href="javascript:;" onClick={function() { self.onCheckStatusClick(record)} } style={{color:'rgba(255, 173, 0, 1)'}}>{text}</a></span>;
       }
     }
   ];
@@ -76,19 +76,19 @@ class RiskContentTable extends Component {
   onCheckStatusClick =(record)=>{
     this.props.onCheckStatusClick(record);
   }
- 
+
   render() {
     const { dataList,fetchData } = this.props;
     return (
       <div>
         <AmosGridTable
         columns={checkListColumns(this)}
-        getTableDataAction={()=>{}} 
-        callBack={this.reload}  
+        getTableDataAction={()=>{}}
+        callBack={this.reload}
         isPageable = {false}
         isChecked = {false}
         dataList={dataList}
-        /> 
+        />
       </div>
     );
   }

mods/components/3dviewConvertor/view/points/dialogModel/RiskWarnModal.js

@@ -73,7 +73,7 @@ class RiskWarnModal extends Component {
       </p>
     });
   }
- 
+
   renderEquipWaring =(alarm)=>{
     return alarm.map(item =>{
       return <p>
@@ -82,11 +82,11 @@ class RiskWarnModal extends Component {
       </p>
     });
   }
-              
- 
+
+
   render() {
     const {  dataList =[], riskSourceInfo={}, inputitemContent=[], alarm =[]} = this.state;
-    const {code, level ,name } = riskSourceInfo; 
+    const {code, level ,name } = riskSourceInfo;
     return (
       <div className = "risk-warn">
         <div className = "risk-warn-header">
@@ -102,12 +102,12 @@ class RiskWarnModal extends Component {
         <div className = "risk-warn-table">
           <AmosGridTable
             columns={checkListColumns(this)}
-            getTableDataAction={()=>{}} 
-            callBack={this.reload}  
+            getTableDataAction={()=>{}}
+            callBack={this.reload}
             isPageable = {false}
             isChecked = {false}
             dataList={dataList}
-          /> 
+          />
         </div>
         <div className = "risk-warn-content">
             <p>

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

@@ -176,7 +176,7 @@ class SearchPane extends Component {
       <div>
         { this.props.visible && <div className="search-pane-bg"/> }
         <SidePane className="search-pane" animateName="zoom-right"  visible={ this.props.visible }>
-          <div className="search-pane-close" onClick={this.props.changeSearchPaneVisible}>
+          <div className="search-pane-close" onClick={this.props.changeSearchPaneVisible()}>
             <Icon icon="close" />
           </div>
           <Tabs 

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;

mods/components/panoramic/consts/imgStatic.js

-export default {
-  panoramicIcon: {
-    safetyrate: require('./../assets/panoramic/main_icon_safetyrate.png'),
-    safetyup: require('./../assets/panoramic/main_icon_up.png'),
-    safetyexecute: require('./../assets/panoramic/main_icon_safetyexecute.png'),
-    select_warn: require('./../assets/panoramic/main_icon_select_warntitle.png'),
-    select_fire: require('./../assets/panoramic/main_icon_select_fire.png'),
-    select_risk: require('./../assets/panoramic/main_icon_select_risk.png'),
-    select_check: require('./../assets/panoramic/main_icon_select_check.png'),
-    unselect_warn: require('./../assets/panoramic/main_icon_unselect_warntitle.png'),
-    unselect_fire: require('./../assets/panoramic/main_icon_unselect_fire.png'),
-    unselect_risk: require('./../assets/panoramic/main_icon_unselect_risk.png'),
-    unselect_check: require('./../assets/panoramic/main_icon_unselect_check.png'),
-    arrow_warn: require('./../assets/panoramic/main_icon_left_arrow.png'),
-    unfold: require('./../assets/panoramic/main_icon_left_unfold.png'),
-    model_fire: require('./../assets/panoramic/main_icon_model_fire.png'),
-    model_risk: require('./../assets/panoramic/main_icon_model_risk.png'),
-    model_patrol: require('./../assets/panoramic/main_icon_model_patrol.png'),
-    model_close: require('./../assets/panoramic/main_icon_model_close.png'),
-    textleft: require('./../assets/panoramic/main_icon_textleft.png'),
-    check_buhege: require('./../assets/panoramic/main_icon_tag_buhege.png'),
-    check_hege: require('./../assets/panoramic/main_icon_tag_hege.png'),
-    check_louyan: require('./../assets/panoramic/main_icon_tag_louyan.png'),
-    check_weizhixing: require('./../assets/panoramic/main_icon_tag_weizhixing.png')
-  }
-};

mods/components/panoramic/consts/urlConsts.js

-import * as endConf from 'amos-processor/lib/config/endconf';
-
-const completePrefix = endConf.completePrefix;
-
-const AmosConfig = endConf.AmosConfig;
-const baseURI = AmosConfig.httpURI.baseURI;
-
-export const FscSerUrl = {
-  //*******************************************************************************
-  // 全景监控
-  //*******************************************************************************
-  safetyIndexUrl: completePrefix(baseURI, 'api/view3d/statistics/safetyIndex'),//今日安全指数
-  safetyIndexDetailUrl: completePrefix(baseURI, 'api/view3d/safetyIndex/detail/{type}'),//今日安全指数详情
-  safetyExecuteListUrl: completePrefix(baseURI, 'api/view3d/safetyExecute/list/{type}'),//告警列表最新5条
-  equipStatusListUrl: completePrefix(baseURI, 'api/view3d/equipStatus/list'),//设备状态消息最新5条
-  safetyIndexWeekUrl: completePrefix(baseURI, 'api/view3d/safetyIndex/week'),//一周安全指数趋势查询
-  statisticsCheckUrl: completePrefix(baseURI, 'api/view3d/statistics/check'),//今日巡检统计接口
-  statisticsDutyUrl: completePrefix(baseURI, 'api/view3d/statistics/duty'), //今日值班统计
-  onlineDayUrl: completePrefix(baseURI, 'api/view3d/online/date') //消防安全执行天数
-};

mods/components/panoramic/consts/wsUrlConsts.js

-import * as endConf from 'amos-processor/lib/config/endconf';
-import formatUrl from 'amos-processor/lib/utils/urlFormat';
-import { Store } from 'amos-tool';
-import SysConsts from 'amos-processor/lib/config/consts';
-const lsTool = Store.lsTool;
-const completePrefix = endConf.completePrefix;
-
-const AmosConfig = endConf.AmosConfig;
-const baseURI = AmosConfig.wsURI.baseURI;
-const view3dURI = AmosConfig.wsURI.view3dURI;
-const getToken = () => {
-  return lsTool.read(SysConsts.token);
-};
-
-
-export default {
-  rulews: completePrefix(view3dURI, 'rule.ws?token={token}'),
-  view3dws: completePrefix(view3dURI, 'view3d.ws?token={token}'),
-  viewIndexws: completePrefix(baseURI, '3dViewMessage')
-};
-
-export const completeToken = (url) => {
-  const token = getToken();
-  const result = formatUrl(url, { token });
-  return result;
-};

mods/components/panoramic/index.js

-import panoramicLeft from './view/panoramic/statistical/indexLeft';
-
-
-export default {
-  key: 'panoramicLeft',
-  component: panoramicLeft
-};

mods/components/panoramic/index.jsx

-import panoramicRight from './view/panoramic/statistical/indexRight';
-
-
-export default {
-  key: 'panoramicRight',
-  component: panoramicRight
-};

mods/components/panoramic/services/panoramicService.js

-import formatUrl from 'amos-processor/lib/utils/urlFormat';
-import * as helper from 'base-r3d/lib/utils/helper';
-import { FscSerUrl } from './../consts/urlConsts';
-import { commonGet, commonPost } from './../utils/request';
-
-/**
- * 今日安全指数
- */
-export const safetyIndexAction = () => {
-  return commonGet(FscSerUrl.safetyIndexUrl);
-};
-
-/**
- * 今日安全指数详情
- */
-export const safetyIndexDetailAction = ( type ) => {
-  return commonGet(formatUrl(FscSerUrl.safetyIndexDetailUrl,{ type }));
-};
-
-/**
- * 消防安全执行天数
- */
-export const onlineDayAction = ( ) => {
-  return commonGet(formatUrl(FscSerUrl.onlineDayUrl));
-};
-
-/**
- * 告警列表最新5条
- */
-export const safetyExecuteListAction = ( type ) => {
-  return commonGet(formatUrl(FscSerUrl.safetyExecuteListUrl,{ type }));
-};
-
-/**
- * 设备状态消息最新5条
- */
-export const equipStatusListAction = () => {
-  return commonGet(FscSerUrl.equipStatusListUrl);
-};
-
-/**
- * 一周安全指数趋势查询
- */
-export const safetyIndexWeekAction = () => {
-  return commonGet(FscSerUrl.safetyIndexWeekUrl);
-};
-
-/**
- * 今日巡检统计接口
- */
-export const statisticsCheckAction = () => {
-  return commonGet(FscSerUrl.statisticsCheckUrl);
-};
-
-/**
- * 今日值班统计
- */
-export const statisticsDutyAction = () => {
-  return commonGet(FscSerUrl.statisticsDutyUrl);
-};

mods/components/panoramic/styles/index.js

-import './view/index.scss';

mods/components/panoramic/styles/view/index.scss

-@import './panoramic/index.scss';

mods/components/panoramic/styles/view/panoramic/index.scss

-@import './statistical.scss';
-
-.sys-view-panoramic{
-    position: absolute;
-    top: 40px;
-    height: calc(100% - 40px);
-    width: 100%;
-    //background: black;
-}

mods/components/panoramic/utils/payload.js

-export default function(data, delRequest){
-  window.setLoading && window.setLoading(false);
-  return new Promise((resolve, reject) => {
-    if (data) {
-      if (data.dataList || data.dataList === null){
-        if(data.result==='SUCCESS'){
-          resolve(data.dataList);
-        }else{
-          resolve(data.result);
-        }
-
-      } else if (data.result || data.result === null){
-        resolve(data.result);
-      }else{
-        resolve(data);
-      }
-    } else {
-      if (data) {
-        reject(data.message);
-      } else {
-        reject(data);
-      }
-    }
-  });
-}

mods/components/panoramic/utils/request.js

-import amosRequest, { singleFetch } from 'amos-processor/lib/fetch/amosRequest';
-import { utils, Store } from 'amos-tool';
-import { message } from 'amos-framework';
-import formatUrl from 'amos-processor/lib/utils/urlFormat';
-import SysConsts from 'amos-processor/lib/config/consts';
-import imgStatic from './../consts/imgStatic';
-const panoramicIcon = imgStatic.panoramicIcon;
-import payload from './payload';
-
-const lsTool = Store.lsTool;
-
-const defaultPageable = {
-  page: 0,
-  size: 10
-};
-
-const defaultHeaders = {
-  appKey: 'CONVERTER_STATION',
-  product: 'CONVERTER_STATION_WEB',
-  channelType: '3dpage'
-};
-
-const compleHeaders = () => {
-  return {
-    ...defaultHeaders,
-    token: getToken(),
-  };
-};
-
-/**
- * 获取 token
- */
-const getToken = () => {
-  return lsTool.read(SysConsts.token);
-}
-
-/**
- * 删除全局变量requests中的地址
- * @param {*} url
- * @param {*} method
- */
-const delRequest = (url, method) => {
-  if (window.requests && window.requests.length > 0) {
-    window.requests = window.requests.filter(e => e.url !== url && e.method !== method);
-  }
-};
-
-/**
- * 构建分页
- */
-const buildPageable = (url, pageable = defaultPageable) => {
-  let { page, size } = pageable;
-  return `${url}?page=${page}&size=${size}`;
-};
-
-/**
- * 转换指定值为 JSON
- * @param {array} dataList
- * @param {string} key
- */
-const convertDatalist = (dataList = [], key = 'content') => {
-  const newDL = dataList.map(d => {
-    if (!utils.isNil(d[key]) && utils.isString(d[key])) {
-      d[key] = JSON.parse(d[key]);
-    }
-    return d;
-  });
-  return newDL;
-};
-
-export function commonGet(url) {
-  window.setLoading && window.setLoading(true);
-  return amosRequest(url, {
-    timeout: 10000000 ,
-    method: 'GET',
-    headers: compleHeaders(),
-    reject(error){
-      window.setLoading && window.setLoading(false);
-      delRequest(url, 'GET');
-      //message.danger(error.message || '请求失败，服务器错误！');
-    }
-  }).then(data => payload(data));
-}
-
-export function commonPost(url, data, params) {
-  window.setLoading && window.setLoading(true);
-  return amosRequest(url, {
-    timeout: 10000000,
-    method: 'POST',
-    headers: compleHeaders(),
-    body: data,
-    reject(error){
-      delRequest(url, 'POST');
-      window.setLoading && window.setLoading(false);
-      //message.danger(error.message || '请求失败，服务器错误！');
-    }
-  }).then(data => payload(data));
-}
-
-export function commonPut(url, data, params) {
-  window.setLoading && window.setLoading(true);
-  return amosRequest(url, {
-    timeout: 10000000,
-    method: 'PUT',
-    headers: compleHeaders(),
-    body: data,
-    reject(error){
-      delRequest(url, 'PUT');
-      window.setLoading && window.setLoading(false);
-      //message.danger(error.message || '请求失败，服务器错误！');
-    }
-  }).then(data => payload(data));
-}
-
-export function commonDelete(url, data, params) {
-  window.setLoading && window.setLoading(true);
-  return amosRequest(url, {
-    timeout: 10000000 ,
-    method: 'DELETE',
-    headers: compleHeaders(),
-    body: data,
-    reject(error){
-      window.setLoading && window.setLoading(false);
-      //message.danger(error.message || '请求失败，服务器错误！');
-    }
-  }).then(data => payload(data));
-}
-
-export const getWithCookie = (url) => {
-  return commonGet(url, {
-    hasCookie: true
-  });
-};
-
-export const getIcon = (alarmType) => {
-  return panoramicIcon[`${alarmType}`];
-};
-
-export { amosRequest, singleFetch, convertDatalist, buildPageable, formatUrl };

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

-import React, { Component } from 'react';
-import Statistical from './statistical'
-
-/**
- * 全景监控
- */
-export default class Panoramic extends Component {
-
-  render() {
-    return (
-      <div className="sys-view-panoramic">
-        <Statistical/>
-      </div>
-    );
-  }
-}

mods/components/panoramic/view/panoramic/statistical/EquipStatusList.js

-import React, { Component } from 'react';
-import { equipStatusListAction } from './../../../services/panoramicService';
-
-
-/**
- * 设备状态消息
- */
-export default class EquipStatusList extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      equipStatusList: []
-    };
-  }
-
-  componentDidMount(){
-    this.equipStatusList();
-  }
-
-  equipStatusList = () => {
-    equipStatusListAction().then(data => {
-      this.setState({
-        equipStatusList: data
-      });
-    });
-  }
-
-  renderContent = (datas) => {
-    return (
-      datas.map((item, index) => {
-        return (
-          <div key={item.id} className="title-child">
-            <div className="title-date" >{item.changeDate}</div>
-            <div className="title-text" >{item.label}</div>
-          </div>
-        );
-      })
-    );
-  }
-
-  render() {
-    let { equipStatusList } = this.state;
-    return (
-      <div className="equipStatusList">
-        {this.renderContent(equipStatusList)}
-      </div>
-    );
-  }
-
-}

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

-import React, { Component } from 'react';
-import { safetyIndexDetailAction } from './../../../services/panoramicService';
-import moment from 'moment';
-const format = 'YYYY-MM-dd';
-
-
-export default class ModelContent extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      alarmData: []
-    };
-  }
-
-  componentDidMount(){
-    let { type } = this.props;
-    this.safetyIndexDetail(type);
-  }
-
-  safetyIndexDetail = (type) => {
-    safetyIndexDetailAction(type).then(data => {
-      this.setState({
-        alarmData: data
-      });
-    });
-  }
-
-  /**
-   * 获取标题
-   *
-   * @memberof ModelContent
-   */
-  getTitle = (v) => {
-    const titleParams = {
-      1: '一级风险点', //一级风险点
-      2: '二级风险点', //二级风险点
-      3: '三级风险点', //三级风险点
-      4: '四级风险点' //四级风险点
-    };
-    return titleParams[v];
-  }
-
-  formatData = (str) => {
-    let date = str.split(' ')[0];
-    return date;
-  }
-
-  renderContent = (content) =>{
-    return (
-      <div className='rows'>
-        {(content || []).map(itemA => {
-          return (
-            <div className='row'>
-              <span>{itemA.name}</span>
-              <span className='date'>{this.formatData(itemA.changeDate)}</span>
-            </div>
-          );
-        })}
-      </div>
-    );
-  }
-
-  render() {
-    let { alarmData } = this.state;
-    let { type } = this.props;
-    return (
-      <div className='model-content'>
-        {(alarmData || []).map(item => {
-          return (
-            <div className='content-div'>
-              <div className='title'>
-                <span>|</span>
-                <span className='next-title'>{ type === 'risk' ? this.getTitle(item.typeCode) : item.typeName }</span>
-              </div>
-              {this.renderContent(item.content)}
-            </div>
-          );
-        })}
-      </div>
-    );
-  }
-}

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

-import React, { Component } from 'react';
-import imgStatic from './../../../consts/imgStatic';
-import { onlineDayAction, safetyExecuteListAction } from './../../../services/panoramicService';
-import { getIcon } from './../../../utils/request';
-import { warnTypes } from './conf';
-
-const panoramicIcon = imgStatic.panoramicIcon;
-
-/**
- * 告警列表
- */
-export default class SafetyExecuteList extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      year: 0,
-      day: 0,
-      alarmData: [],
-      isVisable: false,
-      selectKey: 'fire',
-      selectValue: ''
-    };
-  }
-
-  componentDidMount(){
-    this.onlineDayData();
-    this.safetyExecuteList();
-  }
-
-  onlineDayData = () => {
-    onlineDayAction().then(data => {
-      this.setState({
-        year: data.year,
-        day: data.day
-      });
-    });
-  }
-
-  safetyExecuteList = (type) => {
-    if (!type){
-      type = this.state.selectKey;
-    }
-    let value;
-    safetyExecuteListAction(type).then(data => {
-      warnTypes.some(e => {
-        if (e.type === type) {
-          value = e.label;
-          return true;
-        }
-      });
-      this.setState({
-        alarmData: data,
-        selectValue: value
-      });
-    });
-  }
-
-  /**
-   * 展开
-   *
-   * @memberof SafetyExecuteList
-   */
-  unfoldOnClick = (flag) =>{
-    this.setState({
-      isVisable: flag
-    });
-  }
-
-  onClickIcon = (e) => {
-    if (e.type !== 'warn'){
-      this.setState({
-        selectKey: e.key
-      });
-      this.safetyExecuteList(e.key);
-    }
-  }
-
-  renderContent = (datas) => {
-    return (
-      datas.map((item, index) => {
-        return (
-          <div key={item.id} className="title-child">
-            <span className="title-text" >{item.label}</span>
-          </div>
-        );
-      })
-    );
-  }
-
-  renderIcon = (datas) => {
-    let { selectKey } = this.state;
-    return (
-      datas.map((item, index) => {
-        return (
-          <div key={item.id} className="icon">
-            { selectKey === item.key ? <img src={getIcon(item.icon)} onClick={()=>this.onClickIcon(item)} /> : <img src={getIcon(item.unIcon)} onClick={()=>this.onClickIcon(item)} />}
-          </div>
-        );
-      })
-    );
-  }
-
-  render() {
-    let { year, day, alarmData, isVisable, selectValue } = this.state;
-    let dayNum ;
-    if (year > 0 ){
-      dayNum = year + ' 年 ' + day;
-    } else {
-      dayNum = ' ' + day;
-    }
-    return (
-      isVisable ?
-      (<div className='safetyExecuteList'>
-        <img src={panoramicIcon.unfold} onClick={() => this.unfoldOnClick(false)}></img>
-      </div>) :
-      (<div className="safetyExecuteList">
-        <div className='up'>
-          <div className='left'>
-            <img src={panoramicIcon.safetyexecute}></img>
-          </div>
-          <div className='right'>
-            <div className='common-title'>
-              <span>消防安全执行</span>
-            </div>
-            <div className='content'>
-              <span className='date'>{dayNum}</span>
-              <span className='day'>天</span>
-            </div>
-          </div>
-        </div>
-        <div className='down'>
-          <div className='title'>
-            {this.renderIcon(warnTypes)}
-            <span className='describe'>{selectValue}</span>
-            <img className='arrow' src={panoramicIcon.arrow_warn} onClick={() => this.unfoldOnClick(true)}></img>
-            <div className='bottom-line'></div>
-          </div>
-          <div className='content'>
-            {this.renderContent(alarmData)}
-          </div>
-        </div>
-      </div>)
-    );
-  }
-}

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

-import React, { Component } from 'react';
-import ReactEcharts from 'amos-viz/lib/echarts';
-import { safetyIndexAction } from './../../../services/panoramicService';
-import imgStatic from './../../../consts/imgStatic';
-import ModelContent from './ModelContent';
-import { warnController } from './conf';
-import { getIcon } from './../../../utils/request';
-
-const panoramicIcon = imgStatic.panoramicIcon;
-
-/**
- * 今日安全指数
- */
-export default class SafetyIndex extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      safetyIndexData: {},
-      modelVisable: false
-    };
-  }
-
-  componentDidMount() {
-    this.getSafetyIndex();
-  }
-
-  getSafetyIndex = () => {
-    safetyIndexAction().then(safetyIndexData => {
-      this.setState({ safetyIndexData });
-    });
-  }
-
-  getOption = () => {
-    const { safetyIndexData } = this.state;
-    return {
-      tooltip: {
-          show:false
-      },
-      toolbox: {
-          show:false,
-          feature: {
-              mark: {show: false},
-              restore: {show: false},
-              saveAsImage: {show: false}
-          }
-      },
-      series: [
-          {
-            name: '今日安全指数',
-            type: 'gauge',
-            center: ['10%', '48%'],    // 默认全局居中
-            radius: '60%',
-            min: 0,
-            max: 100,
-            endAngle: 90,
-            startAngle:-90,
-            splitNumber: 3,
-            axisLine: {            // 坐标轴线
-                show:false,
-                lineStyle: { // 属性lineStyle控制线条样式
-                  color: [
-                      [0.5, 'red'],
-                      [0.9, 'Orange'],
-                      [0.95, 'Gold'],
-                      [1, '#00C3FF']
-                  ],
-                  width: 0,
-                  opacity : 0
-              }
-            },
-            axisLabel: {         // 坐标轴小标记
-                show:false
-            },
-            axisTick: {            // 坐标轴小标记
-                show:false
-            },
-            splitLine: {           // 分隔线
-                show:false
-            },
-            pointer: {
-                width: 5
-            },
-            title: {
-                show:false
-            },
-            detail: {
-                show:false
-            },
-          data: [{value: safetyIndexData.safetyIndex, name: '今日安全指数'}]
-        }
-      ]
-    }
-  }
-
-  modelOpen = (flag) =>{
-    this.setState({
-      modelVisable: flag
-    });
-  }
-
-  renderWarnContent = () =>{
-    return (
-      <div className='warnModal'>
-        <div className='close'>
-          <img src={panoramicIcon.model_close} onClick={() => this.modelOpen(false)}></img>
-        </div>
-        {warnController.map(item => {
-          return (
-            <div className='model-line'>
-              <div>
-                <img src={getIcon(item.icon)}></img>
-              </div>
-              <div className='model-title'>{item.label}</div>
-              <ModelContent type={item.type} />
-            </div>
-          );
-        })}
-      </div>
-    );
-  }
-
-  render() {
-    const { safetyIndexData, modelVisable } = this.state;
-    return (
-      <div className="safetyIndex">
-        <div className="safetyIndex-icon">
-          <img className="safetyIndex-safetyrate" src={panoramicIcon.safetyrate} alt="safetyrate" />
-        </div>
-        <div className='safetyIndex-content' onClick={() => this.modelOpen(true)}>
-          <div>今日安全指数 </div>
-          <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" />
-              </span>
-          </div>
-          {
-            [{name:'风险值上升',num:safetyIndexData.riskExceptionNum},
-            {name:'巡检不合格',num:safetyIndexData.checkExceptionNum},
-            {name:'火灾报警',num:safetyIndexData.fireExceptionNum}].map((item,index)=>
-              <div className="content-item">{item.name} {item.num}</div>
-            )
-          }
-          </div>
-          <ReactEcharts className='safetyIndex-content-chart' option={this.getOption()}/>
-          { modelVisable && this.renderWarnContent()}
-      </div>
-    );
-  }
-}

mods/components/panoramic/view/panoramic/statistical/SafetyIndexWeek.js

-import React, { Component } from 'react';
-import ReactEcharts from 'amos-viz/lib/echarts';
-import echarts from 'echarts/lib/echarts';
-import { safetyIndexWeekAction } from './../../../services/panoramicService';
-import { getIcon } from './../../../utils/request';
-
-
-/**
- * 一周安全指数
- */
-
-const option = {
-  xAxis: {
-    type: 'category',
-    boundaryGap: false,
-    data: ['03-15', '03-16', '03-17', '03-18', '03-19', '03-20'],
-    axisLabel: {
-
-      textStyle: {
-        color: 'rgba(255,255,255,1)',
-        fontSize: '14',
-        fontFamiliy: "SourceHanSansCN-Medium,SourceHanSansCN"
-
-
-      },
-    }
-
-  },
-  yAxis: {
-    type: 'value',
-    splitLine: { show: false },//去除网格线
-    axisLine: {
-      lineStyle: {
-        color: '#2A5D75',
-      }
-    },
-    //  改变y轴字体颜色和大小
-    axisLabel: {
-      textStyle: {
-        color: 'rgba(255,255,255,1)',
-        fontSize: '14',
-        fontFamiliy: "SourceHanSansCN-Medium,SourceHanSansCN"
-
-
-      },
-    },
-
-  },
-
-  series: [{
-    data: [0, 40, 80, 100, 85, 70, 85, 80],
-    type: 'line',
-    smooth: true,  //这个是把线变成
-    itemStyle: {
-      normal: {
-        color: "#FF7400", //折线点的颜色
-        lineStyle: {
-          width: 3,//折线宽度
-          color: "#DDBF28"//折线颜色
-        }
-      }
-    },
-    areaStyle: {
-      normal: {
-        //颜色渐变函数 前四个参数分别表示四个位置依次为左、下、右、上
-        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-
-          offset: 0,
-          color: '#00ADFF'
-        }, {
-          offset: 0.5,
-          color: '#DDBF28'
-        }, {
-          offset: 1,
-          color: '#FF7400'
-        }])
-
-      }
-
-    }
-  }]
-};
-
-
-class SafetyIndexWeek extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      data: {}
-    };
-  }
-
-  componentDidMount() {
-    this.safetyIndexWeekData();
-  }
-
-  safetyIndexWeekData = () => {
-    safetyIndexWeekAction().then(data => {
-      this.setState({
-        data
-      });
-    });
-  }
-
-  getOptionsx = (map) => {
-    return {
-      xAxis: {
-        type: 'category',
-
-        boundaryGap: false,
-        data: map.get("dates"),
-        axisLabel: {
-          interval: 0,//横轴信息全部显示
-          // rotate:40,
-          textStyle: {
-            color: 'rgba(255,255,255,1)',
-            fontSize: '12',
-            fontFamiliy: "SourceHanSansCN-Medium,SourceHanSansCN"
-
-
-          },
-          margin: 15,//刻度标签与轴线之间的距离。
-        }
-
-      },
-      yAxis: {
-        type: 'value',
-        splitLine: { show: false },//去除网格线
-        axisLine: {
-          lineStyle: {
-            color: '#2A5D75',
-          }
-        },
-        //  改变y轴字体颜色和大小
-        axisLabel: {
-          textStyle: {
-            color: 'rgba(255,255,255,1)',
-            fontSize: '12',
-            fontFamiliy: "SourceHanSansCN-Medium,SourceHanSansCN"
-
-
-          },
-          margin: 15,//刻度标签与轴线之间的距离。
-        },
-
-      },
-
-      series: [{
-        data: map.get("values"),
-        type: 'line',
-        symbol: 'circle',//折线点设置为实心点
-        smooth: true,  //这个是把线变成
-        itemStyle: {
-          normal: {
-            color: "#E1B623", //折线点的颜色
-            lineStyle: {
-              width: 3,//折线宽度
-              //颜色渐变函数 前四个参数分别表示四个位置依次为左、下、右、上
-              color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-
-                offset: 0,
-                color: '#FF0000'
-              }, {
-                offset: 0.2,
-                color: '#DDBF28'
-              }, {
-                offset: 0.4,
-                color: '#FF7400'
-              }, {
-                offset: 0.5,
-                color: '#00ADFF'
-              }, {
-                offset: 0.6,
-                color: '#DDBF28'
-              }])
-            }
-          }
-        },
-        areaStyle: {
-          normal: {
-            //颜色渐变函数 前四个参数分别表示四个位置依次为左、下、右、上#766016 transparent
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-
-              offset: 0,
-              color: '#00ADFF'
-            }, {
-              offset: 0.1,
-              color: '#6e6a26'
-            }, {
-              offset: 0.2,
-              color: '#766016'
-            }, {
-              offset: 0.5,
-              color: '#4b2006'
-            },{
-              offset: 0.6,
-              color: '#280d07'
-            }])
-
-          }
-
-        }
-      }]
-    };
-  }
-
-  handleData = (data) => {
-    let map = new Map();
-    let dates = [];
-    let values = [];
-    if (data && data.length > 0) {
-      data.map(item => {
-        let time2 = item.date.substring(5);
-        dates.push(time2)
-        values.push(item.value)
-      })
-    }
-
-    map.set("dates", dates);
-    map.set("values", values);
-    return map;
-  }
-
-
-  render() {
-    let { data } = this.state;
-    let map = this.handleData(data);
-    return (
-      <div className="safetyIndexWeek">
-
-
-        <div className="content-week-font-style">
-          <span className='titleIcon' style={{ background: `url(${getIcon('textleft')}) no-repeat center center/100% 100%` }}></span>一周安全趋势</div>
-        {/* <img src="/src/assets/panoramic/statistical/main_icon_textleft.png" ></img> */}
-
-        <ReactEcharts option={this.getOptionsx(map)} className='echart-week' />
-
-      </div>
-    );
-  }
-}
-
-
-SafetyIndexWeek.propTypes = {
-
-};
-
-export default SafetyIndexWeek;

mods/components/panoramic/view/panoramic/statistical/StatisticsCheck.js

-import React, { Component } from 'react';
-import ReactEcharts from 'amos-viz/lib/echarts';
-import { statisticsCheckAction } from './../../../services/panoramicService';
-import { getIcon } from './../../../utils/request';
-
-
-const option = {
-  tooltip: {
-    trigger: 'item',
-    formatter: "{a} <br/>{b}: {c} ({d}%)"
-  },
-  legend: {
-    orient: 'vertical',
-    x: 'left',
-    data: []
-  },
-  //绿色  黄色  灰色 红色
-  //  color: ['#C0C0C0', '#FF0000', '#00FF00', '#FFFF00'],
-  color: ['#C0C0C0', '#FF0000', '#00FF00', '#FFFF00'],
-  series: [
-    {
-
-      type: 'pie',
-      radius: ['80%', '70%'],
-      center: ['35%', '40%'],    // 默认全局居中
-      avoidLabelOverlap: false,
-      label: {
-        normal: {
-          show: false,
-          position: 'center'
-        },
-        emphasis: {
-          show: true,
-          textStyle: {
-            fontSize: '30',
-            fontWeight: 'bold'
-          }
-        }
-      },
-      labelLine: {
-        normal: {
-          show: false
-        }
-      },
-      data: [
-        { value: 335, name: '未执行' },
-        { value: 310, name: '漏检' },
-        { value: 234, name: '合格' },
-        { value: 135, name: '不合格' },
-
-      ]
-    }
-  ]
-};
-
-
-
-/**
- * 今日巡检统计
- */
-class StatisticsCheck extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      data: []
-    };
-  }
-
-  componentDidMount() {
-    this.statisticsCheckData();
-  }
-
-  statisticsCheckData = () => {
-    statisticsCheckAction().then(data => {
-      this.setState({
-        data
-      });
-    });
-  }
-
-  getOptionsx = (data) => {
-    return {
-      tooltip: {
-        trigger: 'item',
-        formatter: "{a} <br/>{b}: {c} ({d}%)"
-      },
-      legend: {
-        orient: 'vertical',
-        x: 'left',
-        data: []
-      },
-      //绿色  黄色  灰色 红色
-      // color: ['#C0C0C0', '#FF0000', '#00FF00', '#FFFF00'],
-      color: ['#C0C0C0', '#00FF00', '#FFFF00', '#FF0000'],
-      series: [
-        {
-
-          type: 'pie',
-          radius: ['80%', '70%'],
-          center: ['35%', '40%'],    // 默认全局居中
-          avoidLabelOverlap: false,
-          label: {
-            normal: {
-              show: false,
-              position: 'center'
-            },
-            emphasis: {
-              show: true,
-              textStyle: {
-                fontSize: '30',
-                fontWeight: 'bold'
-              }
-            }
-          },
-          labelLine: {
-            normal: {
-              show: false
-            }
-          },
-          data: data
-        }
-      ]
-    };;
-  }
-
-
-  handleData = (data) => {
-    let map = new Map();
-    if (data && data.length > 0) {
-      data.map(item => {
-        map.set(item.name, item.value);
-      })
-    }
-    return map;
-  }
-
-  rederStyle = (checkType) => {
-    const style = {
-      background: `url(${getIcon(checkType)}) no-repeat  center center/100% 100%`
-    };
-    return style;
-  }
-
-  render() {
-    let { data } = this.state;
-    let map = this.handleData(data);
-    let weikaishi = map.get("未开始");
-    let hege = map.get("合格");
-    let buhege = map.get("不合格");
-    let loujian = map.get("漏检");
-    return (
-      <div className="statisticsCheck">
-        <div className="check-content">
-          <div className="content-xj-top">
-            <span className='titleIcon' style={this.rederStyle('textleft')}></span> 今日巡检
-          </div>
-          <div className="content-xj-middle">
-            <ReactEcharts option={this.getOptionsx(data)} eventpool={this.onclick} className="div-echars" />
-          </div>
-          <div className="content-xj-bottom" >
-            <div className="yellow-div">
-              <div className="yellow-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_buhege')}></span><span className="content-week-font"> 合格
-                  <span className="content-font-number"> {hege}个</span>
-                </span>
-              </div>
-            </div>
-            <div className="green-div">
-              <div className="green-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_hege')}></span><span className="content-week-font"> 未开始
-                  <span className="content-font-number">{weikaishi}个</span>
-                </span>
-              </div>
-            </div>
-            <div className="red-div">
-              <div className="red-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_louyan')}></span><span className="content-week-font"> 漏检
-                  <span className="content-font-number"> {loujian}个</span>
-                </span>
-              </div>
-            </div>
-            <div className="grey-div">
-              <div className="grey-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_weizhixing')}></span><span className="content-week-font"> 不合格
-                  <span className="content-font-number"> {buhege}个</span>
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-
-StatisticsCheck.propTypes = {
-
-};
-
-export default StatisticsCheck;

mods/components/panoramic/view/panoramic/statistical/StatisticsDuty.js

-import React, { Component } from 'react';
-import { statisticsDutyAction } from './../../../services/panoramicService';
-import { getIcon } from './../../../utils/request';
-
-/**
- * 今日值班统计
- */
-
-
-class StatisticsDuty extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      data: {}
-    };
-  }
-
-  componentDidMount() {
-    this.statisticsDutyData();
-  }
-
-  statisticsDutyData = () => {
-    statisticsDutyAction().then(data => {
-      this.setState({
-        data
-      });
-    });
-  }
-
-  render() {
-    let { data } = this.state;
-    return (
-      <div className="statisticsDuty">
-        <div className="content-duty-font-style">
-          <span className='titleIcon' style={{ background: `url(${getIcon('textleft')}) no-repeat center center/100% 100%` }}></span> 今日值班
-      </div>
-        <div className="content-picture-div">
-          <div className="content-picture-left">
-            <div className="content-image"></div>
-            <div className="content-wenzi">
-              <div className="wenzi-zhiban">值班</div>
-              <div className="wenzi-number">{data.dutyPersonNumber}</div>
-            </div>
-          </div>
-          <div className="content-picture-middle">
-            <div className="content-image"></div>
-            <div className="content-wenzi">
-              <div className="wenzi-zhiban">消防</div>
-              <div className="wenzi-number">{data.firePersonNumber}</div>
-            </div>
-          </div>
-          <div className="content-picture-right">
-            <div className="content-image"></div>
-            <div className="content-wenzi">
-              <div className="wenzi-zhiban">保安</div>
-              <div className="wenzi-number">{data.securityPersonNumber}</div>
-            </div>
-          </div>
-        </div>
-        {/* <img src="/src/assets/panoramic/statistical/main_icon_baoan.png" ></img>
-             <img src="/src/assets/panoramic/statistical/main_icon_baoan.png" ></img> */}
-
-      </div>
-    );
-  }
-}
-
-StatisticsDuty.propTypes = {
-
-};
-
-export default StatisticsDuty;

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

-/**
- * 告警控制
- */
-export const warnController = [
-  { key: 'fire', icon: 'model_fire', type: 'fire', label: '火灾告警' },
-  { key: 'risk', icon: 'model_risk', type: 'risk', label: '风险异常' },
-  { key: 'check', icon: 'model_patrol', type: 'check', label: '巡检异常' }
-];
-
-/**
- *  安全执行控制
- */
-export const warnTypes = [
-  { key: 'warn', icon: 'select_warn', unIcon: 'unselect_warn', type: 'warn', label: '巡检异常' },
-  { key: 'fire', icon: 'select_fire', unIcon: 'unselect_fire', type: 'fire', label: '火灾告警' },
-  { key: 'risk', icon: 'select_risk', unIcon: 'unselect_risk', type: 'risk', label: '风险异常' },
-  { key: 'check', icon: 'select_check', unIcon: 'unselect_check', type: 'check', label: '巡检异常' }
-];

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

-import React, { Component } from 'react';
-
-import EquipStatusList from './EquipStatusList';
-import SafetyExecuteList from './SafetyExecuteList';
-import SafetyIndex from './SafetyIndex';
-import SafetyIndexWeek from './SafetyIndexWeek';
-import StatisticsCheck from './StatisticsCheck';
-import StatisticsDuty from './StatisticsDuty';
-import AmosWebSocket from 'amos-websocket';
-import SysWsURL, { completeToken } from './../../../consts/wsUrlConsts';
-
-/**
- * 全景监控统计
- */
-export default class Statistical extends Component {
-
-  handleData = (data = {}) => {
-    console.log('ws data:', data);
-    data = JSON.parse(JSON.stringify(data));
-    console.log(data);
-    let refreshType = data.refreshType;
-    let content = data.content;
-    switch (refreshType){
-      case 'today_safety_index':
-        console.log('今日安全指数刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndex.getSafetyIndex();
-        break;
-      case 'fire_safety':
-        console.log('消防安全执行刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyExecute.safetyExecuteList();
-        break;
-      case 'monitor_data':
-        console.log('设备状态检测数据刷新~~~~~~~~~~~~~~~~~~~~');
-        this.equipStatus.equipStatusList();
-        break;
-      case 'error_status':
-        console.log('异常区域刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'week_safety_index':
-        console.log('一周安全指数趋势刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndexWeek.safetyIndexWeekData();
-        break;
-      case 'today_check_status':
-        console.log('今日巡检情况刷新~~~~~~~~~~~~~~~~~~~~');
-        this.statisticsCheck.statisticsCheckData();
-        break;
-      case 'today_duty':
-        this.statisticsDuty.statisticsDutyData();
-        console.log('今日值班刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'all':
-        console.log('首页刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndex.getSafetyIndex();
-        this.safetyExecute.safetyExecuteList();
-        this.equipStatus.equipStatusList();
-        this.safetyIndexWeek.safetyIndexWeekData();
-        this.statisticsCheck.statisticsCheckData();
-        this.statisticsDuty.statisticsDutyData();
-        break;
-      default:
-        console.log(refreshType,'：类型不支持');
-    }
-  }
-
-
-  render() {
-    const wsURL = completeToken(SysWsURL.viewIndexws);
-    return (
-      <div className="statistical">
-        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        <div className="statistical-left">
-          <SafetyIndex ref={node => this.safetyIndex = node} />
-          <SafetyExecuteList ref={node => this.safetyExecute = node} />
-          <EquipStatusList ref={node => this.equipStatus = node} />
-        </div>
-        <div className="statistical-right">
-          <SafetyIndexWeek ref={node => this.safetyIndexWeek = node} />
-          <StatisticsCheck ref={node => this.statisticsCheck = node} />
-          <StatisticsDuty ref={node => this.statisticsDuty = node} />
-        </div>
-      </div>
-    );
-  }
-}

mods/components/panoramic/view/panoramic/statistical/indexLeft.js

-import React, { Component } from 'react';
-
-import EquipStatusList from './EquipStatusList';
-import SafetyExecuteList from './SafetyExecuteList';
-import SafetyIndex from './SafetyIndex';
-import AmosWebSocket from 'amos-websocket';
-import SysWsURL, { completeToken } from './../../../consts/wsUrlConsts';
-
-/**
- * 全景监控统计
- */
-export default class StatisticalLeft extends Component {
-
-  handleData = (data = {}) => {
-    console.log('ws data:', data);
-    data = JSON.parse(JSON.stringify(data));
-    console.log(data);
-    let refreshType = data.refreshType;
-    let content = data.content;
-    switch (refreshType){
-      case 'today_safety_index':
-        console.log('今日安全指数刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndex.getSafetyIndex();
-        break;
-      case 'fire_safety':
-        console.log('消防安全执行刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyExecute.safetyExecuteList();
-        break;
-      case 'monitor_data':
-        console.log('设备状态检测数据刷新~~~~~~~~~~~~~~~~~~~~');
-        this.equipStatus.equipStatusList();
-        break;
-      case 'error_status':
-        console.log('异常区域刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'all':
-        console.log('首页左侧刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndex.getSafetyIndex();
-        this.safetyExecute.safetyExecuteList();
-        this.equipStatus.equipStatusList();
-        break;
-      default:
-        console.log(refreshType,'：类型不支持');
-    }
-  }
-
-
-  render() {
-    const wsURL = completeToken(SysWsURL.viewIndexws);
-    return (
-      <div className="statistical-left">
-        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        <SafetyIndex ref={node => this.safetyIndex = node} />
-        <SafetyExecuteList ref={node => this.safetyExecute = node} />
-        <EquipStatusList ref={node => this.equipStatus = node} />
-      </div>
-    );
-  }
-}

mods/components/panoramic/view/panoramic/statistical/indexRight.js

-import React, { Component } from 'react';
-
-import SafetyIndexWeek from './SafetyIndexWeek';
-import StatisticsCheck from './StatisticsCheck';
-import StatisticsDuty from './StatisticsDuty';
-import AmosWebSocket from 'amos-websocket';
-import SysWsURL, { completeToken } from '../../../consts/wsUrlConsts';
-
-/**
- * 全景监控统计
- */
-export default class StatisticalRight extends Component {
-
-  handleData = (data = {}) => {
-    console.log('ws data:', data);
-    data = JSON.parse(JSON.stringify(data));
-    console.log(data);
-    let refreshType = data.refreshType;
-    let content = data.content;
-    switch (refreshType){
-      case 'error_status':
-        console.log('异常区域刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'week_safety_index':
-        console.log('一周安全指数趋势刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndexWeek.safetyIndexWeekData();
-        break;
-      case 'today_check_status':
-        console.log('今日巡检情况刷新~~~~~~~~~~~~~~~~~~~~');
-        this.statisticsCheck.statisticsCheckData();
-        break;
-      case 'today_duty':
-        this.statisticsDuty.statisticsDutyData();
-        console.log('今日值班刷新~~~~~~~~~~~~~~~~~~~~');
-        break;
-      case 'all':
-        console.log('首页右侧刷新~~~~~~~~~~~~~~~~~~~~');
-        this.safetyIndexWeek.safetyIndexWeekData();
-        this.statisticsCheck.statisticsCheckData();
-        this.statisticsDuty.statisticsDutyData();
-        break;
-      default:
-        console.log(refreshType,'：类型不支持');
-    }
-  }
-
-
-  render() {
-    const wsURL = completeToken(SysWsURL.viewIndexws);
-    return (
-      <div className="statistical-right">
-        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        <SafetyIndexWeek ref={node => this.safetyIndexWeek = node} />
-        <StatisticsCheck ref={node => this.statisticsCheck = node} />
-        <StatisticsDuty ref={node => this.statisticsDuty = node} />
-      </div>
-    );
-  }
-}