From b68f2608f324e6dc35e02f5c2c99c0fc67212a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Mon, 21 Jul 2025 23:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                            |  6 +-
 src/assets/styles/common.scss          |  2 +-
 src/mixins/ems/getQuerySiteId.js       | 14 ++---
 src/router/ems.js                      | 86 ++++++++++++--------------
 src/store/modules/ems.js               |  9 +++
 src/views/ems/dzjk/clpz/clyx/index.vue |  2 +-
 src/views/ems/dzjk/clpz/index.vue      | 58 -----------------
 src/views/ems/dzjk/clpz/xftg/index.vue |  2 +-
 src/views/ems/dzjk/gzgj/index.vue      |  4 +-
 src/views/ems/dzjk/home/index.vue      |  7 +--
 src/views/ems/dzjk/sbjk/index.vue      |  5 +-
 src/views/ems/dzjk/tjbb/index.vue      |  5 +-
 src/views/ems/dzjk/zxlt/index.vue      |  3 +-
 13 files changed, 70 insertions(+), 133 deletions(-)
 delete mode 100644 src/views/ems/dzjk/clpz/index.vue

diff --git a/src/App.vue b/src/App.vue
index 12df51d..ba45dca 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,11 @@ import ThemePicker from "@/components/ThemePicker"
 
 export default {
   name: "App",
-  components: { ThemePicker }
+  components: { ThemePicker },
+  mounted() {
+    //获取站点列表
+    this.$store.dispatch('getZdList')
+  }
 }
 </script>
 <style scoped>
diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss
index a3245e6..bc4c1f9 100644
--- a/src/assets/styles/common.scss
+++ b/src/assets/styles/common.scss
@@ -5,7 +5,7 @@
 //右侧内容区域
 //父元素
 .ems-dashboard-editor-container{
-  background-color: #F1F5FC;
+  background-color: #FFFFFF;//#F1F5FC
   padding: 24px;
   font-size: 12px;
 }
