From 6cec2849bab43d06ec59f8b2cf691a9e76572540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Tue, 24 Jun 2025 22:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/common.scss           | 52 +++++++++++++++++
 src/components/Ems/ZdSelect/index.vue   |  2 +-
 src/views/ems/dzjk/gzgj/index.vue       | 78 ++++++++++---------------
 src/views/ems/dzjk/index.vue            | 37 +++++-------
 src/views/ems/dzjk/sbjk/dtdc/index.vue  | 55 +++++++----------
 src/views/ems/dzjk/sbjk/index.vue       | 44 +++++---------
 src/views/ems/dzjk/tjbb/dbbb/index.vue  | 61 +++++++++----------
 src/views/ems/dzjk/tjbb/dcdqx/index.vue | 14 +----
 src/views/ems/dzjk/tjbb/dcwd/index.vue  | 62 +++++++++-----------
 src/views/ems/dzjk/tjbb/glqx/index.vue  | 14 +----
 src/views/ems/dzjk/tjbb/gltj/Dlzb.vue   |  2 +-
 src/views/ems/dzjk/tjbb/gltj/Syzb.vue   |  2 +-
 src/views/ems/dzjk/tjbb/index.vue       | 50 ++++++----------
 src/views/ems/dzjk/tjbb/pcsqx/index.vue | 15 +----
 14 files changed, 213 insertions(+), 275 deletions(-)

diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss
index 8072db1..f110532 100644
--- a/src/assets/styles/common.scss
+++ b/src/assets/styles/common.scss
@@ -110,3 +110,55 @@
     }
   }
 }
+
+//二、三级菜单栏样式
+.ems-second-menu{
+  width:fit-content;
+  .el-menu-item{
+    line-height: 40px;
+    height: 40px;
+    padding:0;
+  }
+  &.el-menu--horizontal > .el-menu-item.is-active,&.el-menu--horizontal > .el-menu-item{
+    border-bottom:none!important;
+  }
+  .el-menu-item.is-active{
+    background: #0366c1!important;
+  }
+}
+.ems-third-menu{
+  border-right: none;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  height: fit-content;
+  .el-menu-item{
+    line-height: 45px;
+    height: 45px;
+    padding: 0 !important;
+    width: 125px;
+    text-align: center;
+  }
+  .el-menu-item:hover{
+    background: #67b1ff!important;
+    color:#ffffff!important;
+  }
+  .el-menu-item.is-active{
+    background: #409eff!important;
+  }
+
+}
+
+
+//按钮栏 选中样式
+.ems-btns-group{
+  .activeBtn{
+    background-color: #0366c1;
+    border-color: #0366c1;
+    color: #ffffff;
+    font-weight: 600;
+  }
+}
+
+//搜索栏样式
+.select-container.el-form--inline .el-form-item{
+  margin-right: 15px;
+}
diff --git a/src/components/Ems/ZdSelect/index.vue b/src/components/Ems/ZdSelect/index.vue
index c6f2c6a..740fb4d 100644
--- a/src/components/Ems/ZdSelect/index.vue
+++ b/src/components/Ems/ZdSelect/index.vue
@@ -8,7 +8,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="warning" @click="onSubmit">搜索</el-button>
+        <el-button type="primary" @click="onSubmit">搜索</el-button>
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index d203ef8..809a5a7 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -2,43 +2,41 @@
 <template>
   <el-card shadow="always" class="common-card-container common-card-container-no-title-bg">
     <!--    搜索栏-->
-    <div class="select-container">
-      <el-form :inline="true">
-        <el-form-item label="设备类型">
-          <el-select v-model="search.sblx" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in sblxOptions" :key="index+'sblxOptions'"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="告警等级">
-          <el-select v-model="search.gjdj" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in gjdjOptions" :key="index+'gjdjOptions'"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="时间选择">
-          <el-date-picker
-            v-model="dateRange"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始时间"
-            :picker-options="pickerOptions"
-            :default-value="defaultDateRange"
-            end-placeholder="结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="onReset" native-type="button">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" class="select-container">
+      <el-form-item label="设备类型">
+        <el-select v-model="search.sblx" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+          <el-option :label="item.name" :value="item.id" v-for="(item,index) in sblxOptions" :key="index+'sblxOptions'"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="告警等级">
+        <el-select v-model="search.gjdj" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+          <el-option :label="item.name" :value="item.id" v-for="(item,index) in gjdjOptions" :key="index+'gjdjOptions'"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间选择">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始时间"
+          :picker-options="pickerOptions"
+          :default-value="defaultDateRange"
+          end-placeholder="结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onReset" native-type="button">重置</el-button>
+      </el-form-item>
+    </el-form>
     <div style="margin:30px 0;">
       <!--        二个选择按钮-->
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-button-group>
-            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'"  type="warning" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+          <el-button-group class="ems-btns-group">
+            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -154,17 +152,3 @@ export default {
   }
 }
 </script>
