Skip to content

A
amos-station-module-view
Commit dbda573f authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.更换重点设备模式图片为2的n次方

2.调整index.json模型的默认视角级及平面视图角度由json配置，如无配置使用默认的
parent 3851f14e
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 77 deletions
example/entry.js
View file @ dbda573f
...@@ -20,16 +20,10 @@ const mockData = { ...@@ -20,16 +20,10 @@ const mockData = {
class App extends Component { class App extends Component {
render() { render() {
const Photo = getSketchCompnents('photo');
const ConvertorView3DRoot = getSketchCompnents('convertorView3DRoot'); const ConvertorView3DRoot = getSketchCompnents('convertorView3DRoot');
const PanoramicLeft = getSketchCompnents('panoramicLeft');
const PanoramicRight = getSketchCompnents('panoramicRight');
return ( return (
<div> <div>
{/* <PanoramicLeft /> */}
<ConvertorView3DRoot /> <ConvertorView3DRoot />
{/* <PanoramicRight /> */}
</div> </div>
); );
} }
......
mods/components/3dviewConvertor/consts/imgStatic.js
View file @ dbda573f
export default { export default {
panoramicIcon: { panoramicIcon: {
safetyrate: require('../assets/panoramic/main_icon_safetyrate.png'), safetyrate: require('../assets/panoramic/main_icon_safetyrate.png'),
safetyup: require('../assets/panoramic/main_icon_up.png'), safetyup: require('../assets/panoramic/main_icon_up.png'),
...@@ -91,7 +89,6 @@ export default { ...@@ -91,7 +89,6 @@ export default {
croom_0: require('../assets/convertor/3dview/markers/croom-0.png'), croom_0: require('../assets/convertor/3dview/markers/croom-0.png'),
croom_1: require('../assets/convertor/3dview/markers/croom-1.png'), croom_1: require('../assets/convertor/3dview/markers/croom-1.png'),
hydrant: require('../assets/convertor/3dview/markers/hydrant.png'), hydrant: require('../assets/convertor/3dview/markers/hydrant.png'),
pool: require('../assets/convertor/3dview/markers/pool.png'), pool: require('../assets/convertor/3dview/markers/pool.png'),
fireCar: require('../assets/convertor/3dview/markers/fireCar.png'), fireCar: require('../assets/convertor/3dview/markers/fireCar.png'),
...@@ -110,26 +107,24 @@ export default { ...@@ -110,26 +107,24 @@ 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_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'), impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'),
impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'), impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'),
impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),// impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'), //
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')
}, },
color: { color: {
hydrant: {color: '#f12525'}, hydrant: { color: '#f12525' },
pool: {color: '#f12525'}, pool: { color: '#f12525' },
fireCar: {color: '#ee3b3b'}, fireCar: { color: '#ee3b3b' },
fireEquipment: {color: '#ff8600'}, fireEquipment: { color: '#ff8600' },
fireFoamRoom: {color: '#8b8b8b'}, fireFoamRoom: { color: '#8b8b8b' },
fireChamber: {color: '#ff9100'}, fireChamber: { color: '#ff9100' },
monitorEquipment: {color: '#71ea07'}, monitorEquipment: { color: '#71ea07' },
video: {color: '#ff8700'}, video: { color: '#ff8700' },
impEquipment: {color: '#f42828'}, impEquipment: { color: '#f42828' }
}, },
biz: { biz: {
...@@ -143,8 +138,8 @@ export default { ...@@ -143,8 +138,8 @@ export default {
common: require('../assets/convertor/region/preview.png') common: require('../assets/convertor/region/preview.png')
}, },
pointIcon: { pointIcon: {
offGrade: require('../assets/convertor/3dview/info/offGrade.png'), // 不合格 offGrade: require('../assets/convertor/3dview/info/offGrade.png'), // 不合格
miss: require('../assets/convertor/3dview/info/miss.png'), // 漏检 miss: require('../assets/convertor/3dview/info/miss.png'), // 漏检
// unusual: require('../assets/convertor/3dview/info/unusual.png'), // 异常 // unusual: require('../assets/convertor/3dview/info/unusual.png'), // 异常
task: require('../assets/convertor/3dview/info/task.png') // 任务，超时 task: require('../assets/convertor/3dview/info/task.png') // 任务，超时
}, },
...@@ -155,7 +150,7 @@ export default { ...@@ -155,7 +150,7 @@ export default {
level_3: require('../assets/convertor/3dview/u1751.png'), level_3: require('../assets/convertor/3dview/u1751.png'),
level_4: require('../assets/convertor/3dview/u1667.png'), level_4: require('../assets/convertor/3dview/u1667.png'),
level_5: require('../assets/convertor/3dview/u1667.png'), level_5: require('../assets/convertor/3dview/u1667.png'),
level_0: require('../assets/convertor/3dview/u1751.png'), level_0: require('../assets/convertor/3dview/u1751.png')
}, },
planDetail: { planDetail: {
...@@ -203,7 +198,7 @@ export default { ...@@ -203,7 +198,7 @@ export default {
user: require('../assets/convertor/main/user.png'), user: require('../assets/convertor/main/user.png'),
notice: require('../assets/convertor/main/notice.png'), notice: require('../assets/convertor/main/notice.png'),
setting: require('../assets/convertor/main/setting.png') setting: require('../assets/convertor/main/setting.png')
}, }
}; };
export const marker3DIoncMapper = { export const marker3DIoncMapper = {
...@@ -234,18 +229,15 @@ export const marker3DIoncMapper = { ...@@ -234,18 +229,15 @@ export const marker3DIoncMapper = {
croom_0: require('../threeres/markers/croom-0.png'), croom_0: require('../threeres/markers/croom-0.png'),
croom_1: require('../threeres/markers/croom-1.png'), croom_1: require('../threeres/markers/croom-1.png'),
//重点设备模式 //重点设备模式
impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'), impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'), impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'),
impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'), impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'),
impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),// impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'), //
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')
}; };
export const safetyIndexIconMapper = { export const safetyIndexIconMapper = {
allEror: require('../threeres/markers/exception_all.png'), allEror: require('../threeres/markers/exception_all.png'),
faultEror: require('../threeres/markers/exception_fault.png'), faultEror: require('../threeres/markers/exception_fault.png'),
......
mods/components/3dviewConvertor/services/3dService.js
View file @ dbda573f
...@@ -11,7 +11,7 @@ export const getObjFromNet = (url, callback) => { ...@@ -11,7 +11,7 @@ export const getObjFromNet = (url, callback) => {
const objs = helper.parseModelConfig(data); const objs = helper.parseModelConfig(data);
// 临时将 asyncModels 也放在主线程 // 临时将 asyncModels 也放在主线程
const { basePath, asyncModels = [] } = data; const { basePath, asyncModels = [], desigerHelperConfig } = data;
const _asyncModels = asyncModels.map(m => { const _asyncModels = asyncModels.map(m => {
const { objName, mtlName, ...rest } = m; const { objName, mtlName, ...rest } = m;
return { return {
...@@ -23,7 +23,7 @@ export const getObjFromNet = (url, callback) => { ...@@ -23,7 +23,7 @@ export const getObjFromNet = (url, callback) => {
}); });
// const _objs = objs.concat(_asyncModels); // const _objs = objs.concat(_asyncModels);
callback(objs, _asyncModels); callback(objs, _asyncModels,desigerHelperConfig);
}); });
}; };
......
mods/components/3dviewConvertor/threeres/models/zmd/index.json
View file @ dbda573f
{ {
"sceneName": "station-zmd", "sceneName": "station-zmd",
"basePath": "/mods/components/3dviewConvertor/threeres/models/zmd/", "basePath": "/mods/components/3dviewConvertor/threeres/models/zmd/",
"desigerHelperConfig": {
"cameraEffect": {
"position": [-17.500976988065194, 268.6439579965516, 375.90413768788187],
"target": [-12.74514585941139, -3.804745927065206, 0.9408263291374016]
},
"verticalCameraEffect": {
"position": [2.3815615940156256, 419.57425506421896, 11.965199740306224],
"target": [2.408441971875859, 1.3271790975878637, 3.918674823963386]
}
},
"models": [{ "objName": "building.obj", "mtlName": "building.mtl", "modelLevel": "Building", "models": [{ "objName": "building.obj", "mtlName": "building.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "building", "key": "building",
...@@ -646,25 +656,20 @@ ...@@ -646,25 +656,20 @@
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
} "position": [56.89320100543368, 11.412329598660357, 7.8422674792993945],
"target": [-84.63030384684673, 1.2896430645024852, -39.11169084269889]
} }
}, }
{ "objName": "valve-hall_01.obj", "mtlName": "valve-hall_01.mtl", "modelLevel": "Building", },
"userData": {
"key": "valve-hall_01",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "valve-hall_02.obj", "mtlName": "valve-hall_02.mtl", "modelLevel": "Building", { "objName": "valve-hall_02.obj", "mtlName": "valve-hall_02.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "valve-hall_02", "key": "valve-hall_02",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
} "position": [-36.51001053772929, 14.40190290718119, 34.75144868513701],
"target": [-57.93604514791863, -3.9901598918294336, -36.583352523189845]
}
} }
}, },
{ "objName": "valve-hall_03.obj", "mtlName": "valve-hall_03.mtl", "modelLevel": "Building", { "objName": "valve-hall_03.obj", "mtlName": "valve-hall_03.mtl", "modelLevel": "Building",
...@@ -673,7 +678,9 @@ ...@@ -673,7 +678,9 @@
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
} "position": [-75.3221097450265, 9.42207234314477, -3.170890511127358],
"target": [-99.59150282013933, 4.789862585422077, -5.547811778137931]
}
} }
}, },
{ "objName": "wall.obj", "mtlName": "wall.mtl", "modelLevel": "Building", { "objName": "wall.obj", "mtlName": "wall.mtl", "modelLevel": "Building",
...@@ -687,14 +694,13 @@ ...@@ -687,14 +694,13 @@
} }
], ],
"asyncModels": [ "asyncModels": [
{ "objName": "valve-hall_01#01.obj", "mtlName": "valve-hall_01#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_01", "level": "sub" ,"parentKey": "valve-hall_01"}}, { "objName": "valve-hall_01#01.obj", "mtlName": "valve-hall_01#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_01", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#01.obj", "mtlName": "valve-hall_01#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_01", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#02.obj", "mtlName": "valve-hall_01#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_02", "level": "sub" ,"parentKey": "valve-hall_01"}}, { "objName": "valve-hall_01#02.obj", "mtlName": "valve-hall_01#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_02", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#03.obj", "mtlName": "valve-hall_01#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_03", "level": "sub" ,"parentKey": "valve-hall_01"}}, { "objName": "valve-hall_01#03.obj", "mtlName": "valve-hall_01#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_03", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#04.obj", "mtlName": "valve-hall_01#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_04", "level": "sub" ,"parentKey": "valve-hall_01"}}, { "objName": "valve-hall_01#04.obj", "mtlName": "valve-hall_01#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_04", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#05.obj", "mtlName": "valve-hall_01#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_05", "level": "sub" ,"parentKey": "valve-hall_01"}}, { "objName": "valve-hall_01#05.obj", "mtlName": "valve-hall_01#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_05", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#06.obj", "mtlName": "valve-hall_01#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_06", "level": "sub" ,"parentKey": "valve-hall_01"}}, { "objName": "valve-hall_01#06.obj", "mtlName": "valve-hall_01#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_06", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#tizi.obj", "mtlName": "valve-hall_01#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_tizi", "level": "sub" ,"parentKey": "valve-hall_01"}}, { "objName": "valve-hall_01#tizi.obj", "mtlName": "valve-hall_01#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_tizi", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_02#01.obj", "mtlName": "valve-hall_02#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_01", "level": "sub" ,"parentKey": "valve-hall_02"}}, { "objName": "valve-hall_02#01.obj", "mtlName": "valve-hall_02#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_01", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#02.obj", "mtlName": "valve-hall_02#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_02", "level": "sub" ,"parentKey": "valve-hall_02"}}, { "objName": "valve-hall_02#02.obj", "mtlName": "valve-hall_02#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_02", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#03.obj", "mtlName": "valve-hall_02#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_03", "level": "sub" ,"parentKey": "valve-hall_02"}}, { "objName": "valve-hall_02#03.obj", "mtlName": "valve-hall_02#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_03", "level": "sub" ,"parentKey": "valve-hall_02"}},
...@@ -708,8 +714,7 @@ ...@@ -708,8 +714,7 @@
{ "objName": "valve-hall_02#11.obj", "mtlName": "valve-hall_02#11.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_11", "level": "sub" ,"parentKey": "valve-hall_02"}}, { "objName": "valve-hall_02#11.obj", "mtlName": "valve-hall_02#11.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_11", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#12.obj", "mtlName": "valve-hall_02#12.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_12", "level": "sub" ,"parentKey": "valve-hall_02"}}, { "objName": "valve-hall_02#12.obj", "mtlName": "valve-hall_02#12.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_12", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#tizi.obj", "mtlName": "valve-hall_02#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_tizi", "level": "sub" ,"parentKey": "valve-hall_02"}}, { "objName": "valve-hall_02#tizi.obj", "mtlName": "valve-hall_02#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_tizi", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_03#01.obj", "mtlName": "valve-hall_03#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_01", "level": "sub" ,"parentKey": "valve-hall_03"}}, { "objName": "valve-hall_03#01.obj", "mtlName": "valve-hall_03#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_01", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#01.obj", "mtlName": "valve-hall_03#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_01", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#02.obj", "mtlName": "valve-hall_03#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_02", "level": "sub" ,"parentKey": "valve-hall_03"}}, { "objName": "valve-hall_03#02.obj", "mtlName": "valve-hall_03#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_02", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#03.obj", "mtlName": "valve-hall_03#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_03", "level": "sub" ,"parentKey": "valve-hall_03"}}, { "objName": "valve-hall_03#03.obj", "mtlName": "valve-hall_03#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_03", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#04.obj", "mtlName": "valve-hall_03#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_04", "level": "sub" ,"parentKey": "valve-hall_03"}}, { "objName": "valve-hall_03#04.obj", "mtlName": "valve-hall_03#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_04", "level": "sub" ,"parentKey": "valve-hall_03"}},
......
mods/components/3dviewConvertor/view/ConvertorView3DRoot.js
View file @ dbda573f
...@@ -110,6 +110,6 @@ ConvertorView3DRoot.propTypes = { ...@@ -110,6 +110,6 @@ ConvertorView3DRoot.propTypes = {
subscribe: PropTypes.func, subscribe: PropTypes.func,
trigger: PropTypes.func, trigger: PropTypes.func,
isPermissionControl: PropTypes.bool, isPermissionControl: PropTypes.bool,
bizPerActionBars: PropTypes.arrays bizPerActionBars: PropTypes.object
}; };
export default ConvertorView3DRoot; export default ConvertorView3DRoot;
mods/components/3dviewConvertor/view/View3D.js
View file @ dbda573f
...@@ -150,8 +150,10 @@ class View3D extends Component { ...@@ -150,8 +150,10 @@ class View3D extends Component {
isOutterView: true ,//控制进入层级后是否显示marker isOutterView: true ,//控制进入层级后是否显示marker
isInitModel: false //是否进入模型内部 isInitModel: false //是否进入模型内部
}; };
this.desigerHelperConfig = {};
getObjFromNet(view3dFile, (objs, asyncModels) => { getObjFromNet(view3dFile, (objs, asyncModels,desigerHelperConfig) => {
this.desigerHelperConfig = desigerHelperConfig || {};
this.cameraFactory.fitView(this.getCameraEffectByKey('cameraEffect'));
this.setState({ this.setState({
objs, objs,
asyncModels asyncModels
...@@ -242,7 +244,7 @@ class View3D extends Component { ...@@ -242,7 +244,7 @@ class View3D extends Component {
this.props.trigger(eventTopics.plan_start, { planStarted: false }); this.props.trigger(eventTopics.plan_start, { planStarted: false });
tirggerTransTopic(CONSTS.forward, { details: { type: 'prePlan', show: false }, dateTime: Date.now() }); tirggerTransTopic(CONSTS.forward, { details: { type: 'prePlan', show: false }, dateTime: Date.now() });
removeFireAlarm2(this); removeFireAlarm2(this);
this.cameraFactory.fitView(desigerHelperConfig.cameraEffect); this.cameraFactory.fitView(this.getCameraEffectByKey('cameraEffect'));
this.quitEditMode(); this.quitEditMode();
this.handleExceptModel('out_except_model', ''); this.handleExceptModel('out_except_model', '');
}; };
...@@ -522,8 +524,7 @@ class View3D extends Component { ...@@ -522,8 +524,7 @@ class View3D extends Component {
r3d, r3d,
enbaleAnimation: true, enbaleAnimation: true,
cameraFactory, cameraFactory,
sceneFactory, sceneFactory
cameraEffect: desigerHelperConfig.cameraEffect
}); });
}; };
...@@ -550,6 +551,7 @@ class View3D extends Component { ...@@ -550,6 +551,7 @@ class View3D extends Component {
if (!obj.isForceParent) { if (!obj.isForceParent) {
//单击聚焦 //单击聚焦
obj.on(EVENT_TYPE_CORE.Click, evt => { obj.on(EVENT_TYPE_CORE.Click, evt => {
console.log(me.stagePilot.cameraInfo);
if (this.state.isEditMode === false) { if (this.state.isEditMode === false) {
// this.focusPosition(evt.pickedPosition); // this.focusPosition(evt.pickedPosition);
me.outlineFactory.toggleOutline(evt.object); me.outlineFactory.toggleOutline(evt.object);
...@@ -591,6 +593,11 @@ class View3D extends Component { ...@@ -591,6 +593,11 @@ class View3D extends Component {
}); });
}); });
} }
getCameraEffectByKey = (key)=>{
return this.desigerHelperConfig[key] ? (this.desigerHelperConfig || {})[key] : desigerHelperConfig[key];
}
focusObject = (object)=> { focusObject = (object)=> {
const me = this; const me = this;
if (!me.state.alarmStarted && object) { if (!me.state.alarmStarted && object) {
...@@ -648,8 +655,6 @@ class View3D extends Component { ...@@ -648,8 +655,6 @@ class View3D extends Component {
} }
} }
startDrow = (areaItem) => { startDrow = (areaItem) => {
// this.a3dRef.addPen(m);
console.log('drow--------');
this.setState({ this.setState({
isAreaSave: true, isAreaSave: true,
selectArea: areaItem, selectArea: areaItem,
...@@ -816,8 +821,6 @@ class View3D extends Component { ...@@ -816,8 +821,6 @@ class View3D extends Component {
pathKey: pen._uuidKey, pathKey: pen._uuidKey,
points: pen.getFmtPoints() points: pen.getFmtPoints()
}); });
console.log(pen);
console.log(pen.getFmtPoints());
this.enableDrawPath = false; this.enableDrawPath = false;
} }
} }
...@@ -906,7 +909,6 @@ class View3D extends Component { ...@@ -906,7 +909,6 @@ class View3D extends Component {
} }
renderAreas = () => { renderAreas = () => {
this.areas = []; this.areas = [];
console.log(this.state.treeData);
this.getAreas(this.state.treeData); this.getAreas(this.state.treeData);
return this.areas; return this.areas;
} }
...@@ -918,8 +920,6 @@ class View3D extends Component { ...@@ -918,8 +920,6 @@ class View3D extends Component {
saveAreaDataAction(data).then(d => { saveAreaDataAction(data).then(d => {
message.success('保存成功！'); message.success('保存成功！');
getAreaTreeAction().then(data => { getAreaTreeAction().then(data => {
//console.log(data);
console.log(JSON.stringify(data));
this.setState({ this.setState({
treeData: data || [], treeData: data || [],
routePathData: [] routePathData: []
...@@ -945,8 +945,6 @@ class View3D extends Component { ...@@ -945,8 +945,6 @@ class View3D extends Component {
drawing: false drawing: false
}); });
getAreaTreeAction().then(data => { getAreaTreeAction().then(data => {
//console.log(data);
console.log(JSON.stringify(data));
this.setState({ this.setState({
treeData: data || [], treeData: data || [],
routePathData: [] routePathData: []
...@@ -1266,8 +1264,6 @@ class View3D extends Component { ...@@ -1266,8 +1264,6 @@ 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) {
message.danger('只能放置在当前区域'); message.danger('只能放置在当前区域');
...@@ -1323,7 +1319,6 @@ class View3D extends Component { ...@@ -1323,7 +1319,6 @@ class View3D extends Component {
treeData: treeData || [] treeData: treeData || []
}); });
getPointTypeAction().then(data => { getPointTypeAction().then(data => {
console.log(data);
this.setState({ this.setState({
pointTypeArr: data || [], pointTypeArr: data || [],
pointType: data[0] ? data[0].code : '' pointType: data[0] ? data[0].code : ''
...@@ -1362,7 +1357,7 @@ class View3D extends Component { ...@@ -1362,7 +1357,7 @@ class View3D extends Component {
executeOperate = ({ key, value }) => { executeOperate = ({ key, value }) => {
// 最佳视角，即恢复默认视角 // 最佳视角，即恢复默认视角
if (key === 'fitview') { if (key === 'fitview') {
this.cameraFactory.fitView(desigerHelperConfig.cameraEffect); this.cameraFactory.fitView(this.getCameraEffectByKey('cameraEffect'));
} }
// 操作说明 // 操作说明
else if (key === 'explain') { else if (key === 'explain') {
...@@ -1535,7 +1530,7 @@ class View3D extends Component { ...@@ -1535,7 +1530,7 @@ class View3D extends Component {
disabledCamera =()=>{ disabledCamera =()=>{
this.stagePilot.cameraFactory.orbitControl.maxPolarAngle = 0;//不能旋转 this.stagePilot.cameraFactory.orbitControl.maxPolarAngle = 0;//不能旋转
this.stagePilot.cameraFactory.orbitControl.minPolarAngle = 0;//不能旋转 this.stagePilot.cameraFactory.orbitControl.minPolarAngle = 0;//不能旋转
this.cameraFactory.fitView(desigerHelperConfig.verticalCameraEffect);//视角调整为平面视角 this.cameraFactory.fitView(this.getCameraEffectByKey('verticalCameraEffect'));//视角调整为平面视角
} }
enableCamera =()=>{ enableCamera =()=>{
...@@ -1700,6 +1695,7 @@ class View3D extends Component { ...@@ -1700,6 +1695,7 @@ class View3D extends Component {
this.lensJumpFactory.fadeIn(obj); this.lensJumpFactory.fadeIn(obj);
}); });
this.outlineFactory.toggleOutline([]); this.outlineFactory.toggleOutline([]);
this.cameraFactory.fitView(this.getCameraEffectByKey('cameraEffect'));//初始视图
} }
setHeaderName =(name)=>{ setHeaderName =(name)=>{
......
mods/components/3dviewConvertor/view/exceptionArea/ExceptionArea.js
View file @ dbda573f
...@@ -22,7 +22,7 @@ const buildMarkerOptions = (markers) => { ...@@ -22,7 +22,7 @@ const buildMarkerOptions = (markers) => {
m.key = m.key || m.id; m.key = m.key || m.id;
m.url = url; m.url = url;
m.position = utils.isArray(m.position) ? m.position : position; m.position = utils.isArray(m.position) ? m.position : position;
m.size = 23; m.size = 10;
}); });
} }
return markers; return markers;
......
mods/components/3dviewConvertor/view/points/marker3DFactory.js
View file @ dbda573f
...@@ -141,7 +141,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options) { ...@@ -141,7 +141,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
planeOptions: { planeOptions: {
width: 20, width: 20,
height: 10, height: 10,
position: [0, markerType !== 'impEquipmentMode' ? 10 : 20, 0], position: [0, markerType !== 'impEquipmentMode' ? 10 : 12, 0],
doubleSide: true doubleSide: true
}, },
canvasOptions: { canvasOptions: {
...@@ -210,7 +210,8 @@ export default function marker3DFactory(WrappedComponent = 'div', options) { ...@@ -210,7 +210,8 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
if (!utils.isArray(m.position)) { if (!utils.isArray(m.position)) {
position = Object.values(m.position); position = Object.values(m.position);
} }
for (let k of Object.keys(defaultParams)) {
(Object.keys(defaultParams) || []).forEach(k => {
if ((markerType === 'riskSource' || markerType === 'patrol') && k !== 'useModel' && !isEditMode) { if ((markerType === 'riskSource' || markerType === 'patrol') && k !== 'useModel' && !isEditMode) {
m[k] = formatUrl(defaultParams[k], { url: `${markerType}-${m.level}` }); m[k] = formatUrl(defaultParams[k], { url: `${markerType}-${m.level}` });
} else if ((markerType === 'riskSource' || markerType === 'patrol') && k !== 'useModel' && isEditMode) { } else if ((markerType === 'riskSource' || markerType === 'patrol') && k !== 'useModel' && isEditMode) {
...@@ -224,7 +225,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options) { ...@@ -224,7 +225,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
} else { } else {
m[k] = defaultParams[k]; m[k] = defaultParams[k];
} }
} });
m.key = m.key || m.id; m.key = m.key || m.id;
m.url = url; m.url = url;
m.position = utils.isArray(m.position) ? m.position : position; m.position = utils.isArray(m.position) ? m.position : position;
......
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