Skip to content

A
amos-station-module-view
Commit 1eccb877 authored by taabe's avatar taabe
Browse files
Options

修改预案交互区样式

parent bf0991b4
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 99 deletions
mods/components/3dviewConvertor/consts/urlConsts.js
View file @ 1eccb877
......@@ -2,7 +2,6 @@ import * as endConf from 'amos-processor/lib/config/endconf';
const completePrefix = endConf.completePrefix;
const AmosConfig = endConf.AmosConfig;
const pluginURI = AmosConfig.httpURI.pluginURI;
const convertorURI = AmosConfig.httpURI.convertorURI;
// 三维视图
const view3dURI = AmosConfig.httpURI.convertorURI;
......@@ -11,7 +10,6 @@ const baseURI = AmosConfig.httpURI.convertorURI;
//规则
const ruleURI = AmosConfig.httpURI.rulesConfigURI;
const baseURI2 = AmosConfig.httpURI.baseURI;
export const ConvertorURI = convertorURI;
export const FscSerUrl = {
......@@ -68,72 +66,71 @@ export const FscSerUrl = {
export const FasSerUrl = {
selectedOrgInfoUrl: completePrefix(convertorURI, 'api/region/current'),//获取选择的公司
selectedOrgInfoUrl: completePrefix(convertorURI, 'api/region/current'),//获取选择的公司
//*******************************************************************************
// 换流站视图
//*******************************************************************************
fireTruckListUrl: completePrefix(convertorURI, 'api/fireSource/fire-car/list?pageNumber={page}&pageSize={size}'), //获取消防车列表
fireTruckDetailUrl: completePrefix(convertorURI, 'api/fireSource/fire-car/det/{id}'), //获取消防车相信信息
fireEquipmentClassifyAllListUrl: completePrefix(convertorURI, 'api/firequment/point/listByType?equipClassify={equipClassify}'), //获取消防装备列表
fireEquipmentListUrl: completePrefix(convertorURI, 'api/fireSource/info/page?name={name}&code={code}&equipClassify={equipClassify}&pageNumber={page}&pageSize={size}'), //获取消防装备列表
monitorPointListUrl: completePrefix(convertorURI, 'api/firequment/point/page?pageNumber={page}&pageSize={size}&type={type}&searchValue={searchValue}'), //获取消防装备已配置监测点位列表
monitorPointEditUrl: completePrefix(convertorURI, 'api/firequment/point'), //新增/更新消防装备监测点位
monitorPointDeleteUrl: completePrefix(convertorURI, 'api/firequment/point/batch/delete?pointIds={ids}'), //删除消防装备监测点位
monitorPointQryEditUrl: completePrefix(convertorURI, 'api/firequment/point/{id}'), //获取消防装备监测点位
monitorPointQryUpdateUrl: completePrefix(convertorURI, 'api/firequment/point/update'), //获取消防装备监测点位
matchEquipmentListUrl: completePrefix(convertorURI, 'api/impEquip/{equipmentId}/fireeqmt/page?pageNumber={page}&pageSize={size}'), //获取重点设备的配套装备列表
equipNoPageListUrl: completePrefix(convertorURI, 'api/impEquip/all-list'), //保护对象查询
deptByOrgCodeUrl: completePrefix(convertorURI, 'api/common/deptment/list'),//部门查询,
fireStationPageUrl: completePrefix(convertorURI, 'api/firestation/page?pageNumber={page}&pageSize={size}'),//消防小室
fireStationDetailUrl: completePrefix(convertorURI,'api/firestation/{id}'), // 消防小室
fireStationDeleteUrl: completePrefix(convertorURI,'api/firestation/{ids}'), // 消防小室删除
fireWaterPageUrl: completePrefix(convertorURI, 'api/waterresource/page?pageNumber={page}&pageSize={size}'),//消防水资源
fireWaterDetailUrl: completePrefix(convertorURI,'api/waterresource/{id}'), // 消防水资源
fireWaterDeleteUrl: completePrefix(convertorURI,'api/waterresource/{ids}'), // 消防水资源
fireWaterNewUrl: completePrefix(convertorURI,'api/waterresource'), // 消防水资源
fireWaterEditUrl: completePrefix(convertorURI,'api/waterresource/{id}'), //消防水资源
fireWaterMatchesAddUrl: completePrefix(convertorURI, 'api/waterresource/fireEquipmenet'), //水资源添加配套消防装备
fireWaterMatchesListUrl: completePrefix(convertorURI, 'api/waterresource/{waterResourceId}/fireEquipmenet/page?pageNumber={page}&pageSize={size}'), //获取水资源的配套装备列表
fireWaterMatchesDeleteUrl: completePrefix(convertorURI, 'api/waterresource/fireEquipmenet'), //删除水资源绑定的消防装备
fireEquipmentDeleteUrl: completePrefix(convertorURI, 'api/fireSource/{ids}'), //删除消防设备
fireEquipmentGetUrl: completePrefix(convertorURI, 'api/fireSource/{id}'), //获取消防设备信息
fireEquipmentAddUrl: completePrefix(convertorURI, 'api/fireSource'), //添加消防设备
fireTruckDeleteUrl: completePrefix(convertorURI, 'api/firecar/{ids}'), //删除消防车
fireTruckAddUrl: completePrefix(convertorURI, 'api/firecar/uploadCarImg'), //添加消防车
fireStrengthPageUrl: completePrefix(convertorURI, 'api/firestrength/page?pageNumber={page}&pageSize={size}'), //消防力量
fireStrengthDetailUrl: completePrefix(convertorURI, 'api/firestrength/{id}'), //消防力量
fireStrengthDeleteUrl: completePrefix(convertorURI, 'api/firestrength/{ids}'), //消防力量
fireStrengthNewUrl: completePrefix(convertorURI, 'api/firestrength'), //消防力量
fireStrengthEditUrl: completePrefix(convertorURI, 'api/firestrength/{id}'), //消防力量
fireStationMatchesAddUrl: completePrefix(convertorURI, 'api/firestation/fireequipmenet'), //消防小室添加配套消防装备
fireStationMatchesListUrl: completePrefix(convertorURI, 'api/firestation/{fireStationId}/fireequipmenet/page?pageNumber={page}&pageSize={size}'), //获取消防站的配套装备列表
fireStationMatchesDeleteUrl: completePrefix(convertorURI, 'api/firestation/fireequipmenet'), //删除消防站绑定的消防装备
dialogPointDetailUrl: completePrefix(convertorURI, 'api/fireSource/info/detail?id={dialogId}&type={type}'),
riskSoureWarningUrl: completePrefix(convertorURI, 'api/risksource/warning/detail?riskSourceId={riskSourceId}'),//风险预警详情
screenSaverDataUrl: completePrefix(convertorURI, 'api/risksource/collection3d'), //3d屏保数据
getFireStationInfoUrl: completePrefix(convertorURI, 'api/firestation/createAndSaveImg'),// 维护消防小室/消防泡沫间信息
getImpEquipDetailUrl: completePrefix(convertorURI, 'api/impEquip/detail/{id}'), //预案获取重点设备信息
startTestPrecontrolUrl: completePrefix(convertorURI, 'api/risksource/data/fireqeuiment/soe'),
//*******************************************************************************
// 换流站视图
//*******************************************************************************
fireTruckListUrl: completePrefix(convertorURI, 'api/fireSource/fire-car/list?pageNumber={page}&pageSize={size}'), //获取消防车列表
fireTruckDetailUrl: completePrefix(convertorURI, 'api/fireSource/fire-car/det/{id}'), //获取消防车相信信息
fireEquipmentClassifyAllListUrl: completePrefix(convertorURI, 'api/firequment/point/listByType?equipClassify={equipClassify}'), //获取消防装备列表
fireEquipmentListUrl: completePrefix(convertorURI, 'api/fireSource/info/page?name={name}&code={code}&equipClassify={equipClassify}&pageNumber={page}&pageSize={size}'), //获取消防装备列表
monitorPointListUrl: completePrefix(convertorURI, 'api/firequment/point/page?pageNumber={page}&pageSize={size}&type={type}&searchValue={searchValue}'), //获取消防装备已配置监测点位列表
monitorPointEditUrl: completePrefix(convertorURI, 'api/firequment/point'), //新增/更新消防装备监测点位
monitorPointDeleteUrl: completePrefix(convertorURI, 'api/firequment/point/batch/delete?pointIds={ids}'), //删除消防装备监测点位
monitorPointQryEditUrl: completePrefix(convertorURI, 'api/firequment/point/{id}'), //获取消防装备监测点位
monitorPointQryUpdateUrl: completePrefix(convertorURI, 'api/firequment/point/update'), //获取消防装备监测点位
matchEquipmentListUrl: completePrefix(convertorURI, 'api/impEquip/{equipmentId}/fireeqmt/page?pageNumber={page}&pageSize={size}'), //获取重点设备的配套装备列表
equipNoPageListUrl: completePrefix(convertorURI, 'api/impEquip/all-list'), //保护对象查询
deptByOrgCodeUrl: completePrefix(convertorURI, 'api/common/deptment/list'),//部门查询,
fireStationPageUrl: completePrefix(convertorURI, 'api/firestation/page?pageNumber={page}&pageSize={size}'),//消防小室
fireStationDetailUrl: completePrefix(convertorURI,'api/firestation/{id}'), // 消防小室
fireStationDeleteUrl: completePrefix(convertorURI,'api/firestation/{ids}'), // 消防小室删除
fireWaterPageUrl: completePrefix(convertorURI, 'api/waterresource/page?pageNumber={page}&pageSize={size}'),//消防水资源
fireWaterDetailUrl: completePrefix(convertorURI,'api/waterresource/{id}'), // 消防水资源
fireWaterDeleteUrl: completePrefix(convertorURI,'api/waterresource/{ids}'), // 消防水资源
fireWaterNewUrl: completePrefix(convertorURI,'api/waterresource'), // 消防水资源
fireWaterEditUrl: completePrefix(convertorURI,'api/waterresource/{id}'), //消防水资源
fireWaterMatchesAddUrl: completePrefix(convertorURI, 'api/waterresource/fireEquipmenet'), //水资源添加配套消防装备
fireWaterMatchesListUrl: completePrefix(convertorURI, 'api/waterresource/{waterResourceId}/fireEquipmenet/page?pageNumber={page}&pageSize={size}'), //获取水资源的配套装备列表
fireWaterMatchesDeleteUrl: completePrefix(convertorURI, 'api/waterresource/fireEquipmenet'), //删除水资源绑定的消防装备
fireEquipmentDeleteUrl: completePrefix(convertorURI, 'api/fireSource/{ids}'), //删除消防设备
fireEquipmentGetUrl: completePrefix(convertorURI, 'api/fireSource/{id}'), //获取消防设备信息
fireEquipmentAddUrl: completePrefix(convertorURI, 'api/fireSource'), //添加消防设备
fireTruckDeleteUrl: completePrefix(convertorURI, 'api/firecar/{ids}'), //删除消防车
fireTruckAddUrl: completePrefix(convertorURI, 'api/firecar/uploadCarImg'), //添加消防车
fireStrengthPageUrl: completePrefix(convertorURI, 'api/firestrength/page?pageNumber={page}&pageSize={size}'), //消防力量
fireStrengthDetailUrl: completePrefix(convertorURI, 'api/firestrength/{id}'), //消防力量
fireStrengthDeleteUrl: completePrefix(convertorURI, 'api/firestrength/{ids}'), //消防力量
fireStrengthNewUrl: completePrefix(convertorURI, 'api/firestrength'), //消防力量
fireStrengthEditUrl: completePrefix(convertorURI, 'api/firestrength/{id}'), //消防力量
fireStationMatchesAddUrl: completePrefix(convertorURI, 'api/firestation/fireequipmenet'), //消防小室添加配套消防装备
fireStationMatchesListUrl: completePrefix(convertorURI, 'api/firestation/{fireStationId}/fireequipmenet/page?pageNumber={page}&pageSize={size}'), //获取消防站的配套装备列表
fireStationMatchesDeleteUrl: completePrefix(convertorURI, 'api/firestation/fireequipmenet'), //删除消防站绑定的消防装备
dialogPointDetailUrl: completePrefix(convertorURI, 'api/fireSource/info/detail?id={dialogId}&type={type}'),
riskSoureWarningUrl: completePrefix(convertorURI, 'api/risksource/warning/detail?riskSourceId={riskSourceId}'),//风险预警详情
screenSaverDataUrl: completePrefix(convertorURI, 'api/risksource/collection3d'), //3d屏保数据
getFireStationInfoUrl: completePrefix(convertorURI, 'api/firestation/createAndSaveImg'),// 维护消防小室/消防泡沫间信息
getImpEquipDetailUrl: completePrefix(convertorURI, 'api/impEquip/detail/{id}'), //预案获取重点设备信息
startTestPrecontrolUrl: completePrefix(convertorURI, 'api/risksource/data/fireqeuiment/soe'),
xiaofangxiaoshiUrl: completePrefix(convertorURI, 'api/firestation/fireEquipments/{id}'),
dictListUrl: completePrefix(convertorURI, 'api/dict/list?dictCode={code}'),
riskSourceSecondLevelUrl: completePrefix(convertorURI, 'api/risksource/riskSourceSecondLevel'),
view3DStatisticsUrl: completePrefix(convertorURI, 'api/risksource/query3DStatistics/{markerType}'),
contingencyWaterUrl: completePrefix(convertorURI, 'api/risksource/contingency/water'),
configPointEquipmentUrl: completePrefix(convertorURI, 'api/firequment/point/batch/bindToEquipment?deviceId={deviceId}&pointIds={pointIds}'),
importExcelDataUrl: completePrefix(convertorURI, 'api/excel/import/data/excel/{type}'),//导入excel数据type=['fireResource','water']
importExcelFireEquipmentPointUrl: completePrefix(convertorURI, 'api/excel/import/fireEquipmentPoint'),
exportExcelFireEquipmentPointUrl: completePrefix(convertorURI, 'api/excel/export?exportType={exportType}&modelName={modelName}'),
pointModelistUrl: completePrefix(convertorURI, 'api/view3d/point/list?model={model}'),
xiaofangxiaoshiUrl: completePrefix(convertorURI, 'api/firestation/fireEquipments/{id}'),
dictListUrl: completePrefix(convertorURI, 'api/dict/list?dictCode={code}'),
riskSourceSecondLevelUrl: completePrefix(convertorURI, 'api/risksource/riskSourceSecondLevel'),
view3DStatisticsUrl: completePrefix(convertorURI, 'api/risksource/query3DStatistics/{markerType}'),
contingencyWaterUrl: completePrefix(convertorURI, 'api/risksource/contingency/water'),
configPointEquipmentUrl: completePrefix(convertorURI, 'api/firequment/point/batch/bindToEquipment?deviceId={deviceId}&pointIds={pointIds}'),
importExcelDataUrl: completePrefix(convertorURI, 'api/excel/import/data/excel/{type}'),//导入excel数据type=['fireResource','water']
importExcelFireEquipmentPointUrl: completePrefix(convertorURI, 'api/excel/import/fireEquipmentPoint'),
exportExcelFireEquipmentPointUrl: completePrefix(convertorURI, 'api/excel/export?exportType={exportType}&modelName={modelName}'),
pointModelistUrl: completePrefix(convertorURI, 'api/view3d/point/list?model={model}')
};
export const ModuleEditUrl = {
getAreaTreeUrl:completePrefix(convertorURI, 'api/view3d/region/tree'),//
getPointTreeUrl:completePrefix(convertorURI, 'api/view3d/point/tree'),
saveAreaDataUrl:completePrefix(convertorURI, 'api/view3d/region/bind'),//
getPointTypeUrl:completePrefix(convertorURI, 'api/view3d/point/type'),
getPointListUrl:completePrefix(convertorURI, 'api/view3d/init3dViewNode'),//获取初始三维点 type=impEquipment&riskSourceId=1
savePointListUrl:completePrefix(convertorURI, 'api/view3d/point/bind'),//批量保存点绑定关系
}
getAreaTreeUrl: completePrefix(convertorURI, 'api/view3d/region/tree'),//
getPointTreeUrl: completePrefix(convertorURI, 'api/view3d/point/tree'),
saveAreaDataUrl: completePrefix(convertorURI, 'api/view3d/region/bind'),//
getPointTypeUrl: completePrefix(convertorURI, 'api/view3d/point/type'),
getPointListUrl: completePrefix(convertorURI, 'api/view3d/init3dViewNode'),//获取初始三维点 type=impEquipment&riskSourceId=1
savePointListUrl: completePrefix(convertorURI, 'api/view3d/point/bind')//批量保存点绑定关系
};
mods/components/3dviewConvertor/styles/index.scss
View file @ 1eccb877
......@@ -13,13 +13,11 @@
@import './actionbar.scss';
@import './moduleEdit.scss';
@import './searchpane.scss';
@import './reservePlan.scss';
@import './../assets/bizFont/iconfont.css';
@import './../assets/amosFont/iconfont.css';
.obj-loading-coms {
position: absolute;
top: 50%;
......@@ -133,5 +131,3 @@
border-image-slice: 50 50 50 50;
border-image-repeat: stretch;
}
mods/components/3dviewConvertor/styles/preControl.scss
View file @ 1eccb877
......@@ -365,53 +365,54 @@
}
}
.reserve-plan-root{
.reserve-plan-root {
height: 80px;
.operate-button-root + .operate-button-root {
padding-left: 35px;
margin-left: 20px;
}
}
%operate-button-root-common {
display: flex;
align-items: center;
width: 250px;
}
.operate-button-display-root{
.operate-button-display-root {
justify-content: center;
}
.operate-button-root{
.operate-button-root {
width: 250px;
justify-content: center;
.operate-button-left{
.operate-button-left {
img{
img {
// width: 20px !important;
// height: 20px !important
}
.operate-button-content{
.operate-button-content {
margin-left: 5px;
font-weight: 500;
line-height: 15px;
width: 170px;
.button-name{
.button-name {
font-size: 14px !important
}
.button-desc{
.button-desc {
font-size: 8px !important
}
}
}
.operate-button-right{
.operate-button-right {
width: 77px;
.operate-button-button{
.operate-button-button {
margin-left: 10px;
width: 70px;
height: 31px;
......@@ -434,7 +435,7 @@
.quit-btn {
margin-top: 10px;
img{
img {
width: 17px
}
}
......
mods/components/3dviewConvertor/view/LayerPool.js
View file @ 1eccb877
......@@ -98,7 +98,7 @@ class LayerPool extends Component {
let wsURL = AmosConfig.wsURI.securityBaseURI + 'plan';
return (
<div className="layer-pool">
<AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
<AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
<SidePane
className={displayDetail ? 'precontrol-sidePlan-detail-display' : 'precontrol-sidePlan-detail'}
left={false}
......
mods/components/3dviewConvertor/view/MaskContent.js
View file @ 1eccb877
......@@ -51,7 +51,7 @@ class MaskContent extends Component {
};
actionBarClick = ({ singleClick, type, label, showLabel }) => {
if (!singleClick){//设置选中状态
this.setState({ activeAction: type });
}
......@@ -91,6 +91,7 @@ class MaskContent extends Component {
headerName,
errorAreaId
} = this.props;
alarmStarted && this.props.editModelChange(true);
const wsURL = completeToken(SysWsURL.rulews);
const controlAnimation = {
animateName: 'zoom-comb-left',
......@@ -121,12 +122,12 @@ class MaskContent extends Component {
return (
<div className="mask-content">
<AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
{ sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
{ sideControlShow && <DataPane animationProps={datapaneAnim} />}
{ !alarmStarted && sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
{ !alarmStarted && sideControlShow && <DataPane animationProps={datapaneAnim} />}
<SearchPane visible={searchPaneVisible} changeSearchPaneVisible={() => this.changeSearchPaneVisible}/>
<TopMsg alarmStart={alarmStart} />
{!isShowActionBar && <ModelHeader headerName={headerName} handleExceptModel={this.handleExceptModel} />}
{isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation}/> }
{ !alarmStarted && !isShowActionBar && <ModelHeader animationProps={controlAnimation} headerName={headerName} handleExceptModel={this.handleExceptModel} />}
{ !alarmStarted && isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation} /> }
{alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />}
</div>
);
......
mods/components/3dviewConvertor/view/View3D.js
View file @ 1eccb877
......@@ -200,6 +200,7 @@ class View3D extends Component {
tirggerTransTopic(CONSTS.forward, { details: { type: 'prePlan', show: false }, dateTime: Date.now() });
removeFireAlarm2(this);
this.cameraFactory.fitView(desigerHelperConfig.cameraEffect);
this.quitEditMode();
};
alarmStart = () => {
......@@ -1203,13 +1204,13 @@ class View3D extends Component {
const { markers } = this.state;
pointModelistAction(actionType).then(d =>{
// if (markerType === 'fireResource') {
markers['impEquipmentMode'] = d.filter(item => item.position != null);
// markers[markerType] = d;
this.setState({
markers,
markerType: "impEquipmentMode"
});
return;
markers['impEquipmentMode'] = d.dataList.filter(item => item.position !== null);
// markers[markerType] = d;
this.setState({
markers,
markerType: "impEquipmentMode"
});
return;
});
}
......@@ -1305,7 +1306,7 @@ class View3D extends Component {
headerName,
errorAreaId
} = this.state;
const { dimension, hiddenScreenSaver } = this.props;
const { dimension, hiddenScreenSaver, editModelChange } = this.props;
const graphicProps = {
...dimension,
...desigerConf,
......@@ -1373,6 +1374,7 @@ class View3D extends Component {
onActionItemClick={this.onActionItemClick}
errorAreaId={errorAreaId}
handleExceptModel={this.handleExceptModel}
editModelChange={editModelChange}
/>
}
modelContentProps={modelContentProps}
......
mods/components/3dviewConvertor/view/common/ModelHeader.js
View file @ 1eccb877
......@@ -12,9 +12,9 @@ export default class ModelHeader extends Component {
}
render() {
const { headerName } = this.props;
const { animationProps, headerName } = this.props;
return (
<div className='ModuleEditPage'>
<div className='ModuleEditPage' {...animationProps}>
<div className='topBox'>
<span className='editTitle'>
<span className='titleText'>{headerName}</span>
......
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