-
-<style scoped lang="scss">
-.select-container{
-  .el-form--inline .el-form-item{
-    margin-right: 20px;
-  }
-}
-.activeBtn{
-  background-color: #FFF2CB;
-  border-color: #FFF2CB;
-  color: #666666;
-  font-weight: 600;
-}
-</style>
diff --git a/src/views/ems/dzjk/index.vue b/src/views/ems/dzjk/index.vue
index 3aa3709..92e3eb3 100644
--- a/src/views/ems/dzjk/index.vue
+++ b/src/views/ems/dzjk/index.vue
@@ -3,14 +3,20 @@
 <template>
   <div class="ems-dashboard-editor-container">
   <zd-select :get-list-by-store="true" :default-site-id="$route.query.siteId" @submitSite="submitSite"/>
-<!--  这里是单站监控的二级菜单栏 需要循环拿到数据 显示在页面上-->
-    <div class="router-container">
-      <div class="route-link" :class="{'active':item.name === $route.meta.activeSecondMenuName}" v-for="(item,index) in childrenRoute" :key="index+'dzjkChildrenRoute'">
-        <router-link  style="height: 100%;width: 100%;display: block" :to="{path:item.path,query:$route.query}">
+  <el-menu
+    class="ems-second-menu"
+    :default-active="$route.meta.activeSecondMenuName"
+    background-color="#1890ff"
+    text-color="#ffffff"
+    active-text-color="#ffffff"
+    mode="horizontal"
+  >
+    <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'dzjkChildrenRoute'">
+      <router-link  style="height: 100%;width: 100%;display: block;padding:0 20px;" :to="{path:item.path,query:$route.query}">
         {{item.meta.title}}
-        </router-link>
-      </div>
-    </div>
+      </router-link>
+    </el-menu-item>
+  </el-menu>
   <div class="ems-content-container ems-content-container-padding dzjk-ems-content-container">
     <keep-alive>
       <router-view></router-view>
@@ -56,23 +62,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  .router-container{
-    display: flex;
-    .route-link{
-      width: 104px;
-      height: 40px;
-      line-height: 40px;
-      background-color: #FFBE29 ;
-      color: #666666;
-      font-size: 14px;
-      text-align: center;
-    }
-    .route-link.active{
-      background-color: #ffffff;
-      color: #333333;
-      font-weight: 500;
-    }
-  }
   .dzjk-ems-content-container{
     margin-top:0;
   }
diff --git a/src/views/ems/dzjk/sbjk/dtdc/index.vue b/src/views/ems/dzjk/sbjk/dtdc/index.vue
index 35a4e94..f495d18 100644
--- a/src/views/ems/dzjk/sbjk/dtdc/index.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/index.vue
@@ -5,32 +5,30 @@
           <span class="large-title">单体电池实时数据</span>
         </div>
       <!--    搜索栏-->
-      <div class="select-container">
-        <el-form :inline="true">
-          <el-form-item label="电池堆">
-            <el-select v-model="search.dcd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-              <el-option :label="item.name" :value="item.id" v-for="(item,index) in dcdOptions" :key="index+'dcdOptions'"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="电池簇">
-            <el-select v-model="search.dcc" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-              <el-option :label="item.name" :value="item.id" v-for="(item,index) in dccOptions" :key="index+'dccOptions'"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button @click="onReset" native-type="button">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+      <el-form :inline="true" class="select-container">
+        <el-form-item label="电池堆">
+          <el-select v-model="search.dcd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+            <el-option :label="item.name" :value="item.id" v-for="(item,index) in dcdOptions" :key="index+'dcdOptions'"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="电池簇">
+          <el-select v-model="search.dcc" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+            <el-option :label="item.name" :value="item.id" v-for="(item,index) in dccOptions" :key="index+'dccOptions'"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="onReset" native-type="button">重置</el-button>
+        </el-form-item>
+      </el-form>
       <div style="margin:30px 0;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);">
         <!--        四个选择按钮-->
         <el-row style="">
           <el-col :xs="24" :sm="24" :lg="24">
