joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into test

Browse Source 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/index.vue
#	src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
This commit is contained in:
zyy 2020-04-10 16:43:40 +08:00
commit 74942486fd
3 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/views/newMap/newMapdraft/mapoperate/index.vue
View File

@ -424,44 +424,47 @@ export default {
} }
/deep/ { /deep/ {
.mapEdit .el-tabs__nav-wrap.is-scrollable { .mapEdit .el-tabs__nav-wrap.is-scrollable {
padding: 0 20px; padding: 0 20px;
} }
.mapEdit .el-tabs__header .el-tabs__item.is-active { .mapEdit .el-tabs__header .el-tabs__item.is-active {
border-bottom-color: #f5f7fa; border-bottom-color: #f5f7fa;
background: #f5f7fa; background: #f5f7fa;
} }
.mapEdit .el-tabs__active-bar{ .mapEdit .el-tabs__active-bar{
background: transparent; background: transparent;
} }
.mapEdit .el-tabs__content { .mapEdit .el-tabs__content {
height: calc(100% - 56px); height: calc(100% - 56px);
} }
.card .el-tabs__nav .el-tabs__item.is-active { .card .el-tabs__nav .el-tabs__item.is-active {
border-bottom: 2px solid #E4E7ED; border-bottom: 2px solid #E4E7ED;
background: #409eff; background: #409eff;
color: #fff; color: #fff;
} }
.card .el-tabs__nav .el-tabs__item{
padding: 0 20px!important;
}
.mapEdit .el-tabs__nav-prev { .mapEdit .el-tabs__nav-prev {
width: 20px; width: 20px;
height: 41px; height: 41px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
box-shadow: 1px 1px 4px #ccc; box-shadow: 1px 1px 4px #ccc;
} }
.mapEdit .el-tabs__nav-next { .mapEdit .el-tabs__nav-next {
width: 20px; width: 20px;
height: 41px; height: 41px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
box-shadow: 1px 1px 4px #ccc; box-shadow: 1px 1px 4px #ccc;
} }
} }
// 页面页签样式 // 页面页签样式
/deep/ { /deep/ {

2
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -485,7 +485,7 @@ export default {
if (section.parentCode === model.code) { if (section.parentCode === model.code) {
const copySection = deepAssign({}, section); const copySection = deepAssign({}, section);
copySection.logicSectionShow = model.logicSectionShow; copySection.logicSectionShow = model.logicSectionShow;
// copySection.lengthFact = (Number(model.lengthFact) / model.logicSectionCodeList.length).toFixed(3); // 容易变成正无穷 或者 NaN // copySection.lengthFact = (Number(model.lengthFact) / model.logicSectionCodeList.length).toFixed(3); // 容易处理成无限大
copySection.stationCode = model.stationCode; // 给元素 子逻辑区段设置 设备集中站 copySection.stationCode = model.stationCode; // 给元素 子逻辑区段设置 设备集中站
models.push(copySection); models.push(copySection);
} else if (model.code !== section.code && (section.type === '01' || section.type === '03')) { } else if (model.code !== section.code && (section.type === '01' || section.type === '03')) {

2
src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
View File

@ -81,7 +81,7 @@ export default {
this.tableData.forEach((ele, index) => { this.tableData.forEach((ele, index) => {
totalNum += Number(ele.num); totalNum += Number(ele.num);
}); });
let lineLength = 0; // 默认实际长度为0 let lineLength = 0; // NaN 由于 0/0 造成的
if (totalNum) { if (totalNum) {
lineLength = lengthFact / totalNum; // 均分逻辑区段偏移量 lineLength = lengthFact / totalNum; // 均分逻辑区段偏移量
} }