Skip to content

A
amos-station-module-view
Commit 5e133a98 authored by 单奇雲's avatar 单奇雲
Browse files
Options

修改样式

parent 3b84a5cf
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 50 deletions
mods/components/3dviewConvertor/styles/actionbar.scss
View file @ 5e133a98
......@@ -24,10 +24,10 @@
position: absolute;
top: -20px;
white-space: nowrap;
width: 38px;
width: 51px;
-webkit-transform-origin-x: 0;
-webkit-transform: scale(0.60);
text-align: end;
-webkit-transform: scale(0.70);
text-align: center;
}
.action-item-content{
......
mods/components/3dviewConvertor/styles/searchpane.scss
View file @ 5e133a98
......@@ -102,6 +102,12 @@
right: 14px;
}
.params-input-img1{
position: absolute;
width: 28px;
height: 28px;
right: 160px;
}
// .params-datePicker{
.ant-input{
background-color: #13428f;
......
mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss
View file @ 5e133a98
......@@ -135,7 +135,10 @@
}
.common-title{
font-size: 16px;
font-size: 18px;
font-family: SourceHanSansCN-Medium, SourceHanSansCN;
font-weight: 500;
color: #70eeff;
}
.safetyIndex {
......@@ -161,13 +164,20 @@
.safetyIndex-content {
height: 100%;
margin-left: 30px;
margin-right: 20px;
margin-right: 14px;
cursor: pointer;
.content-item {
margin: 5px;
}
.safetyIndex-content-title{
font-size: 18px;
font-family: SourceHanSansCN-Medium, SourceHanSansCN;
font-weight: 500;
color: #70eeff;
}
.safetyIndex-content-row {
display: flex;
align-items: flex-end;
......@@ -258,6 +268,9 @@
.content-xj-middle {
height: 44%;
margin-top: 4%;
// background: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_rightmiddle.png');
// background-repeat: repeat;
// background-size: 100% 100%;
}
.content-xj-bottom {
......@@ -265,7 +278,7 @@
margin-top: 12px;
.content-week-font {
font-size: 16px;
font-size: 13px;
font-family: SourceHanSansCN-Regular, SourceHanSansCN;
font-weight: 400;
color: rgba(255, 255, 255, 1);
......
mods/components/3dviewConvertor/view/MaskContent.js
View file @ 5e133a98
......@@ -62,7 +62,6 @@ class MaskContent extends Component {
}
changeSearchPaneVisible = () => {
debugger;
const { searchPaneVisible } = this.state;
this.setState({ searchPaneVisible: !searchPaneVisible });
}
......@@ -89,7 +88,8 @@ class MaskContent extends Component {
sideControlShow,
isShowActionBar,
headerName,
errorAreaId
errorAreaId,
focusPosition
} = this.props;
alarmStarted && this.props.editModelChange(true);
const wsURL = completeToken(SysWsURL.rulews);
......@@ -124,7 +124,7 @@ class MaskContent extends Component {
<AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
{ !alarmStarted && sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
{ !alarmStarted && sideControlShow && <DataPane animationProps={datapaneAnim} />}
{ !alarmStarted && <SearchPane visible={searchPaneVisible} changeSearchPaneVisible={() => this.changeSearchPaneVisible} />}
{ !alarmStarted && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={() => this.changeSearchPaneVisible} />}
<TopMsg alarmStart={alarmStart} />
{ !alarmStarted && !isShowActionBar && <ModelHeader animationProps={controlAnimation} headerName={headerName} handleExceptModel={this.handleExceptModel} />}
{ !alarmStarted && isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation} /> }
......
mods/components/3dviewConvertor/view/View3D.js
View file @ 5e133a98
......@@ -242,6 +242,7 @@ class View3D extends Component {
_bindPubSubEvents = () => {
this.props.subscribe(eventTopics.base3d_view, (topic, data) => {
console.log('subscribe base3d_view')
if (isControllerEvent(topic)) {
executeView3dCMD(this, topic, data);
} else if (isManualOperate(topic)) {
......@@ -1200,7 +1201,7 @@ class View3D extends Component {
const { markers } = this.state;
pointModelistAction(actionType).then(d =>{
// if (markerType === 'fireResource') {
markers['impEquipmentMode'] = d.dataList.filter(item => item.position !== null);
markers['impEquipmentMode'] = d.filter(item => item.position !== null);
// markers[markerType] = d;
this.setState({
markers,
......@@ -1232,9 +1233,9 @@ class View3D extends Component {
}
getExceptionAreasList = () => {
exceptionRegionListAction().then(data=>{
this.setState({ exceptionAreas: data });
});
// exceptionRegionListAction().then(data=>{
// this.setState({ exceptionAreas: data });
// });
}
initExceptionAreasData = ()=>{
......@@ -1371,6 +1372,7 @@ class View3D extends Component {
errorAreaId={errorAreaId}
handleExceptModel={this.handleExceptModel}
editModelChange={editModelChange}
focusPosition={this.focusPosition}
/>
}
modelContentProps={modelContentProps}
......
mods/components/3dviewConvertor/view/dataProcessor.js
View file @ 5e133a98
......@@ -100,6 +100,9 @@ export const parseSearchMenuMarkers = (instance, content) => {
} else {
markersArr.push(item);
markers[type.replace(/(^\s*)|(\s*$)/g, '')] = markersArr;
instance.setState({
markers
});
}
});
}
......@@ -267,6 +270,7 @@ export const parseLevelFilter = (instance, topic, data) => {
*/
export const parseManual = (instance, topic, data) => {
const { operateType, target } = data;
console.log('parseManual..');
switch (operateType) {
// 线路操作
case operateTypes.LINK:
......
mods/components/3dviewConvertor/view/panoramic/statistical/SafetyIndex.js
View file @ 5e133a98
......@@ -130,7 +130,7 @@ export default class SafetyIndex extends Component {
<img className="safetyIndex-safetyrate" src={panoramicIcon.safetyrate} alt="safetyrate" />
</div>
<div className='safetyIndex-content' onClick={() => this.modelOpen(true)}>
<div>今日安全指数 </div>
<div className='safetyIndex-content-title'>今日安全指数 </div>
<div className='safetyIndex-content-row'>
<div className='number-large'>{safetyIndexData.safetyIndex}</div>
<span className='number-unit'>&nbsp;分&nbsp;
......
mods/components/3dviewConvertor/view/panoramic/statistical/StatisticsCheck.js
View file @ 5e133a98
......@@ -74,7 +74,7 @@ class StatisticsCheck extends Component {
statisticsCheckData = () => {
statisticsCheckAction().then(data => {
this.setState({
data
data
});
});
}
......@@ -83,7 +83,7 @@ class StatisticsCheck extends Component {
return {
tooltip: {
trigger: 'item',
formatter: "{a} <br/>{b}: {c} ({d}%)"
formatter: "{b}: {c} ({d}%)"
},
legend: {
orient: 'vertical',
......@@ -159,17 +159,17 @@ class StatisticsCheck extends Component {
<ReactEcharts option={this.getOptionsx(data)} eventpool={this.onclick} className="div-echars" />
</div>
<div className="content-xj-bottom" >
<div className="yellow-div">
<div className="yellow-div-content">
<span className='titleIcon' style={this.rederStyle('check_buhege')}></span><span className="content-week-font"> 合格
<span className="content-font-number"> {hege}个</span>
<div className="green-div">
<div className="green-div-content">
<span className='titleIcon' style={this.rederStyle('check_hege')}></span><span className="content-week-font"> 合格
<span className="content-font-number">{hege}个</span>
</span>
</div>
</div>
<div className="green-div">
<div className="green-div-content">
<span className='titleIcon' style={this.rederStyle('check_hege')}></span><span className="content-week-font"> 未开始
<span className="content-font-number">{weikaishi}个</span>
<div className="grey-div">
<div className="grey-div-content">
<span className='titleIcon' style={this.rederStyle('check_weizhixing')}></span><span className="content-week-font"> 未开始
<span className="content-font-number"> {weikaishi}个</span>
</span>
</div>
</div>
......@@ -180,9 +180,9 @@ class StatisticsCheck extends Component {
</span>
</div>
</div>
<div className="grey-div">
<div className="grey-div-content">
<span className='titleIcon' style={this.rederStyle('check_weizhixing')}></span><span className="content-week-font"> 不合格
<div className="yellow-div">
<div className="yellow-div-content">
<span className='titleIcon' style={this.rederStyle('check_buhege')}></span><span className="content-week-font"> 不合格
<span className="content-font-number"> {buhege}个</span>
</span>
</div>
......
mods/components/3dviewConvertor/view/points/marker3DFactory.js
View file @ 5e133a98
......@@ -15,7 +15,6 @@ const getIcon = (markerType, level) => {
const buildMarkerOptions = (markers, markerType, defaultParams = {}) => {
if (!utils.isEmpty(markers)){
markers.forEach(m => {
debugger;
const url = getIcon(markerType, m.level);
let position;
if (!utils.isArray(m.position)){
......
mods/components/3dviewConvertor/view/searchPane/index.js
View file @ 5e133a98
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { SidePane, Tabs } from 'amos-framework';
import { SidePane, Tabs, message } from 'amos-framework';
import Icon from 'amos-icon';
import ParamsHeader from './paramsHeader';
import AmosGridTable from './../common/tableComponent/table/AmosGridTable';
import { update3DViewData } from './../dataProcessor';
import { operateTypes } from './../consts';
import {
searchAction,
msgAction,
exeRecordAction,
trajectoryAction
trajectoryAction,
recordAction
} from './../../services/3dService';
const { TabList, Tab, TabPanel } = Tabs;
......@@ -19,7 +22,7 @@ const getColumns = (self,retrieveType) => {
return [
{title: '编号',dataIndex: 'code',key: 'code',width: '25%'},
{title: '名称',dataIndex: 'label',key: 'label',width: '25%'},
{title: '等级',dataIndex: 'level',key: 'level',width: '25%'},
{title: '等级',dataIndex: 'levelStr',key: 'level',width: '25%'},
{title: '类别',dataIndex: 'typeName',key: 'typeName',width: '25%'}
];
case 'patrol':
......@@ -65,9 +68,9 @@ const getMsgColumns = () => {
const getRecordColumns = () => {
return [
{title: '名称',dataIndex: 'equipment_Name',key: 'equipment_Name',width: '33%'},
{title: '时间',dataIndex: 'create_time',key: 'create_time',width: '33%'},
{title: '重点设备',dataIndex: 'equipment_Name',key: 'equipment_Name',width: '33%'}
{title: '名称',dataIndex: 'pointName',key: 'pointName',width: '33%'},
{title: '时间',dataIndex: 'checkTime',key: 'checkTime',width: '33%'},
{title: '路线名称',dataIndex: 'routeName',key: 'status',width: '33%'}
]
}
......@@ -169,7 +172,7 @@ class SearchPane extends Component {
//预案
fetchRecordData = () => {
const { filter } = this.state;
exeRecordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
recordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
this.setState({recordDataList:d.content,totalCount: d.totalElements});
});
}
......@@ -234,6 +237,26 @@ class SearchPane extends Component {
}
};
onRetrieveRowDoubleClick = (record) => {
// 更新视图数据
let views = new Array();
if(record.position){
views.push(record);
let args = {
target: views,
operateType: operateTypes.POINT_SEARCH
};
update3DViewData(args);
this.props.focusPosition(this.toCameraPosition(record.position));
}else{
message.danger('坐标未绑定!!!');
}
}
toCameraPosition = (item) => {
return { x: item.x , y: item.y + 200 , z: item.z + 200 }
}
render() {
const { dataList,activeKey,retrieveType,totalCount,msgDataList,recordDataList,trajectoryDataList } = this.state;
return (
......@@ -246,7 +269,7 @@ class SearchPane extends Component {
<Tabs
activeKey={activeKey}
onChange={(index, key) => this.onTabClick(key)}
destroyContent
// destroyContent
>
<TabList>
{tabs.map((item, i) => (
......@@ -255,8 +278,9 @@ class SearchPane extends Component {
</TabList>
<ParamsHeader paramsOnChange={this.paramsOnChange} activeKey={activeKey}/>
<TabPanel activeKey="search">
<div className="search-pane-table">
{/* <div className="search-pane-table"> */}
<AmosGridTable
rowKey="id"
columns={getColumns(this,retrieveType)}
getTableDataAction={()=>{}}
callBack={this.reload}
......@@ -266,9 +290,10 @@ class SearchPane extends Component {
// getPanelHeight={this.getPanelHeight}
dataList={dataList}
totals={totalCount}
onRowDoubleClick={this.onRetrieveRowDoubleClick}
getTableDataAction={this.fetchRetrieveData}
/>
</div>
{/* </div> */}
</TabPanel>
<TabPanel activeKey="message">
<AmosGridTable
......
mods/components/3dviewConvertor/view/searchPane/paramsHeader.js
View file @ 5e133a98
......@@ -73,7 +73,6 @@ class paramsHeader extends Component {
onPamarmsChange = (name,value) => {
let { filter } = this.state;
debugger;
if(name === 'inputText'){
this.setState({ textValue: value });
}
......@@ -81,7 +80,7 @@ class paramsHeader extends Component {
this.setState({ msgTextValue: value });
}
if(name === 'time'){
value = moment(value).format("YYYY-MM-DD");
value = value == null ? '' : moment(value).format("YYYY-MM-DD");
}
if (value) {
const flag = filter.some(e => {
......@@ -97,14 +96,20 @@ class paramsHeader extends Component {
this.setState({ filter }, this.props.paramsOnChange(filter));
}
paramsTypeonChange = (name,value,type) => {
paramsTypeonChange = (name,value,type,key) => {
let {recordFilter} = this.state;
debugger;
if(name === 'contingencyName'){
this.setState({recordTextValue:value})
}
if(name === 'pointName'){
this.setState({ trajectoryTextValue: value })
if(key === 'record'){
this.setState({ recordTextValue:value });
}else{
this.setState({ trajectoryTextValue: value });
}
}
if(name === 'checkTime'){
value = value == null ? '' : moment(value).format("YYYY-MM-DD");
}
if (value) {
const flag = recordFilter.some(e => {
......@@ -187,7 +192,7 @@ class paramsHeader extends Component {
onChange={(e) => this.onPamarmsChange('title',e.target.value)}
placeholder="输入关键字"
/>
<img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" />
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
</div>
<DatePicker
key="time"
......@@ -205,22 +210,22 @@ class paramsHeader extends Component {
getRecordContent = () =>{
const { impEquiList } = this.state;
return (<Group style={groupStyle}>
<Select
{/* <Select
key="recordImpl"
style={selectStyle}
data={impEquiList}
renderOption={item => <Option key={item.id+item.name} value={item.id}>{item.name}</Option>}
defaultOption={<Option>重点设备</Option>}
onChange={(v) => this.paramsTypeonChange('equipmentId', v , SingleQueryEnum.EQUAL)}
/>
/> */}
<div className="params-input" style={inputStyle}>
<Input
key="recordTextValue"
value={this.state.recordTextValue}
onChange={(e) => this.paramsTypeonChange('contingencyName', e.target.value, SingleQueryEnum.LIKE)}
onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE,'record')}
placeholder="输入关键字"
/>
<img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" />
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
</div>
<DatePicker
key="createTime"
......@@ -228,7 +233,7 @@ class paramsHeader extends Component {
style={datePickerStyle}
placeholder="时间"
format="YYYY/MM/DD"
onChange={(v) => this.paramsTypeonChange('createTime', v, SingleQueryEnum.EQUAL)}
onChange={(v) => this.paramsTypeonChange('checkTime', v, SingleQueryEnum.EQUAL)}
/>
</Group>);
}
......@@ -251,7 +256,7 @@ class paramsHeader extends Component {
onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE)}
placeholder="输入关键字"
/>
<img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" />
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
</div>
<DatePicker
key="createTime"
......
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