-            <el-button-group>
-              <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'"  type="warning" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+            <el-button-group class="ems-btns-group">
+              <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
             </el-button-group>
           </el-col>
         </el-row>
@@ -105,16 +103,3 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
-.select-container{
-  .el-form--inline .el-form-item{
-    margin-right: 20px;
-  }
-}
-.activeBtn{
-  background-color: #FFF2CB;
-  border-color: #FFF2CB;
-  color: #666666;
-  font-weight: 600;
-}
-</style>
diff --git a/src/views/ems/dzjk/sbjk/index.vue b/src/views/ems/dzjk/sbjk/index.vue
index 3e3a499..d3d1f9f 100644
--- a/src/views/ems/dzjk/sbjk/index.vue
+++ b/src/views/ems/dzjk/sbjk/index.vue
@@ -1,14 +1,18 @@
 <template>
     <div class="ems-dashboard-editor-container sbjk-ems-dashboard-editor-container">
-    <div class="router-container">
-      <div>
-        <div class="route-link" :class="{'active':item.name === $route.name}" v-for="(item,index) in childrenRoute" :key="index+'dzjkChildrenRoute'">
-          <router-link  style="height: 100%;width: 100%;display: block" :to="{path:item.path,query:$route.query}">
-            {{item.meta.title}}
-          </router-link>
-      </div>
-      </div>
-    </div>
+    <el-menu
+      class="ems-third-menu"
+      :default-active="$route.name"
+      background-color="#ffffff"
+      text-color="#666666"
+      active-text-color="#ffffff"
+    >
+      <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'dzjkChildrenRoute'">
+        <router-link  style="height: 100%;width: 100%;display: block" :to="{path:item.path,query:$route.query}">
+          {{item.meta.title}}
+        </router-link>
+      </el-menu-item>
+    </el-menu>
     <div class="ems-content-container ems-content-container-padding sbjk-ems-content-container">
       <keep-alive>
         <router-view></router-view>
@@ -42,28 +46,6 @@ export default {
   padding:0;
   background: #FFFFFF;
 }
