From f466ae4fdc645c66c9f25e2e4598b9809e2b41af Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 一月 2024 22:56:49 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front
---
src/container/home/index.vue | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/container/home/index.vue b/src/container/home/index.vue
index 8053e10..339e69e 100644
--- a/src/container/home/index.vue
+++ b/src/container/home/index.vue
@@ -3,7 +3,7 @@
<template slot="menu">
<div class="menu-container">
<ul class="">
- <li :class="activeId ==='1' ? 'active' : ''" @click="navigateTo('1')">鐘舵�佺洃鎺�</li>
+ <!-- <li :class="activeId ==='1' ? 'active' : ''" @click="navigateTo('1')">鐘舵�佺洃鎺�</li> -->
<li :class="activeId ==='0' ? 'active' : ''" @click="navigateTo('0')">澶у睆灞曠ず</li>
<li :class="activeId ==='2' ? 'active' : ''" @click="navigateTo('2')">
<span>
@@ -15,22 +15,22 @@
<span>
杞﹂棿鍒楄〃<i class="el-icon-caret-bottom"></i>
</span>
- <ul v-if="showSub">
- <li v-for="item in workshopList" :key="item.id" @click.stop="navigateTo('3',item)">{{ item.name }}</li>
+ <ul v-if="showSub" class="sub">
+ <li v-for="item in workshopList" :key="item.id" @click.stop="navigateTo('workshop',item)">{{ item.name }}</li>
</ul>
</li>
<li :class="activeId ==='4' ? 'active' : ''" @click="navigateTo('4')">
<span>
璁惧淇濆吇<i class="el-icon-caret-bottom"></i>
</span>
- <!-- <ul v-if="showSub">
- <li>2鍘�</li>
- <li>2鍘�</li>
- <li>2鍘�</li>
- <li>2鍘�</li>
- </ul> -->
+ <ul v-if="showSub">
+ <li @click="navigateTo('maintenance', {style: 1})">鏃ュ父淇濆吇</li>
+ <li @click="navigateTo('maintenance', {style: 2})">涓�绾�</li>
+ <li @click="navigateTo('maintenance', {style: 3})">浜岀骇</li>
+ <li @click="navigateTo('maintenance', {style: 4})">涓夌骇</li>
+ </ul>
</li>
- <li :class="activeId ==='5' ? 'active' : ''" @click="navigateTo('5')">
+ <!-- <li :class="activeId ==='5' ? 'active' : ''" @click="navigateTo('5')">
<span>
鎶ヨ〃鐢熸垚<i class="el-icon-caret-bottom"></i>
</span>
@@ -40,8 +40,8 @@
<li>2鍘�</li>
<li>2鍘�</li>
</ul>
- </li>
- <li :class="activeId ==='6' ? 'active' : ''" @click="navigateTo('6')">鐝璁剧疆</li>
+ </li> -->
+ <!-- <li :class="activeId ==='6' ? 'active' : ''" @click="navigateTo('6')">鐝璁剧疆</li> -->
<li :class="activeId ==='7' ? 'active' : ''" @click="navigateTo('7')">宸ヤ欢淇℃伅</li>
<li :class="activeId ==='8' ? 'active' : ''" @click="navigateTo('8')">
<span>
@@ -49,9 +49,7 @@
</span>
<ul v-if="showSub">
<li @click="navigateTo('ledger')">鍙拌处</li>
- <li>2鍘�</li>
- <li>2鍘�</li>
- <li>2鍘�</li>
+ <li @click="navigateTo('deviceType')">璁惧绫诲瀷绠＄悊</li>
</ul>
</li>
</ul>
@@ -92,31 +90,32 @@
navigateTo (name,v) {
let routers = {
2: 'map',
- 3: 'workshop',
- 4: 'maintenance',
+ workshop: 'workshop',
+ maintenance: 'maintenance',
7: 'component',
ledger: 'ledger',
+ deviceType: 'deviceType',
}
- console.log(name, '>>>>>>>')
- if (name === this.activeId) {
- this.showSub = !this.showSub
- } else {
- this.showSub = true
- }
- if (['3','5','8'].includes(name)) {
+
+ if (['3','4','5','8'].includes(name)) {
+ if (name === this.activeId) {
+ this.showSub = !this.showSub
+ } else {
+ this.showSub = true
+ }
this.activeId = name
- console.log(v)
- this.$router.push({name: routers[name],params: {id: v.id},query: {
- ...v
- }})
- this.$nextTick(() => {
- this.showSub = false
- })
} else {
this.activeId = name
- console.log(name)
- // this.$router.push('/home/map')
- this.$router.push({name: routers[name]})
+ let params = {}
+ let query = {}
+ if ('workshop' === name) {
+ params.id = v.id
+ query.name = v.name
+ }
+ if (name === 'maintenance') {
+ params.style = v.style
+ }
+ this.$router.push({name: routers[name],params: params,query: query})
this.$nextTick(() => {
this.showSub = false
})
@@ -148,6 +147,7 @@
position: relative;
ul {
display: none;
+ font-size: 14px;
}
// user-select:none;
}
--
Gitblit v1.9.3