Skip to content

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

样式

parent d812474a
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 52 deletions
mods/components/3dviewConvertor/consts/urlConsts.js
View file @ 98fd6a11
......@@ -19,12 +19,12 @@ export const FscSerUrl = {
view3dInitUrl: completePrefix(view3dURI, 'api/view3d/init3dViewNode?type={type}&riskSourceId={riskSourceId}'), // 初始化三维视图 get
view3dInitLinkUrl: completePrefix(view3dURI, 'view3d/initViewLink'), // 初始化三维视图 获取link get
searchRegionListUrl: completePrefix(patrolURI, 'api/group/queryDept'), //右侧菜单-检索-区域集合
searchViewUrl: completePrefix(view3dURI, 'api/view3d/retrieve/all?inputText={inputText}&dataLevel={dataLevel}&orgCode={orgCode}&nodeState={nodeState}&type={type}&current={page}&pageSize={pageSize}&routeName={routeName}&protectObjName={protectObjName}'), // 右侧菜单-检索
searchViewUrl: completePrefix(view3dURI, 'api/view3d/retrieve/all'), // 右侧菜单-检索
searchLinkUrl: completePrefix(view3dURI, 'view3d/link/searchView?linkId={linkId}'), // 根据单条巡检线 检索节点与线路 get
monitorRegionListUrl: completePrefix(view3dURI, 'monitorRegionListUrl'), //右侧菜单-监控-区域集合
monitorUrl: completePrefix(view3dURI, 'monitorUrl?current={page}&pageSize={size}'), //右侧菜单-监控
recordStatusListUrl: completePrefix(patrolURI, 'api/spc/check/state'), //右侧菜单-记录-状态集合
recordUrl: completePrefix(patrolURI, 'api/check/list?current={page}&pageSize={size}'), //右侧菜单-记录
recordUrl: completePrefix(patrolURI, 'api/check/list?pageNumber={page}&pageSize={size}'), //右侧菜单-记录
trajectoryPersonListUrl: completePrefix(patrolURI, 'api/spc/queryConditions/init/{type}'), //右侧菜单-轨迹-人员集合
trajectoryUrl: completePrefix(patrolURI, 'api/spc/trajectory/list?current={page}&pageSize={size}'), //右侧菜单-轨迹
msgCategoryListUrl: completePrefix(view3dURI, 'msgCategoryListUrl'), //右侧菜单-消息-类别集合
......
mods/components/3dviewConvertor/services/3dService.js
View file @ 98fd6a11
......@@ -52,7 +52,7 @@ export const searchRegionListAction = () => {
* 右侧菜单-检索
*/
export const searchAction = (inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type, page, pageSize) => {
return commonGet(formatUrl(FscSerUrl.searchViewUrl, { inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type, page, pageSize }));
return commonPost(FscSerUrl.searchViewUrl, { inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type, current: page, pageSize });
};
/**
......
mods/components/3dviewConvertor/styles/index.scss
View file @ 98fd6a11
......@@ -37,6 +37,8 @@
#app>div{
height: 100%;
overflow: hidden;
>div{
height: 100%;
}
......
mods/components/3dviewConvertor/styles/searchpane.scss
View file @ 98fd6a11
......@@ -93,6 +93,7 @@
background-color: #13428f;
border-radius: 5px;
float: left;
padding: 0 2em 0 0.6em !important;
}
.params-input-img{
......@@ -101,6 +102,7 @@
width: 28px;
height: 28px;
right: 14px;
cursor: pointer;
}
.params-input-img1{
......@@ -108,6 +110,7 @@
width: 28px;
height: 28px;
right: 160px;
cursor: pointer;
}
// .params-datePicker{
.ant-input{
......
mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss
View file @ 98fd6a11
......@@ -14,15 +14,14 @@
flex-direction: column;
.equipStatusList {
padding-left: 97px;
padding-top: 10px;
flex-grow: 1;
margin-left: 87px;
margin-top: 13px;
height: 21.7%;
overflow-y: auto;
.title-child{
width: 100%;
height: 55px;
//margin-top: 5px;
margin-bottom: 5px;
}
.title-date{
height: 20px;
......@@ -35,12 +34,26 @@
::-webkit-scrollbar {
/* 隐藏滚轮 */
height: 3px;
width: 3px;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background: rgba(255, 0, 0, 0.466);
}
::-webkit-scrollbar-track {
border-radius:10px;
background: #0000006e;
}
::-webkit-scrollbar-button{
display: none;
}
::-webkit-scrollbar-corner{
display: none;
}
.safetyExecuteList{
flex: 2;
height: 45%;
margin-left: 37px;
.up{
height: 90px;
......@@ -73,12 +86,11 @@
}
}
.down{
width: 98%;
height: 245px;
height: calc(100% - 90px);
margin-left: 20px;
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_warning.png');
background-repeat: repeat;
background-size: 100% 100%;
margin-top: 10px;
.title{
text-align: left;
......@@ -102,7 +114,7 @@
position: absolute;
width: 70px;
margin-top: -5px;
margin-left: 60px;
margin-left: 36px;
font-size: 16px;
color: rgba(240,223,45,1);
}
......@@ -116,8 +128,9 @@
}
.content{
padding-left: 30px;
width: 90%;
padding: 0px 30px;
height: calc(100% - 60px);
overflow: auto;
span{
margin-top: 3px;
......@@ -126,8 +139,8 @@
}
.title-child{
height: 35px;
border-bottom: 1px solid rgba(196,86,86,0.3);
padding-top: 7px;
}
}
}
......@@ -144,7 +157,7 @@
display: flex;
margin-left: 37px;
padding-top: 65px;
flex: 1;
height: 33.3%;
.safetyIndex-icon {
width: 36px;
......@@ -213,7 +226,6 @@
position: absolute;
height: 100%;
width: 355px;
//float: right;
padding-top: 40px;
right: 0;
top: 0;
......@@ -506,7 +518,7 @@
height: 88%;
margin-top: 5px;
text-align: center;
flex: 1;
width: 33.3%;
&-img {
height: 30px;
......@@ -520,12 +532,13 @@
.model-content {
height: calc(100% - 60px);
padding-left: 10px;
padding: 0 17px;
margin-left: 5px;
margin-right: 3px;
overflow: auto;
.content-div {
min-width: 80px;
min-height: 120px;
padding-top: 20px;
text-align: left;
......@@ -547,6 +560,11 @@
.row {
display: inline-block;
height: 28px;
>span{
display: block;
white-space: nowrap;
margin-right: 15px;
}
}
.date {
......
mods/components/3dviewConvertor/view/panoramic/statistical/ModelContent.js
View file @ 98fd6a11
......@@ -52,8 +52,8 @@ export default class ModelContent extends Component {
{(content || []).map(itemA => {
return (
<div className='row'>
<span>{itemA.name}</span>
<span className='date'>{this.formatData(itemA.changeDate)}</span>
<span>{itemA.name}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{this.formatData(itemA.changeDate)}</span>
{/* <span className='date'>{this.formatData(itemA.changeDate)}</span> */}
</div>
);
})}
......
mods/components/3dviewConvertor/view/searchPane/index.js
View file @ 98fd6a11
......@@ -103,7 +103,6 @@ class SearchPane extends Component {
dataList: [],
retrieveType: undefined,
totalCount: 0,
filter: [],
msgDataList: [],
recordDataList: [],
trajectoryDataList: []
......@@ -156,7 +155,7 @@ class SearchPane extends Component {
}else if(value === 'trajectory'){
this.fetchTrajectoryData()
}
this.setState({ activeKey:value });
this.setState({ activeKey:value ,filter: []});
}
getPanelHeight = () => {
......
mods/components/3dviewConvertor/view/searchPane/paramsHeader.js
View file @ 98fd6a11
......@@ -54,6 +54,18 @@ class paramsHeader extends Component {
recordStatusListAction().then(d => this.setState({ statusList: d || [] }));
}
componentWillReceiveProps(nextProps) {
if (this.props.activeKey !== nextProps.activeKey){
this.setState({
textValue: undefined,
msgTextValue: undefined,
recordTextValue: undefined,
filter: [],
recordFilter: [],
})
}
}
onChange = (e) => {
this.setState({ value: e.target.value });
}
......@@ -73,12 +85,6 @@ class paramsHeader extends Component {
onPamarmsChange = (name,value) => {
let { filter } = this.state;
if(name === 'inputText'){
this.setState({ textValue: value });
}
if(name === 'title'){
this.setState({ msgTextValue: value });
}
if(name === 'time'){
value = value == null ? '' : moment(value).format("YYYY-MM-DD");
}
......@@ -93,21 +99,17 @@ class paramsHeader extends Component {
} else {
filter = filter.filter(e => e.name !== name);
}
this.setState({ filter }, this.props.paramsOnChange(filter));
if(name === 'inputText'){
this.setState({ textValue: value,filter });
}else if(name === 'title'){
this.setState({ msgTextValue: value,filter });
}else{
this.setState({ filter }, this.props.paramsOnChange(filter));
}
}
paramsTypeonChange = (name,value,type,key) => {
let {recordFilter} = this.state;
if(name === 'contingencyName'){
this.setState({recordTextValue:value})
}
if(name === 'pointName'){
if(key === 'record'){
this.setState({ recordTextValue:value });
}else{
this.setState({ trajectoryTextValue: value });
}
}
if(name === 'checkTime'){
value = value == null ? '' : moment(value).format("YYYY-MM-DD");
}
......@@ -123,11 +125,22 @@ class paramsHeader extends Component {
} else {
recordFilter = recordFilter.filter(e => e.name !== name);
}
this.setState({ recordFilter }, this.props.paramsOnChange(recordFilter));
debugger;
if(name === 'contingencyName'){
this.setState({recordTextValue:value,recordFilter})
}else if(name === 'pointName'){
if(key === 'record'){
this.setState({ recordTextValue:value,recordFilter });
}else{
this.setState({ trajectoryTextValue: value,recordFilter });
}
}else{//不为input时直接查询
this.setState({ recordFilter }, this.props.paramsOnChange(recordFilter));
}
}
getSearchContent = () => {
const { showRiskLevel, showImpEquiList, impEquiList } = this.state;
const { showRiskLevel, showImpEquiList, impEquiList,filter } = this.state;
let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight:'14px' };
let implStyle = { width: '35%', minWidth: '20%', height: '28px', marginRight:'14px' };
return (<Group style={groupStyle}>
......@@ -146,7 +159,7 @@ class paramsHeader extends Component {
onChange={(e) => this.onPamarmsChange('inputText',e.target.value)}
placeholder="输入关键字"
/>
<img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" />
<img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
</div>
{
showRiskLevel &&
......@@ -175,7 +188,7 @@ class paramsHeader extends Component {
}
getMessageContent = () => {
const { filter } = this.state;
return (<Group style={groupStyle}>
<Select
key="messageType"
......@@ -192,7 +205,7 @@ class paramsHeader extends Component {
onChange={(e) => this.onPamarmsChange('title',e.target.value)}
placeholder="输入关键字"
/>
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
</div>
<DatePicker
key="time"
......@@ -208,7 +221,7 @@ class paramsHeader extends Component {
}
getRecordContent = () =>{
const { impEquiList } = this.state;
const { recordFilter } = this.state;
return (<Group style={groupStyle}>
{/* <Select
key="recordImpl"
......@@ -225,7 +238,7 @@ class paramsHeader extends Component {
onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE,'record')}
placeholder="输入关键字"
/>
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=> this.props.paramsOnChange(recordFilter)}/>
</div>
<DatePicker
key="createTime"
......@@ -239,7 +252,7 @@ class paramsHeader extends Component {
}
getTrajectoryContent = () => {
const { statusList } = this.state;
const { statusList,recordFilter } = this.state;
return (<Group style={groupStyle}>
<Select
key="statusSel"
......@@ -256,7 +269,7 @@ class paramsHeader extends Component {
onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE)}
placeholder="输入关键字"
/>
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
<img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=>this.props.paramsOnChange(recordFilter)}/>
</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