更新注释

Merge branch 'develop' into single-develop
2026-01-25 17:02:21 +08:00 · 2026-01-25 16:56:29 +08:00 · 2026-01-24 21:19:27 +08:00 · 2026-01-24 10:37:31 +08:00 · 2026-01-23 20:06:47 +08:00 · 2026-01-23 19:52:13 +08:00
20 changed files with 335 additions and 391 deletions
--- a/.env.production
+++ b/.env.production
@ -5,8 +5,9 @@ VUE_APP_TITLE = 上动新能源-EMS管理系统
 NODE_ENV = 'production'

 # EMS管理系统/生产环境
-VUE_APP_BASE_API= 'http://1.15.120.242:8089'
+VUE_APP_BASE_API= 'http://127.0.0.1:8089'
+

 # EMS管理系统/生产环境 图片拼接地址
-VUE_APP_IMG_URL = 'http://1.15.120.242:8089'
+VUE_APP_IMG_URL = 'http://127.0.0.1:8089'

--- a/src/App.vue
+++ b/src/App.vue
@ -10,7 +10,7 @@ import ThemePicker from "@/components/ThemePicker"

 export default {
  name: "App",
-  components: { ThemePicker }
+  components: { ThemePicker },
 }
 </script>
 <style scoped>
--- a/src/assets/styles/common.scss
+++ b/src/assets/styles/common.scss
@ -4,8 +4,8 @@

 //右侧内容区域
 //父元素