diff --git a/src/mixins/ems/getQuerySiteId.js b/src/mixins/ems/getQuerySiteId.js
index e571c40..b1b8276 100644
--- a/src/mixins/ems/getQuerySiteId.js
+++ b/src/mixins/ems/getQuerySiteId.js
@@ -6,16 +6,16 @@ const getQuerySiteId=  {
     }
   },
   watch: {
-    '$route.query':{
+    '$store.state.ems.zdList':{
       handler (newQuery,oldQuery) {
+        if(!newQuery || newQuery.length === 0){return}
         // 参数变化处理
         this.$nextTick(() => {
-          const {siteId} =newQuery
-          if(siteId){
-            this.siteId = siteId
-            siteId && this.init(newQuery.siteId)
-            console.log('mixin=>getQuerySiteId=>页面参数siteId发生了变化,this.siteId=',this.siteId)
-          }
+          const {siteId} =newQuery[0]
+          this.siteId = siteId
+          siteId && this.init(newQuery.siteId)
+          console.log('watch站点列表返回数据newQuery=',newQuery)
+          console.log('设置页面siteId，this.siteId=',this.siteId)
         })
       },
       immediate: true,
diff --git a/src/router/ems.js b/src/router/ems.js
index a2c2b7f..2145077 100644
--- a/src/router/ems.js
+++ b/src/router/ems.js
@@ -25,78 +25,79 @@ export const dzjk=[
     path: '/dzjk',
     component: Layout,
     redirect: '/dzjk/home',
-    meta: { title: '单站监控', icon: 'dashboard',},
+    meta: { title: '单站监控', icon: 'server',},
     alwaysShow: false,
     name:'Dzjk',
-    hidden:true,
     children: [
-      {
-        path: '',
-        component: () => import('@/views/ems/dzjk/index'),
-        name: 'Dzjk',
-        redirect: '/dzjk/home',
-        hidden: true,
-        children: [
           {
             path: '/dzjk/home',
             component: () => import('@/views/ems/dzjk/home/index.vue'),
             name: 'DzjkHome',
-            meta: { title: '站点首页',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkHome' }
+            meta: { title: '站点首页',breadcrumb: false,activeMenu: '/dzjk/home',activeSecondMenuName:'DzjkHome' }
           },
           {
             path: '/dzjk/zxlt',
             component: () => import('@/views/ems/dzjk/zxlt/index.vue'),
             name: 'DzjkZxlt',
-            meta: { title: '主线路图',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkZxlt' }
+            meta: { title: '主线路图',breadcrumb: false,activeMenu: '/dzjk/zxlt',activeSecondMenuName:'DzjkZxlt' }
           },
           {
             path: '/dzjk/sbjk',
             component: () => import('@/views/ems/dzjk/sbjk/index.vue'),
             name: 'DzjkSbjk',
-            meta: { title: '设备监控',breadcrumb: false,activeMenu: '/dzjk'},
+            alwaysShow: false,
+            meta: { title: '设备监控',breadcrumb: false,activeMenu: '/dzjk/sbjk'},
+            hidden: false,
             redirect: '/dzjk/sbjk/ssyx',
             children: [
               {
                 path: 'ssyx',
                 component: () => import('@/views/ems/dzjk/sbjk/ssyx/index.vue'),
                 name: 'DzjkSbjkSsyx',
-                meta: { title: '实时运行',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                hidden: true,
+                meta: { title: '实时运行',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk'},
               },
               {
                 path: 'pcs',
                 component: () => import('@/views/ems/dzjk/sbjk/pcs/index.vue'),
                 name: 'DzjkSbjkPcs',
-                meta: { title: 'PCS',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                hidden: true,
+                meta: { title: 'PCS',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk'},
               },
               {
                 path: 'bmszl',
                 component: () => import('@/views/ems/dzjk/sbjk/bmszl/index.vue'),
                 name: 'DzjkSbjkBmszl',
-                meta: { title: 'BMS总览',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                hidden: true,
+                meta: { title: 'BMS总览',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk'},
               },
               {
                 path: 'bmsdcc',
                 component: () => import('@/views/ems/dzjk/sbjk/bmsdcc/index.vue'),
                 name: 'DzjkSbjkBmsdcc',
-                meta: { title: 'BMS电池簇',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                hidden: true,
+                meta: { title: 'BMS电池簇',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk'},
               },
               {
                 path: 'dtdc',
                 component: () => import('@/views/ems/dzjk/sbjk/dtdc/index.vue'),
                 name: 'DzjkSbjkDtdc',
-                meta: { title: '单体电池',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                hidden: true,
+                meta: { title: '单体电池',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk'},
               },
               {
                 path: 'db',
                 component: () => import('@/views/ems/dzjk/sbjk/db/index.vue'),
                 name: 'DzjkSbjkDb',
-                meta: { title: '电表',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                hidden: true,
+                meta: { title: '电表',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk'},
               },
               {
                 path: 'yl',
                 component: () => import('@/views/ems/dzjk/sbjk/yl/index.vue'),
                 name: 'DzjkSbjkYl',
-                meta: { title: '液冷',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                hidden: true,
+                meta: { title: '液冷',breadcrumb: false,activeMenu: '/dzjk/sbjk',activeSecondMenuName:'DzjkSbjk'},
               }
             ]
           },
@@ -104,79 +105,68 @@ export const dzjk=[
             path: '/dzjk/gzgj',
             component: () => import('@/views/ems/dzjk/gzgj/index.vue'),
             name: 'DzjkGzgj',
-            meta: { title: '故障告警',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkGzgj' }
+            meta: { title: '故障告警',breadcrumb: false,activeMenu: '/dzjk/gzgj',activeSecondMenuName:'DzjkGzgj' }
           },
           {
             path: '/dzjk/tjbb',
             component: () => import('@/views/ems/dzjk/tjbb/index.vue'),
             name: 'DzjkTjbb',
-            meta: {title: '统计报表', breadcrumb: false, activeMenu: '/dzjk'},
+            alwaysShow: false,
+            meta: {title: '统计报表', breadcrumb: false, activeMenu: '/dzjk/tjbb'},
+            hidden: false,
             redirect: '/dzjk/tjbb/gltj',
             children: [
               {
                 path: 'gltj',
                 component: () => import('@/views/ems/dzjk/tjbb/gltj/index.vue'),
                 name: 'DzjkTjbbGltj',
-                meta: { title: '概率统计',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                hidden: true,
+                meta: { title: '概率统计',breadcrumb: false,activeMenu: '/dzjk/tjbb',activeSecondMenuName:'DzjkTjbb'},
               },
               {
                 path: 'glqx',
                 component: () => import('@/views/ems/dzjk/tjbb/glqx/index.vue'),
                 name: 'DzjkTjbbGlqx',
-                meta: { title: '功率曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                hidden: true,
+                meta: { title: '功率曲线',breadcrumb: false,activeMenu: '/dzjk/tjbb',activeSecondMenuName:'DzjkTjbb'},
               },
               {
                 path: 'pcsqx',
                 component: () => import('@/views/ems/dzjk/tjbb/pcsqx/index.vue'),
                 name: 'DzjkTjbbPcsqx',
-                meta: { title: 'PCS曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                hidden: true,
+                meta: { title: 'PCS曲线',breadcrumb: false,activeMenu: '/dzjk/tjbb',activeSecondMenuName:'DzjkTjbb'},
               },
               {
                 path: 'dcdqx',
                 component: () => import('@/views/ems/dzjk/tjbb/dcdqx/index.vue'),
                 name: 'DzjkTjbbDcdqx',
-                meta: { title: '电池堆曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                hidden: true,
+                meta: { title: '电池堆曲线',breadcrumb: false,activeMenu: '/dzjk/tjbb',activeSecondMenuName:'DzjkTjbb'},
               },
               {
                 path: 'dcwd',
                 component: () => import('@/views/ems/dzjk/tjbb/dcwd/index.vue'),
                 name: 'DzjkTjbbDcwd',
-                meta: { title: '电池温度',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                hidden: true,
+                meta: { title: '电池温度',breadcrumb: false,activeMenu: '/dzjk/tjbb',activeSecondMenuName:'DzjkTjbb'},
               },
               {
                 path: 'dbbb',
                 component: () => import('@/views/ems/dzjk/tjbb/dbbb/index.vue'),
                 name: 'DzjkTjbbDbbb',
-                meta: { title: '电表报表',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                hidden: true,
+                meta: { title: '电表报表',breadcrumb: false,activeMenu: '/dzjk/tjbb',activeSecondMenuName:'DzjkTjbb'},
               }
             ]
           },
           {
             path: '/dzjk/clpz',
-            component: () => import('@/views/ems/dzjk/clpz/index.vue'),
+            component: () => import('@/views/ems/dzjk/clpz/clyx/index.vue'),
             name: 'DzjkClpz',
-            meta: {title: '策略配置', breadcrumb: false, activeMenu: '/dzjk'},
-            redirect: '/dzjk/clpz/clyx',
-            children: [
-              {
-                path: 'clyx',
-                component: () => import('@/views/ems/dzjk/clpz/clyx/index.vue'),
-                name: 'DzjkClpzClyx',
-                meta: { title: '策略运行',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkClpz'},
-              },
-              // {
-              //   path: 'xftg',
-              //   component: () => import('@/views/ems/dzjk/clpz/xftg/index.vue'),
-              //   hidden:true,
-              //   breadcrumb: false,
-              //   name: 'DzjkClpzXftg',
-              //   meta: { title: '削峰填谷',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkClpz'},
-              // }
-            ]
+            meta: {title: '策略配置', breadcrumb: false, activeMenu: '/dzjk/clpz'},
           }
         ]
-      }
-    ]
   }
 ]
 
diff --git a/src/store/modules/ems.js b/src/store/modules/ems.js
index cad9f32..81a84a0 100644
--- a/src/store/modules/ems.js
+++ b/src/store/modules/ems.js
@@ -1,3 +1,4 @@
+import {getAllSites} from '@/api/ems/zddt'
 const ems = {
   state: {
     zdList:[],
@@ -20,6 +21,14 @@ const ems = {
       state.zdList = list || []
     }
   },
+  actions: {
+    getZdList({commit,state}){
+      return getAllSites().then(response => {
+        commit('SET_ZD_LIST', response?.data || [])
+        console.log('store action getZdList 获取站点数据',state.zdList)
+      })
+    }
+  }
 }
 
 export default ems
diff --git a/src/views/ems/dzjk/clpz/clyx/index.vue b/src/views/ems/dzjk/clpz/clyx/index.vue
index b1bc51d..484f875 100644
--- a/src/views/ems/dzjk/clpz/clyx/index.vue
+++ b/src/views/ems/dzjk/clpz/clyx/index.vue
@@ -1,6 +1,6 @@
 
 <template>
-   <div v-loading="loading">
+   <div v-loading="loading" class="ems-dashboard-editor-container ems-content-container-padding">
      <template v-if="!showTemp">
        <el-button v-if="!showTemp" type="primary" plain @click="settingStrategy" style="margin-bottom: 20px;">新增策略</el-button>
        <cl-container v-for="(item,index) in list" :key="index+'clContainer'" :info="item" :hide-setting-btn="showTemp" class="contain" @update="init" @showSetting="settingStrategy(item)">
diff --git a/src/views/ems/dzjk/clpz/index.vue b/src/views/ems/dzjk/clpz/index.vue
deleted file mode 100644
index 085a79d..0000000
--- a/src/views/ems/dzjk/clpz/index.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="ems-dashboard-editor-container clpz-ems-dashboard-editor-container">
-    <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+'clpzChildrenRoute'">
-        <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 clpz-ems-content-container">
-      <keep-alive>
-        <router-view></router-view>
-      </keep-alive>
-    </div>
-  </div>
-
-</template>
-
-<script>
-import { dzjk } from '@/router/ems'
-const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DzjkClpz').children.filter(item=>!item?.hidden)//获取到统计报表下面的字路由
-console.log('设备监控子路由',childrenRoute)
-export default {
-  name:'DzjkClpz',
-  data(){
-    return {
-      childrenRoute,
-      activeMenu:''
-    }
-  },
-  mounted() {
-    console.log('当前统计报表页面路由',this.$route)
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-.clpz-ems-dashboard-editor-container{
-  display: flex;
-  padding:0;
-  background: #FFFFFF;
-}
-.clpz-ems-content-container{
-  margin-top:0;
-  padding-top:0;
-  padding-right: 0;
-  flex: 1;
-}
-</style>
-
diff --git a/src/views/ems/dzjk/clpz/xftg/index.vue b/src/views/ems/dzjk/clpz/xftg/index.vue
index 809c6cb..692b8f6 100644
--- a/src/views/ems/dzjk/clpz/xftg/index.vue
+++ b/src/views/ems/dzjk/clpz/xftg/index.vue
@@ -2,7 +2,7 @@
 <template>
 <!--  <cl-container :hideSettingBtn="true">-->
 <!--    <template v-slot:default>-->
-      <div>
+      <div class="ems-dashboard-editor-container ems-content-container-padding">
         <temp-table ref="tempTable" @updateTimeSetting="updateTimeSetting"/>
         <time-setting ref="timeSetting"/>
         <temp-power-chart ref="tomePowerChart"/>
diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index e94f8c4..d0341d7 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <el-card  v-loading="loading" gshadow="always" class="common-card-container common-card-container-no-title-bg">
+  <div  v-loading="loading" class="ems-dashboard-editor-container ems-content-container-padding">
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="设备类型">
@@ -108,7 +108,7 @@
       >
       </el-pagination>
     </div>
-  </el-card>
+  </div>
 </template>
 
 
diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue
index 1bbf9f3..0e00987 100644
--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="loading" class="ems-dashboard-editor-container">
     <el-row :gutter="32" style="background:#fff;">
       <el-col :xs="24" :sm="24" :lg="10">
         <el-card shadow="always" class="common-card-container common-card-container-body-no-padding">
@@ -70,11 +70,6 @@ import NllzChart from "./NllzChart.vue";
 import getQuerySiteId from '@/mixins/ems/getQuerySiteId'
 export default {
   name:'DzjkSbjkHome',
-  computed: {
-    loader() {
-      return loader
-    }
-  },
   components: {NllzChart},
   mixins: [getQuerySiteId],
   data() {
diff --git a/src/views/ems/dzjk/sbjk/index.vue b/src/views/ems/dzjk/sbjk/index.vue
index 1bc4367..5d2c979 100644
--- a/src/views/ems/dzjk/sbjk/index.vue
+++ b/src/views/ems/dzjk/sbjk/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="ems-dashboard-editor-container sbjk-ems-dashboard-editor-container">
+    <div class="ems-dashboard-editor-container ems-content-container-padding sbjk-ems-dashboard-editor-container">
     <el-menu
       class="ems-third-menu"
       :default-active="$route.name"
@@ -24,7 +24,7 @@
 
 <script>
 import { dzjk } from '@/router/ems'
-const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DzjkSbjk').children//获取到单站监控-设备监控下面的字路由
+const childrenRoute = dzjk[0].children.find(item=> item.name==='DzjkSbjk').children//获取到单站监控-设备监控下面的字路由
 console.log('设备监控子路由',childrenRoute)
 export default {
   name:'DzjkSbjk',
@@ -44,7 +44,6 @@ export default {
 <style scoped lang="scss">
 .sbjk-ems-dashboard-editor-container{
   display: flex;
-  padding:0;
   background: #FFFFFF;
 }
 .sbjk-ems-content-container{
diff --git a/src/views/ems/dzjk/tjbb/index.vue b/src/views/ems/dzjk/tjbb/index.vue
index 83d8ffc..6edeb39 100644
--- a/src/views/ems/dzjk/tjbb/index.vue
+++ b/src/views/ems/dzjk/tjbb/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ems-dashboard-editor-container tjbb-ems-dashboard-editor-container">
+  <div class="ems-dashboard-editor-container ems-content-container-padding tjbb-ems-dashboard-editor-container">
     <el-menu
       class="ems-third-menu"
       :default-active="$route.name"
@@ -25,7 +25,7 @@
 
 <script>
 import { dzjk } from '@/router/ems'
-const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DzjkTjbb').children//获取到统计报表下面的字路由
+const childrenRoute =  dzjk[0].children.find(item=> item.name==='DzjkTjbb').children//获取到统计报表下面的字路由
 console.log('设备监控子路由',childrenRoute)
 export default {
   name:'DzjkTjbb',
@@ -45,7 +45,6 @@ export default {
 <style scoped lang="scss">
 .tjbb-ems-dashboard-editor-container{
   display: flex;
-  padding:0;
   background: #FFFFFF;
 }
 .tjbb-ems-content-container{
diff --git a/src/views/ems/dzjk/zxlt/index.vue b/src/views/ems/dzjk/zxlt/index.vue
index 5783835..1310004 100644
--- a/src/views/ems/dzjk/zxlt/index.vue
+++ b/src/views/ems/dzjk/zxlt/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="ems-dashboard-editor-container" v-loading="loading" >
+    <div class="ems-dashboard-editor-container ems-content-container-padding" v-loading="loading" >
       <div class="container" v-show="!empty">
         <div class="top">
           <div class="cloud-container">
@@ -239,7 +239,6 @@ $arrowColoe:#5ea9df;
 $lineColoe:#5ea9df;
 .ems-dashboard-editor-container {
   background-color: #ffffff;
-  padding:0;
   .container{
     position: relative;
     overflow-x: auto;