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

src/routes/view.js

@@ -54,7 +54,6 @@ import alarmTestView from './../view/bizview/alarm';
 import CusVizLib from './../view/planMgmt/cusVizLib';
 import RealTimeMonitor from './../view/morphic';
 import PublishView from './../view/planMgmt/view';
-import ModelManage from './../view/planMgmt/modelManage';
 import LeaderStruct from './../view/planMgmt/view/leaderStruct';
 import Graph3DModel from 'amos-iot-3dgraph/lib/view/modelMgmt';
 
@@ -111,7 +110,7 @@ const Routes = {
   alarmTest: alarmTestView,
   vizlib: CusVizLib,
   // planDrill: PublishView,
-  modelManage: ModelManage,
+  modelManage: Graph3DModel,
   leaderStruct: LeaderStruct
 };
 

src/view/planMgmt/cusVizLib/index.js

@@ -18,9 +18,8 @@ const uploadUrl = FasSerUrl.uploadTextPlan;
 
 // 额外的操作，系统默认的操作有 edit、publish、cancelpub、see、copy、delete，禁止重复
 const extraMenus = [
-  { key: 'preview', text: '预览', icon: 'eye' },
-  { key: 'textImport', text: '文字预案', icon: 'totop1' },
-  // { key: 'leaderStruct', text: '领导架构', icon: 'user' }
+  { key: 'preview', text: '预案演练', icon: 'eye' },
+  { key: 'textImport', text: '文字预案', icon: 'totop1' }
 ];
 
 /**

src/view/planMgmt/modelManage/index.js

-import React , { Component } from 'react';
-import _amosTool from 'amos-tool';
-
-/**
- * 模型库
- *
- * @class ModelManage
- * @extends {Component}
- */
-class ModelManage extends Component {
-  constructor(props){
-    super(props);
-    this.state = {
-    };
-  }
-
-  render() {
-   
-    return (
-      <div style={{height:'100%'}}>  
-        模型库
-      </div>
-    );
-  }
-}
-
-export default ModelManage;