-.router-container{
-  &>div{
-    border: 1px solid #dcdfe6;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px 0 rgba(0, 0, 0, .04);
-    display: flex;
-    flex-direction: column;
-  }
-  .route-link{
-    width: 104px;
-    height: 40px;
-    line-height: 40px;
-    background-color: #ffffff;
-    color: #666666;
-    font-size: 14px;
-    text-align: center;
-  }
-  .route-link.active{
-    background-color: #FFBE29 ;
-    color: #333333;
-    font-weight: 500;
-  }
-}
 .sbjk-ems-content-container{
   margin-top:0;
   padding-top:0;
diff --git a/src/views/ems/dzjk/tjbb/dbbb/index.vue b/src/views/ems/dzjk/tjbb/dbbb/index.vue
index f99309a..18c0059 100644
--- a/src/views/ems/dzjk/tjbb/dbbb/index.vue
+++ b/src/views/ems/dzjk/tjbb/dbbb/index.vue
@@ -1,35 +1,33 @@
 
 <template>
-  <div>
+  <div style="width:100%">
     <!--    搜索栏-->
-    <div class="select-container">
-      <el-form :inline="true">
-        <el-form-item label="电表">
-          <el-select v-model="search.db" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in dbOptions" :key="index+'dbOptions'"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="日报">
-          <el-select v-model="search.rb" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in rbOptions" :key="index+'rbOptions'"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="时间选择">
-          <el-date-picker
-            v-model="search.date"
-            type="date"
-            :picker-options="pickerOptions"
-            :default-value="defaultDate">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="onReset" native-type="button">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" class="select-container">
+      <el-form-item label="电表">
+        <el-select v-model="search.db" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+          <el-option :label="item.name" :value="item.id" v-for="(item,index) in dbOptions" :key="index+'dbOptions'"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="日报">
+        <el-select v-model="search.rb" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+          <el-option :label="item.name" :value="item.id" v-for="(item,index) in rbOptions" :key="index+'rbOptions'"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间选择">
+        <el-date-picker
+          v-model="search.date"
+          type="date"
+          :picker-options="pickerOptions"
+          :default-value="defaultDate">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onReset" native-type="button">重置</el-button>
+      </el-form-item>
+    </el-form>
     <!--表格-->
     <el-table
           class="common-table"
@@ -163,11 +161,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.select-container{
-  .el-form--inline .el-form-item{
-    margin-right: 20px;
-  }
-}
 ::v-deep{
   .common-table.el-table .el-table__header-wrapper th, .common-table.el-table .el-table__fixed-header-wrapper th{
     border-bottom: 1px solid #dfe6ec;
diff --git a/src/views/ems/dzjk/tjbb/dcdqx/index.vue b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
index c63c74d..4974574 100644
--- a/src/views/ems/dzjk/tjbb/dcdqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
@@ -20,7 +20,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
+          <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
         </el-form-item>
         <el-form-item>
           <el-button @click="onReset" native-type="button">重置</el-button>
@@ -31,8 +31,8 @@
       <!--        二个选择按钮-->
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-button-group>
-            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'"  type="warning" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+          <el-button-group class="ems-btns-group">
+            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -156,11 +156,3 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
-.activeBtn{
-  background-color: #FFF2CB;
-  border-color: #FFF2CB;
-  color: #666666;
-  font-weight: 600;
-}
-</style>
diff --git a/src/views/ems/dzjk/tjbb/dcwd/index.vue b/src/views/ems/dzjk/tjbb/dcwd/index.vue
index e6cb299..ad0a16a 100644
--- a/src/views/ems/dzjk/tjbb/dcwd/index.vue
+++ b/src/views/ems/dzjk/tjbb/dcwd/index.vue
@@ -2,34 +2,32 @@
 <template>
   <div>
     <!--    搜索栏-->
-    <div class="select-container">
-      <el-form :inline="true">
-        <el-form-item label="电池堆">
-          <el-select v-model="search.dcd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in dcdOptions" :key="index+'dcdOptions'"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="电池簇">
-          <el-select v-model="search.gjdj" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in dccOptions" :key="index+'dccOptions'"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="时间选择">
-          <el-date-picker
-            v-model="search.date"
-            type="date"
-            :picker-options="pickerOptions"
-            :default-value="defaultDate">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="onReset" native-type="button">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" class="select-container">
+      <el-form-item label="电池堆">
+        <el-select v-model="search.dcd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+          <el-option :label="item.name" :value="item.id" v-for="(item,index) in dcdOptions" :key="index+'dcdOptions'"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="电池簇">
+        <el-select v-model="search.gjdj" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+          <el-option :label="item.name" :value="item.id" v-for="(item,index) in dccOptions" :key="index+'dccOptions'"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间选择">
+        <el-date-picker
+          v-model="search.date"
+          type="date"
+          :picker-options="pickerOptions"
+          :default-value="defaultDate">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onReset" native-type="button">重置</el-button>
+      </el-form-item>
+    </el-form>
     <div style="margin:30px 0;">
       <!--表格-->
       <el-table
@@ -139,11 +137,3 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
-.select-container{
-  .el-form--inline .el-form-item{
-    margin-right: 20px;
-  }
-}
-
-</style>
diff --git a/src/views/ems/dzjk/tjbb/glqx/index.vue b/src/views/ems/dzjk/tjbb/glqx/index.vue
index cdf772b..ecc2259 100644
--- a/src/views/ems/dzjk/tjbb/glqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/glqx/index.vue
@@ -20,7 +20,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
+          <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
         </el-form-item>
         <el-form-item>
           <el-button @click="onReset" native-type="button">重置</el-button>
@@ -31,8 +31,8 @@
       <!--        二个选择按钮-->
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-button-group>
-            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'"  type="warning" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+          <el-button-group class="ems-btns-group">
+            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -156,11 +156,3 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
-.activeBtn{
-  background-color: #FFF2CB;
-  border-color: #FFF2CB;
-  color: #666666;
-  font-weight: 600;
-}
-</style>
diff --git a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
index 7c173ef..dd6d0a2 100644
--- a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
+++ b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
@@ -19,7 +19,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
+            <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
           </el-form-item>
           <el-form-item>
             <el-button @click="onReset" native-type="button">重置</el-button>
diff --git a/src/views/ems/dzjk/tjbb/gltj/Syzb.vue b/src/views/ems/dzjk/tjbb/gltj/Syzb.vue
index cdb2ea9..a5549b7 100644
--- a/src/views/ems/dzjk/tjbb/gltj/Syzb.vue
+++ b/src/views/ems/dzjk/tjbb/gltj/Syzb.vue
@@ -19,7 +19,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
+            <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
           </el-form-item>
           <el-form-item>
             <el-button @click="onReset" native-type="button">重置</el-button>
diff --git a/src/views/ems/dzjk/tjbb/index.vue b/src/views/ems/dzjk/tjbb/index.vue
index c17550e..13fa142 100644
--- a/src/views/ems/dzjk/tjbb/index.vue
+++ b/src/views/ems/dzjk/tjbb/index.vue
@@ -1,14 +1,19 @@
 <template>
   <div class="ems-dashboard-editor-container tjbb-ems-dashboard-editor-container">
-    <div class="router-container">
-      <div>
-        <div class="route-link" :class="{'active':item.name === $route.name}" v-for="(item,index) in childrenRoute" :key="index+'tjbbChildrenRoute'">
-          <router-link  style="height: 100%;width: 100%;display: block" :to="{path:item.path,query:$route.query}">
-            {{item.meta.title}}
-          </router-link>
-        </div>
-      </div>
-    </div>
+    <el-menu
+      class="ems-third-menu"
+      :default-active="$route.name"
+      background-color="#ffffff"
+      text-color="#666666"
+      active-text-color="#ffffff"
+    >
+      <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'tjbbChildrenRoute'">
+        <router-link  style="height: 100%;width: 100%;display: block;" :to="{path:item.path,query:$route.query}">
+          {{item.meta.title}}
+        </router-link>
+      </el-menu-item>
+    </el-menu>
+
     <div class="ems-content-container ems-content-container-padding tjbb-ems-content-container">
       <keep-alive>
         <router-view></router-view>
@@ -24,6 +29,11 @@ const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='Djzk
 console.log('设备监控子路由',childrenRoute)
 export default {
   name:'DzjkTjbb',
+  computed: {
+    theme() {
+      return this.$store.state.settings.theme
+    },
+  },
   data(){
     return {
       childrenRoute,
@@ -43,28 +53,6 @@ export default {
   padding:0;
   background: #FFFFFF;
 }
-.router-container{
-  &>div{
-    border: 1px solid #dcdfe6;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px 0 rgba(0, 0, 0, .04);
-    display: flex;
-    flex-direction: column;
-  }
-  .route-link{
-    width: 104px;
-    height: 40px;
-    line-height: 40px;
-    background-color: #ffffff;
-    color: #666666;
-    font-size: 14px;
-    text-align: center;
-  }
-  .route-link.active{
-    background-color: #FFBE29 ;
-    color: #333333;
-    font-weight: 500;
-  }
-}
 .tjbb-ems-content-container{
   margin-top:0;
   padding-top:0;
diff --git a/src/views/ems/dzjk/tjbb/pcsqx/index.vue b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
index aa08f12..1bbda47 100644
--- a/src/views/ems/dzjk/tjbb/pcsqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
@@ -20,7 +20,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="warning" @click="onSearch" native-type="button">搜索</el-button>
+          <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
         </el-form-item>
         <el-form-item>
           <el-button @click="onReset" native-type="button">重置</el-button>
@@ -31,8 +31,8 @@
       <!--        二个选择按钮-->
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-button-group>
-            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'"  type="warning" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+          <el-button-group class="ems-btns-group">
+            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -156,12 +156,3 @@ export default {
   },
 }
 </script>
-
-<style scoped lang="scss">
-.activeBtn{
-  background-color: #FFF2CB;
-  border-color: #FFF2CB;
-  color: #666666;
-  font-weight: 600;
-}
-</style>