Commit b597bb79 authored by xinglei's avatar xinglei

*)监控屏组态

parent a1981f24
......@@ -7,14 +7,17 @@
Amos.config = {
// 普通http
httpURI: {
baseURI: 'http://127.0.0.1:10005/'
baseURI: 'http://127.0.0.1:10005/',
pluginURI: 'http://172.16.10.72:10005/',
fileServerURI: 'http://172.16.10.175:8888/' //图片服务器地址
//设计器数据绑定
// dataBindUrl: 'http://172.16.10.91:8083/api/visual/common/dataBind'
},
// websocket 地址
wsURI: {
baseURI: 'ws://172.16.10.91:10600/',
ruleURI: 'ws://172.16.3.63:8083/'
ruleURI: 'ws://172.16.3.63:8083/',
pluginURI: 'ws://172.16.10.80:30102/morphic/'
},
// 外部链接地址
outterURI: {
......@@ -58,7 +61,7 @@
//组态页面的配置
morphic: {
//组态页面的subjectid
appId: '2c908ac26f645e52016f9ca5b46c001c',
appId: '1292626941341372417',
//组态页面的序号,从0开始
sceneIndex: 0
},
......
......@@ -37,6 +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 AsyncFireResourceView = props => <AsyncLoader load={import('./../view/bizview/equipmentLedger/FireResources')} componentProps={props} />;
......@@ -68,7 +69,6 @@ const AsyncUserModel = props => <AsyncLoader load={import('../view/bizview/user'
const AsyncFireRectification = props => <AsyncLoader load={import('../view/bizview/fireRectification')} componentProps={props} />;
const Routes = {
// 添加 rules 路由
...parsePlugin,
......@@ -94,6 +94,7 @@ const Routes = {
checklist: AsyncCheckList,
task: AsyncTaskView,
pointInfo: AsyncPointInfoView,
morphic: AsyncRealTimeMonitor,
//设备台账
assessment: AsyncRiskAssessment,
......
......@@ -51,7 +51,7 @@ import DifferentiateView from './../view/bizview/intelligentDifferentiate/Differ
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';
......@@ -82,7 +82,7 @@ const Routes = {
checkdetail: CheckDetail,
checklist: CheckList,
task: TaskView,
morphic: RealTimeMonitor, // 组态监控屏功能,组态升级暂时有问题。
morphic: RealTimeMonitor, // 组态监控屏功能
//设备台账
assessment: RiskAssessment,
......
......@@ -7,6 +7,7 @@
flex-wrap: wrap;
justify-content: center;
align-items: center;
background-size: 100% 100%;
.region-item {
position: relative;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -7,7 +7,7 @@
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script type="application/javascript" src="/amos.config.js"></script>
<!-- <script src="http://webapi.amap.com/maps?v=1.4.3&key=8afbcd8006fcd36a22136ef20a12456a"></script> -->
<script src="http://webapi.amap.com/maps?v=1.4.3&key=8afbcd8006fcd36a22136ef20a12456a"></script>
<title>IFC100消防指挥系统</title>
<script>
window.offlineMap = {
......
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