-.ems-dashboard-editor-container {
-  background-color: #F1F5FC;
+.ems-dashboard-editor-container{
+  background-color: #FFFFFF;//#F1F5FC
  padding: 24px;
  font-size: 12px;
 }
@ -280,7 +280,7 @@

 .ems-third-menu-container {
  position: relative;
-  padding-left: 140px;
+  padding-left: 160px;
  background-color: #ffffff;

  .ems-third-menu {
@ -288,10 +288,9 @@
    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
    height: fit-content;
    position: absolute;
-    top: 0;
-    left: 0;
-
-    .el-menu-item {
+    top:20px;
+    left:20px;
+    .el-menu-item{
      line-height: 45px;
      height: 45px;
      padding: 0 !important;
--- 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,
--- a/src/permission.js
+++ b/src/permission.js
@ -31,6 +31,7 @@ router.beforeEach((to, from, next) => {
        // 判断当前用户是否已拉取完user_info信息
        store.dispatch('GetInfo').then(() => {
          isRelogin.show = false
+          store.dispatch('getZdList')
          store.dispatch('GenerateRoutes').then(accessRoutes => {
            // 根据roles权限生成可访问的路由表
            router.addRoutes(accessRoutes) // 动态添加可访问路由表
--- a/src/router/ems.js
+++ b/src/router/ems.js
@ -7,295 +7,257 @@ 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,
+                path: '/dzjk/home',
+                component: () => import('@/views/ems/dzjk/home/index.vue'),
+                name: '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/zxlt', activeSecondMenuName: 'DzjkZxlt'}
+            },
+            {
+                path: '/dzjk/sbjk',
+                component: () => import('@/views/ems/dzjk/sbjk/index.vue'),
+                name: 'DzjkSbjk',
+                alwaysShow: false,
+                meta: {title: '设备监控', breadcrumb: false, activeMenu: '/dzjk/sbjk'},
+                hidden: false,
+                redirect: '/dzjk/sbjk/ssyx',
                children: [
                    {
-                        path: '/dzjk/home',
-                        component: () => import('@/views/ems/dzjk/home/index.vue'),
-                        name: 'DzjkHome',
+                        path: 'ssyx',
+                        component: () => import('@/views/ems/dzjk/sbjk/ssyx/index.vue'),
+                        name: 'DzjkSbjkSsyx',
+                        hidden: true,
                        meta: {
-                            title: '站点首页',
+                            title: '实时运行',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'SSYX'
+                        },
+                    },
+                    {
+                        path: 'ems',
+                        component: () => import('@/views/ems/dzjk/sbjk/ems/index.vue'),
+                        name: 'DzjkSbjkEms',
+                        hidden: true,
+                        meta: {
+                            title: 'EMS',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'EMS'
+                        },
+                    },
+                    {
+                        path: 'pcs',
+                        component: () => import('@/views/ems/dzjk/sbjk/pcs/index.vue'),
+                        name: 'DzjkSbjkPcs',
+                        hidden: true,
+                        meta: {
+                            title: 'PCS',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'PCS'
+                        },
+                    },
+                    {
+                        path: 'bmszl',
+                        component: () => import('@/views/ems/dzjk/sbjk/bmszl/index.vue'),
+                        name: 'DzjkSbjkBmszl',
+                        hidden: true,
+                        meta: {
+                            title: 'BMS总览',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'STACK'
+                        },
+                    },
+                    {
+                        path: 'bmsdcc',
+                        component: () => import('@/views/ems/dzjk/sbjk/bmsdcc/index.vue'),
+                        name: 'DzjkSbjkBmsdcc',
+                        hidden: true,
+                        meta: {
+                            title: 'BMS电池簇',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'CLUSTER'
+                        },
+                    },
+                    {
+                        path: 'dtdc',
+                        component: () => import('@/views/ems/dzjk/sbjk/dtdc/index.vue'),
+                        name: 'DzjkSbjkDtdc',
+                        hidden: true,
+                        meta: {
+                            title: '单体电池',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'BATTERY'
+                        },
+                    },
+                    {
+                        path: 'db',
+                        component: () => import('@/views/ems/dzjk/sbjk/db/index.vue'),
+                        name: 'DzjkSbjkDb',
+                        hidden: true,
+                        meta: {
+                            title: '电表',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'AMMETER'
+                        },
+                    },
+                    {
+                        path: 'yl',
+                        component: () => import('@/views/ems/dzjk/sbjk/yl/index.vue'),
+                        name: 'DzjkSbjkYl',
+                        hidden: true,
+                        meta: {
+                            title: '液冷',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/sbjk',
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'COOLING'
+                        },
+                    },
+                    {
+                        path: 'dh',
+                        component: () => import('@/views/ems/dzjk/sbjk/dh/index.vue'),
+                        name: 'DzjkSbjkDh',
+                        hidden: true,
+                        meta: {
+                            title: '动环',
                            breadcrumb: false,
                            activeMenu: '/dzjk',
-                            activeSecondMenuName: 'DzjkHome'
-                        }
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'DH'
+                        },
                    },
                    {
-                        path: '/dzjk/zxlt',
-                        component: () => import('@/views/ems/dzjk/zxlt/index.vue'),
-                        name: 'DzjkZxlt',
+                        path: 'xf',
+                        component: () => import('@/views/ems/dzjk/sbjk/xf/index.vue'),
+                        name: 'DzjkSbjkXf',
+                        hidden: true,
                        meta: {
-                            title: '主线路图',
+                            title: '消防',
                            breadcrumb: false,
                            activeMenu: '/dzjk',
-                            activeSecondMenuName: 'DzjkZxlt'
-                        }
-                    },
-                    {
-                        path: '/dzjk/sbjk',
-                        component: () => import('@/views/ems/dzjk/sbjk/index.vue'),
-                        name: 'DzjkSbjk',
-                        meta: {title: '设备监控', breadcrumb: false, activeMenu: '/dzjk'},
-                        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',
-                                    deviceCategory: 'SSYX'
-                                },
-                            },
-                            {
-                                path: 'ems',
-                                component: () => import('@/views/ems/dzjk/sbjk/ems/index.vue'),
-                                name: 'DzjkSbjkEms',
-                                meta: {
-                                    title: 'EMS',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'EMS'
-                                },
-                            },
-                            {
-                                path: 'pcs',
-                                component: () => import('@/views/ems/dzjk/sbjk/pcs/index.vue'),
-                                name: 'DzjkSbjkPcs',
-                                meta: {
-                                    title: 'PCS',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'PCS'
-                                },
-                            },
-                            {
-                                path: 'bmszl',
-                                component: () => import('@/views/ems/dzjk/sbjk/bmszl/index.vue'),
-                                name: 'DzjkSbjkBmszl',
-                                meta: {
-                                    title: 'BMS总览',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'STACK'
-                                },
-                            },
-                            {
-                                path: 'bmsdcc',
-                                component: () => import('@/views/ems/dzjk/sbjk/bmsdcc/index.vue'),
-                                name: 'DzjkSbjkBmsdcc',
-                                meta: {
-                                    title: 'BMS电池簇',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'CLUSTER'
-                                },
-                            },
-                            {
-                                path: 'dtdc',
-                                component: () => import('@/views/ems/dzjk/sbjk/dtdc/index.vue'),
-                                name: 'DzjkSbjkDtdc',
-                                meta: {
-                                    title: 'BMS单体电池',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'BATTERY'
-                                },
-                            },
-                            {
-                                path: 'db',
-                                component: () => import('@/views/ems/dzjk/sbjk/db/index.vue'),
-                                name: 'DzjkSbjkDb',
-                                meta: {
-                                    title: '电表',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'AMMETER'
-                                },
-                            },
-                            {
-                                path: 'yl',
-                                component: () => import('@/views/ems/dzjk/sbjk/yl/index.vue'),
-                                name: 'DzjkSbjkYl',
-                                meta: {
-                                    title: '冷却',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'COOLING'
-                                },
-                            },
-                            {
-                                path: 'dh',
-                                component: () => import('@/views/ems/dzjk/sbjk/dh/index.vue'),
-                                name: 'DzjkSbjkDh',
-                                meta: {
-                                    title: '动环',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'DH'
-                                },
-                            },
-                            {
-                                path: 'xf',
-                                component: () => import('@/views/ems/dzjk/sbjk/xf/index.vue'),
-                                name: 'DzjkSbjkXf',
-                                meta: {
-                                    title: '消防',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkSbjk',
-                                    deviceCategory: 'XF'
-                                },
-                            }
-                        ]
-                    },
-                    {
-                        path: '/dzjk/gzgj',
-                        component: () => import('@/views/ems/dzjk/gzgj/index.vue'),
-                        name: 'DzjkGzgj',
-                        meta: {
-                            title: '故障告警',
-                            breadcrumb: false,
-                            activeMenu: '/dzjk',
-                            activeSecondMenuName: 'DzjkGzgj'
-                        }
-                    },
-                    {
-                        path: '/dzjk/tjbb',
-                        component: () => import('@/views/ems/dzjk/tjbb/index.vue'),
-                        name: 'DzjkTjbb',
-                        meta: {title: '统计报表', breadcrumb: false, activeMenu: '/dzjk'},
-                        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'
-                                },
-                            },
-                            {
-                                path: 'glqx',
-                                component: () => import('@/views/ems/dzjk/tjbb/glqx/index.vue'),
-                                name: 'DzjkTjbbGlqx',
-                                meta: {
-                                    title: '功率曲线',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkTjbb'
-                                },
-                            },
-                            {
-                                path: 'pcsqx',
-                                component: () => import('@/views/ems/dzjk/tjbb/pcsqx/index.vue'),
-                                name: 'DzjkTjbbPcsqx',
-                                meta: {
-                                    title: 'PCS曲线',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkTjbb'
-                                },
-                            },
-                            {
-                                path: 'dcdqx',
-                                component: () => import('@/views/ems/dzjk/tjbb/dcdqx/index.vue'),
-                                name: 'DzjkTjbbDcdqx',
-                                meta: {
-                                    title: '电池堆曲线',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkTjbb'
-                                },
-                            },
-                            {
-                                path: 'dcwd',
-                                component: () => import('@/views/ems/dzjk/tjbb/dcwd/index.vue'),
-                                name: 'DzjkTjbbDcwd',
-                                meta: {
-                                    title: '电池温度',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkTjbb'
-                                },
-                            },
-                            {
-                                path: 'dbbb',
-                                component: () => import('@/views/ems/dzjk/tjbb/dbbb/index.vue'),
-                                name: 'DzjkTjbbDbbb',
-                                meta: {
-                                    title: '电表报表',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkTjbb'
-                                },
-                            },
-                            {
-                                path: 'sybb',
-                                component: () => import('@/views/ems/dzjk/tjbb/sybb/index.vue'),
-                                name: 'DzjkTjbbSybb',
-                                meta: {
-                                    title: '收益报表',
-                                    breadcrumb: false,
-                                    activeMenu: '/dzjk',
-                                    activeSecondMenuName: 'DzjkTjbb'
-                                },
-                            }
-                        ]
-                    },
-                    {
-                        path: '/dzjk/clpz',
-                        component: () => import('@/views/ems/dzjk/clpz/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'},
-                            // }
-                        ]
+                            activeSecondMenuName: 'DzjkSbjk',
+                            deviceCategory: 'XF'
+                        },
                    }
                ]
+            },
+            {
+                path: '/dzjk/gzgj',
+                component: () => import('@/views/ems/dzjk/gzgj/index.vue'),
+                name: 'DzjkGzgj',
+                meta: {title: '故障告警', breadcrumb: false, activeMenu: '/dzjk/gzgj', activeSecondMenuName: 'DzjkGzgj'}
+            },
+            {
+                path: '/dzjk/tjbb',
+                component: () => import('@/views/ems/dzjk/tjbb/index.vue'),
+                name: 'DzjkTjbb',
+                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',
+                        hidden: true,
+                        meta: {
+                            title: '运行统计',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/tjbb',
+                            activeSecondMenuName: 'DzjkTjbb'
+                        },
+                    },
+                    {
+                        path: 'glqx',
+                        component: () => import('@/views/ems/dzjk/tjbb/glqx/index.vue'),
+                        name: 'DzjkTjbbGlqx',
+                        hidden: true,
+                        meta: {
+                            title: '功率曲线',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/tjbb',
+                            activeSecondMenuName: 'DzjkTjbb'
+                        },
+                    },
+                    {
+                        path: 'pcsqx',
+                        component: () => import('@/views/ems/dzjk/tjbb/pcsqx/index.vue'),
+                        name: 'DzjkTjbbPcsqx',
+                        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',
+                        hidden: true,
+                        meta: {
+                            title: '电池堆曲线',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/tjbb',
+                            activeSecondMenuName: 'DzjkTjbb'
+                        },
+                    },
+                    {
+                        path: 'dcwd',
+                        component: () => import('@/views/ems/dzjk/tjbb/dcwd/index.vue'),
+                        name: 'DzjkTjbbDcwd',
+                        hidden: true,
+                        meta: {
+                            title: '电池温度',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/tjbb',
+                            activeSecondMenuName: 'DzjkTjbb'
+                        },
+                    },
+                    {
+                        path: 'dbbb',
+                        component: () => import('@/views/ems/dzjk/tjbb/dbbb/index.vue'),
+                        name: 'DzjkTjbbDbbb',
+                        hidden: true,
+                        meta: {
+                            title: '电表报表',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk/tjbb',
+                            activeSecondMenuName: 'DzjkTjbb'
+                        },
+                    }
+                ]
+            },
+            {
+                path: '/dzjk/clpz',
+                component: () => import('@/views/ems/dzjk/clpz/clyx/index.vue'),
+                name: 'DzjkClpz',
+                meta: {title: '策略配置', breadcrumb: false, activeMenu: '/dzjk/clpz'},
            }
        ]
    }
