Skip to content

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

修改样式

parent 8f7965a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 34 deletions
mods/components/3dviewConvertor/assets/bizFont/demo_index.html
View file @ 6b53e693
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>IconFont Demo</title> <title>IconFont Demo</title>
<link rel="shortcut icon" href="https://gtms04.alicdn.com/tps/i4/TB1_oz6GVXXXXaFXpXXJDFnIXXX-64-64.ico" type="image/x-icon"/> <link rel="shortcut icon" href="https://img.alicdn.com/tps/i4/TB1_oz6GVXXXXaFXpXXJDFnIXXX-64-64.ico" type="image/x-icon"/>
<link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css"> <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
<link rel="stylesheet" href="demo.css"> <link rel="stylesheet" href="demo.css">
<link rel="stylesheet" href="iconfont.css"> <link rel="stylesheet" href="iconfont.css">
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon fasicon">&#xe60b;</span>
<div class="name">search-pane</div>
<div class="code-name">&amp;#xe60b;</div>
</li>
<li class="dib">
<span class="icon fasicon">&#xe60a;</span> <span class="icon fasicon">&#xe60a;</span>
<div class="name">任务列表</div> <div class="name">任务列表</div>
<div class="code-name">&amp;#xe60a;</div> <div class="code-name">&amp;#xe60a;</div>
...@@ -1179,6 +1185,15 @@ ...@@ -1179,6 +1185,15 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon fasicon fasicon-chaxun"></span>
<div class="name">
search-pane
</div>
<div class="code-name">.fasicon-chaxun
</div>
</li>
<li class="dib">
<span class="icon fasicon fasicon-renwuliebiao"></span> <span class="icon fasicon fasicon-renwuliebiao"></span>
<div class="name"> <div class="name">
任务列表 任务列表
...@@ -2856,6 +2871,14 @@ ...@@ -2856,6 +2871,14 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#fasicon-chaxun"></use>
</svg>
<div class="name">search-pane</div>
<div class="code-name">#fasicon-chaxun</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#fasicon-renwuliebiao"></use> <use xlink:href="#fasicon-renwuliebiao"></use>
</svg> </svg>
<div class="name">任务列表</div> <div class="name">任务列表</div>
......
mods/components/3dviewConvertor/assets/bizFont/iconfont.js
View file @ 6b53e693
This source diff could not be displayed because it is too large. You can view the blob instead.
mods/components/3dviewConvertor/assets/bizFont/iconfont.json
View file @ 6b53e693
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "14970084",
"name": "search-pane",
"font_class": "chaxun",
"unicode": "e60b",
"unicode_decimal": 58891
},
{
"icon_id": "13937674", "icon_id": "13937674",
"name": "任务列表", "name": "任务列表",
"font_class": "renwuliebiao", "font_class": "renwuliebiao",
......
mods/components/3dviewConvertor/assets/bizFont/iconfont.svg
View file @ 6b53e693
...@@ -20,6 +20,9 @@ Created by iconfont ...@@ -20,6 +20,9 @@ Created by iconfont
/> />
<missing-glyph /> <missing-glyph />
<glyph glyph-name="chaxun" unicode="&#58891;" d="M819.8 141.9L703.1 258.6c12.4 17.2 22.9 35.8 31.2 55.5 14.5 34.5 21.8 71.1 21.8 108.8s-7.4 74.3-21.8 108.8c-14 33.3-34.1 63.2-59.6 88.9-25.5 25.6-55.2 45.8-88.5 60-34.5 14.5-70.9 21.9-108.4 21.9-37.6 0-74.1-7.4-108.4-22.1-33.1-14.1-62.9-34.2-88.5-60-25.6-25.8-45.7-55.7-59.6-88.9-14.5-34.5-21.8-71.1-21.8-108.8s7.4-74.3 21.8-108.8c14-33.3 34.1-63.2 59.6-88.9 25.5-25.6 55.2-45.8 88.5-60 34.3-14.6 70.7-22 108.4-22 37.5 0 74 7.4 108.4 22 19.9 8.5 38.8 19.2 56.1 31.9l116.5-116.5c8.4-8.4 19.5-12.6 30.5-12.6 11.1 0 22.1 4.2 30.6 12.6l0.1 0.1c16.7 17.2 16.6 44.7-0.2 61.4z m-138 280.9c0-113.2-91.5-205.2-204-205.2s-204 92.1-204 205.2S365.3 628 477.8 628s204-92.1 204-205.2z" horiz-adv-x="1024" />
<glyph glyph-name="renwuliebiao" unicode="&#58890;" d="M594.1248 22.784H483.9936V742.7584a52.5312 52.5312 0 0 0 55.04 50.7904 55.4496 55.4496 0 0 0 55.04-50.8416v-719.9232zM191.744 382.7712h559.0528a38.4512 38.4512 0 0 1 29.6448 12.6976l80.4864 93.184a33.2288 33.2288 0 0 1 0 46.592l-80.4864 88.9344a38.4512 38.4512 0 0 1-29.6448 12.6976H191.744a37.3248 37.3248 0 0 1-38.0928-33.8944V420.864a37.9392 37.9392 0 0 1 38.0928-38.0928M742.8096 344.6784L297.984 272.2304a60.2112 60.2112 0 0 1-25.6-8.448l-58.112-58.9312c-8.448-8.448-8.448-16.9472 4.2496-21.1968l71.9872-38.144a53.7088 53.7088 0 0 1 25.6-4.2496l452.4544 75.008c16.9472 4.2496 21.504 15.36 19.7632 33.536l-11.1616 71.424c0 20.48-17.5616 27.5968-34.5088 23.3472" horiz-adv-x="1024" /> <glyph glyph-name="renwuliebiao" unicode="&#58890;" d="M594.1248 22.784H483.9936V742.7584a52.5312 52.5312 0 0 0 55.04 50.7904 55.4496 55.4496 0 0 0 55.04-50.8416v-719.9232zM191.744 382.7712h559.0528a38.4512 38.4512 0 0 1 29.6448 12.6976l80.4864 93.184a33.2288 33.2288 0 0 1 0 46.592l-80.4864 88.9344a38.4512 38.4512 0 0 1-29.6448 12.6976H191.744a37.3248 37.3248 0 0 1-38.0928-33.8944V420.864a37.9392 37.9392 0 0 1 38.0928-38.0928M742.8096 344.6784L297.984 272.2304a60.2112 60.2112 0 0 1-25.6-8.448l-58.112-58.9312c-8.448-8.448-8.448-16.9472 4.2496-21.1968l71.9872-38.144a53.7088 53.7088 0 0 1 25.6-4.2496l452.4544 75.008c16.9472 4.2496 21.504 15.36 19.7632 33.536l-11.1616 71.424c0 20.48-17.5616 27.5968-34.5088 23.3472" horiz-adv-x="1024" />
......
mods/components/3dviewConvertor/consts/imgStatic.js
View file @ 6b53e693
...@@ -57,7 +57,8 @@ export default { ...@@ -57,7 +57,8 @@ export default {
play: require('../assets/convertor/3dview/datapanel/play.png'), play: require('../assets/convertor/3dview/datapanel/play.png'),
search: require('../assets/convertor/3dview/datapanel/search.png'), search: require('../assets/convertor/3dview/datapanel/search.png'),
smilingFace: require('../assets/convertor/3dview/datapanel/smilingFace.png'), smilingFace: require('../assets/convertor/3dview/datapanel/smilingFace.png'),
user: require('../assets/convertor/3dview/datapanel/user.png') user: require('../assets/convertor/3dview/datapanel/user.png'),
searchPane: require('../assets/convertor/3dview/actionbars/chaxun.png'),
}, },
markers: { markers: {
riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'), riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'),
......
mods/components/3dviewConvertor/styles/searchpane.scss
View file @ 6b53e693
...@@ -94,12 +94,28 @@ ...@@ -94,12 +94,28 @@
float: left; float: left;
} }
.params-input{ .params-input-img{
float: left;
position: absolute;
width: 28px;
height: 28px;
right: 14px;
.params-input-img{ }
// .params-datePicker{
.ant-input{
background-color: #13428f;
border: none !important;
border-radius: 5px;
color: white;
} }
// }
.ant-calendar-picker-icon:after{
color: white;
}
::-webkit-input-placeholder {
color: white;
} }
} }
...@@ -108,7 +124,7 @@ ...@@ -108,7 +124,7 @@
} }
.search-pane-table{ // .search-pane-table{
.ant-table-title{ .ant-table-title{
display: none; display: none;
} }
...@@ -129,6 +145,13 @@ ...@@ -129,6 +145,13 @@
overflow: hidden !important; overflow: hidden !important;
} }
.ant-table-placeholder {
position: absolute;
width: 100%;
top: 55px;
border: none !important;
}
.ant-table-body { .ant-table-body {
color: white; color: white;
...@@ -153,6 +176,7 @@ ...@@ -153,6 +176,7 @@
} }
} }
} }
.ant-table-placeholder{ .ant-table-placeholder{
background:transparent!important; background:transparent!important;
color: white; color: white;
...@@ -193,6 +217,8 @@ ...@@ -193,6 +217,8 @@
background: rgba(39,85,162,1); background: rgba(39,85,162,1);
} }
} }
} }
...@@ -213,9 +239,15 @@ ...@@ -213,9 +239,15 @@
.ant-pagination-item{ .ant-pagination-item{
background-color: rgba(255,255,255,0.5); background-color: rgba(255,255,255,0.5);
} }
.ant-pagination-jump-prev {
background-color: rgba(255,255,255,0.5);
}
.ant-pagination-jump-next {
background-color: rgba(255,255,255,0.5);
}
.ant-pagination-item-active a, .ant-pagination-item-active:focus a, .ant-pagination-item-active:hover a { .ant-pagination-item-active a, .ant-pagination-item-active:focus a, .ant-pagination-item-active:hover a {
color: #fff; color: #fff;
} }
} }
} // }
} }
\ No newline at end of file
mods/components/3dviewConvertor/view/conf.js
View file @ 6b53e693
...@@ -84,7 +84,7 @@ export const actionBars = [ ...@@ -84,7 +84,7 @@ export const actionBars = [
{ key: 'burst-action', icon: 'burst', type: 'burst', singleClick: true, label: '分解' , showLabel: false }, { key: 'burst-action', icon: 'burst', type: 'burst', singleClick: true, label: '分解' , showLabel: false },
{ key: 'fitview-action', icon: 'fitview', type: 'fitview', singleClick: true, label: '初始视图' , showLabel: false }, { key: 'fitview-action', icon: 'fitview', type: 'fitview', singleClick: true, label: '初始视图' , showLabel: false },
{ key: 'edit-action', icon: 'editMode', type: 'editMode', singleClick: false, label: '编辑' , showLabel: true }, { key: 'edit-action', icon: 'editMode', type: 'editMode', singleClick: false, label: '编辑' , showLabel: true },
{ key: 'search-action', icon: 'editMode', type: 'search', singleClick: true, label: '检索' , showLabel: true } { key: 'search-action', icon: 'chaxun', type: 'search', singleClick: true, label: '检索' , showLabel: true }
]; ];
/** /**
......
mods/components/3dviewConvertor/view/searchPane/index.js
View file @ 6b53e693
...@@ -5,7 +5,10 @@ import Icon from 'amos-icon'; ...@@ -5,7 +5,10 @@ import Icon from 'amos-icon';
import ParamsHeader from './paramsHeader'; import ParamsHeader from './paramsHeader';
import AmosGridTable from './../common/tableComponent/table/AmosGridTable'; import AmosGridTable from './../common/tableComponent/table/AmosGridTable';
import { import {
searchAction searchAction,
msgAction,
exeRecordAction,
trajectoryAction
} from './../../services/3dService'; } from './../../services/3dService';
const { TabList, Tab, TabPanel } = Tabs; const { TabList, Tab, TabPanel } = Tabs;
...@@ -51,10 +54,36 @@ const getColumns = (self,retrieveType) => { ...@@ -51,10 +54,36 @@ const getColumns = (self,retrieveType) => {
} }
}; };
const getMsgColumns = () => {
return [
{title: '标题',dataIndex: 'title',key: 'title',width: '15%'},
{title: '类型',dataIndex: 'type',key: 'type',width: '15%'},
{title: '时间',dataIndex: 'timeStr',key: 'timeStr',width: '15%'},
{title: '内容',dataIndex: 'content',key: 'content',width: '55%'}
]
}
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%'}
]
}
const getTrajectoryColumns = () => {
return [
{title: '巡检人',dataIndex: 'userName',key: 'userName',width: '33%'},
{title: '时间',dataIndex: 'checkTime',key: 'checkTime',width: '33%'},
{title: '轨迹',dataIndex: 'traName',key: 'traName',width: '33%'}
]
}
const tabs = [ const tabs = [
{ id: '1', key: 'search', closable: false, title: '检索' }, { id: '1', key: 'search', closable: false, title: '检索' },
{ id: '2', key: 'message', closable: false, title: '消息' }, { id: '2', key: 'message', closable: false, title: '消息' },
{ id: '3', key: 'contingency', closable: false, title: '预案' }, { id: '3', key: 'record', closable: false, title: '预案' },
{ id: '4', key: 'trajectory', closable: false, title: '轨迹' },
]; ];
class SearchPane extends Component { class SearchPane extends Component {
...@@ -71,7 +100,10 @@ class SearchPane extends Component { ...@@ -71,7 +100,10 @@ class SearchPane extends Component {
dataList: [], dataList: [],
retrieveType: undefined, retrieveType: undefined,
totalCount: 0, totalCount: 0,
filter: [] filter: [],
msgDataList: [],
recordDataList: [],
trajectoryDataList: []
}; };
} }
...@@ -81,18 +113,17 @@ class SearchPane extends Component { ...@@ -81,18 +113,17 @@ class SearchPane extends Component {
this.fetchRetrieveData(); this.fetchRetrieveData();
} }
// onSearch = (page) => { paramsOnChange = (filter) => {
const {activeKey} = this.state;
// searchAction(inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type, page || 0, pageSize).then(d => { if(activeKey === 'search'){
// // 填充列表数据 this.setState({filter},this.fetchRetrieveData);
// this.listRef.setData(d, this); }else if(activeKey === 'message'){
// }); this.setState({filter},this.fetchMsgData);
// } }else if(activeKey === 'record'){
this.setState({filter},this.fetchRecordData);
retrieveOnChange = (filter) => { }else if(activeKey === 'trajectory'){
// const { pageSize } = this.state; this.setState({filter},this.fetchTrajectoryData);
this.setState({filter},this.fetchRetrieveData); }
} }
...@@ -112,13 +143,15 @@ class SearchPane extends Component { ...@@ -112,13 +143,15 @@ class SearchPane extends Component {
}; };
onTabClick = (value) =>{ onTabClick = (value) =>{
console.log(value) this.pageConfig.current = 0;
if(value === 'search'){ if(value === 'search'){
this.fetchRetrieveData(); this.fetchRetrieveData();
}else if(value === 'search'){ }else if(value === 'message'){
this.fetchMsgData();
}else{ }else if(value === 'record'){
this.fetchRecordData();
}else if(value === 'trajectory'){
this.fetchTrajectoryData()
} }
this.setState({ activeKey:value }); this.setState({ activeKey:value });
} }
...@@ -126,7 +159,38 @@ class SearchPane extends Component { ...@@ -126,7 +159,38 @@ class SearchPane extends Component {
getPanelHeight = () => { getPanelHeight = () => {
return 700; return 700;
}; };
//轨迹
fetchTrajectoryData = () => {
const { filter } = this.state;
trajectoryAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
this.setState({trajectoryDataList:d.content,totalCount: d.totalElements});
});
}
//预案
fetchRecordData = () => {
const { filter } = this.state;
exeRecordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
this.setState({recordDataList:d.content,totalCount: d.totalElements});
});
}
//消息
fetchMsgData = () => {
const { filter } = this.state;
let searchParam = {};
( filter || [] ).forEach((item, i) => {
if (item.name === 'type') {
searchParam.category = item.value;
} else if (item.name === 'title') {
searchParam.title = item.value;
} else if (item.name === 'time') {
searchParam.time = item.value;
}
});
msgAction(searchParam, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
this.setState({msgDataList:d.content,totalCount: d.totalElements});
});
}
//检索
fetchRetrieveData = ()=> { fetchRetrieveData = ()=> {
const { filter } = this.state; const { filter } = this.state;
let inputText = ''; let inputText = '';
...@@ -171,7 +235,7 @@ class SearchPane extends Component { ...@@ -171,7 +235,7 @@ class SearchPane extends Component {
}; };
render() { render() {
const { dataList,activeKey,retrieveType,totalCount } = this.state; const { dataList,activeKey,retrieveType,totalCount,msgDataList,recordDataList,trajectoryDataList } = this.state;
return ( return (
<div> <div>
{ this.props.visible && <div className="search-pane-bg"/> } { this.props.visible && <div className="search-pane-bg"/> }
...@@ -182,13 +246,14 @@ class SearchPane extends Component { ...@@ -182,13 +246,14 @@ class SearchPane extends Component {
<Tabs <Tabs
activeKey={activeKey} activeKey={activeKey}
onChange={(index, key) => this.onTabClick(key)} onChange={(index, key) => this.onTabClick(key)}
destroyContent
> >
<TabList> <TabList>
{tabs.map((item, i) => ( {tabs.map((item, i) => (
<Tab key={item.key} activeKey={item.key} closable={item.closable}>{item.title}</Tab>) <Tab key={item.key} activeKey={item.key} closable={item.closable}>{item.title}</Tab>)
)} )}
</TabList> </TabList>
<ParamsHeader retrieveOnChange={this.retrieveOnChange} retrieveType='search'/> <ParamsHeader paramsOnChange={this.paramsOnChange} activeKey={activeKey}/>
<TabPanel activeKey="search"> <TabPanel activeKey="search">
<div className="search-pane-table"> <div className="search-pane-table">
<AmosGridTable <AmosGridTable
...@@ -205,8 +270,45 @@ class SearchPane extends Component { ...@@ -205,8 +270,45 @@ class SearchPane extends Component {
/> />
</div> </div>
</TabPanel> </TabPanel>
<TabPanel activeKey="message">消息</TabPanel> <TabPanel activeKey="message">
<TabPanel activeKey="contingency">预案</TabPanel> <AmosGridTable
columns={getMsgColumns()}
getTableDataAction={()=>{}}
callBack={this.reload}
isPageable = {true}
setPageConfig={this.setPageConfig}
isChecked = {false}
dataList={msgDataList}
totals={totalCount}
getTableDataAction={this.fetchMsgData}
/>
</TabPanel>
<TabPanel activeKey="record">
<AmosGridTable
columns={getRecordColumns()}
getTableDataAction={()=>{}}
callBack={this.reload}
isPageable = {true}
setPageConfig={this.setPageConfig}
isChecked = {false}
dataList={recordDataList}
totals={totalCount}
getTableDataAction={this.fetchRecordData}
/>
</TabPanel>
<TabPanel activeKey="trajectory">
<AmosGridTable
columns={getTrajectoryColumns()}
getTableDataAction={()=>{}}
callBack={this.reload}
isPageable = {true}
setPageConfig={this.setPageConfig}
isChecked = {false}
dataList={trajectoryDataList}
totals={totalCount}
getTableDataAction={this.fetchTrajectoryData}
/>
</TabPanel>
</Tabs> </Tabs>
</SidePane>} </SidePane>}
</div> </div>
......
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