xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'pc-master' (#18) from pc-master into portal 

Reviewed-on: #18
pull/34/head^2
xiaomeng 2023-10-17 10:08:39 +00:00
parent ceba1f0b47 d90bf7bef1
commit 0e61082d16
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/setParams.vue
View File

@ -23,7 +23,7 @@
</li>
</ul>
</el-collapse-item>
<div @click="toRouter(item)" class="no-list" v-else>{{ item.name }}</div>
<div @click="toRouter(item)" :class="routerNow==item.router?'active':''" class="no-list" v-else>{{ item.name }}</div>
</template>
</el-collapse>
</div>
@ -33,9 +33,9 @@ export default {
data() {
return {
routerList: [
{ name: '施肥机配方设置', list: [] },
{ name: '施肥机配方设置', list: [],router:'' },
{
name: '灌溉组配置', list: [
name: '灌溉组配置',router:'', list: [
{ name: '1#灌溉组配置', status: -1, router: 'irrigateSet', index: 1 },
{ name: '2#灌溉组配置', status: -1, router: 'irrigateSet', index: 2 },
{ name: '3#灌溉组配置', status: -1, router: 'irrigateSet', index: 3 },
@ -141,7 +141,14 @@ export default {
margin-right: 10px;
}
}
.no-list{
color: #A8B6C8;
&.active{
background: rgba(255, 255, 255, 0.1);
border: 1px solid rgba(255, 255, 255, 0.3);
color: #fff;
}
}
.set-tips {
width: 100%;
border-bottom: 1px solid rgba(168, 182, 200, 0.2);
@ -153,8 +160,8 @@ export default {
>div {
width: 220px;
height: 40px;
background: rgba(255, 255, 255, 0.1);
border: 1px solid rgba(255, 255, 255, 0.3);
// background: rgba(255, 255, 255, 0.1);
// border: 1px solid rgba(255, 255, 255, 0.3);
display: flex;
align-items: center;

3
src/views/index.vue
View File

@ -61,7 +61,8 @@ export default {
headerActive: 0,
headerList: [
{ name: '实时数据', router: 'realTime', routerList: ['realTime'], img: require('../assets/image/header-img1.png') },
{ name: '设定值参数', router: 'status', index: 1, routerList: ['formula', 'irrigateSet', 'PIDSet', 'systemSet', 'upload', 'sensorSet'], img: require('../assets/image/header-img0.png') },
// { name: '设定值参数', router: 'status', index: 1, routerList: ['formula', 'irrigateSet', 'PIDSet', 'systemSet', 'upload', 'sensorSet'], img: require('../assets/image/header-img0.png') },
{ name: '设定值参数', router: 'status', index: 1, routerList: ['status'], img: require('../assets/image/header-img0.png') },
{ name: '设备菜单', router: '', routerList: [], img: require('../assets/image/header-img1.png') },
{ name: '视频监控', router: '', routerList: [], img: require('../assets/image/header-img2.png') },
// history history