--- a/src/settings.js
+++ b/src/settings.js
@ -7,7 +7,7 @@ module.exports = {
  /**
   * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
   */
-  sideTheme: 'theme-light',
+  sideTheme: 'theme-dark',

  /**
   * 系统布局配置
--- a/src/store/modules/ems.js
+++ b/src/store/modules/ems.js
@ -1,3 +1,4 @@
+import {getAllSites} from '@/api/ems/zddt'
 import {getAlarmDetailList, getSiteAllDeviceCategory} from '@/api/ems/dzjk'

 const ems = {
@ -43,6 +44,14 @@ const ems = {
        }
    },
    actions: {
+        getZdList({commit, state}) {
+            if (state.zdList.length === 0) {
+                getAllSites().then(response => {
+                    commit('SET_ZD_LIST', response?.data || [])
+                    console.log('store action getZdList 获取站点数据', state.zdList)
+                })
+            }
+        },
        //查询站点的所有待处理0的告警 存在展示红点标志
        getSiteAlarmNum({state, commit}, siteId) {
            getAlarmDetailList({
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@ -33,12 +33,13 @@ const permission = {
    GenerateRoutes({ commit }) {
      return new Promise(resolve => {
        // 向后端请求路由数据
-        getRouters().then(res => {    
-          let hasDzjk = false
+        getRouters().then(res => {
+          let sysDzjk = -1
          if(res?.data){
-            res.data.forEach(i=>{
-              i.children && i.children.find(j=>j.path.indexOf('dzjk')>-1) && (hasDzjk=true)
+            sysDzjk = res.data.findIndex(i=>{
+              return i.children && i.children.find(j=>j.path.indexOf('dzjk')>-1)
            })
+            if(sysDzjk>-1) res.data.splice(sysDzjk,1)
          }
          const sdata = JSON.parse(JSON.stringify(res.data))
          const rdata = JSON.parse(JSON.stringify(res.data))
@ -47,7 +48,7 @@ const permission = {
          const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
          rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
          router.addRoutes(asyncRoutes)
-          if(!hasDzjk){
+          if(sysDzjk === -1){
            const index = constantRoutes.findIndex(i=>i.path.indexOf('dzjk')>-1)
            constantRoutes.splice(index,1)
          }
--- 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)">
--- a/src/views/ems/dzjk/clpz/index.vue
+++ b/src/views/ems/dzjk/clpz/index.vue
@ -1,53 +0,0 @@
-<template>
-  <div class="ems-dashboard-editor-container ems-third-menu-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-content-container{
-  margin-top:0;
-  padding-top:0;
-  padding-right: 0;
-  flex: 1;
-}
-</style>
-
--- 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"/>
--- 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>


--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@ -1,5 +1,8 @@
 <template>
-  <div v-loading="loading">
+  <div
+    class="ems-dashboard-editor-container ems-content-container-padding"
+    v-loading="loading"
+  >
    <el-row style="background: #fff" class="row-container" :gutter="15">
      <el-col :xs="24" :sm="24" :lg="5">
        <!--      站点信息-->
--- a/src/views/ems/dzjk/sbjk/index.vue
+++ b/src/views/ems/dzjk/sbjk/index.vue
@ -19,14 +19,13 @@
        </keep-alive>
      </div>
  </div>
-
 </template>

 <script>
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import { dzjk } from '@/router/ems'
 import {mapState} from "vuex";
-const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DzjkSbjk').children//获取到单站监控-设备监控下面的字路由
+const childrenRoute = ((dzjk[0]?.children || []).find(item=> item.name==='DzjkSbjk').children) || []//获取到单站监控-设备监控下面的字路由
 export default {
  name:'DzjkSbjk',
  mixins:[getQuerySiteId],
@ -65,11 +64,14 @@ export default {
 </script>

 <style scoped lang="scss">
-.sbjk-ems-content-container{
-  margin-top:0;
-  padding-top:0;
+.sbjk-ems-dashboard-editor-container {
+  display: flex;
+  background: #ffffff;
+}
+.sbjk-ems-content-container {
+  margin-top: 0;
+  padding-top: 0;
  padding-right: 0;
  flex: 1;
 }
 </style>
-
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@ -27,6 +27,12 @@
            <div>数据更新时间：{{ pcsItem.dataUpdateTime }}</div>
          </div>
          <div class="alarm">
+            <pcs-switch style="margin-right:10px;"
+                        :round="true"
+                        size="small"
+                        type="danger"
+                        :data="pcsItem"
+                        @updateSuccess="init"/>
            <el-button type="primary" round size="small" style="margin-right:20px;"
                       @click="pointDetail(pcsItem,'point')">
              详细
@ -184,11 +190,12 @@ import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getPcsDetailInfo, getRunningHeadInfo} from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import PcsSwitch from "@/views/ems/site/sblb/PcsSwitch.vue";
 import {mapState} from "vuex";

 export default {
  name: "DzjkSbjkPcs",
-  components: {RealTimeBaseInfo, pointChart, PointTable},
+  components: {RealTimeBaseInfo, pointChart, PointTable, PcsSwitch},
  mixins: [getQuerySiteId, intervalUpdate],
  computed: {
    ...mapState({
--- a/src/views/ems/dzjk/tjbb/index.vue
+++ b/src/views/ems/dzjk/tjbb/index.vue
@ -7,47 +7,55 @@
      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}}
+      <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">
+    <div
+      class="ems-content-container ems-content-container-padding tjbb-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==='DzjkTjbb').children//获取到统计报表下面的字路由
-console.log('设备监控子路由',childrenRoute)
+import { dzjk } from "@/router/ems";
+const childrenRoute = dzjk[0].children.find(
+  (item) => item.name === "DzjkTjbb"
+).children; //获取到统计报表下面的字路由
+console.log("设备监控子路由", childrenRoute);
 export default {
-  name:'DzjkTjbb',
-  data(){
+  name: "DzjkTjbb",
+  data() {
    return {
      childrenRoute,
-      activeMenu:''
-    }
+      activeMenu: "",
+    };
  },
  mounted() {
-    console.log('当前统计报表页面路由',this.$route)
-  }
-
-}
+    console.log("当前统计报表页面路由", this.$route);
+  },
+};
 </script>

 <style scoped lang="scss">
-.tjbb-ems-content-container{
-  margin-top:0;
-  padding-top:0;
+.tjbb-ems-content-container {
+  margin-top: 0;
+  padding-top: 0;
  padding-right: 0;
  flex: 1;
 }
 </style>
-
--- a/src/views/ems/dzjk/zxlt/index.vue
+++ b/src/views/ems/dzjk/zxlt/index.vue
@ -323,7 +323,7 @@ $lineColor: #86bcc7;

 .ems-dashboard-editor-container {
  background-color: #ffffff;
-  padding: 0;
+  padding: 30px;
  color: #666666;

  .container {
--- a/src/views/ems/site/sblb/PcsSwitch.vue
+++ b/src/views/ems/site/sblb/PcsSwitch.vue
@ -40,14 +40,18 @@ export default {
      required: true
    }
  },
+  data() {
+    return {
+      runningStatusMap: ['0', '3', '4', '6']
+    }
+  },
  computed: {
    label() {
-      return this.data.workStatus === '0' ? '关机' : '开机'
+      return this.runningStatusMap.includes(this.data.workStatus) ? '关机' : '开机'
    }
  },
  methods: {
    switchStatus() {
-      console.log(this.data, 11111111)
      const {workStatus, deviceId, deviceName, siteId} = this.data
      this.$confirm(`确认要${this.label}设备${deviceName || ''}吗?`, {
        confirmButtonText: "确定",
@ -61,7 +65,7 @@ export default {
            //做开关机操作,更新成功后刷新表格
            updateDeviceStatus({
              siteId,
-              workStatus: workStatus === '0' ? "1" : '0',
+              workStatus: this.runningStatusMap.includes(workStatus) ? "1" : '0',//1 关机 0开机
              deviceId
            })
                .then((response) => {
--- a/src/views/ems/site/sblb/index.vue
+++ b/src/views/ems/site/sblb/index.vue
@ -84,10 +84,10 @@
          label="在线状态">
        <template slot-scope="scope">
          <span>{{ $store.state.ems.deviceStatusOptions[scope.row.deviceStatus] }}</span>
-          <!--          <pcs-switch v-if="scope.row.deviceCategory === 'PCS' && ![null,'',undefined].includes(scope.row.deviceStatus)"-->
-          <!--                      style="margin-left:5px;"-->
-          <!--                      :data="{siteId:scope.row.siteId,deviceStatus:scope.row.deviceStatus,deviceId:scope.row.deviceId,deviceName:scope.row.deviceName}"-->
-          <!--                      @updateSuccess="getData"/>-->
+          <pcs-switch v-if="scope.row.deviceCategory === 'PCS' && ![null,'',undefined].includes(scope.row.workStatus)"
+                      style="margin-left:5px;"
+                      :data="{siteId:scope.row.siteId,workStatus:scope.row.workStatus,deviceId:scope.row.deviceId,deviceName:scope.row.deviceName}"
+                      @updateSuccess="getData"/>
        </template>
      </el-table-column>
      <el-table-column
@ -180,11 +180,11 @@ import {getAllDeviceCategory} from '@/api/ems/search'
 import PointTable from './PointTable.vue'
 import AddDevice from "./AddDevice.vue";
 import PointUpload from "./PointUpload.vue";
-// import PcsSwitch from "./PcsSwitch.vue";
+import PcsSwitch from "./PcsSwitch.vue";

 export default {
  name: "Sblb",
-  components: {AddDevice, PointTable, PointUpload},
+  components: {AddDevice, PointTable, PointUpload, PcsSwitch},
  data() {
    return {
      loading: false,
Author	SHA1	Message	Date
白菜	3a26f6312b	更新注释	2026-01-25 17:02:21 +08:00
白菜	138b0753af	Merge branch 'develop' into single-develop	2026-01-25 16:56:29 +08:00
白菜	085f6fd252	Merge branch 'develop' into single-develop	2026-01-24 21:19:27 +08:00
白菜	d3e51322ab	Merge branch 'develop' into single-develop	2026-01-24 10:37:31 +08:00
白菜	81f8f75d7e	pcs开关机状态判断更新	2026-01-23 20:06:47 +08:00
白菜	fccddab04a	Merge branch 'develop' into single-develop	2026-01-23 19:52:13 +08:00
白菜	1b712a70f6	Merge branch 'develop' into single-develop	2026-01-21 14:42:02 +08:00
白菜	5d84972b8a	菜单	2026-01-16 16:08:54 +08:00
白菜	b122ab35ab	Merge branch 'develop' into single-develop # Conflicts: # src/router/ems.js	2026-01-16 15:59:17 +08:00
白菜	80f07876c6	Merge branch 'develop' into single-develop	2026-01-12 14:17:32 +08:00
白菜	bef8f01d0d	pcs开关机接口参数更新	2026-01-08 17:14:57 +08:00
白菜	b469190d9f	Merge branch 'develop' into single-develop	2026-01-08 16:59:47 +08:00
白菜	e98b4ed287	Merge branch 'develop' into single-develop	2025-12-31 17:25:47 +08:00
白菜	6140ca8f14	Merge branch 'develop' into single-develop	2025-12-26 21:01:54 +08:00
白菜	a3d6cf7c55	Merge branch 'develop' into single-develop	2025-12-19 21:51:51 +08:00
白菜	6fb706b528	云下展示pcs开关机按钮	2025-12-18 16:37:59 +08:00
白菜	579920e007	Merge branch 'develop' into single-develop	2025-12-18 16:35:34 +08:00
白菜	d9eeee106f	Merge branch 'develop' into single-develop	2025-12-16 13:48:09 +08:00
白菜	c90f4f5766	Merge branch 'develop' into single-develop	2025-12-16 11:14:50 +08:00
白菜	4a4d26f018	生产、云下环境变量配置	2025-12-15 17:41:29 +08:00
白菜	1a11c67aad	test 环境变量配置	2025-12-15 14:42:27 +08:00
白菜	71fd48918d	Merge branch 'develop' into single-develop # Conflicts: # src/assets/styles/common.scss	2025-12-12 17:47:57 +08:00
白菜	34d9e038e6	合并代码	2025-12-10 15:09:33 +08:00
白菜	b4c49c3e58	Merge branch 'develop' into single-develop	2025-12-05 09:49:54 +08:00
白菜	9cfce671a6	Merge branch 'develop' into single-develop	2025-12-05 09:16:54 +08:00
白菜	87e3db9f0f	云下使用深色主题区分云上	2025-11-28 15:21:42 +08:00
白菜	4132d8e539	合并develop最新代码	2025-11-28 15:18:27 +08:00
白菜	28176ce052	Merge branch 'develop' into single-develop	2025-11-13 16:53:19 +08:00
白菜	fdcf82e343	Merge branch 'develop' into single-develop	2025-11-12 16:38:00 +08:00
白菜	e4c6f1f798	Merge branch 'develop' into single-develop	2025-11-12 10:59:13 +08:00
白菜	f4a42c168f	Merge branch 'develop' into single-develop	2025-11-07 14:59:56 +08:00
白菜	371a2d8be0	菜单更新,单站监控展示	2025-11-05 14:50:11 +08:00
白菜	c403922639	Merge branch 'develop' into single-develop	2025-11-05 14:10:00 +08:00
白菜	2a3d2fcf63	Merge branch 'develop' into single-develop	2025-09-22 17:59:25 +08:00
白菜	25bb28f77a	Merge branch 'develop' into single-develop	2025-09-17 14:57:30 +08:00
baicai	3d5d8918d7	合并develop最新代码	2025-08-20 17:53:26 +08:00
白菜	fe14089562	在路由权限校验中获取设备列表	2025-07-23 21:35:40 +08:00
白菜	b68f2608f3	本地	2025-07-21 23:00:41 +08:00