Compare commits

..

No commits in common. "e8aee0fb3e276dba40999e0858cddcd3dc6fb6a2" and "0e61082d161ee8af68252b85f2c4dfe3f701b8d6" have entirely different histories.

4 changed files with 24 additions and 62 deletions

View File

@ -167,16 +167,8 @@
left: 10px; left: 10px;
} }
.collapse.set-params .el-collapse-item.active .el-collapse-item__header { .collapse.set-params .el-collapse-item__header {
background: rgba(255, 255, 255, 0.1); padding-left: 20px;
border: 1px solid rgba(255, 255, 255, 0.3);
}
.collapse.set-params .el-collapse-item.active .el-collapse-item__header .name {
color: #fff !important;
}
.collapse.set-params .el-collapse-item__header .name {
color: #A8B6C8; color: #A8B6C8;
} }

File diff suppressed because one or more lines are too long

View File

@ -176,27 +176,11 @@
} }
&.set-params { &.set-params {
.el-collapse-item {
&.active{
.el-collapse-item__header { .el-collapse-item__header {
background: rgba(255, 255, 255, 0.1); padding-left: 20px;
border: 1px solid rgba(255, 255, 255, 0.3);
.name {
color: #fff !important;
}
}
}
}
.el-collapse-item__header {
.name{
color: #A8B6C8; color: #A8B6C8;
} }
}
.table-ul { .table-ul {
.table-li { .table-li {
width: 100%; width: 100%;

View File

@ -9,16 +9,13 @@
</div> </div>
<el-collapse v-model="$store.state.activeNames"> <el-collapse v-model="$store.state.activeNames">
<template v-for="item, index in routerList"> <template v-for="item, index in routerList">
<el-collapse-item :class="routerNow == item.router ? 'active' : ''" :name="index + 1" :key="index" <el-collapse-item :name="index + 1" :key="index" v-if="!item.isRouter">
v-if="!item.isRouter">
<template slot="title" class="collapse-title"> <template slot="title" class="collapse-title">
<span class="name">{{ item.name }}</span> {{ item.name }}
</template> </template>
<!-- --> <!-- -->
<ul class="table-ul"> <ul class="table-ul">
<li @click="toRouter(item1)" <li @click="toRouter(item1)" :class="routerNow == item1.router&&routerIndex==index1+1 ? 'active' : ''" class="table-li" v-for="item1, index1 in item.list" :key="index1">{{
:class="routerNow == item1.router && routerIndex == index1 + 1 ? 'active' : ''" class="table-li"
v-for="item1, index1 in item.list" :key="index1">{{
item1.name }} <div class="status" :class="item1.status == 0 ? 'outline' : 'online'" item1.name }} <div class="status" :class="item1.status == 0 ? 'outline' : 'online'"
v-if="item1.status >= 0">{{ item1.status v-if="item1.status >= 0">{{ item1.status
== 0 == 0
@ -26,9 +23,7 @@
</li> </li>
</ul> </ul>
</el-collapse-item> </el-collapse-item>
<div @click="toRouter(item)" :class="routerNow == item.router ? 'active' : ''" class="no-list" v-else>{{ <div @click="toRouter(item)" :class="routerNow==item.router?'active':''" class="no-list" v-else>{{ item.name }}</div>
item.name
}}</div>
</template> </template>
</el-collapse> </el-collapse>
</div> </div>
@ -38,9 +33,9 @@ export default {
data() { data() {
return { return {
routerList: [ routerList: [
{ name: '施肥机配方设置', list: [], router: 'formula' }, { name: '施肥机配方设置', list: [],router:'' },
{ {
name: '灌溉组配置', router: 'irrigateSet', list: [ name: '灌溉组配置',router:'', list: [
{ name: '1#灌溉组配置', status: -1, router: 'irrigateSet', index: 1 }, { name: '1#灌溉组配置', status: -1, router: 'irrigateSet', index: 1 },
{ name: '2#灌溉组配置', status: -1, router: 'irrigateSet', index: 2 }, { name: '2#灌溉组配置', status: -1, router: 'irrigateSet', index: 2 },
{ name: '3#灌溉组配置', status: -1, router: 'irrigateSet', index: 3 }, { name: '3#灌溉组配置', status: -1, router: 'irrigateSet', index: 3 },
@ -146,23 +141,14 @@ export default {
margin-right: 10px; margin-right: 10px;
} }
} }
.el-collapse-item {
&.active {}
}
.no-list{ .no-list{
color: #A8B6C8; color: #A8B6C8;
&.active{ &.active{
background: rgba(255, 255, 255, 0.1); background: rgba(255, 255, 255, 0.1);
border: 1px solid rgba(255, 255, 255, 0.3); border: 1px solid rgba(255, 255, 255, 0.3);
color: #fff; color: #fff;
} }
} }
.set-tips { .set-tips {
width: 100%; width: 100%;
border-bottom: 1px solid rgba(168, 182, 200, 0.2); border-bottom: 1px solid rgba(168, 182, 200, 0.2);