Commit 9aef339c authored by 单奇雲's avatar 单奇雲

冲突

parents cda846bd 9378d83b
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
delayTime: 10 // 屏保出现时间(单位:秒) 10s delayTime: 10 // 屏保出现时间(单位:秒) 10s
}, },
//三维模型配置 yinan 沂南站 shm 上海庙站 sn 苏南 hainan 海南站 //三维模型配置 yinan 沂南站 shm 上海庙站 sn 苏南 hainan 海南站
view3dFile:'/mods/components/3dviewConvertor/threeres/models/shm/index_dev.json', view3dFile:'/mods/components/3dviewConvertor/threeres/models/yinan-new/index_dev.json',
} }
} }
}; };
......
...@@ -100,6 +100,15 @@ export default { ...@@ -100,6 +100,15 @@ export default {
fire: require('../assets/convertor/3dview/markers/fire.png'), fire: require('../assets/convertor/3dview/markers/fire.png'),
fireDetection: require('../assets/convertor/3dview/markers/fireDetector.png'), fireDetection: require('../assets/convertor/3dview/markers/fireDetector.png'),
//重点设备模式
impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'),
impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'),
impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),//
impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),//
impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'),
}, },
color: { color: {
hydrant: {color: '#f12525'}, hydrant: {color: '#f12525'},
...@@ -187,18 +196,13 @@ export default { ...@@ -187,18 +196,13 @@ export default {
}, },
}; };
export const markerTitleBgMapper = {
impEquipmentMode: require('../assets/convertor/3dview/prePlan/shapan-qipao2.svg'),
quanjing: require('../assets/convertor/3dview/prePlan/shapan-qipao2.png')
}
export const marker3DIoncMapper = { export const marker3DIoncMapper = {
riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'), riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'),
riskSource_1: require('../assets/convertor/3dview/markers/risk-1.png'), riskSource_1: require('../assets/convertor/3dview/markers/risk-1.png'),
riskSource_2: require('../assets/convertor/3dview/markers/risk-2.png'), riskSource_2: require('../assets/convertor/3dview/markers/risk-2.png'),
riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'), riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'),
riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'), riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'),
riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'), riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'),
risk_0: '/mods/components/3dviewConvertor/threeres/markers/risk-0.png', risk_0: '/mods/components/3dviewConvertor/threeres/markers/risk-0.png',
risk_1: '/mods/components/3dviewConvertor/threeres/markers/risk-1.png', risk_1: '/mods/components/3dviewConvertor/threeres/markers/risk-1.png',
risk_2: '/mods/components/3dviewConvertor/threeres/markers/risk-2.png', risk_2: '/mods/components/3dviewConvertor/threeres/markers/risk-2.png',
...@@ -206,10 +210,11 @@ export const marker3DIoncMapper = { ...@@ -206,10 +210,11 @@ export const marker3DIoncMapper = {
risk_4: '/mods/components/3dviewConvertor/threeres/markers/risk-4.png', risk_4: '/mods/components/3dviewConvertor/threeres/markers/risk-4.png',
risk_5: '/mods/components/3dviewConvertor/threeres/markers/risk-5.png', risk_5: '/mods/components/3dviewConvertor/threeres/markers/risk-5.png',
patrol_0: require('../assets/convertor/3dview/markers/pa-0.png'), patrol_1: '/mods/components/3dviewConvertor/threeres/markers/patrol-1.png',
patrol_1: require('../assets/convertor/3dview/markers/pa-1.png'), patrol_2: '/mods/components/3dviewConvertor/threeres/markers/patrol-2.png',
patrol_2: require('../assets/convertor/3dview/markers/pa-2.png'), patrol_3: '/mods/components/3dviewConvertor/threeres/markers/patrol-3.png',
patrol_3: require('../assets/convertor/3dview/markers/pa-3.png'), patrol_4: '/mods/components/3dviewConvertor/threeres/markers/patrol-4.png',
patrol_5: '/mods/components/3dviewConvertor/threeres/markers/patrol-5.png',
person_0: '/mods/components/3dviewConvertor/threeres/markers/person-0.png', person_0: '/mods/components/3dviewConvertor/threeres/markers/person-0.png',
...@@ -227,15 +232,6 @@ export const marker3DIoncMapper = { ...@@ -227,15 +232,6 @@ export const marker3DIoncMapper = {
impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),// impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),//
impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'), impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'),
hydrant: require('../assets/convertor/3dview/markers/hydrant.png'),
pool: require('../assets/convertor/3dview/markers/pool.png'),
fireCar: require('../assets/convertor/3dview/markers/fireCar.png'),
fireEquipment: require('../assets/convertor/3dview/markers/fireEquip.png'),
fireFoamRoom: require('../assets/convertor/3dview/markers/fireFoam.png'),
fireChamber: require('../assets/convertor/3dview/markers/fireChamber.png'),
impEquipment: require('../assets/convertor/3dview/markers/impEquip.png'),
monitorEquipment: require('../assets/convertor/3dview/markers/monitorEquip.png'),
video: require('../assets/convertor/3dview/markers/video.png'),
}; };
......
{ {
"sceneName": "station-yinan", "sceneName": "station-yinan",
"basePath": "/threeres/models/yinan/", "basePath": "/mods/components/3dviewConvertor/threeres/models/yinan-new/",
"models": [ "models": [
{ "objName": "ground.obj", "mtlName": "ground.mtl", "modelLevel": "Park" }, { "objName": "ground.obj", "mtlName": "ground.mtl", "modelLevel": "Park" },
{ "objName": "helper-text.obj", "mtlName": "helper-text.mtl", "modelLevel": "Stuff" } { "objName": "helper-text.obj", "mtlName": "helper-text.mtl", "modelLevel": "Stuff" },
{ "objName": "maps.obj", "mtlName": "maps.mtl", "modelLevel": "Building" }
], ],
"version": "1.0.0" "version": "1.0.0"
} }
...@@ -97,7 +97,9 @@ class PointsPool extends Component { ...@@ -97,7 +97,9 @@ class PointsPool extends Component {
updateMarkers = (data) => { updateMarkers = (data) => {
this.props.updateMarker(data); this.props.updateMarker(data);
} }
addMarker=(data)=>{
this.props.addMarker(data)
}
render() { render() {
const { markers, ...rest } = this.props; const { markers, ...rest } = this.props;
let hideDetector = false; let hideDetector = false;
...@@ -106,11 +108,14 @@ class PointsPool extends Component { ...@@ -106,11 +108,14 @@ class PointsPool extends Component {
} }
return ( return (
<Shuttle> <Shuttle>
<RiskPoint <RiskPoint
{...rest} {...rest}
markers={markers.riskSource} markers={markers.riskSource}
onCreated={(val) => this.onMarkersCreated('riskSource', val)} onCreated={(val) => this.onMarkersCreated('riskSource', val)}
isEditMode={this.props.isEditMode} isEditMode={this.props.isEditMode}
addMarker={this.addMarker}
stagePilot={this.props.stagePilot}
positionCtl={this.props.positionCtl}
/> />
{/* <PatrolPoint {/* <PatrolPoint
{...rest} {...rest}
......
...@@ -2,10 +2,11 @@ import React, { Component } from 'react'; ...@@ -2,10 +2,11 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { utils,UUID } from 'amos-tool'; import { utils,UUID } from 'amos-tool';
import { PubSub } from 'ray-eventpool'; import { PubSub } from 'ray-eventpool';
import { Connect as UIConnect, Toast,message } from 'amos-framework'; import { Connect as UIConnect, Modal,message } from 'amos-framework';
import { FatLine } from 'amos-3d/lib/advanced'; import { FatLine } from 'amos-3d/lib/advanced';
import A3DDesigner, { Connect, FireObject,DESIGNER_CONSTS,PolygonRegion, PointLight } from 'amos-3d/lib/designer'; import A3DDesigner, { Connect, FireObject,DESIGNER_CONSTS,PolygonRegion } from 'amos-3d/lib/designer';
import WorkerObjContent from 'amos-3d/lib/worker/WorkerObjContent'; import WorkerObjContent from 'amos-3d/lib/worker/WorkerObjContent';
import { transitionHelper } from 'amos-3d/lib/helpers';
import * as endConf from 'amos-processor/lib/config/endconf'; import * as endConf from 'amos-processor/lib/config/endconf';
import { LensJumpFactory } from 'base-r3d/lib/factory'; import { LensJumpFactory } from 'base-r3d/lib/factory';
import { CONSTS } from './../consts/storageConsts'; import { CONSTS } from './../consts/storageConsts';
...@@ -113,12 +114,14 @@ class View3D extends Component { ...@@ -113,12 +114,14 @@ class View3D extends Component {
pointType: '', //筛选框点类型 pointType: '', //筛选框点类型
editFlag: false,//编辑模式 editFlag: false,//编辑模式
showRightPanel: false, //是否显示右侧详情 showRightPanel: false, //是否显示右侧详情
simpleTipVisible: false, //简单提示
dragItem: '', //拖动的节点, dragItem: '', //拖动的节点,
exceptionAreas: [], //异常区域 exceptionAreas: [], //异常区域
startLoadExceptionArea: false, //是否开始加载区域marker startLoadExceptionArea: false, //是否开始加载区域marker
sideControlShow: false, //隐藏耳朵 sideControlShow: false, //隐藏耳朵
isShowActionBar: true, //显示工具栏 isShowActionBar: true, //显示工具栏
errorAreaId: '' //异常区域id errorAreaId: '' ,//异常区域id
positionxyz:null
}; };
getObjFromNet(view3dFile, (objs, asyncModels) => { getObjFromNet(view3dFile, (objs, asyncModels) => {
...@@ -250,6 +253,7 @@ class View3D extends Component { ...@@ -250,6 +253,7 @@ class View3D extends Component {
_bindPubSubEvents = () => { _bindPubSubEvents = () => {
this.props.subscribe(eventTopics.base3d_view, (topic, data) => { this.props.subscribe(eventTopics.base3d_view, (topic, data) => {
console.log('subscribe base3d_view')
if (isControllerEvent(topic)) { if (isControllerEvent(topic)) {
executeView3dCMD(this, topic, data); executeView3dCMD(this, topic, data);
} else if (isManualOperate(topic)) { } else if (isManualOperate(topic)) {
...@@ -448,7 +452,7 @@ class View3D extends Component { ...@@ -448,7 +452,7 @@ class View3D extends Component {
}); });
}; };
onGraphCreated = ({ cameraFactory, sceneFactory, outlineFactory, r3d, stagePilot }) => { onGraphCreated = ({ cameraFactory, sceneFactory, outlineFactory, r3d, stagePilot}) => {
this.cameraFactory = cameraFactory; this.cameraFactory = cameraFactory;
this.sceneFactory = sceneFactory; this.sceneFactory = sceneFactory;
this.outlineFactory = outlineFactory; this.outlineFactory = outlineFactory;
...@@ -456,6 +460,7 @@ class View3D extends Component { ...@@ -456,6 +460,7 @@ class View3D extends Component {
this.polygonRegion = {}; this.polygonRegion = {};
this.stagePilot = stagePilot; this.stagePilot = stagePilot;
this.positionCtl = stagePilot.positionCtl; this.positionCtl = stagePilot.positionCtl;
// 重新设置 outline 风格 // 重新设置 outline 风格
this.outlineFactory.outlineConfig = { this.outlineFactory.outlineConfig = {
visibleEdgeColor: '#f8a303', visibleEdgeColor: '#f8a303',
...@@ -472,7 +477,7 @@ class View3D extends Component { ...@@ -472,7 +477,7 @@ class View3D extends Component {
onAllDone = objGroup => { onAllDone = objGroup => {
this.sceneFactory.level.change(objGroup); this.sceneFactory.level.change(objGroup);
this.stagePilot.rendererFactory.setupUModelSahdow(); this.cameraFactory.fitView(desigerHelperConfig.cameraEffect);
this.setState({ this.setState({
startAsyncLoad: true startAsyncLoad: true
}); });
...@@ -482,20 +487,19 @@ class View3D extends Component { ...@@ -482,20 +487,19 @@ class View3D extends Component {
onAfterWorkerInit = workerObjGroup => { onAfterWorkerInit = workerObjGroup => {
// 处理跳跃 // 处理跳跃
this.lensJumpFactory.process(workerObjGroup); this.lensJumpFactory.process(workerObjGroup);
// 子线程模型加上阴影
workerObjGroup.toggleShadow(true);
}; };
onComplete = obj => { onComplete = obj => {
const me = this; const me = this;
if (!obj.isForceParent) { if (!obj.isForceParent) {
obj.on('click', evt => { obj.on('click', evt => {
if (this.state.editFlag === false) { if (this.state.editFlag == false) {
console.log('obj click:', evt); console.log('obj click:', evt);
// this.focusPosition(evt.pickedPosition); // this.focusPosition(evt.pickedPosition);
me.outlineFactory.toggleOutline(evt.object); me.outlineFactory.toggleOutline(evt.object);
me.focusObject(evt.object); me.focusObject(evt.object);
} }
}); });
} }
// 处理跳跃 // 处理跳跃
...@@ -537,19 +541,19 @@ class View3D extends Component { ...@@ -537,19 +541,19 @@ class View3D extends Component {
} }
}; };
getPointList = () => { getPointList = () => {
let { markers } = this.state; let { markers } = this.state
getPointListAction().then(data => { getPointListAction().then(data => {
for (let i = 0; i < data.length;i++){ for (let i = 0; i < data.length;i++){
markers[data[i].type].push(data[i]); markers[data[i].type].push(data[i])
} }
this.setState({ markers }); this.setState({markers})
}); })
} }
startDrow = (areaItem) => { startDrow = (areaItem) => {
// this.a3dRef.addPen(); // this.a3dRef.addPen();
console.log('drow--------'); console.log('drow--------')
this.drowItem = areaItem; this.drowItem = areaItem;
this.addPen(areaItem.id); this.addPen(areaItem.id)
} }
addPen(areaKey) { addPen(areaKey) {
let params = { "displayName": "进攻线路", "thumb": "/a3dres/images/pathline/line-attack.png", "descr": "", "objParam": null, "type": "pen" } let params = { "displayName": "进攻线路", "thumb": "/a3dres/images/pathline/line-attack.png", "descr": "", "objParam": null, "type": "pen" }
...@@ -749,6 +753,7 @@ class View3D extends Component { ...@@ -749,6 +753,7 @@ class View3D extends Component {
selectPointChange = (selectPoints) => { selectPointChange = (selectPoints) => {
this.setState({ this.setState({
selectPoints, selectPoints,
positionxyz:selectPoints.position3d && selectPoints.position3d.split(","),
showRightPanel: true showRightPanel: true
}); });
} }
...@@ -842,10 +847,8 @@ class View3D extends Component { ...@@ -842,10 +847,8 @@ class View3D extends Component {
}); });
} }
} }
savePointListAction(paramsArr).then(data => { savePointListAction(paramsArr).then(data => {
getPointTreeAction(pointType).then(data => { getPointTreeAction(pointType).then(data => {
this.setState({ this.setState({
treeData: data || [], treeData: data || [],
pageType: 'point', pageType: 'point',
...@@ -979,12 +982,17 @@ class View3D extends Component { ...@@ -979,12 +982,17 @@ class View3D extends Component {
drop = (event) => { drop = (event) => {
event.preventDefault(); event.preventDefault();
const { dragItem,markers } = this.state; let { dragItem,markers } = this.state;
//alert(JSON.stringify(dragItem));
if (dragItem) { if (dragItem) {
if (dragItem.isBind) { if (dragItem.isBind) {
this.toastWarningInfo('只能放置未绑定的标记点'); this.tipMsg = '只能放置未绑定的标记点'
this.setState({
simpleTipVisible: true
});
return false; return false;
} }
} }
const objs = this.a3dRef.pickerCoordinate(event.clientX, event.clientY, null, true); const objs = this.a3dRef.pickerCoordinate(event.clientX, event.clientY, null, true);
let position; let position;
...@@ -992,9 +1000,13 @@ class View3D extends Component { ...@@ -992,9 +1000,13 @@ class View3D extends Component {
position = objs[0].point; position = objs[0].point;
} }
const isInside = this.polygonRegion[dragItem.parentId].pointInPolygon([position.x,position.y,position.z]) const isInside = this.polygonRegion[dragItem.parentId].pointInPolygon([position.x,position.y,position.z])
console.log(isInside);
if (dragItem) { if (dragItem) {
if (isInside === false) { if (isInside === false) {
this.toastWarningInfo('只能放置在当前区域'); this.tipMsg = '只能放置在当前区域';
this.setState({
simpleTipVisible: true
});
return false; return false;
} }
let uid = UUID.uuidFast(); let uid = UUID.uuidFast();
...@@ -1024,14 +1036,6 @@ class View3D extends Component { ...@@ -1024,14 +1036,6 @@ class View3D extends Component {
this.props.editModelChange(false); this.props.editModelChange(false);
} }
toastWarningInfo =(content)=>{
Toast.warning({
title: '警告',
content,
placement: 'topMiddle'
});
}
editButtonClick = () => { editButtonClick = () => {
let { editFlag } = this.state; let { editFlag } = this.state;
if (editFlag === true) { if (editFlag === true) {
...@@ -1056,6 +1060,12 @@ class View3D extends Component { ...@@ -1056,6 +1060,12 @@ class View3D extends Component {
} }
} }
simpleTipOk = () => {
this.setState({
simpleTipVisible: false
});
}
changeMarkerType = (item, isCancel) => { changeMarkerType = (item, isCancel) => {
const { markers } = this.state; const { markers } = this.state;
if (item.isLine) { if (item.isLine) {
...@@ -1336,7 +1346,39 @@ class View3D extends Component { ...@@ -1336,7 +1346,39 @@ class View3D extends Component {
setHeaderName =(name)=>{ setHeaderName =(name)=>{
this.setState({ headerName: name }); this.setState({ headerName: name });
} }
markerCreated = (markersCache) => {
this.markersCache = markersCache;
};
prevProcessTarget = (object) => {
// 处理 target 元素,只有标识了 isMarkerRoot 的 Object3D 才是真实的 marker root 元素, 同时为其注入了 `extData`
const target = object.getBusinessNode(obj => obj.isMarkerRoot);
if (target){
return target;
}
// 非法元素
return object;
}
addMarker=({extData,position})=>{
let {markers} =this.state
let paramsArr = [{
pointId: extData.id,
pointType: extData.type,
position3d: `${position.toArray()[0]},${position.toArray()[1]},${position.toArray()[2]}`
}];
console.log(paramsArr)
savePointListAction(paramsArr).then(data => {
getPointTreeAction(extData.type).then(data => {
this.setState({
treeData: data || [],
pageType: 'point',
showRightPanel: false
});
});
})
this.setState({positionxyz:position.toArray()})
}
render() { render() {
const { const {
objs, objs,
...@@ -1354,7 +1396,8 @@ class View3D extends Component { ...@@ -1354,7 +1396,8 @@ class View3D extends Component {
sideControlShow, sideControlShow,
isShowActionBar, isShowActionBar,
headerName, headerName,
errorAreaId errorAreaId,
positionxyz
} = this.state; } = this.state;
const { dimension, hiddenScreenSaver, editModelChange } = this.props; const { dimension, hiddenScreenSaver, editModelChange } = this.props;
const graphicProps = { const graphicProps = {
...@@ -1392,14 +1435,6 @@ class View3D extends Component { ...@@ -1392,14 +1435,6 @@ class View3D extends Component {
firePosition = { x: -90.827, y: 30.4577, z: 1.0839 }; firePosition = { x: -90.827, y: 30.4577, z: 1.0839 };
} }
const shadowLight = {
castShadow: true,
shadowMapWidth: 1024 * 4,
shadowMapHeight: 1024 * 4,
intensity: 0.5,
distance: 0,
decay: 2
};
return ( return (
<div className='ModuleEditPage'> <div className='ModuleEditPage'>
<div <div
...@@ -1444,10 +1479,10 @@ class View3D extends Component { ...@@ -1444,10 +1479,10 @@ class View3D extends Component {
penProps={penProps} penProps={penProps}
enablePositionCtl enablePositionCtl
positionCtlProps={positionCtlProps} positionCtlProps={positionCtlProps}
onCreated={this.onGraphCreated}
> >
<PointLight {...shadowLight} position={[100, 200, 50]} /> {startAsyncLoad && <WorkerObjContent objs={asyncModels} onWorkerMessage={this.onWorkerLoading} enableLoading afterInit={this.onAfterWorkerInit} />}
{startAsyncLoad && <WorkerObjContent objs={asyncModels} onAllDone={this.workerLoadComplete} onWorkerMessage={this.onWorkerLoading} enableLoading afterInit={this.onAfterWorkerInit} />} {editFlag && pageType === 'region' ? '' : <PointsPool markers={markers} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot} positionCtl={this.positionCtl} addMarker={this.addMarker}/>}
{editFlag && pageType === 'region' ? '' : <PointsPool markers={markers} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot} />}
{fireTruckRoute && <FatLine {...lineData.fatLineConf} linePath={JSON.parse(fireTruckRoute)} visible={showFireTruckRoute} />} {fireTruckRoute && <FatLine {...lineData.fatLineConf} linePath={JSON.parse(fireTruckRoute)} visible={showFireTruckRoute} />}
<FlameFire position={firePosition} width={10} height={20} depth={8} sliceSpacing={1} visible={planStarted} /> <FlameFire position={firePosition} width={10} height={20} depth={8} sliceSpacing={1} visible={planStarted} />
{editFlag && this.renderAreas()} {editFlag && this.renderAreas()}
...@@ -1493,11 +1528,19 @@ class View3D extends Component { ...@@ -1493,11 +1528,19 @@ class View3D extends Component {
showRightPanel && pageType === 'region' ? <RightEditRegionPanel detailData={selectArea} closeRightPanel={()=>this.setState({showRightPanel:false})}/> : '' showRightPanel && pageType === 'region' ? <RightEditRegionPanel detailData={selectArea} closeRightPanel={()=>this.setState({showRightPanel:false})}/> : ''
} }
{ {
showRightPanel && pageType === 'point' ? <RightEditPointPanel detailData={selectPoints} closeRightPanel={()=>this.setState({showRightPanel:false})}/> : '' showRightPanel && pageType === 'point' ? <RightEditPointPanel detailData={selectPoints} positionxyz={positionxyz} closeRightPanel={()=>this.setState({showRightPanel:false})}/> : ''
} }
</div> </div>
</div> </div>
} }
<Modal
className='moduleEditMadel simpleTip'
header="基本模态框"
visible={this.state.simpleTipVisible}
noDefaultHeader
onOk={this.simpleTipOk}
content={<div>{this.tipMsg}</div>}
/>
</div> </div>
); );
} }
......
...@@ -197,7 +197,7 @@ class PointLeftTree extends Component { ...@@ -197,7 +197,7 @@ class PointLeftTree extends Component {
<Select onChange={this.onSelectChange} defaultValue={pointType} className='leftSelect'> <Select onChange={this.onSelectChange} defaultValue={pointType} className='leftSelect'>
{ {
pointTypeArr.map(item => { pointTypeArr.map(item => {
return (<Option value={item.code}>{item.name}</Option>) return (<Option value={item.code} >{item.name}</Option>)
}) })
} }
</Select> </Select>
......
...@@ -93,8 +93,8 @@ class RightEditPointPanel extends Component { ...@@ -93,8 +93,8 @@ class RightEditPointPanel extends Component {
} }
render() { render() {
let { rules, form,pointTypeArr,pointType ,detailData} = this.state; let { rules, form,pointTypeArr,pointType ,detailData,} = this.state;
let { pageType } = this.props; let { pageType,positionxyz } = this.props;
let radio = detailData.isIndoor ? "prop1":"prop2" let radio = detailData.isIndoor ? "prop1":"prop2"
let position = (detailData.position3d) && detailData.position3d.split(",") let position = (detailData.position3d) && detailData.position3d.split(",")
const formItemLayout = { const formItemLayout = {
...@@ -164,17 +164,17 @@ class RightEditPointPanel extends Component { ...@@ -164,17 +164,17 @@ class RightEditPointPanel extends Component {
<div className='position'> <div className='position'>
<div className='positionItem'> <div className='positionItem'>
<FormItem label="X" field="positionX" {...formItemLayout}> <FormItem label="X" field="positionX" {...formItemLayout}>
<Input value={position && position[0]} /> <Input value={positionxyz && positionxyz[0]} />
</FormItem> </FormItem>
</div> </div>
<div className='positionItem'> <div className='positionItem'>
<FormItem label="Y" field="positionY" {...formItemLayout}> <FormItem label="Y" field="positionY" {...formItemLayout}>
<Input value={position && position[1]} /> <Input value={positionxyz && positionxyz[1]} />
</FormItem> </FormItem>
</div> </div>
<div className='positionItem'> <div className='positionItem'>
<FormItem label="Z" field="positionZ" {...formItemLayout}> <FormItem label="Z" field="positionZ" {...formItemLayout}>
<Input value={position && position[2]} /> <Input value={positionxyz && positionxyz[2]} />
</FormItem> </FormItem>
</div> </div>
</div> </div>
......
...@@ -76,7 +76,6 @@ class RightEditRegionPanel extends Component { ...@@ -76,7 +76,6 @@ class RightEditRegionPanel extends Component {
handleSubmit = (e) => { handleSubmit = (e) => {
// e.preventDefault(); // e.preventDefault();
this.form.validate((valid, dataValues, errors) => { this.form.validate((valid, dataValues, errors) => {
alert(JSON.stringify(dataValues))
console.log('返回内容:', dataValues, valid, errors); console.log('返回内容:', dataValues, valid, errors);
if (valid) { if (valid) {
//AmosAlert.success('结果', JSON.stringify(dataValues)); //AmosAlert.success('结果', JSON.stringify(dataValues));
......
...@@ -70,18 +70,22 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -70,18 +70,22 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
if(marker.object2DPipe){ if(marker.object2DPipe){
marker.object2DPipe.pipeNode.visible = true; marker.object2DPipe.pipeNode.visible = true;
marker.object2DPipe.pipeNode.elementVisible = true; marker.object2DPipe.pipeNode.elementVisible = true;
marker.object2DPipe.toggleDisplay(true);
} }
if(marker.extData.type === 'riskSource'){ if(marker.extData.type === 'riskSource'){
marker.node.baseObjHelper.title = marker.extData.name; marker.node.baseObjHelper.title = marker.extData.name;
marker.object2DPipe && marker.object2DPipe.toggleDisplay(true);
} }
}, },
mouseout: (marker) => { mouseout: (marker) => {
if(marker.object2DPipe){ if(marker.object2DPipe){
marker.object2DPipe.pipeNode.visible = false; marker.object2DPipe.pipeNode.visible = false;
marker.object2DPipe.pipeNode.elementVisible = false; marker.object2DPipe.pipeNode.elementVisible = false;
marker.object2DPipe.toggleDisplay(false);
} }
if(marker.extData.type === 'riskSource'){ if(marker.extData.type === 'riskSource'){
marker.node.baseObjHelper.title = marker.extData.title; marker.node.baseObjHelper.title = marker.extData.title;
marker.object2DPipe.toggleDisplay(false);
} }
} }
}; };
...@@ -97,7 +101,13 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -97,7 +101,13 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
componentWillReceiveProps = nextProps => { componentWillReceiveProps = nextProps => {
this.setState({ planStarted: nextProps.planStarted }); this.setState({ planStarted: nextProps.planStarted });
} }
onEditorChangeDone = (evt) => {
if (evt && evt.target && evt.target.object){
const marker = evt.target.object;
//alert(marker.position.toArray());//(marker.extData
this.props.addMarker(marker)
}
}
componentWillUnmount() { componentWillUnmount() {
this.objAnchorHelper && this.objAnchorHelper.destroy(); this.objAnchorHelper && this.objAnchorHelper.destroy();
} }
...@@ -122,7 +132,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -122,7 +132,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
return false return false
} }
tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData }); tirggerPlanTopic(CONSTS.plan_detail, { type: marker.extData.type, data: marker.extData });
if (isClick) { if (isClick) {
this.setState({ isClick: false }); //将isClick 变成false,将不会执行处理事件 this.setState({ isClick: false }); //将isClick 变成false,将不会执行处理事件
// this.pdRef && this.pdRef.onOpenClick(marker); // this.pdRef && this.pdRef.onOpenClick(marker);
...@@ -139,6 +149,13 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -139,6 +149,13 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
markerCreated = ({ markersCache }) => { markerCreated = ({ markersCache }) => {
this.markersCache = markersCache; this.markersCache = markersCache;
this.props.positionCtl && this.props.positionCtl.addListener('changeDone', this.onEditorChangeDone);
// 拖拽过程即刻改变line
this.props.positionCtl &&this.props.positionCtl.addListener('objectChange', this.onEditorChange);
// 绑定 positionCtl
this.props.positionCtl && this.markersCache.eachValue(item => {
this.props.positionCtl.addObjects(item.node);
});
this.stagePilot = this.props.stagePilot; this.stagePilot = this.props.stagePilot;
this.outlineHelper = this.stagePilot ? this.stagePilot.outlineHelper : undefined; this.outlineHelper = this.stagePilot ? this.stagePilot.outlineHelper : undefined;
markersCache.eachValue(obj=>{ markersCache.eachValue(obj=>{
...@@ -185,7 +202,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -185,7 +202,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
imgHeight: 128, imgHeight: 128,
// image: markerTitleBgMapper['quanjing'] // image: markerTitleBgMapper['quanjing']
}; };
if(type === 'riskSource'){ if(type === 'riskSource'){
cardTitle = '风险值' + title cardTitle = '风险值' + title
}else{ }else{
cardTitle = title ? title : name; cardTitle = title ? title : name;
......
...@@ -95,9 +95,9 @@ export default function markerFactory(WrappedComponent = 'div', options){ ...@@ -95,9 +95,9 @@ export default function markerFactory(WrappedComponent = 'div', options){
return <MarkerIcon {...extData} markerType={markerType} />; return <MarkerIcon {...extData} markerType={markerType} />;
} }
} }
markerCreated = ({ markersCache }) => { markerCreated = ({ markersCache }) => {
this.markersCache = markersCache; this.markersCache = markersCache;
}; };
render() { render() {
const { markers } = this.props; const { markers } = this.props;
const { planStarted } = this.state; const { planStarted } = this.state;
......
{
"header": {
"reportVersion": 1,
"event": "Allocation failed - JavaScript heap out of memory",
"trigger": "FatalError",
"filename": "report.20200529.113449.25296.0.001.json",
"dumpEventTime": "2020-05-29T11:34:49Z",
"dumpEventTimeStamp": "1590723289573",
"processId": 25296,
"cwd": "G:\\workSpace\\amos-station-module-view",
"commandLine": [
"node",
"G:\\workSpace\\amos-station-module-view\\node_modules\\.bin\\\\..\\webpack-dev-server\\bin\\webpack-dev-server.js"
],
"nodejsVersion": "v12.16.1",
"wordSize": 64,
"arch": "x64",
"platform": "win32",
"componentVersions": {
"node": "12.16.1",
"v8": "7.8.279.23-node.31",
"uv": "1.34.0",
"zlib": "1.2.11",
"brotli": "1.0.7",
"ares": "1.15.0",
"modules": "72",
"nghttp2": "1.40.0",
"napi": "5",
"llhttp": "2.0.4",
"http_parser": "2.9.3",
"openssl": "1.1.1d",
"cldr": "35.1",
"icu": "64.2",
"tz": "2019c",
"unicode": "12.1"
},
"release": {
"name": "node",
"lts": "Erbium",
"headersUrl": "https://nodejs.org/download/release/v12.16.1/node-v12.16.1-headers.tar.gz",
"sourceUrl": "https://nodejs.org/download/release/v12.16.1/node-v12.16.1.tar.gz",
"libUrl": "https://nodejs.org/download/release/v12.16.1/win-x64/node.lib"
},
"osName": "Windows_NT",
"osRelease": "10.0.18362",
"osVersion": "Windows 10 Pro",
"osMachine": "x86_64",
"cpus": [
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 20572046,
"nice": 0,
"sys": 28603921,
"idle": 327093406,
"irq": 16140968
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 51583546,
"nice": 0,
"sys": 11053140,
"idle": 313632296,
"irq": 443890
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 31699750,
"nice": 0,
"sys": 7315750,
"idle": 337253500,
"irq": 152640
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 28976140,
"nice": 0,
"sys": 6496609,
"idle": 340796250,
"irq": 134843
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 22962484,
"nice": 0,
"sys": 6654750,
"idle": 346651734,
"irq": 111609
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 24190296,
"nice": 0,
"sys": 7057765,
"idle": 345020921,
"irq": 149359
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 23859796,
"nice": 0,
"sys": 7865531,
"idle": 344543656,
"irq": 122921
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 28429437,
"nice": 0,
"sys": 10696578,
"idle": 337142968,
"irq": 147078
}
],
"networkInterfaces": [
{
"name": "以太网",
"internal": false,
"mac": "e4:54:e8:bc:0c:f8",
"address": "fe80::fc0b:6bad:6f5:3715",
"netmask": "ffff:ffff:ffff:ffff::",
"family": "IPv6",
"scopeid": 9
},
{
"name": "以太网",
"internal": false,
"mac": "e4:54:e8:bc:0c:f8",
"address": "172.16.3.26",
"netmask": "255.255.0.0",
"family": "IPv4"
},
{
"name": "Loopback Pseudo-Interface 1",
"internal": true,
"mac": "00:00:00:00:00:00",
"address": "::1",
"netmask": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
"family": "IPv6",
"scopeid": 0
},
{
"name": "Loopback Pseudo-Interface 1",
"internal": true,
"mac": "00:00:00:00:00:00",
"address": "127.0.0.1",
"netmask": "255.0.0.0",
"family": "IPv4"
}
],
"host": "DESKTOP-KKH52JE"
},
"javascriptStack": {
"message": "No stack.",
"stack": [
"Unavailable."
]
},
"nativeStack": [
{
"pc": "0x00007ff7657119f9",
"symbol": "std::basic_ostream<char,std::char_traits<char> >::operator<<+10873"
},
{
"pc": "0x00007ff765715e1c",
"symbol": "std::basic_ostream<char,std::char_traits<char> >::operator<<+28316"
},
{
"pc": "0x00007ff765714dd8",
"symbol": "std::basic_ostream<char,std::char_traits<char> >::operator<<+24152"
},
{
"pc": "0x00007ff7658134cb",
"symbol": "v8::base::CPU::has_sse+38363"
},
{
"pc": "0x00007ff766029f4e",
"symbol": "v8::Isolate::ReportExternalAllocationLimitReached+94"
},
{
"pc": "0x00007ff766012021",
"symbol": "v8::SharedArrayBuffer::Externalize+833"
},
{
"pc": "0x00007ff765ede57c",
"symbol": "v8::internal::Heap::EphemeronKeyWriteBarrierFromCode+1436"
},
{
"pc": "0x00007ff765ee97d0",
"symbol": "v8::internal::Heap::ProtectUnprotectedMemoryChunks+1312"
},
{
"pc": "0x00007ff765ee62f4",
"symbol": "v8::internal::Heap::PageFlagsAreConsistent+3204"
},
{
"pc": "0x00007ff765edbb13",
"symbol": "v8::internal::Heap::CollectGarbage+1283"
},
{
"pc": "0x00007ff765eda184",
"symbol": "v8::internal::Heap::AddRetainedMap+2452"
},
{
"pc": "0x00007ff765efb36d",
"symbol": "v8::internal::Factory::NewFillerObject+61"
},
{
"pc": "0x00007ff765c60c51",
"symbol": "v8::internal::interpreter::JumpTableTargetOffsets::iterator::operator=+1665"
},
{
"pc": "0x00007ff766474ddd",
"symbol": "v8::internal::SetupIsolateDelegate::SetupHeap+546637"
},
{
"pc": "0x000002ad7f4adcd9",
"symbol": ""
}
],
"javascriptHeap": {
"totalMemory": 2162216960,
"totalCommittedMemory": 2162216960,
"usedMemory": 2151881152,
"availableMemory": 37726400,
"memoryLimit": 2197815296,
"heapSpaces": {
"read_only_space": {
"memorySize": 262144,
"committedMemory": 262144,
"capacity": 32808,
"used": 32808,
"available": 0
},
"new_space": {
"memorySize": 2097152,
"committedMemory": 2097152,
"capacity": 1047456,
"used": 64,
"available": 1047392
},
"old_space": {
"memorySize": 313147392,
"committedMemory": 313147392,
"capacity": 311422320,
"used": 311422320,
"available": 0
},
"code_space": {
"memorySize": 2527232,
"committedMemory": 2527232,
"capacity": 2059392,
"used": 2026176,
"available": 33216
},
"map_space": {
"memorySize": 7606272,
"committedMemory": 7606272,
"capacity": 2575920,
"used": 2575920,
"available": 0
},
"large_object_space": {
"memorySize": 1835954176,
"committedMemory": 1835954176,
"capacity": 1835279576,
"used": 1835279576,
"available": 0
},
"code_large_object_space": {
"memorySize": 622592,
"committedMemory": 622592,
"capacity": 544288,
"used": 544288,
"available": 0
},
"new_large_object_space": {
"memorySize": 0,
"committedMemory": 0,
"capacity": 1047456,
"used": 0,
"available": 1047456
}
}
},
"resourceUsage": {
"userCpuSeconds": 485.296,
"kernelCpuSeconds": 58.937,
"cpuConsumptionPercent": 0.845568,
"maxRss": 2112184320,
"pageFaults": {
"IORequired": 31050801,
"IONotRequired": 0
},
"fsActivity": {
"reads": 10045,
"writes": 274
}
},
"libuv": [
],
"environmentVariables": {
"=G:": "G:\\workSpace\\amos-station-module-view",
"ALLUSERSPROFILE": "C:\\ProgramData",
"APPDATA": "C:\\Users\\DELL\\AppData\\Roaming",
"ChocolateyInstall": "C:\\ProgramData\\chocolatey",
"ChocolateyLastPathUpdate": "132289007529906412",
"CLASSPATH": ".;C:\\Program Files\\Java\\jdk1.8.0_201\\lib\\dt.jar;C:\\Program Files\\Java\\jdk1.8.0_201\\lib\\tools.jar;",
"COLORTERM": "truecolor",
"CommonProgramFiles": "C:\\Program Files\\Common Files",
"CommonProgramFiles(x86)": "C:\\Program Files (x86)\\Common Files",
"CommonProgramW6432": "C:\\Program Files\\Common Files",
"COMPUTERNAME": "DESKTOP-KKH52JE",
"ComSpec": "C:\\Windows\\system32\\cmd.exe",
"dp0": "G:\\workSpace\\amos-station-module-view\\node_modules\\.bin\\",
"DriverData": "C:\\Windows\\System32\\Drivers\\DriverData",
"GIT_ASKPASS": "c:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\extensions\\git\\dist\\askpass.sh",
"HOME": "C:\\Users\\DELL",
"HOMEDRIVE": "C:",
"HOMEPATH": "\\Users\\DELL",
"INIT_CWD": "G:\\workSpace\\amos-station-module-view",
"JAVA_HOME": "C:\\Program Files\\Java\\jdk1.8.0_201",
"LANG": "zh_CN.UTF-8",
"LOCALAPPDATA": "C:\\Users\\DELL\\AppData\\Local",
"LOGONSERVER": "\\\\DESKTOP-KKH52JE",
"NODE": "F:\\install\\nodejs\\node.exe",
"NODE_ENV": "development ",
"NODE_EXE": "F:\\install\\nodejs\\\\node.exe",
"NODE_PATH": "F:\\install\\nodejs\\node_modules",
"NPM_CLI_JS": "F:\\install\\nodejs\\\\node_modules\\npm\\bin\\npm-cli.js",
"npm_config_access": "",
"npm_config_allow_same_version": "",
"npm_config_also": "",
"npm_config_always_auth": "",
"npm_config_argv": "{\"remain\":[],\"cooked\":[\"start\"],\"original\":[\"start\"]}",
"npm_config_audit": "true",
"npm_config_audit_level": "low",
"npm_config_auth_type": "legacy",
"npm_config_before": "",
"npm_config_bin_links": "true",
"npm_config_browser": "",
"npm_config_ca": "",
"npm_config_cache": "F:\\install\\nodejs\\node_cache",
"npm_config_cache_lock_retries": "10",
"npm_config_cache_lock_stale": "60000",
"npm_config_cache_lock_wait": "10000",
"npm_config_cache_max": "Infinity",
"npm_config_cache_min": "10",
"npm_config_cafile": "",
"npm_config_cert": "",
"npm_config_cidr": "",
"npm_config_color": "true",
"npm_config_commit_hooks": "true",
"npm_config_depth": "Infinity",
"npm_config_description": "true",
"npm_config_dev": "",
"npm_config_dry_run": "",
"npm_config_editor": "notepad.exe",
"npm_config_engine_strict": "",
"npm_config_fetch_retries": "2",
"npm_config_fetch_retry_factor": "10",
"npm_config_fetch_retry_maxtimeout": "60000",
"npm_config_fetch_retry_mintimeout": "10000",
"npm_config_force": "",
"npm_config_format_package_lock": "true",
"npm_config_fund": "true",
"npm_config_git": "git",
"npm_config_git_tag_version": "true",
"npm_config_global": "",
"npm_config_globalconfig": "F:\\install\\nodejs\\node_global\\etc\\npmrc",
"npm_config_globalignorefile": "F:\\install\\nodejs\\node_global\\etc\\npmignore",
"npm_config_global_style": "",
"npm_config_group": "",
"npm_config_ham_it_up": "",
"npm_config_heading": "npm",
"npm_config_https_proxy": "",
"npm_config_if_present": "",
"npm_config_ignore_prepublish": "",
"npm_config_ignore_scripts": "",
"npm_config_init_author_email": "",
"npm_config_init_author_name": "",
"npm_config_init_author_url": "",
"npm_config_init_license": "ISC",
"npm_config_init_module": "C:\\Users\\DELL\\.npm-init.js",
"npm_config_init_version": "1.0.0",
"npm_config_json": "",
"npm_config_key": "",
"npm_config_legacy_bundling": "",
"npm_config_link": "",
"npm_config_local_address": "",
"npm_config_loglevel": "notice",
"npm_config_logs_max": "10",
"npm_config_long": "",
"npm_config_maxsockets": "50",
"npm_config_message": "%s",
"npm_config_metrics_registry": "http://172.16.11.26:9696/",
"npm_config_node_gyp": "F:\\install\\nodejs\\node_modules\\npm\\node_modules\\node-gyp\\bin\\node-gyp.js",
"npm_config_node_options": "",
"npm_config_node_version": "12.16.1",
"npm_config_noproxy": "",
"npm_config_npm_set_registry_http___registry_npm_taobao_org_": "true",
"npm_config_offline": "",
"npm_config_onload_script": "",
"npm_config_only": "",
"npm_config_optional": "true",
"npm_config_otp": "",
"npm_config_package_lock": "",
"npm_config_package_lock_only": "",
"npm_config_parseable": "",
"npm_config_prefer_offline": "",
"npm_config_prefer_online": "",
"npm_config_prefix": "F:\\install\\nodejs\\node_global",
"npm_config_preid": "",
"npm_config_production": "",
"npm_config_progress": "true",
"npm_config_proxy": "",
"npm_config_read_only": "",
"npm_config_rebuild_bundle": "true",
"npm_config_registry": "http://172.16.11.26:9696/",
"npm_config_rollback": "true",
"npm_config_sass_binary_site": "http://172.16.11.26:8888/node-sass",
"npm_config_save": "",
"npm_config_save_bundle": "",
"npm_config_save_dev": "",
"npm_config_save_exact": "",
"npm_config_save_optional": "",
"npm_config_save_prefix": "^",
"npm_config_save_prod": "",
"npm_config_scope": "",
"npm_config_scripts_prepend_node_path": "warn-only",
"npm_config_script_shell": "",
"npm_config_searchexclude": "",
"npm_config_searchlimit": "20",
"npm_config_searchopts": "",
"npm_config_searchstaleness": "900",
"npm_config_send_metrics": "",
"npm_config_shell": "C:\\Windows\\system32\\cmd.exe",
"npm_config_shrinkwrap": "true",
"npm_config_sign_git_commit": "",
"npm_config_sign_git_tag": "",
"npm_config_sso_poll_frequency": "500",
"npm_config_sso_type": "oauth",
"npm_config_strict_ssl": "true",
"npm_config_tag": "latest",
"npm_config_tag_version_prefix": "v",
"npm_config_timing": "",
"npm_config_tmp": "C:\\Users\\DELL\\AppData\\Local\\Temp",
"npm_config_umask": "0000",
"npm_config_unicode": "",
"npm_config_unsafe_perm": "true",
"npm_config_update_notifier": "true",
"npm_config_usage": "",
"npm_config_user": "",
"npm_config_userconfig": "C:\\Users\\DELL\\.npmrc",
"npm_config_user_agent": "npm/6.13.4 node/v12.16.1 win32 x64",
"npm_config_version": "",
"npm_config_versions": "",
"npm_config_viewer": "browser",
"npm_execpath": "F:\\install\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",
"npm_lifecycle_event": "start",
"npm_lifecycle_script": "set NODE_ENV=development && webpack-dev-server",
"npm_node_execpath": "F:\\install\\nodejs\\node.exe",
"npm_package_author_name": "ilex.h",
"npm_package_dependencies_amos_3d": "^2.x",
"npm_package_dependencies_amos_designer": "^1.x",
"npm_package_dependencies_amos_viz": "^1.x",
"npm_package_dependencies_amos_websocket": "^1.0.3",
"npm_package_dependencies_ray_hotkeys": "^1.0.0",
"npm_package_devDependencies_amos_build": "^3.x",
"npm_package_devDependencies_amos_framework": "^1.x",
"npm_package_devDependencies_amos_iot_3dgraph": "^1.0.3",
"npm_package_devDependencies_amos_iot_webstudio": "^1.x",
"npm_package_devDependencies_amos_processor": "^2.x",
"npm_package_devDependencies_amos_security": "^2.x",
"npm_package_devDependencies_eslint_config_ray": "^1.0.25",
"npm_package_devDependencies_ray_code_split": "^1.0.1",
"npm_package_devDependencies_ray_mediaquery": "^1.0.0",
"npm_package_devDependencies_ray_progress": "^1.0.0",
"npm_package_devDependencies_react": "~16.0.0",
"npm_package_devDependencies_react_dom": "~16.0.0",
"npm_package_devDependencies_stylelint_config_ray": "^2.0.0",
"npm_package_gitHead": "597a66d24654dad0b3ce8733f837a9e6aca4638e",
"npm_package_main": "./lib/index.js",
"npm_package_name": "amos-station-module-view",
"npm_package_publishConfig_registry": "http://172.16.11.26:9696",
"npm_package_readmeFilename": "readme.md",
"npm_package_scripts_build": "ray-build react && ray-build stylescss",
"npm_package_scripts_clean": "rimraf lib dist released",
"npm_package_scripts_lint": "eslint src tests",
"npm_package_scripts_lint_fix": "npm run lint -- --fix",
"npm_package_scripts_pub": "npm run build && amos-run dllreleased",
"npm_package_scripts_start": "set NODE_ENV=development && webpack-dev-server",
"npm_package_scripts_stylelint": "stylelint src",
"npm_package_scripts_watch": "webpack -w",
"npm_package_version": "1.0.0",
"NPM_PREFIX_NPM_CLI_JS": "F:\\install\\nodejs\\node_global\\node_modules\\npm\\bin\\npm-cli.js",
"NUMBER_OF_PROCESSORS": "8",
"NVM_HOME": "C:\\Users\\DELL\\AppData\\Roaming\\nvm",
"NVM_SYMLINK": "C:\\Program Files\\nodejs",
"OneDrive": "C:\\Users\\DELL\\OneDrive",
"OS": "Windows_NT",
"Path": "F:\\install\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;G:\\workSpace\\amos-station-module-view\\node_modules\\.bin;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;D:\\Program Files\\Git\\cmd;C:\\Program Files\\TortoiseGit\\bin;C:\\Users\\DELL\\AppData\\Roaming\\nvm;C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;C:\\Program Files\\TortoiseSVN\\bin;C:\\ProgramData\\chocolatey\\bin;F:\\install\\nodejs\\node_global;F:\\install\\Python27;C:\\Program Files\\Java\\jdk1.8.0_201\\bin;F:\\install\\nodejs\\;C:\\Users\\DELL\\AppData\\Local\\Microsoft\\WindowsApps;\"C:\\Program Files\\Java\\jdk1.8.0_201\\bin;C:\\Program Files\\Java\\jdk1.8.0_201\\jre\\bin\";C:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\Users\\DELL\\AppData\\Roaming\\nvm;C:\\Program Files\\nodejs;D:\\develop\\nodejs\\node_global;C:\\Users\\DELL\\AppData\\Roaming\\npm",
"PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC;.CPL",
"PROCESSOR_ARCHITECTURE": "AMD64",
"PROCESSOR_IDENTIFIER": "Intel64 Family 6 Model 158 Stepping 13, GenuineIntel",
"PROCESSOR_LEVEL": "6",
"PROCESSOR_REVISION": "9e0d",
"ProgramData": "C:\\ProgramData",
"ProgramFiles": "C:\\Program Files",
"ProgramFiles(x86)": "C:\\Program Files (x86)",
"ProgramW6432": "C:\\Program Files",
"PROMPT": "$P$G",
"PSModulePath": "C:\\Users\\DELL\\Documents\\WindowsPowerShell\\Modules;C:\\Program Files\\WindowsPowerShell\\Modules;C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules",
"PUBLIC": "C:\\Users\\Public",
"SESSIONNAME": "Console",
"SystemDrive": "C:",
"SystemRoot": "C:\\Windows",
"TEMP": "C:\\Users\\DELL\\AppData\\Local\\Temp",
"TERM_PROGRAM": "vscode",
"TERM_PROGRAM_VERSION": "1.45.1",
"TMP": "C:\\Users\\DELL\\AppData\\Local\\Temp",
"USERDOMAIN": "DESKTOP-KKH52JE",
"USERDOMAIN_ROAMINGPROFILE": "DESKTOP-KKH52JE",
"USERNAME": "DELL",
"USERPROFILE": "C:\\Users\\DELL",
"VSCODE_GIT_ASKPASS_MAIN": "c:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\extensions\\git\\dist\\askpass-main.js",
"VSCODE_GIT_ASKPASS_NODE": "C:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\Code.exe",
"VSCODE_GIT_IPC_HANDLE": "\\\\.\\pipe\\vscode-git-11879c72ba-sock",
"windir": "C:\\Windows",
"_prog": "node"
},
"sharedObjects": [
"F:\\install\\nodejs\\node.exe",
"C:\\Windows\\SYSTEM32\\ntdll.dll",
"C:\\Windows\\System32\\KERNEL32.DLL",
"C:\\Windows\\System32\\KERNELBASE.dll",
"C:\\Windows\\System32\\WS2_32.dll",
"C:\\Windows\\System32\\RPCRT4.dll",
"C:\\Windows\\System32\\PSAPI.DLL",
"C:\\Windows\\System32\\ADVAPI32.dll",
"C:\\Windows\\System32\\msvcrt.dll",
"C:\\Windows\\System32\\sechost.dll",
"C:\\Windows\\SYSTEM32\\dbghelp.dll",
"C:\\Windows\\System32\\ucrtbase.dll",
"C:\\Windows\\System32\\USER32.dll",
"C:\\Windows\\System32\\win32u.dll",
"C:\\Windows\\System32\\GDI32.dll",
"C:\\Windows\\System32\\gdi32full.dll",
"C:\\Windows\\SYSTEM32\\IPHLPAPI.DLL",
"C:\\Windows\\System32\\msvcp_win.dll",
"C:\\Windows\\SYSTEM32\\USERENV.dll",
"C:\\Windows\\System32\\CRYPT32.dll",
"C:\\Windows\\System32\\MSASN1.dll",
"C:\\Windows\\System32\\profapi.dll",
"C:\\Windows\\System32\\bcrypt.dll",
"C:\\Windows\\SYSTEM32\\WINMM.dll",
"C:\\Windows\\SYSTEM32\\winmmbase.dll",
"C:\\Windows\\System32\\cfgmgr32.dll",
"C:\\Windows\\System32\\bcryptPrimitives.dll",
"C:\\Windows\\System32\\IMM32.DLL",
"C:\\Windows\\System32\\powrprof.dll",
"C:\\Windows\\System32\\UMPDC.dll",
"C:\\Windows\\SYSTEM32\\CRYPTBASE.DLL",
"C:\\Windows\\system32\\uxtheme.dll",
"C:\\Windows\\System32\\combase.dll",
"C:\\Windows\\system32\\mswsock.dll",
"C:\\Windows\\System32\\kernel.appcore.dll",
"C:\\Windows\\System32\\NSI.dll",
"C:\\Windows\\SYSTEM32\\dhcpcsvc6.DLL",
"C:\\Windows\\SYSTEM32\\dhcpcsvc.DLL",
"C:\\Windows\\SYSTEM32\\DNSAPI.dll",
"\\\\?\\G:\\workSpace\\amos-station-module-view\\node_modules\\node-sass\\vendor\\win32-x64-72\\binding.node",
"C:\\Windows\\system32\\napinsp.dll",
"C:\\Windows\\system32\\pnrpnsp.dll",
"C:\\Windows\\System32\\winrnr.dll",
"C:\\Windows\\system32\\NLAapi.dll",
"C:\\Windows\\system32\\wshbth.dll"
]
}
\ No newline at end of file
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