Commit a26ad386 authored by maoying's avatar maoying

添加监控屏组态状态页面

parent a70140d0
......@@ -37,7 +37,7 @@ const AsyncCheckList = props => <AsyncLoader load={import('./../view/bizview/xjc
const AsyncPatrol = props => <AsyncLoader load={import('./../view/bizview/point')} componentProps={props} />;
const AsyncTaskView = props => <AsyncLoader load={import('./../view/bizview/task')} componentProps={props} />;
const AsyncPointInfoView = props => <AsyncLoader load={import('./../view/bizview/pointInfo')} componentProps={props} />;
// const AsyncRealTimeMonitor = props => <AsyncLoader load={import('./../view/morphic')} componentProps={props} />; 监控屏组态
const AsyncRealTimeMonitor = props => <AsyncLoader load={import('./../view/morphic')} componentProps={props} />; //监控屏组态
const AsyncFireResourceView = props => <AsyncLoader load={import('./../view/bizview/equipmentLedger/FireResources')} componentProps={props} />;
......@@ -94,7 +94,7 @@ const Routes = {
checklist: AsyncCheckList,
task: AsyncTaskView,
pointInfo: AsyncPointInfoView,
// morphic: AsyncRealTimeMonitor,
morphic: AsyncRealTimeMonitor,
//设备台账
assessment: AsyncRiskAssessment,
......
......@@ -45,13 +45,13 @@ import Graph3DModel from 'amos-iot-3dgraph/lib/view/modelMgmt';
import FireStrengthResourceView from './../view/bizview/equipmentLedger/FireResources/FireStrength';
import FireStationMatches from './../view/bizview/equipmentLedger/FireResources/matchEquipment/FireStationMatches';
//import XJCtrlModel from '../view/bizview/xunjian';
import XJCtrlModel from '../view/bizview/xunjian';
import XJCtrlModel from '../view/bizview/xunjian/XJIndex';
import DifferentiateView from './../view/bizview/intelligentDifferentiate/DifferentiateView';
import AlarmVideoMonitor from './../view/bizview/alarmVideoMonitor';
import alarmTestView from './../view/bizview/alarm';
import CusVizLib from './../view/planMgmt/cusVizLib';
// import RealTimeMonitor from './../view/morphic'; // 组态监控屏功能
import RealTimeMonitor from './../view/morphic'; // 组态监控屏功能
import PublishView from './../view/planMgmt/view';
import PanoramicMonitor from './../view/panoramicMonitor';
import LeaderStruct from './../view/planMgmt/view/leaderStruct';
......
import React, { Component } from 'react';
import { Connect, Scrollbars } from 'amos-framework';
import { utils } from 'amos-tool';
// import { MorphicPublishView } from './amosmorphic';
import { MorphicPublishView } from './amosmorphic';
import * as endConf from 'amos-processor/lib/config/endconf';
const AmosConfig = endConf.AmosConfig;
......@@ -15,12 +15,12 @@ class RealTimeMonitor extends Component {
}
render() {
// return (
// // <MorphicPublishView
// // appId={appId}
// // sceneIndex={sceneIndex}
// // />
// );
return (
<MorphicPublishView
appId={appId}
sceneIndex={sceneIndex}
/>
);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment