Skip to content

A
amos-station-module-view
Commit 6cafbc87 authored by 张博's avatar 张博
Browse files
Options

chongtu

parent a8c2579e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 105 deletions
mods/components/3dviewConvertor/styles/moduleEdit.scss
View file @ 6cafbc87
.ModuleEditPage { .ModuleEditPage {
position: relative; position: relative;
height: 100%; height: 100%;
::-webkit-scrollbar { /* 血槽宽度 */ ::-webkit-scrollbar {
width:5px; /* 血槽宽度 */
width: 5px;
height: 5px; height: 5px;
background-color: rgba(10, 53, 62, 1); background-color: rgba(10, 53, 62, 1);
border-radius: 5px; border-radius: 5px;
} }
::-webkit-scrollbar-thumb { /* 拖动条 */ ::-webkit-scrollbar-thumb {
/* 拖动条 */
border-radius: 5px; border-radius: 5px;
background-color: rgba(255, 255, 255, 0.4); background-color: rgba(255, 255, 255, 0.4);
} }
::-webkit-scrollbar-track { /* 背景槽 */ ::-webkit-scrollbar-track {
background-color:rgba(17, 44, 88, 0.2); /* 背景槽 */
background-color: rgba(17, 44, 88, 0.2);
} }
.topBox { .topBox {
...@@ -24,8 +27,8 @@ ...@@ -24,8 +27,8 @@
display: inline-block; display: inline-block;
} }
.editTitle { .editTitle {
width:257px; width: 257px;
height:55px; height: 55px;
background: url('../assets/convertor/moduleEdit/title.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/title.png') no-repeat 100% 100%;
// opacity:0.4; // opacity:0.4;
font-size: 24px; font-size: 24px;
...@@ -61,7 +64,7 @@ ...@@ -61,7 +64,7 @@
width: 177px; width: 177px;
height: 42px; height: 42px;
line-height: 42px; line-height: 42px;
background: rgba(46,217,239,0.2); background: rgba(46, 217, 239, 0.2);
// border: 2px solid #2ED9EF; // border: 2px solid #2ED9EF;
margin: 0 10px; margin: 0 10px;
text-align: center; text-align: center;
...@@ -81,10 +84,9 @@ ...@@ -81,10 +84,9 @@
.editPointBtn.selected { .editPointBtn.selected {
background: url('../assets/convertor/moduleEdit/poingBtn_select.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/poingBtn_select.png') no-repeat 100% 100%;
} }
} }
// 左侧树 // 左侧树
.leftTree { .leftTree {
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -110,11 +112,9 @@ ...@@ -110,11 +112,9 @@
border: none; border: none;
line-height: 31px; line-height: 31px;
padding: 5px; padding: 5px;
color: #F0DF2D; color: #f0df2d;
} }
.leftSearch { .leftSearch {
height: 33px; height: 33px;
line-height: 33px; line-height: 33px;
...@@ -126,10 +126,9 @@ ...@@ -126,10 +126,9 @@
color: #fff; color: #fff;
} }
.amosicon-search { .amosicon-search {
color: #2ED9EF; color: #2ed9ef;
} }
} }
} }
.treeBox { .treeBox {
height: calc(100% - 132px); height: calc(100% - 132px);
...@@ -168,7 +167,7 @@ ...@@ -168,7 +167,7 @@
} }
} }
// 右侧面板 // 右侧面板
.rightEditPanel { .rightEditPanel {
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -185,7 +184,7 @@ ...@@ -185,7 +184,7 @@
border: 1px solid rgba(46, 217, 239, 0.59); border: 1px solid rgba(46, 217, 239, 0.59);
padding: 12px; padding: 12px;
color: #fff; color: #fff;
.basic-demo{ .basic-demo {
height: calc(100% - 53px); height: calc(100% - 53px);
overflow-y: auto; overflow-y: auto;
} }
...@@ -193,27 +192,26 @@ ...@@ -193,27 +192,26 @@
color: #fff; color: #fff;
} }
.topForm { .topForm {
.rightTitle{ .rightTitle {
margin-left: -15px; margin-left: -15px;
.titleText{ .titleText {
margin-left: 5px; margin-left: 5px;
} }
} }
.amos-input{ .amos-input {
background-color: rgba(4, 30, 36,0.4); background-color: rgba(4, 30, 36, 0.4);
border-radius: 1px; border-radius: 1px;
border: solid 1px rgba(46, 217, 239, 0.59); border: solid 1px rgba(46, 217, 239, 0.59);
font-size: 14px; font-size: 14px;
color:#fff; color: #fff;
} }
.moduleTitle{ .moduleTitle {
height: 50px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
.titleText{ .titleText {
margin-left: 5px; margin-left: 5px;
} }
} }
height: calc(100% - 48px); height: calc(100% - 48px);
padding-left: 20px; padding-left: 20px;
...@@ -223,16 +221,16 @@ ...@@ -223,16 +221,16 @@
.amos-select { .amos-select {
width: 100%; width: 100%;
} }
.radio-text{ .radio-text {
color:#fff color: #fff;
} }
} }
} }
.bottomBtns { .bottomBtns {
position: absolute; position: absolute;
bottom:15px; bottom: 15px;
padding-top: 15px; padding-top: 15px;
left:50%; left: 50%;
margin-left: -100px; margin-left: -100px;
.sureBtn { .sureBtn {
width: 100px; width: 100px;
...@@ -261,42 +259,41 @@ ...@@ -261,42 +259,41 @@
left: 50%; left: 50%;
} }
} }
.amos-select-options{ .amos-select-options {
.selectOption{ .selectOption {
color:#fff; color: #fff;
background-color: rgba(10, 53, 62, 0.8); background-color: rgba(10, 53, 62, 0.8);
} }
.selectOption:hover{ .selectOption:hover {
color:#F0DF2D; color: #f0df2d;
background-color: rgba(10, 53, 62, 0.8) background-color: rgba(10, 53, 62, 0.8);
} }
} }
.pormpt-modal{ .pormpt-modal {
height:100%; height: 100%;
.amos-modal-container{ .amos-modal-container {
background-image: url('../assets/convertor/3dview/promptModal.png'); background-image: url('../assets/convertor/3dview/promptModal.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
height:253px; height: 253px;
width: 392px !important; width: 392px !important;
background-color: transparent; background-color: transparent;
box-shadow: none; box-shadow: none;
.amos-modal-content{ .amos-modal-content {
width: 100%; width: 100%;
height: 100%; height: 100%;
color: #fff; color: #fff;
font-size: 20px; font-size: 20px;
font-weight: normal; font-weight: normal;
.prompt-content{ .prompt-content {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top:40px ; padding-top: 40px;
display:flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
.prompt-buttons{ .prompt-buttons {
span { span {
display: inline-block; display: inline-block;
width: 71px; width: 71px;
...@@ -305,24 +302,22 @@ ...@@ -305,24 +302,22 @@
margin: 0 10px; margin: 0 10px;
text-align: center; text-align: center;
} }
.promptOk{ .promptOk {
background: url('../assets/convertor/3dview/promptOk.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptOk.png') no-repeat 100% 100%;
} }
.promptNo { .promptNo {
background: url('../assets/convertor/3dview/promptNo.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptNo.png') no-repeat 100% 100%;
} }
.promptSave{ .promptSave {
background: url('../assets/convertor/3dview/promptSave.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptSave.png') no-repeat 100% 100%;
} }
.promptCancel{ .promptCancel {
background: url('../assets/convertor/3dview/promptCancel.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptCancel.png') no-repeat 100% 100%;
} }
} }
} }
} }
} }
} }
// .rayd-modal{ // .rayd-modal{
// background-color: rgba(25, 86, 147, 0.6) !important; // background-color: rgba(25, 86, 147, 0.6) !important;
......
mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js
View file @ 6cafbc87
/* eslint-disable react/prop-types */ /* eslint-disable react/prop-types */
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
<<<<<<< HEAD
import { Connect,Tree,Select,Search,Button } from 'amos-framework';
=======
import { Connect, Tree, Select, Search, Button } from 'amos-framework'; import { Connect, Tree, Select, Search, Button } from 'amos-framework';
import imgStatic from '../../consts/imgStatic'; import imgStatic from '../../consts/imgStatic';
const moduleEditIcon = imgStatic.moduleEditIcon; const moduleEditIcon = imgStatic.moduleEditIcon;
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
const eventConnect = Connect.eventConnect; const eventConnect = Connect.eventConnect;
const TreeNode = Tree.TreeNode; const TreeNode = Tree.TreeNode;
const Option = Select.Option; const Option = Select.Option;
...@@ -48,23 +44,14 @@ class PointLeftTree extends Component { ...@@ -48,23 +44,14 @@ class PointLeftTree extends Component {
} }
componentDidMount() { componentDidMount() {
<<<<<<< HEAD
let { treeData,pointTypeArr,treeDataList } = this.props;
=======
let { treeData, pointTypeArr, treeDataList } = this.props; let { treeData, pointTypeArr, treeDataList } = this.props;
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
this.setState({ this.setState({
treeData, treeData,
treeDataList, treeDataList,
pointTypeArr, pointTypeArr,
<<<<<<< HEAD
pointType: pointTypeArr[0] ? pointTypeArr[0].code : ''
});
=======
pointType: pointTypeArr[0]?pointTypeArr[0].code:'' pointType: pointTypeArr[0]?pointTypeArr[0].code:''
}); });
// console.log(this.props) // console.log(this.props)
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
...@@ -134,47 +121,6 @@ class PointLeftTree extends Component { ...@@ -134,47 +121,6 @@ class PointLeftTree extends Component {
); );
if (item.children) { if (item.children) {
return ( return (
<<<<<<< HEAD
<TreeNode
title={
<div>
{item.isRegion ?
<span>
{title}
<span className='icon'>
{
// eslint-disable-next-line jsx-a11y/alt-text
item.isRegion ? item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
// eslint-disable-next-line jsx-a11y/alt-text
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> :
// eslint-disable-next-line jsx-a11y/alt-text
item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
// eslint-disable-next-line jsx-a11y/alt-text
item.position3d ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' /> :
// eslint-disable-next-line jsx-a11y/alt-text
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
}
</span>
</span> :
<span
draggable
onDragStart={() => {
this.props.dragItemChange(item);
}}
>
{title}
<span className='icon'>
{
item.isRegion ? item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> :
item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
item.position3d ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' /> :
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
}
</span>
</span>}
</div>
=======
<TreeNode <TreeNode
title={ title={
<div> <div>
...@@ -209,7 +155,6 @@ class PointLeftTree extends Component { ...@@ -209,7 +155,6 @@ class PointLeftTree extends Component {
</span> </span>
</span>} </span>}
</div> </div>
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
} }
key={item.id} key={item.id}
dataRef={item} dataRef={item}
......
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