Skip to content

A
amos-convertor-view
Commit 044ada16 authored by 单奇雲's avatar 单奇雲
Browse files
Options

修复bug及样式

parent 2a5218e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 52 deletions
src/assets/bizFont/demo_index.html
View file @ 044ada16
......@@ -31,6 +31,18 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon fasicon">&#xe60a;</span>
<div class="name">任务列表</div>
<div class="code-name">&amp;#xe60a;</div>
</li>
<li class="dib">
<span class="icon fasicon">&#xe609;</span>
<div class="name">文本预案</div>
<div class="code-name">&amp;#xe609;</div>
</li>
<li class="dib">
<span class="icon fasicon">&#xe608;</span>
<div class="name">排烟线</div>
<div class="code-name">&amp;#xe608;</div>
......@@ -1167,6 +1179,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon fasicon fasicon-renwuliebiao"></span>
<div class="name">
任务列表
</div>
<div class="code-name">.fasicon-renwuliebiao
</div>
</li>
<li class="dib">
<span class="icon fasicon fasicon-jiuyuanjiagou"></span>
<div class="name">
文本预案
</div>
<div class="code-name">.fasicon-jiuyuanjiagou
</div>
</li>
<li class="dib">
<span class="icon fasicon fasicon-paiyanxian"></span>
<div class="name">
排烟线
......@@ -2826,6 +2856,22 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#fasicon-renwuliebiao"></use>
</svg>
<div class="name">任务列表</div>
<div class="code-name">#fasicon-renwuliebiao</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#fasicon-jiuyuanjiagou"></use>
</svg>
<div class="name">文本预案</div>
<div class="code-name">#fasicon-jiuyuanjiagou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#fasicon-paiyanxian"></use>
</svg>
<div class="name">排烟线</div>
......
src/assets/bizFont/iconfont.css
View file @ 044ada16
This diff is collapsed.
src/assets/bizFont/iconfont.js
View file @ 044ada16
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/bizFont/iconfont.json
View file @ 044ada16
......@@ -6,6 +6,20 @@
"description": "",
"glyphs": [
{
"icon_id": "13937674",
"name": "任务列表",
"font_class": "renwuliebiao",
"unicode": "e60a",
"unicode_decimal": 58890
},
{
"icon_id": "13937625",
"name": "文本预案",
"font_class": "jiuyuanjiagou",
"unicode": "e609",
"unicode_decimal": 58889
},
{
"icon_id": "13719442",
"name": "排烟线",
"font_class": "paiyanxian",
......
src/assets/bizFont/iconfont.svg
View file @ 044ada16
......@@ -20,6 +20,12 @@ Created by iconfont
/>
<missing-glyph />
<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="jiuyuanjiagou" unicode="&#58889;" d="M719.4624 54.016h-414.72a102.4 102.4 0 1 0-121.7024 122.88V591.1552A102.4 102.4 0 1 0 305.152 712.0896h413.8496a102.4 102.4 0 1 0 121.344-121.0368v-414.0544a102.4 102.4 0 1 0-120.8832-122.88z m1.536 51.5072a102.4 102.4 0 0 0 70.5024 69.8368V592.5888a102.4 102.4 0 0 0-70.5024 69.8368H303.1552a102.4 102.4 0 0 0-72.96-70.5024v-415.9488a102.4 102.4 0 0 0 72.96-70.5024zM481.7408 264.4992V492.8H372.5824v-60.928H312.8832V543.2832H712.0384v-111.616H652.288V492.8h-108.544v-228.2496h47.9232V204.8H432.3328v59.7504h49.3568z" horiz-adv-x="1024" />
<glyph glyph-name="paiyanxian" unicode="&#58888;" d="M491.78279488 427.59837603h-137.49844541a51.85686299 51.85686299 0 0 1 0-103.71372601h168.70909098a51.85686299 51.85686299 0 1 1 0 103.71372601zM338.73265322 111.36267688999999h-52.92939376a108.27198177 108.27198177 0 1 1 0-103.71372599h52.92939376a51.85686299 51.85686299 0 0 1 0 103.71372599zM641.29358499 111.41630341999996h-143.34373814a51.85686299 51.85686299 0 0 1 0-103.71372597h143.34373814a51.85686299 51.85686299 0 1 1 0 103.71372597zM823.62381682 291.65510023a51.85686299 51.85686299 0 0 1 34.48186442 90.62885052 172.30206908 172.30206908 0 0 1-126.9876438 45.31442528h-57.80940881a51.85686299 51.85686299 0 1 1 0-103.71372601h57.80940881a70.73340464 70.73340464 0 0 0 58.07754147-19.09104779 51.48147723 51.48147723 0 0 1 34.42823791-13.138502zM887.43939793 247.09144651999998a52.33950186 52.33950186 0 0 1-53.62653875-50.30169337c-1.17978384-39.79089175-21.02160321-57.70215572-57.00501072-75.07715428a51.85686299 51.85686299 0 1 1 44.99266604-93.4710571 181.36495412 181.36495412 0 0 1 115.67244412 165.3842456 51.80323646 51.80323646 0 0 1-50.03356069 53.46565915zM547.92978096 640.12034917h172.83833449c1.34066346 0 2.62770038 0.2681327 3.96836386 0.37538577v-123.34103915l208.28547659 174.66163678-208.28547659 174.7152633v-123.34103916c-1.34066346 0-2.62770038 0.4290123-3.96836386 0.4290123H547.92978096a51.85686299 51.85686299 0 1 1 0-103.71372598zM250.73150309 626.87459411a52.07136915 52.07136915 0 0 1 22.46951976 5.36265388 59.84721727 59.84721727 0 0 0 34.4282379 8.09760735h101.89042366a51.85686299 51.85686299 0 1 1 0 103.71372598h-101.89042366a159.64620592 159.64620592 0 0 1-79.36727739-18.34027626 51.85686299 51.85686299 0 0 1 22.52314628-98.61920481zM167.98575378 377.02854997a51.85686299 51.85686299 0 0 1 68.96372887 77.43672199 106.34142639 106.34142639 0 0 0-35.60802176 79.42090392 28.74382478 28.74382478 0 0 0 1.12615731 13.51388777 51.85686299 51.85686299 0 0 1-100.49613368 25.47260592 119.37267531 119.37267531 0 0 1-4.34374963-38.98649369 210.10877893 210.10877893 0 0 1 70.35801889-156.85762591z" horiz-adv-x="1024" />
......
src/routes/view.js
View file @ 044ada16
......@@ -54,6 +54,7 @@ import alarmTestView from './../view/bizview/alarm';
import CusVizLib from './../view/planMgmt/cusVizLib';
import RealTimeMonitor from './../view/morphic';
import PublishView from './../view/planMgmt/view';
import ModelManage from './../view/planMgmt/modelManage';
const Routes = {
// 添加 rules 路由
......@@ -107,7 +108,8 @@ const Routes = {
alarmVideoMonitor: AlarmVideoMonitor,
alarmTest: alarmTestView,
vizlib: CusVizLib,
planDrill: PublishView
planDrill: PublishView,
modelManage: ModelManage
};
const pageCompontent = key => {
......
src/styles/view/planMgmt/plan.scss
View file @ 044ada16
......@@ -30,17 +30,18 @@
}
.text-plan-root {
width: calc(100% - 168px);
width: calc(100% - 230px);
height: 100%;
padding-top: 40px;
margin-left: 168px;
margin-left: 230px;
}
}
}
.publish-view-side {
width: 168px;
width: 230px;
right: 0px;
.planDrill {
.amos-tree-node-content-wrapper {
......@@ -74,6 +75,31 @@
border-radius: 10px;
}
.plan-tree-planDrill{
position: absolute !important;
background-color: rgba(0, 0, 0, 0.6);
color: white;
overflow: auto;
top: 82px !important;
right: 0px !important;
left:calc(100% - 230px) !important;
bottom: 32px;
.amos-tree-title{
padding-left: 2px;
}
}
.plan-tree-textPlan{
position: absolute !important;
background-color: rgb(255, 255, 255);
overflow: auto;
top: 82px !important;
bottom: 0px;
border-right: 1px solid rgb(234, 234, 234);
left: 0px !important;
}
.text-button {
i {
padding: 4px 6px;
......
src/styles/view/planMgmt/play.scss
View file @ 044ada16
......@@ -254,7 +254,8 @@ $play-control-bg: rgba(0,0,0,0.8);
}
.tip-control-panel {
position: absolute !important;
bottom: 50px !important;
top: 100px !important;
left: 15px !important;
width: 206px;
height: 245px;
font-size: 12px;
......@@ -326,12 +327,12 @@ $play-control-bg: rgba(0,0,0,0.8);
}
}
}
.task-open{
right: 250px !important;
}
.task-close{
right: 20px !important;
}
// .task-open{
// right: 250px !important;
// }
// .task-close{
// right: 20px !important;
// }
.zimu-control-panel{
width: 60%;
left: 20%;
......
src/styles/view/planMgmt/pubview.scss
View file @ 044ada16
......@@ -79,6 +79,10 @@
width: calc(100% - 36px) !important;
float: left !important;
.amos-collapse{
border-radius: 0px;
}
.board-tasktab-all{
color: white;
background:rgba(0,0,0,0.5);
......@@ -186,57 +190,61 @@
background: rgba(0,0,0,0.8);
height: 30px;
padding: 0;
border-bottom: 1px solid #605f5f;
border-bottom: none;
.amos-modal-title{
color: white;
line-height: 30px;
padding-left: 9px;
padding-left: 15px;
font-size: 13px;
}
}
.amos-modal-content{
padding: 0;
background: rgba(0,0,0,0.6);
background: rgba(0,0,0,0.7);
.board-actuator-modal-row{
display: flex;
height: 45px;
background: rgba(0,0,0,0);
.colTitle {
float: left;
font-weight: bold;
padding-top: 7px;
padding-top: 10px;
height: 40px;
padding-left: 8px;
padding-left: 30px;
box-sizing: border-box;
flex: 1;
width: 40%;
}
.colValue {
float: left;
padding-top: 7px;
padding-top: 10px;
height: 40px;
padding-left: 8px;
flex: 1;
border-left: 1px solid #605f5f;
width: 60%;
border-bottom: 1px solid rgba(0,0,0,0.1);
}
}
.board-actuator-popupContent{
padding: 1em;
padding: 1.5em;
text-align: center;
}
}
.amos-modal-footer{
border-top: 1px solid #605f5f;
background: rgba(0,0,0,0.6);
border: none;
background: rgba(0,0,0,0.7);
text-align: center;
padding: 5px;
padding: 0px 0px 10px 0px;
.amos-btn{
height: 25px;
background-color: rgba(0,0,0,0);
border: 1px solid white;
height: 30px;
background-color: rgba(0,0,0,0.4);
padding: 0 2.5em;
border: none;
}
}
}
......
src/styles/view/planMgmt/text.scss
View file @ 044ada16
.plan-view {
height: 100%;
width: calc(100% - 168px);
width: calc(100% - 230px);
display: flex;
left: 168px;
left: 230px;
position: relative;
top: 40px;
......
src/view/planMgmt/common/conf.js
View file @ 044ada16
......@@ -2,8 +2,8 @@ export const headerButton = [
// { key: 'back', text: '返回', icon: 'fanhui' },
{ key: 'onOff', text: '显示窗', icon: 'yuan1' },
{ key: 'planDrill', text: '预案演练', icon: 'yuan1' },
{ key: 'textPlan', text: '文字预案', icon: 'yuan-shuxing' },
{ key: 'taskList', text: '任务列表', icon: 'renwu' },
{ key: 'textPlan', text: '文字预案', icon: 'jiuyuanjiagou' },
{ key: 'taskList', text: '任务列表', icon: 'renwuliebiao' },
];
export const pageUrl = {
......
src/view/planMgmt/modelManage/index.js 0 → 100644
View file @ 044ada16
import React , { Component } from 'react';
import _amosTool from 'amos-tool';
/**
* 模型库
*
* @class ModelManage
* @extends {Component}
*/
class ModelManage extends Component {
constructor(props){
super(props);
this.state = {
};
}
render() {
return (
<div style={{height:'100%'}}>
模型库
</div>
);
}
}
export default ModelManage;
src/view/planMgmt/treeView/PlanTreeView.js
View file @ 044ada16
......@@ -114,12 +114,13 @@ class PlanTreeView extends Component {
getTreeIcon = (props) => {
let { type } = props;
let { activeKey } = this.props;
if (type === 'treeNode') {
return <BizIcon icon="shu-changqu" /> ;
return <BizIcon icon="shu-changqu" color={ activeKey === 'planDrill' ? '#ffffff' : '#345FA6'}/> ;
} else if (type === 'listNode') {
return <BizIcon icon="shu-zhukonglou" /> ;
return <BizIcon icon="shu-zhukonglou" color={ activeKey === 'planDrill' ? '#ffffff' : '#345FA6'}/> ;
} else if (type === 'textNode') {
return <BizIcon icon="yuan-shuxing" />;
return <BizIcon icon="yuan-shuxing" color={ activeKey === 'planDrill' ? '#ffffff' : '#345FA6'}/>;
} else {
return '';
}
......
src/view/planMgmt/view/index.js
View file @ 044ada16
......@@ -17,13 +17,14 @@ const ls = _amosTool.Store.lsTool;
const sidePaneStyle = {
planDrill: {
left: 0,
right: 0,
top: 82,
bottom: 32,
left: 'calc(100% - 230px)',
style: {
backgroundColor: 'rgba(0,0,0,0.6)',
color: 'white',
overflow: 'auto'
overflow: 'auto',
}
},
textPlan: {
......@@ -119,7 +120,11 @@ class PublishView extends Component {
pathname: pageUrl.planDrill,
state: { ...params }
};
this.setState({ activeKey,visible: true });
if(this.state.taskTabsShow) {
this.state.taskTabsShow = false;
PubSub.publish(eventTopics.plan_task_list,this.state.taskTabsShow);
}
this.setState({ activeKey,visible: true, taskTabsShow: this.state.taskTabsShow });
browserHistory.push($path);
break;
case 'textPlan':
......@@ -134,11 +139,16 @@ class PublishView extends Component {
browserHistory.push(pageUrl.back);
break;
case 'onOff':
this.setState({ visible: !this.state.visible });
if(this.state.taskTabsShow) {
this.state.taskTabsShow = false;
PubSub.publish(eventTopics.plan_task_list,this.state.taskTabsShow);
}
this.setState({ visible: !this.state.visible, taskTabsShow: this.state.taskTabsShow });
break;
case 'taskList': //任务列表
if(this.state.visible) this.state.visible = false;
PubSub.publish(eventTopics.plan_task_list,!this.state.taskTabsShow);
this.setState({ taskTabsShow: !this.state.taskTabsShow });
this.setState({ visible: this.state.visible, taskTabsShow: !this.state.taskTabsShow });
break;
default:
break;
......@@ -148,7 +158,11 @@ class PublishView extends Component {
renderButton = (activeKey)=>{
if (activeKey === 'textPlan') {
return headerButton.filter(item=>item.key !== 'onOff').map(e=>{
return headerButton.filter(item=>{
if(item.key !== 'onOff' && item.key !== 'taskList'){
return item;
}
}).map(e=>{
return <TextButton key={e.key} {...e} onClick={()=>this.handleChange(e.key)} />;
});
} else {
......@@ -283,12 +297,13 @@ class PublishView extends Component {
{this.renderButton(activeKey)}
</div>
<SidePane
className='publish-view-side'
animateName="fade-left"
// className={`publish-view-side plan-tree-${activeKey}`}
className={`publish-view-side plan-tree-${activeKey}`}
animateName="fade"
animateProps={animateProps}
animateDelay={animateDelay}
visible={visible}
{...sidePaneStyle[activeKey]}
// {...sidePaneStyle[activeKey]}
>
{activeKey && this.getSidePaneContent(activeKey)}
</SidePane>
......
src/view/planMgmt/view/pubview/StageActuator.js
View file @ 044ada16
......@@ -367,7 +367,7 @@ class StageActuator extends Component {
getFooter = () => {
return (
<div>
<Button onClick={() => this.playCancel()}>取消</Button>
<Button style={{color:'red'}} onClick={() => this.playCancel()}>取消</Button>
<Button onClick={() => this.playAnimation()}>确定</Button>
</div> )
;
......@@ -459,7 +459,7 @@ class StageActuator extends Component {
header='提示'
visible={modal}
destroyContent
width='20%'
width='17%'
className='board-actuator-detail-modal'
content={this.getContext()}
outterClosable={false}
......
src/view/planMgmt/view/pubview/play/PlayMenuBar.js
View file @ 044ada16
......@@ -25,17 +25,17 @@ class PlayMenuBar extends Component {
constructor(props){
super(props);
this.state = {
tulieActive: false,
tulieActive: true,
zimuActive: true,
quanpingActive: false,
taskTabsShow: false
// taskTabsShow: false
};
}
componentDidMount(){
this.tabsPubsub = PubSub.subscribe(eventTopics.plan_task_list,function(topic,message){
this.setState({ taskTabsShow: message })
}.bind(this));
// this.tabsPubsub = PubSub.subscribe(eventTopics.plan_task_list,function(topic,message){
// this.setState({ taskTabsShow: message })
// }.bind(this));
}
componentWillUnmount(){
......@@ -94,7 +94,7 @@ class PlayMenuBar extends Component {
}
render() {
const { tulieActive,zimuActive,quanpingActive,taskTabsShow } = this.state;
const { tulieActive,zimuActive,quanpingActive } = this.state;
const animateProps = {
transitionAppear: true
};
......@@ -116,7 +116,7 @@ class PlayMenuBar extends Component {
</Select>
{/* 图列 */}
<SidePane
className={`tip-control-panel ${taskTabsShow ? 'task-open' : 'task-close'}`}
className={`tip-control-panel`}
left={false}
top={false}
animateName="slide-down"
......
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