screen

.env.production

@@ -5,9 +5,8 @@ VUE_APP_TITLE = 上动新能源-EMS管理系统
 NODE_ENV = 'production'
 
 # EMS管理系统/生产环境
-VUE_APP_BASE_API= 'http://127.0.0.1:8089'
+VUE_APP_BASE_API= 'http://1.15.120.242:8089'
-
 
 # EMS管理系统/生产环境 图片拼接地址
-VUE_APP_IMG_URL = 'http://127.0.0.1:8089'
+VUE_APP_IMG_URL = 'http://1.15.120.242:8089'
 

src/App.vue

@@ -10,7 +10,7 @@ import ThemePicker from "@/components/ThemePicker"
 
 export default {
   name: "App",
-  components: { ThemePicker },
+  components: { ThemePicker }
 }
 </script>
 <style scoped>

src/assets/styles/common.scss

@@ -4,8 +4,8 @@
 
 //右侧内容区域
 //父元素
-.ems-dashboard-editor-container{
+.ems-dashboard-editor-container {
-  background-color: #FFFFFF;//#F1F5FC
+  background-color: #F1F5FC;
   padding: 24px;
   font-size: 12px;
 }
@@ -104,6 +104,10 @@
     .el-card__header {
       background-color: #b64040; //#fc6b69;
     }
+
+    .work-status {
+      color: #b64040 !important;;
+    }
   }
 
   //绿色背景颜色标题
@@ -111,6 +115,10 @@
     .el-card__header {
       background-color: #40b6a5; //#05aea3;
     }
+
+    .work-status {
+      color: #40b6a5 !important;
+    }
   }
 
   //灰色背景颜色标题
@@ -118,6 +126,10 @@
     .el-card__header {
       background-color: #666666;
     }
+
+    .work-status {
+      color: #666666 !important;;
+    }
   }
 }
 
@@ -268,7 +280,7 @@
 
 .ems-third-menu-container {
   position: relative;
-  padding-left: 160px;
+  padding-left: 140px;
   background-color: #ffffff;
 
   .ems-third-menu {
@@ -276,9 +288,10 @@
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     height: fit-content;
     position: absolute;
-    top:20px;
+    top: 0;
-    left:20px;
+    left: 0;
-    .el-menu-item{
+
+    .el-menu-item {
       line-height: 45px;
       height: 45px;
       padding: 0 !important;

src/components/BigDataPopup/index.vue

@@ -0,0 +1,49 @@
+<template>
+  <el-dialog :fullscreen="true" :append-to-body="true" :visible.sync="show" :show-close="false" top="0"
+             custom-class="big-data-dialog">
+    <img src="@/assets/images/ems/bigData.png" alt="">
+    <div class="close-btn" @click="show=false">
+      <i class="el-icon-close"></i>
+    </div>
+  </el-dialog>
+</template>
+<style lang="scss" scoped>
+.close-btn {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+  font-size: 23px;
+  line-height: 20px;
+  color: rgba(176, 228, 255, 0.7);
+  cursor: pointer;
+}
+
+img {
+  height: 100vh;
+  width: 100vw;
+  display: block;
+  margin: 0;
+}
+</style>
+<style lang="scss">
+.big-data-dialog {
+  .el-dialog__header {
+    display: none;
+  }
+
+  .el-dialog__body {
+    padding: 0;
+    margin: 0;
+    position: relative;
+  }
+}
+</style>
+<script>
+export default {
+  data() {
+    return {
+      show: false
+    }
+  }
+}
+</script>

src/components/Ems/DateRangeSelect/index.vue

@@ -1,36 +1,68 @@
 <template>
-    <div class="time-range">
+  <div class="time-range">
-        <el-date-picker
+    <el-date-picker
-            v-model="dateRange"
+        v-model="dateRange"
-            type="daterange"
+        :class="miniTimePicker ? 'mini-date-picker' : ''"
-            range-separator="至"
+        type="daterange"
-            start-placeholder="开始时间"
+        range-separator="至"
-            value-format="yyyy-MM-dd"
+        start-placeholder="开始时间"
-            :clearable="false"
+        value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions"
+        :clearable="false"
-            end-placeholder="结束时间">
+        :picker-options="pickerOptions"
-            </el-date-picker>
+        end-placeholder="结束时间">
-            <el-button size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
+    </el-date-picker>
-            <el-button type="primary" size="mini" :loading="loading" @click="search">搜索</el-button>
+    <template v-if="!showIcon">
-            <el-button type="primary" size="mini" :loading="loading" @click="timeLine('before')">上一时段</el-button>
+      <el-button size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
-            <el-button type="primary" size="mini" :loading="loading" @click="timeLine('next')" :disabled="disabledNextBtn">下一时段</el-button>
+      <el-button type="primary" size="mini" :loading="loading" @click="search">搜索</el-button>
-        </div>
+      <el-button type="primary" size="mini" :loading="loading" @click="timeLine('before')">上一时段</el-button>
+      <el-button type="primary" size="mini" :loading="loading" @click="timeLine('next')" :disabled="disabledNextBtn">
+        下一时段
+      </el-button>
+    </template>
+    <template v-else>
+      <el-button class="btn-icon" icon="el-icon-refresh-right" circle size="mini" style="margin-left: 8px;"
+                 :loading="loading"
+                 @click="reset"></el-button>
+      <el-button class="btn-icon" type="primary" size="mini" icon="el-icon-search" circle :loading="loading"
+                 @click="search"></el-button>
+      <el-button class="btn-icon" type="primary" size="mini" icon="el-icon-d-arrow-left" circle :loading="loading"
+                 @click="timeLine('before')"></el-button>
+      <el-button class="btn-icon" type="primary" size="mini" icon="el-icon-d-arrow-right" circle :loading="loading"
+                 @click="timeLine('next')"
+                 :disabled="disabledNextBtn"></el-button>
+    </template>
+
+
+  </div>
 </template>
 
 <script>
 import {formatDate} from '@/filters/ems'
+
 export default {
-  computed:{
+  props: {
-    disabledNextBtn(){
+    showIcon: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    miniTimePicker: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
+  computed: {
+    disabledNextBtn() {
       return new Date(this.dateRange[1]) >= new Date(this.defaultDateRange[1])
     }
   },
   data() {
     return {
-      loading:false,
+      loading: false,
-      dateRange:[],
+      dateRange: [],
-      defaultDateRange:[],
+      defaultDateRange: [],
-      pickerOptions:{
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
@@ -38,64 +70,81 @@ export default {
     }
   },
   methods: {
-    init(today=false){
+    init(today = false) {
-        const now = new Date(),formatNow = formatDate(now);
+      const now = new Date(), formatNow = formatDate(now);
-        const weekAgo = formatDate(today ? new Date(now.getTime()) : new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000))
+      const weekAgo = formatDate(today ? new Date(now.getTime()) : new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000))
-        this.dateRange = [weekAgo, formatNow];
+      this.dateRange = [weekAgo, formatNow];
-        this.defaultDateRange=[weekAgo, formatNow];
+      this.defaultDateRange = [weekAgo, formatNow];
-        this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
-    showBtnLoading(status){
+    showBtnLoading(status) {
-        this.loading = status
+      this.loading = status
     },
-    resetDate(){
+    resetDate() {
       this.dateRange = this.defaultDateRange
     },
     //重置 设置时间范围为初始化时间段
-    reset(){
+    reset() {
-        this.resetDate()
+      this.resetDate()
-        this.$emit('reset')
+      this.$emit('reset')
-        this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
     // 搜索
-    search(){
+    search() {
-      this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
-    timeLine(type){
+    timeLine(type) {
-      if(!this.dateRange || !this.dateRange[0] || !this.dateRange[1]) return
+      if (!this.dateRange || !this.dateRange[0] || !this.dateRange[1]) return
-      const nowStartTimes = new Date(this.dateRange[0]).getTime(),nowEndTimes = new Date(this.dateRange[1]).getTime(),maxTime = new Date(this.defaultDateRange[1]).getTime()
+      const nowStartTimes = new Date(this.dateRange[0]).getTime(), nowEndTimes = new Date(this.dateRange[1]).getTime(),
+          maxTime = new Date(this.defaultDateRange[1]).getTime()
       const nowDis = nowEndTimes - nowStartTimes//用户当前选择时间差 可能=0
       //baseTime,maxTime 毫秒数
-      const baseDis =  24 * 60 * 60 * 1000
+      const baseDis = 24 * 60 * 60 * 1000
       const calcDis = nowDis === 0 ? baseDis : nowDis
       let start = type === 'before' ? nowStartTimes - calcDis : nowStartTimes + calcDis
-      if(start>maxTime) start=maxTime
+      if (start > maxTime) start = maxTime
       let end = type === 'before' ? nowEndTimes - calcDis : nowEndTimes + calcDis
-      if(end>maxTime) end=maxTime
+      if (end > maxTime) end = maxTime
-      this.dateRange = [formatDate(start),formatDate(end)]
+      this.dateRange = [formatDate(start), formatDate(end)]
-      this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
   }
 }
 
 </script>
 <style lang="scss" scoped>
-.time-range{
+.time-range {
-    display: flex;
+  display: flex;
-    ::v-deep {
+
-        .el-range-editor--medium .el-range__icon, .el-range-editor--medium .el-range__close-icon{
+  ::v-deep {
-          line-height: 22px;
+
-        }
+    .el-range-editor--medium .el-range__icon, .el-range-editor--medium .el-range__close-icon {
-        .el-range-editor--medium.el-input__inner{
+      line-height: 22px;
-            height: 30px;
-        }
-        .el-range-editor--medium .el-range-separator{
-            line-height: 24px;
-        }
-        .el-button--mini{
-            padding:3px 10px;
-        }
     }
 
+    .el-range-editor--medium.el-input__inner {
+      height: 30px;
+    }
+
+    .el-range-editor--medium .el-range-separator {
+      line-height: 22px;
+    }
+
+    .el-button--mini {
+      padding: 3px 10px;
+    }
+
+    //  展示icon的小组件
+    .btn-icon.el-button--mini {
+      padding: 3px 8px;
+      margin-left: 6px;
+    }
+
+    //小宽度时间选择框
+    .mini-date-picker {
+      width: 250px !important;
+    }
+  }
+
 }
 </style>

src/components/Ems/ZdBaseInfo/index.vue

@@ -32,13 +32,13 @@ export default {
         attr:'installCapacity'
 
       },{
-        title:'总充电量（MWh）',
+        title:'总充电量（KWh）',
         num:'',
         color:'#A696FF',
         attr:'totalChargedCap'
 
       },{
-        title:'总放电量（MWh）',
+        title:'总放电量（KWh）',
         num:'',
         color:'#A696FF',
         attr:'totalDischargedCap'

src/layout/components/Navbar.vue

@@ -1,19 +1,24 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+               @toggleClick="toggleSideBar"/>
 
-    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
+    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container"/>
-    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
+    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container"/>
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <div class="big-data-container">
+          <i class="el-icon-s-marketing big-data-icon" @click.stop="showBigDataImg"></i>
+        </div>
+
+        <search id="header-search" class="right-menu-item"/>
 
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <screenfull id="screenfull" class="right-menu-item hover-effect"/>
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
+          <size-select id="size-select" class="right-menu-item hover-effect"/>
         </el-tooltip>
 
       </template>
@@ -32,16 +37,15 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-
       <div class="right-menu-item hover-effect setting" @click="setLayout" v-if="setting">
-        <svg-icon icon-class="more-up" />
+        <svg-icon icon-class="more-up"/>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
@@ -78,6 +82,12 @@ export default {
     }
   },
   methods: {
+    showBigDataImg() {
+      const routeUrl = this.$router.resolve({
+        path: '/screen'
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -93,7 +103,8 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/index'
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     }
   }
 }
@@ -105,7 +116,7 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
   .hamburger-container {
     line-height: 46px;
@@ -113,7 +124,7 @@ export default {
     float: left;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
       background: rgba(0, 0, 0, .025)
@@ -139,6 +150,17 @@ export default {
     height: 100%;
     line-height: 50px;
 
+    .big-data-container {
+      display: inline-block;
+      padding: 0 8px;
+      height: 100%;
+      font-size: 24px;
+      color: #5a5e66;
+      vertical-align: text-bottom;
+      cursor: pointer;
+    }
+
+
     &:focus {
       outline: none;
     }
@@ -177,7 +199,7 @@ export default {
           border-radius: 50%;
         }
 
-        .user-nickname{
+        .user-nickname {
           position: relative;
           bottom: 10px;
           font-size: 14px;

src/mixins/ems/getQuerySiteId.js

@@ -6,16 +6,16 @@ const getQuerySiteId=  {
     }
   },
   watch: {
-    '$store.state.ems.zdList':{
+    '$route.query':{
       handler (newQuery,oldQuery) {
-        if(!newQuery || newQuery.length === 0){return}
         // 参数变化处理
         this.$nextTick(() => {
-          const {siteId} =newQuery[0]
+          const {siteId} =newQuery
-          this.siteId = siteId
+          if(siteId){
-          siteId && this.init(newQuery.siteId)
+            this.siteId = siteId
-          console.log('watch站点列表返回数据newQuery=',newQuery)
+            siteId && this.init(newQuery.siteId)
-          console.log('设置页面siteId，this.siteId=',this.siteId)
+            console.log('mixin=>getQuerySiteId=>页面参数siteId发生了变化,this.siteId=',this.siteId)
+          }
         })
       },
       immediate: true,

src/permission.js

@@ -31,7 +31,6 @@ 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) // 动态添加可访问路由表

src/router/ems.js

@@ -7,257 +7,295 @@ export const dzjk = [
         path: '/dzjk',
         component: Layout,
         redirect: '/dzjk/home',
-        meta: {title: '单站监控', icon: 'server',},
+        meta: {title: '单站监控', icon: 'dashboard',},
         alwaysShow: false,
         name: 'Dzjk',
+        hidden: true,
         children: [
             {
-                path: '/dzjk/home',
+                path: '',
-                component: () => import('@/views/ems/dzjk/home/index.vue'),
+                component: () => import('@/views/ems/dzjk/index'),
-                name: 'DzjkHome',
+                name: 'Dzjk',
-                meta: {title: '站点首页', breadcrumb: false, activeMenu: '/dzjk/home', activeSecondMenuName: 'DzjkHome'}
+                redirect: '/dzjk/home',
-            },
+                hidden: true,
-            {
-                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: 'ssyx',
+                        path: '/dzjk/home',
-                        component: () => import('@/views/ems/dzjk/sbjk/ssyx/index.vue'),
+                        component: () => import('@/views/ems/dzjk/home/index.vue'),
-                        name: 'DzjkSbjkSsyx',
+                        name: 'DzjkHome',
-                        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: 'DzjkSbjk',
+                            activeSecondMenuName: 'DzjkHome'
-                            deviceCategory: 'DH'
+                        }
-                        },
                     },
                     {
-                        path: 'xf',
+                        path: '/dzjk/zxlt',
-                        component: () => import('@/views/ems/dzjk/sbjk/xf/index.vue'),
+                        component: () => import('@/views/ems/dzjk/zxlt/index.vue'),
-                        name: 'DzjkSbjkXf',
+                        name: 'DzjkZxlt',
-                        hidden: true,
                         meta: {
-                            title: '消防',
+                            title: '主线路图',
                             breadcrumb: false,
                             activeMenu: '/dzjk',
-                            activeSecondMenuName: 'DzjkSbjk',
+                            activeSecondMenuName: 'DzjkZxlt'
-                            deviceCategory: 'XF'
+                        }
-                        },
+                    },
+                    {
+                        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'},
+                            // }
+                        ]
                     }
                 ]
-            },
-            {
-                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'},
             }
         ]
     }

src/router/index.js

@@ -52,6 +52,11 @@ export const constantRoutes = [
     component: () => import('@/views/register'),
     hidden: true
   },
+  {
+    path: '/screen',
+    component: () => import('@/views/screen/index'),
+    hidden: true
+  },
   {
     path: '/404',
     component: () => import('@/views/error/404'),

src/settings.js

@@ -7,7 +7,7 @@ module.exports = {
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */
-  sideTheme: 'theme-dark',
+  sideTheme: 'theme-light',
 
   /**
    * 系统布局配置

src/store/modules/ems.js

@@ -1,4 +1,3 @@
-import {getAllSites} from '@/api/ems/zddt'
 import {getAlarmDetailList, getSiteAllDeviceCategory} from '@/api/ems/dzjk'
 
 const ems = {
@@ -6,8 +5,18 @@ const ems = {
         dzjkAlarmLighting: false,//单站监控 告警统计红点标志
         zdList: [],
         zdDeviceCategoryOptions: {},//站点各个站点包含的设备种类 {021_DDS_01:["BATTERY","CLUSTER","STACK", "DH", "AMMETER", "PCS", "XF"],021_DDS_02:[]...}
-        workStatusOptions: {'0': '正常', '1': '异常', '2': '停止'},//工作状态
+        CLUSTERWorkStatusOptions: {'0': '静置', '1': '充电', '2': '放电', '3': '待机', '5': '运行', '9': "故障"},//电池簇工作状态
-        deviceStatusOptions: {'0': '离线', '1': '待机', '2': '运行', '3': '故障', '4': '停机'},//设备状态
+        PCSWorkStatusOptions: {'0': '运行', '1': '停机', '2': '故障', '3': '待机', '4': '充电', '5': '放电'},//PCS工作状态
+        STACKWorkStatusOptions: {
+            "0": "静置",
+            "1": "充电",
+            "2": "放电",
+            "3": "浮充",
+            '4': '待机',
+            '5': '运行',
+            '9': "故障"
+        },//STACKBMS总览工作状态
+        deviceStatusOptions: {'0': '离线', '1': '在线'},//设备状态
         gridStatusOptions: {'0': '并网', '1': '未并网'},//并网状态
         controlModeOptions: {'0': '远程', '1': '本地'},//控制模式
         warnOptions: {0: '正常', 1: '中断', 2: '不在线', 3: '异常'},//告警状态
@@ -34,14 +43,6 @@ 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({

src/store/modules/permission.js

@@ -34,12 +34,11 @@ const permission = {
       return new Promise(resolve => {
         // 向后端请求路由数据
         getRouters().then(res => {    
-          let sysDzjk = -1
+          let hasDzjk = false
           if(res?.data){
-            sysDzjk = res.data.findIndex(i=>{
+            res.data.forEach(i=>{
-              return i.children && i.children.find(j=>j.path.indexOf('dzjk')>-1)
+              i.children && i.children.find(j=>j.path.indexOf('dzjk')>-1) && (hasDzjk=true)
             })
-            if(sysDzjk>-1) res.data.splice(sysDzjk,1)
           }
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
@@ -48,7 +47,7 @@ const permission = {
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           router.addRoutes(asyncRoutes)
-          if(sysDzjk === -1){
+          if(!hasDzjk){
             const index = constantRoutes.findIndex(i=>i.path.indexOf('dzjk')>-1)
             constantRoutes.splice(index,1)
           }

src/views/ems/dzjk/clpz/clyx/index.vue

@@ -1,6 +1,6 @@
 
 <template>
-   <div v-loading="loading" class="ems-dashboard-editor-container ems-content-container-padding">
+   <div v-loading="loading">
      <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)">

src/views/ems/dzjk/clpz/index.vue

@@ -0,0 +1,53 @@
+<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>
+

src/views/ems/dzjk/clpz/xftg/AddTemplate.vue

@@ -262,28 +262,6 @@ export default {
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        //校验时间选择范围是否冲突
-        let status = true
-        this.tableData.forEach((outer, outerIndex) => {
-          const {startTime, endTime} = outer
-          const outerStart = parseInt(startTime), outerEnd = parseInt(endTime)
-          if (outerStart > outerEnd) {
-            status = false
-          } else {
-            this.tableData.forEach((inner, innerIndex) => {
-              if (innerIndex !== outerIndex) {
-                const {startTime: innerStartTime, endTime: innerEndTime} = inner
-                const innerStart = parseInt(innerStartTime), innerEnd = parseInt(innerEndTime)
-                if ((innerStart < outerStart && innerEnd > outerEnd) || !((innerStart < outerStart && innerEnd <= outerStart) || (innerStart >= outerEnd && innerEnd > outerEnd))) {
-                  status = false
-                }
-              }
-            })
-          }
-        })
-        if (!status) {
-          return this.$message.error('时间选择范围冲突');
-        }
         const {templateName, sdcLimit, sdcDown, sdcUp} = this.formData
         const {siteId, updateStrategyId} = this.$home
         const {tableData} = this

src/views/ems/dzjk/clpz/xftg/index.vue

@@ -2,7 +2,7 @@
 <template>
 <!--  <cl-container :hideSettingBtn="true">-->
 <!--    <template v-slot:default>-->
-      <div class="ems-dashboard-editor-container ems-content-container-padding">
+      <div>
         <temp-table ref="tempTable" @updateTimeSetting="updateTimeSetting"/>
         <time-setting ref="timeSetting"/>
         <temp-power-chart ref="tomePowerChart"/>

src/views/ems/dzjk/gzgj/index.vue

@@ -1,6 +1,6 @@
 
 <template>
-  <div  v-loading="loading" class="ems-dashboard-editor-container ems-content-container-padding">
+  <el-card  v-loading="loading" gshadow="always" class="common-card-container common-card-container-no-title-bg">
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="设备清单">
@@ -108,7 +108,7 @@
       >
       </el-pagination>
     </div>
-  </div>
+  </el-card>
 </template>
 
 

src/views/ems/dzjk/home/ActiveChart.vue

@@ -1,30 +1,29 @@
-
 <template>
-    <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
+  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
-      <div slot="header" class="time-range-header">
+    <div slot="header" class="time-range-header">
-        <span class="card-title">当日功率曲线</span>
+      <span class="card-title">当日功率曲线</span>
-        <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
+      <date-range-select ref="dateRangeSelect" :showIcon="true" :mini-time-picker="true" @updateDate="updateDate"/>
-      </div>
+    </div>
-      <div style="height: 310px" id="activeChart"></div>
+    <div style="height: 310px" id="activeChart"></div>
-    </el-card>
+  </el-card>
 </template>
 
 <script>
 import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
-import { getPointData } from '@/api/ems/dzjk'
+import {getPointData} from '@/api/ems/dzjk'
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
-  mixins: [resize,intervalUpdate],
+  mixins: [resize, intervalUpdate],
   components: {DateRangeSelect},
   data() {
     return {
       chart: null,
-      timeRange:[],
+      timeRange: [],
-      siteId:'',
+      siteId: '',
-      isInit:true
+      isInit: true
     }
   },
   mounted() {
@@ -41,23 +40,23 @@ export default {
   },
   methods: {
     // 更新时间范围 重置图表
-    updateDate(data){
+    updateDate(data) {
-      this.timeRange=data
+      this.timeRange = data
       !this.isInit && this.getGVQXData()
       this.isInit = false
     },
-    getGVQXData(){
+    getGVQXData() {
       this.showLoading()
-      const {siteId,timeRange}=this
+      const {siteId, timeRange} = this
-      getPointData({siteId,startDate:timeRange[0],endDate:timeRange[1]}).then(response => {
+      getPointData({siteId, startDate: timeRange[0], endDate: timeRange[1]}).then(response => {
         this.setOption(response?.data || [])
-      }).finally(()=>this.hideLoading())
+      }).finally(() => this.hideLoading())
     },
-    init(siteId){
+    init(siteId) {
       //初始化 清空数据
       this.siteId = siteId
       this.isInit = true
-      this.timeRange=[]
+      this.timeRange = []
       this.$refs.dateRangeSelect.init(true)
       this.getGVQXData()
       this.updateInterval(this.getGVQXData)
@@ -65,17 +64,17 @@ export default {
     initChart() {
       this.chart = echarts.init(document.querySelector('#activeChart'))
     },
-    showLoading(){
+    showLoading() {
       this.chart && this.chart.showLoading()
     },
-    hideLoading(){
+    hideLoading() {
       this.chart && this.chart.hideLoading()
     },
     setOption(data) {
-      const source = [['日期','电网功率','负载功率','储能功率','光伏功率','soc平均值','soh平均值','电池平均温度平均值']]
+      const source = [['日期', '电网功率', '负载功率', '储能功率', '光伏功率', 'soc平均值', 'soh平均值', '电池平均温度平均值']]
-      console.log('source.slice(1)',source[0].slice(1))
+      console.log('source.slice(1)', source[0].slice(1))
-      this.chart && data.forEach((item)=>{
+      this.chart && data.forEach((item) => {
-        source.push([item.statisDate,item.gridPower,item.loadPower,item.storagePower,item.pvPower,item.avgSoc,item.avgSoh,item.avgTemp])
+        source.push([item.statisDate, item.gridPower, item.loadPower, item.storagePower, item.pvPower, item.avgSoc, item.avgSoh, item.avgTemp])
       })
       this.chart.setOption({
         grid: {
@@ -91,8 +90,8 @@ export default {
             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
           }
         },
-        textStyle:{
+        textStyle: {
-          color:"#333333",
+          color: "#333333",
         },
         xAxis: {
           type: 'category',
@@ -105,11 +104,17 @@ export default {
             type: 'value',
           },
         ],
-        dataset:{source},
+        dataset: {source},
-        series: source[0].slice(1).map((item,index)=>{
+        series: source[0].slice(1).map((item, index) => {
           return {
-            type: 'line',
+            type: 'line',//index === 5 ? 'bar' : 'line',
-            yAxisIndex:index<=4 ? 0 : 1
+            showSymbol: false,
+            symbolSize: 2,
+            smooth: true,
+            areaStyle: {
+              opacity: 0.5,
+            },
+            yAxisIndex: index <= 4 ? 0 : 1
           }
         })
       })

src/views/ems/dzjk/home/WeekChart.vue

@@ -1,12 +1,11 @@
-
 <template>
-      <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
+  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
-        <div slot="header" class="time-range-header">
+    <div slot="header" class="time-range-header">
-          <span class="card-title">一周充放曲线</span>
+      <span class="card-title">一周充放曲线</span>
-          <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
+      <date-range-select ref="dateRangeSelect" :showIcon="true" :mini-time-picker="true" @updateDate="updateDate"/>
-        </div>
+    </div>
-        <div style="height: 310px" id="weekChart"></div>
+    <div style="height: 310px" id="weekChart"></div>
-      </el-card>
+  </el-card>
 </template>
 
 <script>
@@ -14,14 +13,15 @@ import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
 import {getSevenChargeData} from '@/api/ems/dzjk'
+
 export default {
   mixins: [resize],
   components: {DateRangeSelect},
   data() {
     return {
       chart: null,
-      timeRange:[],
+      timeRange: [],
-      siteId:'',
+      siteId: '',
     }
   },
   mounted() {
@@ -38,41 +38,40 @@ export default {
   },
   methods: {
     // 更新时间范围 重置图表
-    updateDate(data){
+    updateDate(data) {
-      this.timeRange=data
+      this.timeRange = data
       this.getWeekKData()
     },
-    getWeekKData(){
+    getWeekKData() {
       this.showLoading()
-      const {siteId,timeRange}=this
+      const {siteId, timeRange} = this
-      this.hideLoading()
+      getSevenChargeData({siteId, startDate: timeRange[0], endDate: timeRange[1]}).then(response => {
-      getSevenChargeData({siteId,startDate:timeRange[0],endDate:timeRange[1]}).then(response => {
         this.setOption(response?.data || [])
-      }).finally(()=>this.hideLoading())
+      }).finally(() => this.hideLoading())
     },
-    init(siteId){
+    init(siteId) {
       //初始化 清空数据
       this.siteId = siteId
-      this.timeRange=[]
+      this.timeRange = []
-      this.deviceId=''
+      this.deviceId = ''
       this.$refs.dateRangeSelect.init()
     },
     initChart() {
       this.chart = echarts.init(document.querySelector('#weekChart'))
     },
-    showLoading(){
+    showLoading() {
       this.chart && this.chart.showLoading()
     },
-    hideLoading(){
+    hideLoading() {
       this.chart && this.chart.hideLoading()
     },
-    setOption(data,unit) {
+    setOption(data, unit) {
-      const source = [['日期','充电量','放电量']]
+      const source = [['日期', '充电量', '放电量']]
-      data.forEach(item=>{
+      data.forEach(item => {
-        source.push([item.ammeterDate, item.chargedCap,item.disChargedCap])
+        source.push([item.ammeterDate, item.chargedCap, item.disChargedCap])
       })
       this.chart && this.chart.setOption({
-        color:['#4472c4','#70ad47'],//所有充放电颜色保持统一
+        color: ['#4472c4', '#70ad47'],//所有充放电颜色保持统一
         tooltip: {
           trigger: 'axis',
           axisPointer: { // 坐标轴指示器，坐标轴触发有效
@@ -88,29 +87,29 @@ export default {
         },
         xAxis: {
           type: 'category',
-          name:unit,
+          name: unit,
-          nameLocation:'center'
+          nameLocation: 'center'
         },
         yAxis: [{
           type: 'value',
-          name:'充电量/放电量kWh',
+          name: '充电量/放电量kWh',
           axisLine: {
-            lineStyle:{
+            lineStyle: {
               color: '#333333',
             },
-            onZero:false
+            onZero: false
           }
         }],
-        dataset:{
+        dataset: {
           source
         },
         series: [
           {
-            yAxisIndex:0,
+            yAxisIndex: 0,
             type: 'bar',
           },
           {
-            yAxisIndex:0,
+            yAxisIndex: 0,
             type: 'bar',
           },
         ]

src/views/ems/dzjk/home/index.vue

@@ -1,133 +1,164 @@
 <template>
-  <div
+  <div v-loading="loading">
-    class="ems-dashboard-editor-container ems-content-container-padding"
-    v-loading="loading"
-  >
     <el-row style="background: #fff" class="row-container" :gutter="15">
-      <el-col v-if="tableData.length > 0" :xs="24" :sm="24" :lg="24">
+      <el-col :xs="24" :sm="24" :lg="5">
-        <alarm-table :tableData="tableData" />
+        <!--      站点信息-->
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="6">
         <el-card
-          shadow="always"
+            shadow="always"
-          class="common-card-container common-card-container-body-no-padding"
+            class="common-card-container common-card-container-body-no-padding"
         >
           <div slot="header">
             <span class="card-title">站点信息</span>
+            <div class="alarm-msg" v-if="tableData.length > 0" @click="toAlarm">
+              <i class="el-icon-message-solid"></i> 设备告警
+            </div>
           </div>
           <div
-            style="box-sizing: border-box; height: 250px; padding: 20px 15px"
+              style="box-sizing: border-box; height: 218px; padding: 20px 15px"
           >
-            <el-descriptions class="home-normal-info" :column="1">
+            <!--            地址、运行时间-->
-              <el-descriptions-item
+            <div class="site-info site-info-address">
-                size="mini"
+              <div class="title">
-                v-for="(item, index) in singleZdInfo"
+                <i class="el-icon-location"></i>
-                :key="index + 'singleZdInfo'"
+              </div>
-                :label="item.title"
+              <div class="value">{{ info.siteAddress }}</div>
-                >{{ info[item.attr] | formatNumber }}</el-descriptions-item
+            </div>
-              >
+            <div class="site-info">
-            </el-descriptions>
+              <div class="title">
-          </div>
+                <i class="el-icon-date"></i>
-        </el-card>
+              </div>
-      </el-col>
+              <div class="value">{{ info.runningTime || '-' }}</div>
-      <el-col :xs="24" :sm="24" :lg="8">
+            </div>
-        <el-card
+            <!--      装机功率、容量      -->
-          shadow="always"
+            <el-row :gutter="10" style="margin-top:20px;">
-          class="common-card-container common-card-container-body-no-padding"
-        >
-          <div slot="header">
-            <span class="card-title">总累计运行数据</span>
-          </div>
-          <div
-            style="box-sizing: border-box; height: 250px; padding: 20px 15px"
-          >
-            <el-row :gutter="20">
               <el-col
-                :span="12"
+                  :span="12"
-                v-for="(item, index) in sjglData"
+                  class="sjgl-col power-col"
-                :key="index + 'sjglData'"
-                class="sjgl-data"
               >
-                <div class="sjgl-title">{{ item.title }}</div>
+                <div class="sjgl-wrapper">
-                <div class="sjgl-value">
+                  <div class="sjgl-title">装机功率(MW)</div>
-                  {{ runningInfo[item.attr] | formatNumber }}
+                  <div class="sjgl-value">
+                    {{ info.installPower | formatNumber }}
+                  </div>
+                </div>
+              </el-col>
+              <el-col
+                  :span="12"
+                  class="sjgl-col power-col"
+              >
+                <div class="sjgl-wrapper">
+                  <div class="sjgl-title">装机容量(MW)</div>
+                  <div class="sjgl-value">
+                    {{ info.installCapacity | formatNumber }}
+                  </div>
                 </div>
               </el-col>
             </el-row>
           </div>
         </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="10">
+      <!--      总累计运行数据-->
-        <cl-info :info="runningInfo.strategyTempInfo" />
+      <el-col :xs="24" :sm="24" :lg="19">
+        <el-card
+            shadow="always"
+            class="common-card-container common-card-container-body-no-padding"
+        >
+          <div slot="header">
+            <span class="card-title">总累计运行数据</span>
+            <div class="total-count">
+              <span class="title">总收入</span>
+              <span class="value">{{ runningInfo.totalRevenue | formatNumber }}</span>
+              <span class="unit">元</span>
+            </div>
+          </div>
+          <div
+              style="box-sizing: border-box; height: 218px; padding: 20px 15px"
+          >
+            <el-row :gutter="10">
+              <el-col
+                  :span="6"
+                  v-for="(item, index) in sjglData"
+                  :key="index + 'sjglData'"
+                  class="sjgl-col"
+              >
+                <div class="sjgl-wrapper">
+                  <div class="sjgl-title">{{ item.title }}</div>
+                  <div class="sjgl-value" :style="{color:item.color}">
+                    {{ runningInfo[item.attr] | formatNumber }}
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+        </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="24">
+      <el-col :xs="24" :sm="24" :lg="12">
-        <week-chart ref="weekChart" />
+        <week-chart ref="weekChart"/>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="24">
+      <el-col :xs="24" :sm="24" :lg="12">
-        <active-chart ref="activeChart" />
+        <active-chart ref="activeChart"/>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import { getSingleSiteBaseInfo } from "@/api/ems/zddt";
+import {getSingleSiteBaseInfo} from "@/api/ems/zddt";
-import { getDzjkHomeView } from "@/api/ems/dzjk";
+import {getDzjkHomeView} from "@/api/ems/dzjk";
 import WeekChart from "./WeekChart.vue";
 import ActiveChart from "./ActiveChart.vue";
 import AlarmTable from "./AlarmTable.vue";
 import ClInfo from "./ClInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+
 export default {
   name: "DzjkSbjkHome",
-  components: { WeekChart, ActiveChart, AlarmTable, ClInfo },
+  components: {WeekChart, ActiveChart, AlarmTable, ClInfo},
   mixins: [getQuerySiteId, intervalUpdate],
   data() {
     return {
       loading: false,
-      singleZdInfo: [
-        {
-          title: "电站位置",
-          attr: "siteAddress",
-        },
-        {
-          title: "投运时间",
-          attr: "runningTime",
-        },
-        {
-          title: "装机功率(MW)",
-          attr: "installPower",
-        },
-        {
-          title: "装机容量(MW)",
-          attr: "installCapacity",
-        },
-      ],
       sjglData: [
         {
           title: "今日充电量（kWh）",
           attr: "dayChargedCap",
+          color: '#4472c4'
         },
         {
           title: "今日放电量（kWh）",
           attr: "dayDisChargedCap",
+          color: '#70ad47'
         },
         {
           title: "总充电量（kWh）",
           attr: "totalChargedCap",
+          color: '#4472c4'
+        },
+        {
+          title: "今日实时收入（元）",
+          attr: "dayRevenue",
+          color: '#f67438'
+        },
+        {
+          title: "昨日充电量（kWh）",
+          attr: "yesterdayChargedCap",
+          color: '#4472c4'
+        },
+        {
+          title: "昨日放电量（kWh）",
+          attr: "yesterdayDisChargedCap",
+          color: '#70ad47'
         },
         {
           title: "总放电量（kWh）",
           attr: "totalDischargedCap",
+          color: '#70ad47'
         },
         {
-          title: "总收入（元）",
+          title: "昨日实时收入（元）",
-          attr: "totalRevenue",
+          attr: "yesterdayRevenue",
-        },
+          color: '#f67438'
-        {
-          title: "当日实时收入（元）",
-          attr: "dayRevenue",
         },
       ],
       info: {}, //基本信息
@@ -136,14 +167,13 @@ export default {
   },
   computed: {
     tableData() {
-      console.log(
-        "this.runningInfo?.siteMonitorHomeAlarmVo ",
-        this.runningInfo?.siteMonitorHomeAlarmVo
-      );
       return this.runningInfo?.siteMonitorHomeAlarmVo || [];
     },
   },
   methods: {
+    toAlarm() {
+      this.$router.push({path: "/dzjk/gzgj", query: this.$route.query});
+    },
     getBaseInfo() {
       return getSingleSiteBaseInfo(this.siteId).then((response) => {
         this.info = response?.data || {};
@@ -173,6 +203,73 @@ export default {
 </script>
 
 <style scoped lang="scss">
+//设备告警
+.alarm-msg {
+  background: #ff4949;
+  padding: 2px 5px;
+  font-size: 10px;
+  font-weight: bolder;
+  border-radius: 3px;
+  line-height: 20px;
+  cursor: pointer;
+  color: #fff;
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+//基本信息-地址 运行️时间
+.site-info {
+  display: flex;
+  font-size: 12px;
+  line-height: 20px;
+  margin-bottom: 10px;
+  align-items: center;
+
+  &.site-info-address {
+    height: 40px;
+  }
+
+  .title {
+    color: #1791ff;
+    font-size: 18px;
+    line-height: 20px;
+    margin-right: 7px;
+  }
+
+  .value {
+    color: #000;
+    font-size: 12px;
+    max-height: 40px;
+    overflow: hidden;
+  }
+}
+
+//总收入
+.total-count {
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 12px;
+  font-weight: bolder;
+  color: #333;
+  line-height: 14px;
+
+  .unit {
+    font-style: italic;
+  }
+
+  .value {
+    font-size: 22px;
+    font-weight: bolder;
+    color: #ed2f1d;
+    font-style: italic;
+    padding: 0 5px;
+  }
+}
+
 .row-container {
   & > .el-col {
     margin-bottom: 20px;
@@ -180,25 +277,47 @@ export default {
 }
 
 //数据概览
-.sjgl-data {
+.sjgl-col {
-  text-align: center;
+  .sjgl-wrapper {
-  &:nth-child(1),
+    text-align: left;
+    padding: 15px 20px;
+    background-color: #f2f7fb;
+  }
+
+  &.power-col {
+    .sjgl-wrapper {
+      padding: 10px;
+
+      .sjgl-value {
+        color: #c44444;
+      }
+    }
+  }
+
+  &:nth-child(4),
   &:nth-child(2),
   &:nth-child(3),
   &:nth-child(4) {
-    margin-bottom: 25px;
+    margin-bottom: 10px;
   }
+
   .sjgl-title {
-    color: #666666;
+    color: #717171;
     line-height: 14px;
+    font-weight: bold;
   }
+
   .sjgl-value {
     color: rgba(51, 51, 51, 1);
-    font-size: 26px;
+    font-size: 22px;
     line-height: 26px;
-    font-weight: 500;
+    font-weight: bolder;
+    font-style: italic;
     margin-top: 14px;
-    word-wrap: break-word;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 }
 </style>
@@ -206,10 +325,12 @@ export default {
 <style lang="scss">
 .home-normal-info {
   font-size: 12px;
+
   .el-descriptions-item__container {
     .el-descriptions-item__label {
       color: #666666;
     }
+
     .el-descriptions-item__content {
       color: #333333;
     }

src/views/ems/dzjk/sbjk/bmsdcc/index.vue

@@ -3,13 +3,12 @@
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmsdccContainer'" style="margin-bottom:25px;">
       <el-card shadow="always"
                class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
-               :class="{
+               :class="handleCardClass(baseInfo)">
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
-        'running-card-container':baseInfo.workStatus === '0'
-      }">
         <div slot="header">
           <span
-              class="large-title">{{ baseInfo.parentDeviceName ? `${baseInfo.parentDeviceName} -> ` : '' }}{{ baseInfo.deviceName }}</span>
+              class="large-title">{{
+              baseInfo.parentDeviceName ? `${baseInfo.parentDeviceName} -> ` : ''
+            }}{{ baseInfo.deviceName }}</span>
           <div class="info">
             <div>数据更新时间：{{ baseInfo.dataUpdateTime || '-' }}</div>
           </div>
@@ -17,7 +16,7 @@
             <el-button type="primary" round size="small" style="margin-right:20px;"
                        @click="pointDetail(baseInfo,'point')">详细
             </el-button>
-            <el-badge :value="baseInfo.alarmNum || 0" class="item">
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(baseInfo,'alarmPoint')"
@@ -27,16 +26,16 @@
         </div>
         <div class="descriptions-main">
           <el-descriptions direction="vertical" :column="3" :colon="false">
-            <el-descriptions-item labelClassName="descriptions-label"
+            <el-descriptions-item
-                                  :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`"
+                contentClassName="descriptions-direction work-status"
-                                  :span="1" label="工作状态">
+                :span="1" label="工作状态">
-              {{ $store.state.ems.workStatusOptions[baseInfo.workStatus] }}
+              {{ CLUSTERWorkStatusOptions[baseInfo.workStatus] }}
             </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"
+            <el-descriptions-item contentClassName="descriptions-direction"
                                   :span="1" label="与PCS通信">
               {{ $store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus] }}
             </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"
+            <el-descriptions-item contentClassName="descriptions-direction"
                                   :span="1" label="与EMS通信">
               {{ $store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus] }}
             </el-descriptions-item>
@@ -80,7 +79,9 @@
           >
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.avgData }}</span>
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.avgData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -88,7 +89,9 @@
               label="单体最小值">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.minData }}</span>
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.minData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -100,7 +103,9 @@
               label="单体最大值">
             <template slot-scope="scope">
               <span class="pointer "
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.maxData }}</span>
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.maxData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -123,11 +128,17 @@ import PointTable from "@/views/ems/site/sblb/PointTable.vue";
 import {getBMSBatteryCluster} from '@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import {mapState} from "vuex";
 
 export default {
   name: 'DzjkSbjkBmsdcc',
   mixins: [getQuerySiteId, intervalUpdate],
   components: {PointTable, pointChart},
+  computed: {
+    ...mapState({
+      CLUSTERWorkStatusOptions: state => state?.ems?.CLUSTERWorkStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
@@ -162,6 +173,10 @@ export default {
     }
   },
   methods: {
+    handleCardClass(item) {
+      const {workStatus = ''} = item
+      return !(Object.keys(this.CLUSTERWorkStatusOptions).includes(item.workStatus)) ? "timing-card-container" : workStatus === '9' ? 'warning-card-container' : 'running-card-container'
+    },
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {siteId, deviceId} = row

src/views/ems/dzjk/sbjk/bmszl/index.vue

@@ -1,11 +1,10 @@
 <template>
   <div v-loading="loading">
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmszlContainer'" style="margin-bottom:25px;">
-      <el-card :class="{
+      <el-card
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
+          :class="handleCardClass(baseInfo)"
-        'running-card-container':baseInfo.workStatus === '0'
+          class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
-      }" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+          shadow="always">
-               shadow="always">
         <div slot="header">
           <span class="large-title">{{ baseInfo.deviceName }}</span>
           <div class="info">
@@ -15,7 +14,7 @@
             <el-button type="primary" round size="small" style="margin-right:20px;"
                        @click="pointDetail(baseInfo,'point')">详细
             </el-button>
-            <el-badge :value="baseInfo.alarmNum || 0" class="item">
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(baseInfo,'alarmPoint')"
@@ -26,9 +25,9 @@
         <div class="descriptions-main">
           <el-descriptions :colon="false" :column="3" direction="vertical">
             <el-descriptions-item
-                :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1"
+                contentClassName="descriptions-direction work-status"
                 label="工作状态" labelClassName="descriptions-label">
-              {{ $store.state.ems.workStatusOptions[baseInfo.workStatus] }}
+              {{ STACKWorkStatusOptions[baseInfo.workStatus] }}
             </el-descriptions-item>
             <el-descriptions-item :span="1" contentClassName="descriptions-direction" label="与PCS通信"
                                   labelClassName="descriptions-label">
@@ -97,7 +96,9 @@
               prop="maxVoltage">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最高单体电压',scope.row.clusterId,'CLUSTER')">{{ scope.row.maxCellVoltage }} V</span>
+                    @click="showChart('最高单体电压',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.maxCellVoltage
+                }} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -109,7 +110,9 @@
               prop="minVoltage">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最低单体电压',scope.row.clusterId,'CLUSTER')">{{ scope.row.minCellVoltage }} V</span>
+                    @click="showChart('最低单体电压',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.minCellVoltage
+                }} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -120,7 +123,9 @@
               label="单体最高温度">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最高单体温度',scope.row.clusterId,'CLUSTER')">{{ scope.row.maxCellTemp }} &#8451;</span>
+                    @click="showChart('最高单体温度',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.maxCellTemp
+                }} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -132,7 +137,9 @@
               prop="minTemperature">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最低单体温度',scope.row.clusterId,'CLUSTER')">{{ scope.row.minCellTemp }} &#8451;</span>
+                    @click="showChart('最低单体温度',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.minCellTemp
+                }} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -155,11 +162,17 @@ import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 import pointChart from "./../PointChart.vue";
 import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+import {mapState} from "vuex";
 
 export default {
   name: 'DzjkSbjkBmszl',
   components: {pointChart, PointTable},
   mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      STACKWorkStatusOptions: state => state?.ems?.STACKWorkStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
@@ -178,6 +191,11 @@ export default {
     }
   },
   methods: {
+    handleCardClass(item) {
+      const {workStatus = ''} = item
+      return !Object.keys(this.STACKWorkStatusOptions).find(i => i === workStatus) ? "timing-card-container" : workStatus === '9' ? 'warning-card-container' : 'running-card-container'
+    },
+
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {siteId, deviceId} = row

src/views/ems/dzjk/sbjk/db/index.vue

@@ -6,7 +6,8 @@
         shadow="always"
         class="sbjk-card-container list"
         :class="{
-        'warning-card-container':item.emsCommunicationStatus && item.emsCommunicationStatus !== '0',
+        'timing-card-container':!['0','2'].includes(item.emsCommunicationStatus),
+        'warning-card-container':item.emsCommunicationStatus === '2',
         'running-card-container':item.emsCommunicationStatus === '0'
       }"
     >
@@ -15,18 +16,16 @@
         <div class="info">
           <div>
             {{
-              $store.state.ems.communicationStatusOptions[
+              communicationStatusOptions[item.emsCommunicationStatus] || '-'
-                  item.emsCommunicationStatus
-                  ]
             }}
           </div>
-          <div>数据更新时间：{{ item.dataUpdateTime }}</div>
+          <div>数据更新时间：{{ item.dataUpdateTime || '-' }}</div>
         </div>
         <div class="alarm">
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"
@@ -35,10 +34,11 @@
         </div>
       </div>
       <el-row class="device-info-row">
-        <el-col v-for="(tempDataItem,tempDataIndex) in deviceIdTypeMsg[item.deviceId]" :key="tempDataIndex+'dbTempData'"
+        <el-col v-for="(tempDataItem,tempDataIndex) in (deviceIdTypeMsg[item.deviceId] || otherTypeMsg)"
+                :key="tempDataIndex+'dbTempData'"
                 :span="8" class="device-info-col">
             <span class="pointer" @click="showChart(tempDataItem.pointName,item.deviceId)">
-              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] || '-' }}<span
                 v-html="tempDataItem.unit"></span></span>
             </span>
         </el-col>
@@ -56,11 +56,18 @@ import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getAmmeterDataList} from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+import {mapState} from "vuex";
 
 export default {
   name: "DzjkSbjkDb",
   mixins: [getQuerySiteId, intervalUpdate],
   components: {PointTable, pointChart},
+  computed: {
+
+    ...mapState({
+      communicationStatusOptions: state => state?.ems?.communicationStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
@@ -70,89 +77,125 @@ export default {
           {
             name: '正向有功电能',
             attr: 'forwardActive',
-            pointName: '正向有功电能'
+            pointName: '正向有功电能',
+            unit: 'kWh'
           },
           {
             name: '反向有功电能',
             attr: 'reverseActive',
-            pointName: '反向有功电能'
+            pointName: '反向有功电能',
+            unit: 'kWh'
           },
           {
             name: '正向无功电能',
             attr: 'forwardReactive',
-            pointName: '正向无功电能'
+            pointName: '正向无功电能',
+            unit: 'kvarh'
           },
           {
             name: '反向无功电能',
             attr: 'reverseReactive',
-            pointName: '反向无功电能'
+            pointName: '反向无功电能',
+            unit: 'kvarh'
           },
           {
             name: '有功功率',
             attr: 'activePower',
-            pointName: '总有功功率'
+            pointName: '总有功功率',
+            unit: 'kW'
           },
           {
             name: '无功功率',
             attr: 'reactivePower',
-            pointName: '总无功功率'
+            pointName: '总无功功率',
+            unit: 'kvar'
           }
         ],
         'METE': [
           {
             name: '正向有功电能',
             attr: 'forwardActive',
-            pointName: '正向有功电能'
+            pointName: '正向有功电能',
+            unit: 'kWh'
           },
           {
             name: '反向有功电能',
             attr: 'reverseActive',
-            pointName: '反向有功电能'
+            pointName: '反向有功电能',
+            unit: 'kWh'
           },
           {
             name: '正向无功电能',
             attr: 'forwardReactive',
-            pointName: '正向无功电能'
+            pointName: '正向无功电能',
+            unit: 'kvarh'
           },
           {
             name: '反向无功电能',
             attr: 'reverseReactive',
-            pointName: '反向无功电能'
+            pointName: '反向无功电能',
+            unit: 'kvarh'
           },
           {
             name: '有功功率',
             attr: 'activePower',
-            pointName: '总有功功率'
+            pointName: '总有功功率',
+            unit: 'kW'
           },
           {
             name: '无功功率',
             attr: 'reactivePower',
-            pointName: '总无功功率'
+            pointName: '总无功功率',
+            unit: 'kvar'
           }
         ],
         'METEGF': [
           {
             name: '有功电能',
             attr: 'activeEnergy',
-            pointName: '有功电能'
+            pointName: '有功电能',
+            unit: 'kWh'
           },
           {
             name: '无功电能',
             attr: 'reactiveEnergy',
-            pointName: '无功电能'
+            pointName: '无功电能',
+            unit: 'kvarh'
           },
           {
             name: '有功功率',
             attr: 'activePower',
-            pointName: '总有功功率'
+            pointName: '总有功功率',
+            unit: 'kW'
           },
           {
             name: '无功功率',
             attr: 'reactivePower',
-            pointName: '总无功功率'
+            pointName: '总无功功率',
+            unit: 'kvar'
           }
         ]
-      }
+      },
+      otherTypeMsg: [
+        {
+          name: '正向有功电能',
+          attr: 'forwardActive',
+          pointName: '正向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '反向有功电能',
+          attr: 'reverseActive',
+          pointName: '反向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '有功功率',
+          attr: 'activePower',
+          pointName: '总有功功率',
+          unit: 'kW'
+        },
+      ]
     };
   },
   methods: {

src/views/ems/dzjk/sbjk/dh/index.vue

@@ -14,7 +14,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"
@@ -26,7 +26,8 @@
         <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'hdTempData'" :span="12"
                 class="device-info-col">
             <span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
-              <span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+              <span class="left">{{ tempDataItem.title }}</span> <span
+                class="right">{{ item[tempDataItem.attr] || '-' }}<span
                 v-html="tempDataItem.unit"></span></span>
             </span>
         </el-col>

src/views/ems/dzjk/sbjk/ems/index.vue

@@ -1,206 +1,5 @@
 <template>
   <div v-loading="loading" class="ems">
-    <!--    <div-->
-    <!--        v-for="(item, index) in list"-->
-    <!--        :key="index + 'PcsHome'"-->
-    <!--        style="margin-bottom: 25px"-->
-    <!--    >-->
-    <!--      <el-card-->
-    <!--          :class="{-->
-    <!--          'warning-card-container': item.workStatus === '1',-->
-    <!--          'timing-card-container': item.workStatus === '2',-->
-    <!--          'running-card-container': !['1', '2'].includes(item.workStatus),-->
-    <!--        }"-->
-    <!--          class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"-->
-    <!--          shadow="always"-->
-    <!--      >-->
-    <!--        &lt;!&ndash;        标题&ndash;&gt;-->
-    <!--        <div slot="header">-->
-    <!--          <span class="large-title"-->
-    <!--          >{{ item.deviceName }}</span-->
-    <!--          >-->
-    <!--          <div class="info">-->
-    <!--            <div>-->
-    <!--              {{-->
-    <!--                $store.state.ems.workStatusOptions[item.workStatus]-->
-    <!--              }}-->
-    <!--            </div>-->
-    <!--            <div>数据更新时间：{{ item.dataUpdateTime }}</div>-->
-    <!--          </div>-->
-    <!--          <div class="alarm">-->
-    <!--            <el-button type="primary" size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">-->
-    <!--              详细-->
-    <!--            </el-button>-->
-    <!--            <el-badge :value="item.alarmNum || 0" class="item">-->
-    <!--              <i-->
-    <!--                  class="el-icon-message-solid alarm-icon"-->
-    <!--                  @click="pointDetail(item,'alarmPoint')"-->
-    <!--              ></i>-->
-    <!--            </el-badge>-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        工作状态&ndash;&gt;-->
-    <!--        <div class="descriptions-main">-->
-    <!--          <el-descriptions :colon="false" :column="5" direction="vertical">-->
-    <!--            <el-descriptions-item-->
-    <!--                :contentClassName="`descriptions-direction ${-->
-    <!--                            item.workStatus === '0' ? 'save' : 'danger'-->
-    <!--                          }`"-->
-    <!--                :span="1"-->
-    <!--                label="工作状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.workStatusOptions[item.workStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="工作模式"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--              todo 手动/自动-->
-    <!--              {{-->
-    <!--                $store.state.ems.gridStatusOptions[item.gridStatus]-->
-    <!--              }}-->
-
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="并网状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.gridStatusOptions[item.gridStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="告警状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--              todo-->
-    <!--              &lt;!&ndash;-->
-    <!--              {{-->
-    <!--                              $store.state.ems.warnOptions[item.warnMode]-->
-    <!--                            }}&ndash;&gt;-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :contentClassName="`descriptions-direction ${-->
-    <!--                item.deviceStatus === '2' ? 'save' : 'danger'-->
-    <!--              }`"-->
-    <!--                :span="1"-->
-    <!--                label="设备状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.deviceStatusOptions[item.deviceStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--          </el-descriptions>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        用电量&ndash;&gt;-->
-    <!--        <div class="descriptions-main descriptions-main-bg-color">-->
-    <!--          <el-descriptions :colon="false" :column="5" direction="vertical">-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="5"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="当日用电量："-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="电网用电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="储能放电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="储能充电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="负荷用电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="光伏发电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--          </el-descriptions>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        表格&ndash;&gt;-->
-    <!--        <el-table-->
-    <!--            class="common-table"-->
-    <!--            stripe-->
-    <!--            style="width: 100%;margin-top:25px;">-->
-    <!--          <el-table-column-->
-    <!--              label="功率"-->
-    <!--              prop="type">-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="电网"-->
-    <!--          >-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电压',scope.row.clusterId)">{{ scope.row.clusterVoltage }} V</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="储能">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电流',scope.row.clusterId)">{{ scope.row.clusterCurrent }} A</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="负荷">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电流',scope.row.clusterId)">{{ scope.row.clusterCurrent }} A</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="光伏">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('当前SOC',scope.row.clusterId)">{{ scope.row.currentSoc }} %</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--        </el-table>-->
-    <!--        &lt;!&ndash;        图表&ndash;&gt;-->
-    <!--        <div id="emsChart" style="height: 350px"></div>-->
-    <!--      </el-card>-->
-    <!--    </div>-->
     <el-card
         v-for="(item,index) in list"
         :key="index+'emsList'"
@@ -220,7 +19,7 @@
         <div class="alarm">
           <el-button size="small" round style="margin-right:20px;" type="primary" @click="pointDetail(item,'point')">详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"

src/views/ems/dzjk/sbjk/index.vue

@@ -19,13 +19,14 @@
         </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 || []).find(item=> item.name==='DzjkSbjk').children) || []//获取到单站监控-设备监控下面的字路由
+const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DzjkSbjk').children//获取到单站监控-设备监控下面的字路由
 export default {
   name:'DzjkSbjk',
   mixins:[getQuerySiteId],
@@ -64,14 +65,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.sbjk-ems-dashboard-editor-container {
+.sbjk-ems-content-container{
-  display: flex;
+  margin-top:0;
-  background: #ffffff;
+  padding-top:0;
-}
-.sbjk-ems-content-container {
-  margin-top: 0;
-  padding-top: 0;
   padding-right: 0;
   flex: 1;
 }
 </style>
+

src/views/ems/dzjk/sbjk/pcs/index.vue

@@ -8,11 +8,7 @@
         style="margin-bottom: 25px"
     >
       <el-card
-          :class="{
+          :class="handleCardClass(pcsItem)"
-          'warning-card-container': pcsItem.workStatus === '1',
-          'timing-card-container': pcsItem.workStatus === '2',
-          'running-card-container': !['1', '2'].includes(pcsItem.workStatus),
-        }"
           class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
           shadow="always"
       >
@@ -31,17 +27,11 @@
             <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')">
               详细
             </el-button>
-            <el-badge :value="pcsItem.alarmNum || 0" class="item">
+            <el-badge :hidden="!pcsItem.alarmNum" :value="pcsItem.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(pcsItem,'alarmPoint')"
@@ -52,14 +42,12 @@
         <div class="descriptions-main">
           <el-descriptions :colon="false" :column="4" direction="vertical">
             <el-descriptions-item
-                :contentClassName="`descriptions-direction ${
+                contentClassName="descriptions-direction work-status"
-                pcsItem.workStatus === '0' ? 'save' : 'danger'
-              }`"
                 :span="1"
                 label="工作状态"
                 labelClassName="descriptions-label"
             >{{
-                $store.state.ems.workStatusOptions[pcsItem.workStatus]
+                PCSWorkStatusOptions[pcsItem.workStatus]
               }}
             </el-descriptions-item
             >
@@ -75,7 +63,7 @@
             >
             <el-descriptions-item
                 :contentClassName="`descriptions-direction ${
-                pcsItem.deviceStatus === '2' ? 'save' : 'danger'
+                pcsItem.deviceStatus === '1' ? 'save' : 'danger'
               }`"
                 :span="1"
                 label="设备状态"
@@ -196,12 +184,17 @@ 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, PcsSwitch},
+  components: {RealTimeBaseInfo, pointChart, PointTable},
   mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      PCSWorkStatusOptions: state => state?.ems?.PCSWorkStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
@@ -209,10 +202,10 @@ export default {
       pcsList: [],
       infoData: [
         {
-          label: "总交流有功电率",
+          label: "总交流有功功率",
           attr: "totalActivePower",
           unit: "kW",
-          pointName: "总交流有功电率",
+          pointName: "总交流有功功率",
         },
         {
           label: "当天交流充电量",
@@ -228,10 +221,10 @@ export default {
           pointName: "A相电流",
         },
         {
-          label: "总交流无功电率",
+          label: "总交流无功功率",
           attr: "totalReactivePower",
           unit: "kVar",
-          pointName: "总交流无功电率",
+          pointName: "总交流无功功率",
         },
         {
           label: "当天交流放电量",
@@ -288,6 +281,10 @@ export default {
     };
   },
   methods: {
+    handleCardClass(item) {
+      const {workStatus = ''} = item
+      return workStatus === '1' || !Object.keys(this.PCSWorkStatusOptions).find(i => i === workStatus) ? "timing-card-container" : workStatus === '2' ? 'warning-card-container' : 'running-card-container'
+    },
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {deviceId} = row

src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue

@@ -1,12 +1,12 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container common-card-container-body-no-padding"
+      class="common-card-container common-card-container-body-no-padding"
   >
     <div slot="header">
       <span class="card-title">PCS有功功率/PCS无功功率</span>
     </div>
-    <div style="height: 360px" id="cnglqxChart" />
+    <div style="height: 360px" id="cnglqxChart"/>
   </el-card>
 </template>
 
@@ -14,7 +14,7 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { storagePower } from "@/api/ems/dzjk";
+import {storagePower} from "@/api/ems/dzjk";
 
 export default {
   mixins: [resize],
@@ -36,56 +36,56 @@ export default {
   methods: {
     init(siteId, timeRange) {
       this.chart.showLoading();
-      const [startTime='', endTime=''] = timeRange;
+      const [startTime = '', endTime = ''] = timeRange;
-      storagePower(siteId,startTime,endTime)
+      storagePower(siteId, startTime, endTime)
-        .then((response) => {
+          .then((response) => {
-          this.setOption(response?.data?.pcsPowerList || []);
+            this.setOption(response?.data?.pcsPowerList || []);
-        })
+          })
-        .finally(() => {
+          .finally(() => {
-          this.chart.hideLoading();
+            this.chart.hideLoading();
-        });
+          });
     },
     setOption(data) {
       let xdata = [],
-        series = [];
+          series = [];
       data.forEach((element, index) => {
         if (index === 0) {
           xdata = (element.energyStoragePowList || []).map((i) => i.createDate);
         }
         series.push(
-          {
+            {
-            type: "line",
+              type: "line",
-            name: `${element.deviceId}有功功率`,
+              name: `${element.deviceId}有功功率`,
-            areaStyle: {
+              areaStyle: {
-              // color:'#FFBD00'
+                // color:'#FFBD00'
+              },
+              data: (element.energyStoragePowList || []).map(
+                  (i) => {
+                    return {
+                      value: i.pcsTotalActPower,
+                      year: i.dateDay || ''
+                    }
+                  }
+              )
             },
-            data: (element.energyStoragePowList || []).map(
+            {
-              (i) => {
+              type: "line",
-                return {
+              name: `${element.deviceId}无功功率`,
-                  value:i.pcsTotalActPower,
+              areaStyle: {
-                  year:i.dateDay || ''
+                // color:'#FFBD00'
-                }
+              },
-              }
+              data: (element.energyStoragePowList || []).map(
-            )
+                  (i) => {
-          },
+                    return {
-          {
+                      value: i.pcsTotalReactivePower,
-            type: "line",
+                      year: i.dateDay || ''
-            name: `${element.deviceId}无功功率`,
+                    }
-            areaStyle: {
+                  }
-              // color:'#FFBD00'
+              ),
-            },
+            }
-            data: (element.energyStoragePowList || []).map(
-              (i) => {
-                return {
-                  value: i.pcsTotalReactivePower,
-                  year:i.dateDay || ''
-                }
-              }
-            ),
-          }
         );
       });
-      this.chart.setOption({
+      this.chart && this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -99,29 +99,29 @@ export default {
           containLabel: true,
         },
         tooltip: {
-          show:true,
+          show: true,
           trigger: "axis",
           axisPointer: {
             // 坐标轴指示器，坐标轴触发有效
             type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
           },
-          formatter :(params)=>{
+          formatter: (params) => {
-            if(params.length <= 0) return
+            if (params.length <= 0) return
-            let result = (params[0].data.year || '')+' '+ params[0].name + '<div>'
+            let result = (params[0].data.year || '') + ' ' + params[0].name + '<div>'
-            params.forEach(item=>{
+            params.forEach(item => {
-              const {color,seriesName,value} = item
+              const {color, seriesName, value} = item
-              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
+              result += `<div style="position: relative;padding-left:20px;line-height: 20px;">
                 <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
                 <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
             })
-            result+='</div>'
+            result += '</div>'
             return result
           }
         },
         textStyle: {
           color: "#333333",
         },
-        xAxis: { type: "category", data: xdata },
+        xAxis: {type: "category", data: xdata},
         yAxis: {
           type: "value",
         },
@@ -137,7 +137,7 @@ export default {
           },
         ],
         series,
-      });
+      }, true);
     },
   },
 };

src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue

@@ -54,7 +54,7 @@ export default {
           year:element.dateDay,
         });
       });
-      xdata = this.chart.setOption({
+      this.chart && this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -115,7 +115,7 @@ export default {
             data: ydata,
           },
         ],
-      });
+      },true);
     },
   },
 };

src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue

@@ -57,7 +57,7 @@ export default {
           }
         );
       });
-      xdata = this.chart.setOption({
+      this.chart && this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -118,7 +118,7 @@ export default {
             data: ydata,
           },
         ],
-      });
+      },true);
     },
   },
 };

src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue

@@ -66,7 +66,7 @@ export default {
           }),
         });
       });
-      this.chart.setOption({
+      this.chart && this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -118,7 +118,7 @@ export default {
           },
         ],
         series,
-      });
+      },true);
     },
   },
 };

src/views/ems/dzjk/sbjk/xf/index.vue

@@ -25,7 +25,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"
@@ -37,8 +37,10 @@
         <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'hdTempData'" :span="12"
                 class="device-info-col">
             <span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
-              <span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] || '' }}<span
+              <span class="left">{{ tempDataItem.title }}</span> <span class="right">{{
-                v-html="tempDataItem.unit"></span></span>
+                item[tempDataItem.attr] || '-'
+              }}<span
+                  v-html="tempDataItem.unit"></span></span>
             </span>
         </el-col>
       </el-row>

src/views/ems/dzjk/sbjk/yl/index.vue

@@ -14,7 +14,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"
@@ -26,7 +26,8 @@
         <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'ylTempData'" :span="8"
                 class="device-info-col">
             <span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
-              <span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+              <span class="left">{{ tempDataItem.title }}</span> <span
+                class="right">{{ item[tempDataItem.attr] || '-' }}<span
                 v-html="tempDataItem.unit"></span></span>
             </span>
         </el-col>

src/views/ems/dzjk/tjbb/index.vue

@@ -7,55 +7,47 @@
       text-color="#666666"
       active-text-color="#ffffff"
     >
-      <el-menu-item
+      <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'tjbbChildrenRoute'">
-        :index="item.name"
+        <router-link  style="height: 100%;width: 100%;display: block;" :to="{path:item.path,query:$route.query}">
-        v-for="(item, index) in childrenRoute"
+          {{item.meta.title}}
-        :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
+    <div class="ems-content-container ems-content-container-padding tjbb-ems-content-container">
-      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";
+import { dzjk } from '@/router/ems'
-const childrenRoute = dzjk[0].children.find(
+const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DzjkTjbb').children//获取到统计报表下面的字路由
-  (item) => item.name === "DzjkTjbb"
+console.log('设备监控子路由',childrenRoute)
-).children; //获取到统计报表下面的字路由
-console.log("设备监控子路由", childrenRoute);
 export default {
-  name: "DzjkTjbb",
+  name:'DzjkTjbb',
-  data() {
+  data(){
     return {
       childrenRoute,
-      activeMenu: "",
+      activeMenu:''
-    };
+    }
   },
   mounted() {
-    console.log("当前统计报表页面路由", this.$route);
+    console.log('当前统计报表页面路由',this.$route)
-  },
+  }
-};
+
+}
 </script>
 
 <style scoped lang="scss">
-.tjbb-ems-content-container {
+.tjbb-ems-content-container{
-  margin-top: 0;
+  margin-top:0;
-  padding-top: 0;
+  padding-top:0;
   padding-right: 0;
   flex: 1;
 }
 </style>
+

src/views/ems/dzjk/tjbb/sybb/index.vue

@@ -26,14 +26,15 @@
     <el-table
         class="common-table"
         :data="tableData"
+        show-summary
         stripe
         style="width: 100%;margin-top:25px;">
       <!--        汇总列-->
-      <el-table-column label="汇总">
+      <el-table-column label="汇总" min-width="100px" align="center">
         <el-table-column
             prop="dataTime"
             label="日期"
-            width="120">
+            min-width="100px" align="center">
         </el-table-column>
       </el-table-column>
       <!--充电量列-->
@@ -92,13 +93,14 @@
             label="总">
         </el-table-column>
       </el-table-column>
-      <!--        效率-->
+      <!--      实际收益-->
-      <!--          <el-table-column label="效率(%)" align="center">-->
+      <el-table-column label="" align="center" fixed="right">
-      <!--            <el-table-column-->
+        <el-table-column
-      <!--                align="center"-->
+            prop="actualRevenue"
-      <!--              prop="effect">-->
+            label="实际收益"
-      <!--            </el-table-column>-->
+            align="center">
-      <!--          </el-table-column>-->
+        </el-table-column>
+      </el-table-column>
     </el-table>
     <el-pagination
         v-show="tableData.length>0"
@@ -171,7 +173,6 @@ export default {
       this.loading = true
       const {siteId, pageNum, pageSize} = this
       const [startTime = '', endTime = ''] = (this.dateRange || [])
-//http://localhost:8089/ems/statsReport/getAmmeterRevenueData?siteId=021_DDS_01&startTime=2025-10-14&endTime=2025-10-15&pageSize=10&pageNum=1
       getAmmeterRevenueData({siteId: siteId, startTime, endTime, pageSize, pageNum}).then(response => {
         this.tableData = response?.rows || [];
         this.totalSize = response?.total || 0
@@ -185,10 +186,9 @@ export default {
       this.totalSize = 0
       this.pageSize = 10
       this.pageNum = 1
-      const now = new Date().getTime();
+      let now = new Date(), lastDay = now.getTime(), firstDay = new Date(now.setDate(1)).getTime();
-      const lastMonth = new Date(now - 30 * 24 * 60 * 60 * 1000).getTime();
+      this.defaultDateRange = [formatDate(firstDay), formatDate(lastDay)];
-      this.defaultDateRange = [formatDate(lastMonth), formatDate(now)];
+      this.dateRange = [formatDate(firstDay), formatDate(lastDay)];
-      this.dateRange = [formatDate(lastMonth), formatDate(now)];
       this.getData()
     },
   },
@@ -197,9 +197,19 @@ export default {
 
 <style scoped lang="scss">
 ::v-deep {
-  .common-table.el-table .el-table__header-wrapper th, .common-table.el-table .el-table__fixed-header-wrapper th {
+  .common-table.el-table {
-    border-bottom: 1px solid #dfe6ec;
+    .el-table__header-wrapper th, .common-table.el-table .el-table__fixed-header-wrapper th {
+      border-bottom: 1px solid #dfe6ec;
+    }
+
+    .el-table__footer-wrapper {
+      tbody td.el-table__cell {
+        color: #000;
+        font-weight: bolder;
+      }
+    }
   }
+
 }
 
 </style>

src/views/ems/dzjk/zxlt/index copy 2.vue

@@ -1,577 +0,0 @@
-<template>
-  <div class="ems-dashboard-editor-container" v-loading="loading">
-    <div class="container" v-show="!empty">
-      <!-- 云、电脑 -->
-      <div class="top">
-        <div class="cloud-container">
-          <div class="cloud">
-            <span style="z-index: 2; position: relative">云</span>
-          </div>
-        </div>
-        <div class="double-arrows">
-          <div class="top-arrows"></div>
-          <div class="bottom-arrows"></div>
-        </div>
-        <div class="computer">
-          <img src="@/assets/images/ems/computer.png" alt="" />
-          <span style="z-index: 2; position: relative">ems</span>
-        </div>
-      </div>
-      <div class="outer-border">
-        <!--            电表-->
-        <div class="row-lists-container" v-if="showDb">
-          <div class="row-title">电表({{ db.length }})</div>
-          <div class="row-lists">
-            <div v-for="item in db" :key="item.deviceId" class="row-items">
-              <div
-                class="status"
-                :class="
-                  item.communicationStatus === '0' ? 'status-running' : ''
-                "
-              >
-                {{ communicationStatusOptions[item.communicationStatus] }}
-              </div>
-              <div class="row-items-img">
-                <img
-                  class="img-db"
-                  :src="require('@/assets/images/ems/db.png')"
-                />
-                <div class="name">{{ item.deviceName }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!--            液冷-->
-        <div class="row-lists-container" v-if="showLq">
-          <div class="row-title">冷却({{ lq.length }})</div>
-          <div class="row-lists">
-            <div v-for="item in lq" :key="item.deviceId" class="row-items">
-              <div
-                class="status"
-                :class="
-                  item.communicationStatus === '0' ? 'status-running' : ''
-                "
-              >
-                {{ communicationStatusOptions[item.communicationStatus] }}
-              </div>
-              <div class="row-items-img">
-                <img
-                  class="img-lq"
-                  :src="require('@/assets/images/ems/lq.png')"
-                />
-                <div class="name">{{ item.deviceName }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!--            PCS-->
-        <div class="row-lists-container" v-if="showPcs">
-          <div class="row-lists">
-            <div class="row-title">PCS({{ pcs.length }})</div>
-            <div
-              v-for="(item, index) in pcs"
-              :key="item.deviceId"
-              class="row-items row-items-pcs"
-            >
-              <!-- pcs -->
-              <div class="parent-dash">
-                <div
-                  class="status"
-                  :class="
-                    item.communicationStatus === '0' ? 'status-running' : ''
-                  "
-                >
-                  {{ communicationStatusOptions[item.communicationStatus] }}
-                </div>
-                <div class="row-items-img">
-                  <img
-                    class="img-pcs"
-                    :src="require('@/assets/images/ems/pcs.png')"
-                  />
-                  <div class="name">{{ item.deviceName }}</div>
-                </div>
-              </div>
-              <!-- 子设备 bms -->
-              <div
-                v-if="item.children && item.children.length > 0"
-                class="children-dash"
-              >
-                <div
-                  class="row-children-title"
-                  v-if="bmsHasParentLength > 0 && index === 0"
-                >
-                  BMS({{ bmsHasParentLength }})
-                </div>
-                <div
-                  v-for="(childrenItem, childrenIndex) in item.children"
-                  :key="childrenIndex + 'childrenBms'"
-                  class="children-dash-items"
-                >
-                  <div
-                    class="status"
-                    :class="
-                      childrenItem.communicationStatus === '0'
-                        ? 'status-running'
-                        : ''
-                    "
-                  >
-                    {{
-                      communicationStatusOptions[
-                        childrenItem.communicationStatus
-                      ]
-                    }}
-                  </div>
-                  <div class="row-items-img">
-                    <img
-                      class="img-pcs"
-                      :src="require('@/assets/images/ems/bms.png')"
-                    />
-                    <div class="name">{{ childrenItem.deviceName }}</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="row-lists-container" v-if="showPcs">
-          <div class="row-title">PCS({{ pcs.length }})</div>
-          <div class="row-lists">
-            <div
-              v-for="item in bmsNoParent"
-              :key="item.deviceId"
-              class="row-items row-items-pcs"
-            >
-              <!-- pcs -->
-              <div class="parent-dash">
-                <div
-                  class="status"
-                  :class="
-                    item.communicationStatus === '0' ? 'status-running' : ''
-                  "
-                >
-                  {{ communicationStatusOptions[item.communicationStatus] }}
-                </div>
-                <div class="row-items-img">
-                  <img :src="require('@/assets/images/ems/bms.png')" />
-                  <div class="name">{{ item.deviceName }}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <!--            bms没有上级设备-->
-        <div class="row-lists-container" v-if="bmsNoParent.length > 0">
-          <div class="row-title">BMS({{ bmsNoParent.length }})</div>
-          <div class="row-lists">
-            <div
-              v-for="item in bmsNoParent"
-              :key="item.deviceId"
-              class="row-items row-items-pcs"
-            >
-              <!-- pcs -->
-              <div class="parent-dash">
-                <div
-                  class="status"
-                  :class="
-                    item.communicationStatus === '0' ? 'status-running' : ''
-                  "
-                >
-                  {{ communicationStatusOptions[item.communicationStatus] }}
-                </div>
-                <div class="row-items-img">
-                  <img :src="require('@/assets/images/ems/bms.png')" />
-                  <div class="name">{{ item.deviceName }}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <el-empty v-show="empty" :image-size="200"></el-empty>
-  </div>
-</template>
-
-<script>
-import { getDeviceList } from "@/api/ems/site";
-import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { mapState } from "vuex";
-export default {
-  name: "DzjkZxlt",
-  mixins: [getQuerySiteId],
-  data() {
-    return {
-      loading: false,
-      pcs: [],
-      bms: [],
-      db: [],
-      lq: [],
-      pcsHasChildren: [],
-      pcsNoChildren: [],
-      bmsNoParent: [],
-    };
-  },
-  computed: {
-    ...mapState({
-      communicationStatusOptions: (state) =>
-        state.ems.communicationStatusOptions,
-    }),
-
-    showPcs() {
-      return this.pcs.length > 0;
-    },
-    showBms() {
-      return this.bms.length > 0;
-    },
-    showDb() {
-      return this.db.length > 0;
-    },
-    showLq() {
-      return this.lq.length > 0;
-    },
-    bmsHasParentLength() {
-      let count = 0;
-      this.pcs.forEach((item) => (count += item.children.length));
-      return count;
-    },
-    empty() {
-      return !this.showBms && !this.showPcs && !this.showDb && !this.showLq;
-    },
-  },
-  methods: {
-    init() {
-      this.pcs = [];
-      this.bms = [];
-      this.lq = [];
-      this.db = [];
-      this.bmsNoParent = [];
-      this.loading = true;
-      getDeviceList(this.siteId)
-        .then((response) => {
-          const data = JSON.parse(JSON.stringify(response?.data || []));
-          let pcs = [],
-            bms = [],
-            db = [],
-            lq = [],
-            bmsNoParent = [];
-          data.forEach((item) => {
-            // 电表
-            if (item.deviceCategory === "AMMETER") {
-              db.push({ ...item, children: [] });
-            } else if (item.deviceCategory === "PCS") {
-              // pcs
-              pcs.push({ ...item, children: [] });
-            } else if (item.deviceCategory === "STACK") {
-              // bms
-              bms.push({ ...item, children: [] });
-            } else if (item.deviceCategory === "COOLING") {
-              // 液冷
-              lq.push({ ...item, children: [] });
-            }
-          });
-          bms.forEach((item, index) => {
-            if (item.parentId) {
-              pcs
-                .find((pcsItem) => pcsItem.deviceId === item.parentId)
-                .children.push(item);
-            } else {
-              bmsNoParent.push(item);
-            }
-          });
-          this.pcs = pcs;
-          this.bms = bms;
-          this.lq = lq;
-          this.db = db;
-          this.pcsHasChildren = pcs.filter((item) => item.children.length > 0);
-          this.pcsNoChildren = pcs.filter((item) => item.children.length === 0);
-          this.bmsNoParent = bmsNoParent;
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-$sqDistance: 30px;
-$borderColor: #174a8e;
-$lineColor: #86bcc7;
-
-.ems-dashboard-editor-container {
-  background-color: #ffffff;
-  padding: 0;
-  color: #666666;
-
-  .container {
-    display: flex;
-    position: relative;
-  }
-  //云 、计算机 、箭头
-  .top {
-    z-index: 2;
-    width: fit-content;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    // position: absolute;
-    // top: 50%;
-    // left: 0;
-    // transform: translateY(-50%);
-    //云 样式
-    .cloud-container {
-      margin: 0 auto;
-      .cloud {
-        width: 60px;
-        height: 26px;
-        background: #cbebfd;
-        border-radius: 100px;
-        position: relative;
-        text-align: center;
-        font-weight: bold;
-        font-size: 14px;
-        line-height: 26px;
-      }
-      .cloud:before,
-      .cloud:after {
-        content: "";
-        position: absolute;
-        background: #cbebfd;
-        width: 30px;
-        height: 30px;
-        border-radius: 100%;
-      }
-      .cloud:before {
-        top: -9px;
-        left: 8px;
-      }
-      .cloud:after {
-        top: -6px;
-        right: 9px;
-      }
-    }
-    //双箭头
-    .double-arrows {
-      height: fit-content;
-      margin: 0 10px;
-      text-align: center;
-      .top-arrows,
-      .bottom-arrows {
-        height: 4px;
-        width: 30px;
-        background-color: #5ea9df;
-        margin: 0 10px;
-        position: relative;
-        &::after {
-          content: "";
-          position: absolute;
-          left: 0;
-          width: 0;
-          height: 0;
-        }
-      }
-      .top-arrows {
-        vertical-align: super;
-      }
-      .top-arrows::after {
-        top: -4px;
-        border-bottom: 6px solid transparent;
-        border-left: 6px solid transparent;
-        border-right: 6px solid #5ea9df;
-        border-top: 6px solid transparent;
-        left: -11px;
-      }
-      .bottom-arrows {
-        margin-top: 8px;
-        &::after {
-          top: -4px;
-          border-top: 6px solid transparent;
-          border-left: 6px solid #5ea9df;
-          border-right: 6px solid transparent;
-          border-bottom: 6px solid transparent;
-          right: -11px;
-          left: auto;
-        }
-      }
-    }
-
-    //电脑
-    .computer {
-      text-align: center;
-      font-size: 14px;
-      line-height: 16px;
-      font-weight: bold;
-      position: relative;
-      background: #fff;
-      img {
-        width: 80px;
-        height: auto;
-        display: block;
-      }
-    }
-  }
-  .outer-border {
-    position: relative;
-    width: fit-content;
-    border: 1.5px solid $borderColor;
-    border-radius: 5px;
-    padding-left: 120px;
-    padding-right: 20px;
-    margin-left: -40px;
-  }
-
-  // 设备列表
-  .row-lists-container {
-    font-size: 10px;
-    position: relative;
-    padding: 10px;
-    .row-title {
-      position: absolute;
-      left: -$sqDistance - 30px;
-      top: calc(50% + 10px);
-      transform: translateY(-50%);
-      color: #000;
-      font-weight: bolder;
-    }
-    .row-lists {
-      display: flex;
-      position: relative;
-      .row-items {
-        position: relative;
-        padding: 5px 0;
-        &:not(:first-child) {
-          margin-left: $sqDistance; //和外层父元素上下padding一致
-        }
-        &::before {
-          content: "";
-          display: block;
-          height: 3px;
-          width: $sqDistance - 2px;
-          background: $lineColor;
-          position: absolute;
-          left: -$sqDistance;
-          top: calc(50% + 10px);
-          transform: scale(1, 0.4);
-        }
-        // 一列 第一个设备最上面的线
-        &:first-child {
-          &::before {
-            width: $sqDistance + 20px;
-            // top: -$sqDistance - 20px;
-          }
-        }
-        // 一列 最后一个设备最下面的线
-        // &:last-child {
-        //   &::after {
-        //     content: "";
-        //     display: block;
-        //     width: 3px;
-        //     height: $sqDistance - 2px;
-        //     background: $lineColor;
-        //     position: absolute;
-        //     bottom: -$sqDistance;
-        //     left: 50%;
-        //     transform: scale(0.4, 1);
-        //   }
-        // }
-        // 设备状态
-        .status {
-          margin: 0 auto 4px;
-          width: fit-content;
-          height: 18px;
-          padding: 0 8px;
-          box-sizing: border-box;
-          text-align: center;
-          font-size: 8px;
-          line-height: 18px;
-          border: 1px solid #08ffff;
-          border-radius: 2px;
-          background: #aaaaaa;
-          color: #ffffff;
-          &.status-running {
-            background: #00c69c;
-          }
-        }
-        // 图片+设备名称
-        .row-items-img {
-          position: relative;
-          padding-top: 12px;
-          img {
-            width: 80px;
-            height: auto;
-            display: block;
-            &.img-lq {
-              width: 50px;
-            }
-            &.img-pcs {
-              width: 50px;
-            }
-            &.img-db {
-              width: 56px;
-            }
-          }
-          .name {
-            position: absolute;
-            top: 1px;
-            left: 0;
-            color: #666;
-            white-space: nowrap;
-          }
-        }
-      }
-    }
-  }
-
-  //子设备
-  .row-lists-container-children {
-    margin: 10px 0 0 $sqDistance;
-    .parent-dash {
-      position: relative;
-      &::before {
-        content: "";
-        display: block;
-        height: 40px;
-        width: 3px;
-        background: #ec7f8c;
-        position: absolute;
-        left: 20%;
-        top: -40px;
-        transform: scale(0.4, 1) rotate(-40deg);
-      }
-    }
-  }
-  .parent-dash {
-    width: fit-content;
-  }
-  .children-dash {
-    margin: $sqDistance 0 0 $sqDistance;
-    position: relative;
-    .row-children-title {
-      position: absolute;
-      left: -$sqDistance - 30px;
-      top: calc(50% + 10px);
-      transform: translateY(-50%);
-      color: #000;
-      font-weight: bolder;
-    }
-    .children-dash-items {
-      position: relative;
-      &::before {
-        content: "";
-        display: block;
-        height: $sqDistance;
-        width: 3px;
-        background: #ec7f8c;
-        position: absolute;
-        left: 20%;
-        top: -$sqDistance;
-        transform: scale(0.4, 1) rotate(-40deg);
-      }
-    }
-  }
-}
-</style>

src/views/ems/dzjk/zxlt/index copy.vue

@@ -1,614 +0,0 @@
-<template>
-    <div class="ems-dashboard-editor-container" v-loading="loading" >
-      <div class="container" v-show="!empty">
-        <div class="top">
-          <div class="cloud-container">
-            <div class="cloud">
-              <span style="z-index:2;position: relative;">云</span>
-            </div>
-          </div>
-          <div class="double-arrows">
-            <div class="top-arrows"></div>
-            <div class="bottom-arrows"></div>
-          </div>
-          <div class="computer">
-            <img src="@/assets/images/ems/computer.png" alt="">
-            <span style="z-index:2;position: relative;">ems</span>
-          </div>
-          <div class="arrow"></div>
-        </div>
-        <div class="bottom">
-<!--          四列设备-->
-          <div class="zxlt-row">
-<!--            bms、pcs 下级和上级在一列 -->
-            <div class="row-lists pcs-row-lists" v-if="showPcsAndBms">
-              <div class="item-square">
-                <div class="row-lists-title" v-if="showPcs">PCS({{pcs.length}})</div>
-                <div class="row-lists-title" v-if="showBms">BMS({{bms.length}})</div>
-              </div>
-<!--              上下级块 class区分-->
-              <div class="item-square pcs-has-children-item-square" :class="{'no-bms-list':!showBms}" v-for="(item,index) in pcsHasChildren" :key="index+'pcsHasChildren'">
-                <!--                左边的上级 上级只有一个-->
-                <div class="item-lists parent-item-lists">
-                  <!--                  上级设备-->
-                  <div class="items normal-items-arrow">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/pcs.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-<!--                右边的下级 下级有多个-->
-                <div class="item-lists children-item-lists">
-<!--                  下级设备 循环生成-->
-                  <div class="items children-items-arrow bms-children-arrow" v-for="children in  item.children" :key="children.deviceId">
-                    <div class="items-inner">
-                        <div style="text-align: center;margin-bottom:10px;">
-                          <div class="status" :class="children.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[children.communicationStatus] || '-'}}</div>
-                        </div>
-                        <img v-if="children.pictureUrl" :src="children.pictureUrl">
-                        <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                        <div class="name">{{children.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-
-              </div>
-<!--                没有上下级关系的bms、pcs-->
-              <div class="item-square" :class="{'no-bms-list':!showBms}">
-<!--                左边没有下级的pcs-->
-                <div class="item-lists">
-                  <div class="items normal-items-arrow" v-for="item in  pcsNoChildren" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/pcs.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-                <!--                右边没有上级的bms-->
-                <div class="item-lists">
-                  <!--                  下级设备 循环生成-->
-                  <div class="items children-items-arrow" v-for="item in  bmsNoParent" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-<!--            电表-->
-            <div class="row-lists" v-if="showDb">
-              <div class="item-square">
-                <div class="row-lists-title" style="width:100%;">电表({{db.length}})</div>
-              </div>
-              <div class="item-square">
-                <!--                左边的下级 下级有多个-->
-                <div class="item-lists">
-                  <!--                  下级设备 循环生成-->
-                  <div class="items normal-items-arrow" v-for="item in  db" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-            </div>
-<!--冷却-->
-            <div class="row-lists" v-if="showLq">
-              <div class="item-square">
-                <div class="row-lists-title" style="width:100%;">冷却({{lq.length}})</div>
-              </div>
-              <div class="item-square">
-                <div class="item-lists">
-                  <div class="items normal-items-arrow" v-for="item in  lq" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <el-empty v-show="empty" :image-size="200"></el-empty>
-    </div>
-</template>
-
-
-<script>
-import {getDeviceList} from'@/api/ems/site'
-import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {mapState} from "vuex";
-export default {
-  name: 'DzjkZxlt',
-  mixins: [getQuerySiteId],
-  data() {
-    return {
-      loading:false,
-      pcs :[],
-      bms:[],
-      db:[],
-      lq:[],
-      pcsHasChildren:[],
-      pcsNoChildren:[],
-      bmsNoParent:[]
-    }
-  },
-  computed:{
-    ...mapState({
-      communicationStatusOptions:(state)=>state.ems.communicationStatusOptions
-    }),
-
-    showPcs(){
-      return this.pcs.length>0
-    },
-    showBms(){
-      return this.bms.length>0
-    },
-    showDb(){
-      return this.db.length>0
-    },
-    showLq(){
-      return this.lq.length>0
-    },
-    showPcsAndBms(){
-      return this.showPcs || this.showBms
-    },
-    empty(){
-      return !this.showBms && !this.showPcs && !this.showDb && !this.showLq
-    },
-
-  },
-  methods: {
-    init(){
-      this.pcs = []
-      this.bms = []
-      this.lq=[]
-      this.db=[]
-      this.bmsNoParent=[]
-      this.loading = true
-      getDeviceList(this.siteId).then(response => {
-        const data =JSON.parse(JSON.stringify(response?.data || []))
-        let pcs = [],bms=[],db=[],lq=[],bmsNoParent=[]
-        data.forEach(item=>{
-          // 电表
-          if(item.deviceCategory === 'AMMETER'){
-            db.push({...item,children:[]})
-          }else if(item.deviceCategory === 'PCS'){
-            // pcs
-            pcs.push({...item,children:[]})
-          }else if(item.deviceCategory === 'STACK'){
-            // bms
-            bms.push({...item,children:[]})
-          }else if(item.deviceCategory === 'COOLING'){
-            // 液冷
-            lq.push({...item,children:[]})
-          }
-        })
-        bms.forEach((item,index)=>{
-          if(item.parentId){
-            pcs.find(pcsItem=>pcsItem.deviceId === item.parentId).children.push(item)
-          }else{
-            bmsNoParent.push(item)
-          }
-        })
-        this.pcs = pcs
-        this.bms = bms
-        this.lq=lq
-        this.db=db
-        this.pcsHasChildren = pcs.filter(item=>item.children.length > 0)
-        this.pcsNoChildren = pcs.filter(item=>item.children.length === 0)
-        this.bmsNoParent = bmsNoParent
-      }).finally(() => {
-        this.loading = false
-      })
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-$distance:60px;
-$arrowDistance:80px;//margin:60+quare的padding10
-$arrowColoe:#5ea9df;
-$lineColoe:#5ea9df;
-.ems-dashboard-editor-container {
-  background-color: #ffffff;
-  padding:0;
-  .container{
-    position: relative;
-    overflow-x: auto;
-  }
-  //云 、计算机 、箭头
-  .top{
-    width: 280px;
-    font-size: 30px;
-    line-height: 40px;
-    font-weight: 500;
-    display: flex;
-    flex-direction: column;
-    //云 样式
-    .cloud-container{
-      padding-top:40px;
-      margin:0 auto;
-      .cloud {
-        width: 150px;
-        height: 60px;
-        background: #cbebfd;
-        border-radius: 200px;
-        position: relative;
-        text-align: center;
-        color:#666666;
-      }
-      .cloud:before, .cloud:after {
-        content: '';
-        position: absolute;
-        background:#cbebfd;
-        width: 80px;
-        height: 80px;
-        border-radius: 50%;
-      }
-      .cloud:before {
-        top: -28px;
-        left: 20px;
-      }
-      .cloud:after {
-        top: -31px;
-        right: 20px;
-      }
-    }
-    //双箭头
-    .double-arrows {
-      height: 50px;
-      margin:20px 0;
-      text-align: center;
-      .top-arrows,.bottom-arrows{
-        height: 100%;
-        width: 6px;
-        background-color: $arrowColoe;
-        display: inline-block;
-        margin: 0 10px;
-        position: relative;
-        vertical-align: super;
-        &::after {
-          content: '';
-          position: absolute;
-          left:0;
-          width: 0;
-          height: 0;
-
-        }
-      }
-      .top-arrows{
-        vertical-align: super;
-      }
-      .top-arrows::after {
-        bottom: -24px;
-        border-bottom: 12px solid transparent;
-        border-left: 12px solid transparent;
-        border-right: 12px solid transparent;
-        border-top: 14px solid $arrowColoe;
-        left: -9px;
-      }
-      .bottom-arrows{
-        margin-top:12px;
-        &::after {
-          top: -24px;
-          border-top: 12px solid transparent;
-          border-left: 12px solid transparent;
-          border-right: 12px solid transparent;
-          border-bottom: 14px solid $arrowColoe;
-          left: -9px;
-        }
-      }
-
-    }
-
-    //电脑
-    .computer{
-      margin:20px auto;
-      text-align: center;
-      color:#666666;
-      position: relative;
-      img {
-        width: auto;
-        height: 100px;
-        display: block;
-      }
-    }
-    .arrow{
-      height: 50px;
-      width: 30px;
-      border-radius: 5px;
-      background-color: $arrowColoe;
-      position: relative;
-      margin:0 auto;
-      &::after{
-        content: "";
-        position: absolute;
-        width: 0;
-        height: 0;
-        left: -9px;
-        border-top: 24px solid $arrowColoe;
-        border-left: 24px solid transparent;
-        border-bottom: 24px solid transparent;
-        border-right: 24px solid transparent;
-        bottom: -44px;
-      }
-    }
-
-  }
-  .bottom{
-    z-index:1;
-    box-sizing: border-box;
-    margin-top:50px;
-    .zxlt-row{
-      display: flex;
-      padding:20px $distance;
-      position: relative;
-      width: fit-content;
-      &:before{
-        content: '';
-        display: block;
-        width:calc(100% - 100px);
-        height:1px;
-        background-color: $lineColoe;
-        position:absolute;
-        top:0;
-        left: $distance/2;
-      }
-      .row-lists{
-        height: fit-content;
-        position: relative;
-        &:before{
-          content: '';
-          display: block;
-          height: 100%;
-          width: 1px;
-          position: absolute;
-          left:-($distance/2);
-          top:-20px;
-          background-color: $lineColoe;
-        }
-        //pcs列 bms右侧的边框
-        &.pcs-row-lists{
-          &:after{
-            content: '';
-            display: block;
-            height: 100%;
-            width: 1px;
-            position: absolute;
-            right:-(($distance/2) + 1);
-            top:-20px;
-            background-color: $lineColoe;
-          }
-        }
-        &:not(:last-child){
-          margin-right: $distance;
-        }
-        .item-square{
-          //左右 两列
-          display: flex;
-          vertical-align: middle;
-          align-items: flex-start;
-          padding:10px;
-          border-radius: 5px;
-          &:not(:last-child){
-            margin-bottom: 40px;
-          }
-          .row-lists-title{
-            font-size: 20px;
-            line-height: 20px;
-            color: #333333;
-            font-weight: 500;
-            text-align: center;
-            flex: 1;
-          }
-          .item-lists{
-            position: relative;
-            &:not(:last-child){
-              margin-right:$distance;
-            }
-            //每个设备
-            .items{
-              background-color: #cbebfd;
-              position: relative;
-              border-radius: 5px;
-              padding: 10px;
-              box-shadow: 0 0 10px rgba(0, 0, 0, 0.1), 0 0 0 rgba(0, 0, 0, 0.5);
-              //普通设备 箭头方向
-              &.normal-items-arrow{
-                &:before{
-                  content: '';
-                  display: block;
-                  width:($arrowDistance/2) - 15;
-                  height: 4px;
-                  background-color: $arrowColoe;
-                  position: absolute;
-                  top:50%;
-                  left: -($arrowDistance/2);
-                  transform: translateY(-50%);
-                }
-                &:after{
-                  content: '';
-                  display: block;
-                  height: 0;
-                  width: 0;
-                  border-left: 10px solid #5ea9df;
-                  border-right: 10px solid transparent;
-                  border-bottom: 10px solid transparent;
-                  border-top: 10px solid transparent;
-                  position: absolute;
-                  top: 50%;
-                  left: -15px;
-                  transform: translateY(-50%);
-                }
-              }
-              //下级的箭头
-              &.children-items-arrow{
-                &:before{
-                  content: '';
-                  display: block;
-                  width:($arrowDistance/2) - 15;
-                  height: 4px;
-                  background-color: $arrowColoe;
-                  position: absolute;
-                  top:50%;
-                  right: -($arrowDistance/2);
-                  transform: translateY(-50%);
-                }
-                &:after{
-                  content: '';
-                  display: block;
-                  height: 0;
-                  width: 0;
-                  border-right: 10px solid #5ea9df;
-                  border-left: 10px solid transparent;
-                  border-bottom: 10px solid transparent;
-                  border-top: 10px solid transparent;
-                  position: absolute;
-                  top: 50%;
-                  right: -15px;
-                  transform: translateY(-50%);
-                }
-              }
-              &:not(:last-child){
-                margin-bottom: 15px;
-              }
-
-              .items-inner{
-                background-color: #ffffff;
-                border-radius: 5px;
-                padding:10px;
-                width:130px;
-                text-align: center;
-              }
-
-              img{
-                width: 80px;
-                height: auto;
-                display: block;
-                z-index:2;
-                margin: 0 auto;
-              }
-              .name{
-                text-align: center;
-                margin-top:10px;
-                font-size: 14px;
-                line-height: 20px;
-                z-index:2;
-              }
-              .status{
-                z-index:2;
-                margin-top:10px;
-                font-size: 14px;
-                line-height: 20px;
-                position: relative;
-                padding-left:20px;
-                display: inline;
-                &.status-normal {
-                  &:before {
-                    content: "";
-                    display: block;
-                    width: 15px;
-                    height: 15px;
-                    border-radius: 50%;
-                    background-color: #05AEA3;
-                    position: absolute;
-                    top:50%;
-                    left:0;
-                    transform: translate(0,-50%);
-                  }
-                }
-                &.status-warn{
-                  &:before{
-                    content: "";
-                    display: inline-block;
-                    width: 15px;
-                    height: 15px;
-                    border-radius: 50%;
-                    background-color: #FC6B69;
-                    position: absolute;
-                    top:50%;
-                    left:0;
-                    transform: translate(0,-50%);
-                  }
-                }
-              }
-            }
-          }
-          .children-item-lists{
-            //todo 手动修改
-            &:before{
-              content: '';
-              display: block;
-              width:40px;
-              height: 4px;
-              background-color: $arrowColoe;
-              position: absolute;
-              top:50%;
-              left: -50px;
-              transform:translateY(-50%);
-            }
-            &:after{
-              content: '';
-              display: block;
-              height: 0;
-              width: 0;
-              border-left: 10px solid #5ea9df;
-              border-right: 10px solid transparent;
-              border-bottom: 10px solid transparent;
-              border-top: 10px solid transparent;
-              position: absolute;
-              top: 50%;
-              left: -14px;
-              transform:translateY(-50%);
-            }
-          }
-        }
-        .pcs-has-children-item-square{
-          vertical-align: middle;
-          align-items: center;
-          background-color: #ffefad;
-        }
-        .no-bms-list{
-          .item-lists{
-            &:not(:last-child){
-              margin-right:0;
-            }
-          }
-        }
-      }
-    }
-
-
-  }
-}
-</style>
-
-

src/views/ems/dzjk/zxlt/index.vue

@@ -34,7 +34,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -68,7 +68,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -107,7 +107,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -150,7 +150,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -171,7 +171,7 @@
                   <div
                       class="status"
                       :class="
-                      item.children[0].deviceStatus === '2'
+                      item.children[0].deviceStatus === '1'
                         ? 'status-running'
                         : ''
                     "
@@ -323,7 +323,7 @@ $lineColor: #86bcc7;
 
 .ems-dashboard-editor-container {
   background-color: #ffffff;
-  padding: 30px;
+  padding: 0;
   color: #666666;
 
   .container {

src/views/ems/site/sblb/AddDevice.vue

@@ -1,90 +1,136 @@
 <template>
   <el-dialog :visible.sync="dialogTableVisible" :close-on-press-escape="false" :close-on-click-modal="false"
-             :show-close="false" destroy-on-close lock-scroll append-to-body width="600px" class="ems-dialog"
+             :show-close="false" destroy-on-close lock-scroll append-to-body width="800px" class="ems-dialog"
              :title="mode === 'add'?'新增设备':`编辑设备` ">
-    <el-form v-loading="loading>0" ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="140px">
+    <div v-loading="loading>0">
-      <el-form-item label="站点" prop="siteId">
+      <el-form v-loading="loading>0" ref="addTempForm" inline :model="formData" :rules="rules" size="medium"
-        <el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
+               label-width="120px" class="device-form">
-          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
+        <el-form-item label="站点" prop="siteId">
-                     :key="index+'siteOptions'"></el-option>
+          <el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
-        </el-select>
+            <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
-      </el-form-item>
+                       :key="index+'siteOptions'"></el-option>
-      <el-form-item label="设备id" prop="deviceId">
+          </el-select>
-        <el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
+        </el-form-item>
-        </el-input>
+        <el-form-item label="设备id" prop="deviceId">
-      </el-form-item>
+          <el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
-      <el-form-item label="设备名称" prop="deviceName">
+          </el-input>
-        <el-input v-model="formData.deviceName" placeholder="请输入" clearable :style="{width: '100%'}">
+        </el-form-item>
-        </el-input>
+        <el-form-item label="设备名称" prop="deviceName">
-      </el-form-item>
+          <el-input v-model="formData.deviceName" placeholder="请输入" clearable :style="{width: '100%'}">
-      <el-form-item label="设备描述" prop="description">
+          </el-input>
-        <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable
+        </el-form-item>
-                  :style="{width: '100%'}">
+        <el-form-item label="设备描述" prop="description">
-        </el-input>
+          <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable
-      </el-form-item>
+                    :style="{width: '100%'}">
-      <el-form-item label="工作状态" prop="communicationStatus">
+          </el-input>
-        <el-select v-model="formData.communicationStatus" placeholder="请选择" :style="{width: '100%'}">
+        </el-form-item>
-          <el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions"
+        <el-form-item label="工作状态" prop="communicationStatus">
-                     :key="key+'communicationStatusOptions'"></el-option>
+          <el-select v-model="formData.communicationStatus" placeholder="请选择" :style="{width: '100%'}">
-        </el-select>
+            <el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions"
-      </el-form-item>
+                       :key="key+'communicationStatusOptions'"></el-option>
-      <el-form-item label="设备类型" prop="deviceType">
+          </el-select>
-        <el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
+        </el-form-item>
-          <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions"
+        <el-form-item label="设备类型" prop="deviceType">
-                     :key="key+'deviceTypeOptions'"></el-option>
+          <el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
-        </el-select>
+            <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions"
-      </el-form-item>
+                       :key="key+'deviceTypeOptions'"></el-option>
-      <el-form-item label="设备类别" prop="deviceCategory">
+          </el-select>
-        <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
+        </el-form-item>
-          <el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList"
+        <el-form-item label="设备类别" prop="deviceCategory">
-                     :key="index+'deviceCategoryList'"></el-option>
+          <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}"
-        </el-select>
+                     @change="changeType">
-      </el-form-item>
+            <el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList"
-      <el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
+                       :key="index+'deviceCategoryList'"></el-option>
-        <el-select v-model="formData.parentId"
+          </el-select>
-                   :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'"
+        </el-form-item>
-                   :style="{width: '100%'}">
+        <el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
-          <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList"
+          <el-select v-model="formData.parentId"
-                     :key="index+'parentDeviceList'"></el-option>
+                     :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'"
-        </el-select>
+                     :style="{width: '100%'}">
-      </el-form-item>
+            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList"
-      <el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
+                       :key="index+'parentDeviceList'"></el-option>
-        <el-input v-model="formData.ipAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-select>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
-      <el-form-item label="TCP设备的端口号" prop="ipPort" v-if="formData.deviceType === 'TCP'">
+          <el-input v-model="formData.ipAddress" placeholder="请输入" clearable :style="{width: '100%'}">
-        <el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="TCP设备的端口号" prop="ipPort" v-if="formData.deviceType === 'TCP'">
-      <el-form-item label="从站地址" prop="slaveId" v-if="formData.deviceType === 'TCP'">
+          <el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
-        <el-input v-model="formData.slaveId" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="从站地址" prop="slaveId" v-if="formData.deviceType === 'TCP'">
-      <el-form-item label="串口路径" prop="serialPort">
+          <el-input v-model="formData.slaveId" placeholder="请输入" clearable :style="{width: '100%'}">
-        <el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="串口路径" prop="serialPort">
-      <el-form-item label="波特率" prop="baudRate">
+          <el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
-        <el-input v-model="formData.baudRate" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="波特率" prop="baudRate">
-      <el-form-item label="数据位" prop="dataBits">
+          <el-input v-model="formData.baudRate" placeholder="请输入" clearable :style="{width: '100%'}">
-        <el-input v-model="formData.dataBits" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="数据位" prop="dataBits">
-      <el-form-item label="停止位" prop="stopBits">
+          <el-input v-model="formData.dataBits" placeholder="请输入" clearable :style="{width: '100%'}">
-        <el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="停止位" prop="stopBits">
-      <el-form-item label="校验位" prop="parity">
+          <el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
-        <el-input v-model="formData.parity" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
-        </el-input>
+        </el-form-item>
-      </el-form-item>
+        <el-form-item label="校验位" prop="parity">
-      <el-form-item label="图片" prop="pictureUrl">
+          <el-input v-model="formData.parity" placeholder="请输入" clearable :style="{width: '100%'}">
-        <image-upload :limit="1" :drag="false" @input="uploadImage" :value="formData.pictureUrl"/>
+          </el-input>
-      </el-form-item>
+        </el-form-item>
+        <el-form-item label="图片" prop="pictureUrl">
+          <image-upload :limit="1" :drag="false" @input="uploadImage" :value="formData.pictureUrl"/>
+        </el-form-item>
 
-    </el-form>
+      </el-form>
+      <!--      pcs配置-->
+      <el-form v-if="isPcs" ref="pcsSettingForm" inline :model="pcsSetting" size="medium"
+               label-width="120px" class="device-form" :rules="pcsSettingRules">
+        <div style="font-size: 14px;padding: 10px 0 20px;font-weight: 600;">PCS配置</div>
+        <el-form-item label="开关机地址" prop="pointAddress">
+          <el-input v-model="pcsSetting.pointAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="功率地址" prop="powerAddress">
+          <el-input v-model="pcsSetting.powerAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="开机指令" prop="startCommand">
+          <el-input v-model="pcsSetting.startCommand" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="开机目标功率" prop="startPower">
+          <el-input v-model="pcsSetting.startPower" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="关机指令" prop="stopCommand">
+          <el-input v-model="pcsSetting.stopCommand" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="关机目标功率" prop="stopPower">
+          <el-input v-model="pcsSetting.stopPower" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="电池簇数" prop="clusterNum">
+          <el-input v-model="pcsSetting.clusterNum" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <br>
+        <template v-for="index in parseInt(pcsSetting.clusterNum) || 0">
+          <el-form-item :label="'电池簇'+(index)+'地址'"
+                        prop="clusterPointAddress">
+            <el-input v-model="pcsSetting.clusterPointAddress[index-1]" placeholder="请输入" clearable
+                      :style="{width: '100%'}">
+            </el-input>
+          </el-form-item>
+        </template>
+      </el-form>
+    </div>
     <div slot="footer">
       <el-button @click="closeDialog">取消</el-button>
       <el-button type="primary" @click="saveDialog">确定</el-button>
@@ -124,6 +170,13 @@ export default {
         callback();
       }
     }
+    const validateNumber = (rule, value, callback) => {
+      if (value !== '' && !/^[0-9]+$/.test(value)) {
+        callback(new Error('只能输入数字!'));
+      } else {
+        callback();
+      }
+    }
     return {
       loading: 0,
       dccDeviceCategoryList: ['CLUSTER', 'BATTERY'],//需要展示上级设备的设备类型
@@ -151,6 +204,17 @@ export default {
         pictureUrl: '',//设备图片
         slaveId: '',//从站地址
       },
+      pcsSetting: {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
+      },
       rules: {
         siteId: [
           {required: true, message: '请选择站点', trigger: ['blur', 'change']}
@@ -183,7 +247,7 @@ export default {
           {validator: validateText, trigger: 'blur'}
         ],
         slaveId: [
-          {validator: validateText, trigger: 'blur'}
+          {validator: validateNumber, trigger: 'blur'}
         ],
         serialPort: [
           {validator: validateText, trigger: 'blur'}
@@ -204,13 +268,47 @@ export default {
         //   { required: true, message: '请上传图片', trigger: ['blur', 'change']}
         // ],
       },
+      pcsSettingRules: {
+        pointAddress: [
+          {required: true, message: '请输入开关机地址', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        powerAddress: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        startCommand: [
+          {required: true, message: '请输入开机指令', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        startPower: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        stopCommand: [
+          {required: true, message: '请输入关机指令', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        stopPower: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        clusterNum: [
+          {required: true, message: '请输入电池簇数', trigger: 'blur'},
+          {validator: validateNumber, trigger: 'blur'}
+        ],
+        clusterPointAddress: [
+          {required: true, message: '请输入电池簇地址', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ]
+      }
     }
   },
   computed: {
     ...mapState({
       communicationStatusOptions: state => state?.ems?.communicationStatusOptions || {},
       deviceTypeOptions: state => state?.ems?.deviceTypeOptions || {}
-    })
+    }),
+    isPcs() {
+      return this.formData.deviceCategory === 'PCS'
+    }
   },
   watch: {
     dialogTableVisible: {
@@ -228,7 +326,14 @@ export default {
         if ((newVal || newVal === 0) && this.mode !== 'add') {
           this.loading += 1
           getDeviceDetailInfo(newVal).then(response => {
-            this.formData = JSON.parse(JSON.stringify(response?.data || {}));
+            const {pcsSetting, ...data} = JSON.parse(JSON.stringify(response?.data || {}))
+            this.formData = data;
+            if (pcsSetting && JSON.stringify(pcsSetting) !== '{}') {
+              this.pcsSetting = JSON.parse(JSON.stringify({
+                ...pcsSetting,
+                clusterPointAddress: JSON.parse(pcsSetting.clusterPointAddress || [])
+              }));
+            }
             if (this.dccDeviceCategoryList.includes(this.formData.deviceCategory)) {
               this.getParentDeviceList(true)
             }
@@ -280,91 +385,107 @@ export default {
         this.loading = this.loading - 1
       })
     },
+    saveData() {
+      this.loading += 1
+      const {
+        id = '',
+        siteId = '',//站点ID
+        deviceId = '',//设备id
+        deviceName = '',//设备名称
+        description = '',//设备描述
+        communicationStatus = '',//工作状态
+        deviceType = '',//设备类型
+        deviceCategory = '',//设备类别
+        parentId = '',//上级设备id
+        ipAddress = '',//TCP设备的ip地址
+        ipPort = "",//TCP端口号
+        serialPort = '',//串口路径
+        baudRate = '',//波特率
+        dataBits = '',//数据位
+        stopBits = '',//停止位
+        parity = '',//校验位
+        pictureUrl = '',//设备图片
+        slaveId = '',//从站地址
+      } = this.formData;
+      const {
+        deviceSettingId,
+        powerAddress,
+        pointAddress,
+        startCommand,
+        stopCommand,
+        startPower,
+        stopPower,
+        clusterNum,
+        clusterPointAddress
+      } = this.pcsSetting
+      let params = {
+        siteId,
+        deviceId,
+        deviceName,
+        description,
+        communicationStatus,
+        deviceType,
+        deviceCategory,
+        parentId,
+        ipAddress,
+        ipPort,
+        serialPort,
+        baudRate,
+        dataBits,
+        stopBits,
+        parity,
+        pictureUrl,
+        slaveId,
+      }
+      if (this.isPcs) {
+        params.pcsSetting = {
+          powerAddress,
+          pointAddress,
+          startCommand,
+          stopCommand,
+          startPower,
+          stopPower,
+          clusterNum,
+          clusterPointAddress: JSON.stringify(!clusterNum ? [] : (clusterPointAddress || []).slice(0, clusterNum))
+        }
+      }
+      if (this.mode === 'add') {
+        addDevice(params).then(response => {
+          if (response.code === 200) {
+            //新增成功
+            // 关闭弹窗 更新表格
+            this.$emit('update')
+            this.closeDialog()
+          }
+        }).finally(() => {
+          this.loading -= 1
+        })
+      } else {
+        params.id = id
+        params.pcsSetting && (params.pcsSetting.deviceSettingId = deviceSettingId)
+        updateDevice(params).then(response => {
+          if (response.code === 200) {
+            //新增成功
+            // 关闭弹窗 更新表格
+            this.$emit('update')
+            this.closeDialog()
+          }
+        }).finally(() => {
+          this.loading -= 1
+        })
+      }
+    },
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        this.loading += 1
+        if (this.isPcs) {
-        const {
+          this.$refs.pcsSettingForm.validate(pcsValidate => {
-          id = '',
+            if (!pcsValidate) return
-          siteId = '',//站点ID
+            this.saveData()
-          deviceId = '',//设备id
-          deviceName = '',//设备名称
-          description = '',//设备描述
-          communicationStatus = '',//工作状态
-          deviceType = '',//设备类型
-          deviceCategory = '',//设备类别
-          parentId = '',//上级设备id
-          ipAddress = '',//TCP设备的ip地址
-          ipPort = "",//TCP端口号
-          serialPort = '',//串口路径
-          baudRate = '',//波特率
-          dataBits = '',//数据位
-          stopBits = '',//停止位
-          parity = '',//校验位
-          pictureUrl = '',//设备图片
-          slaveId = '',//从站地址
-        } = this.formData;
-        if (this.mode === 'add') {
-          addDevice({
-            siteId,
-            deviceId,
-            deviceName,
-            description,
-            communicationStatus,
-            deviceType,
-            deviceCategory,
-            parentId,
-            ipAddress,
-            ipPort,
-            serialPort,
-            baudRate,
-            dataBits,
-            stopBits,
-            parity,
-            pictureUrl,
-            slaveId
-          }).then(response => {
-            if (response.code === 200) {
-              //新增成功
-              // 关闭弹窗 更新表格
-              this.$emit('update')
-              this.closeDialog()
-            }
-          }).finally(() => {
-            this.loading -= 1
           })
         } else {
-          updateDevice({
+          this.saveData()
-            id,
-            siteId,
-            deviceId,
-            deviceName,
-            description,
-            communicationStatus,
-            deviceType,
-            deviceCategory,
-            parentId,
-            ipAddress,
-            ipPort,
-            serialPort,
-            baudRate,
-            dataBits,
-            stopBits,
-            parity,
-            pictureUrl,
-            slaveId
-          }).then(response => {
-            if (response.code === 200) {
-              //新增成功
-              // 关闭弹窗 更新表格
-              this.$emit('update')
-              this.closeDialog()
-            }
-          }).finally(() => {
-            this.loading -= 1
-          })
         }
-
       })
     },
     closeDialog() {
@@ -390,12 +511,34 @@ export default {
         pictureUrl: '',//设备图片
         slaveId: '',//从站地址
       }
+      this.pcsSetting = {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
+      }
       this.$refs.addTempForm.resetFields()
+      this.$refs?.pcsSettingForm?.resetFields()
       this.dialogTableVisible = false
     }
   }
 }
 
 </script>
-<style scoped>
+<style scoped lang="scss">
+.device-form {
+  ::v-deep .el-form-item--medium .el-form-item__content {
+    width: 260px;
+  }
+
+  .el-form-item {
+    width: 50%;
+    margin-right: 0;
+  }
+}
 </style>

src/views/ems/site/sblb/PcsSwitch.vue

@@ -32,7 +32,7 @@ export default {
       type: Object,
       default: () => {
         return {
-          deviceStatus: null,
+          workStatus: null,
           deviceId: null,
           deviceName: null,
         }
@@ -42,13 +42,13 @@ export default {
   },
   computed: {
     label() {
-      return this.data.deviceStatus === '4' ? '开机' : '关机'
+      return this.data.workStatus === '0' ? '关机' : '开机'
     }
   },
   methods: {
     switchStatus() {
       console.log(this.data, 11111111)
-      const {deviceStatus, deviceId, deviceName, siteId} = this.data
+      const {workStatus, deviceId, deviceName, siteId} = this.data
       this.$confirm(`确认要${this.label}设备${deviceName || ''}吗?`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -61,7 +61,7 @@ export default {
             //做开关机操作,更新成功后刷新表格
             updateDeviceStatus({
               siteId,
-              deviceStatus,
+              workStatus: workStatus === '0' ? "1" : '0',
               deviceId
             })
                 .then((response) => {

src/views/ems/site/sblb/PointTable.vue

@@ -80,7 +80,7 @@
         <el-table-column label="数据点位" prop="dataPoint"></el-table-column>
         <el-table-column
             label="数据点位名称"
-            prop="pointName"
+            prop="dataPointName"
         ></el-table-column>
         <!--        <el-table-column label="modbus地址">-->
         <!--          <template slot-scope="scope">-->
@@ -88,8 +88,8 @@
         <!--              `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`-->
         <!--            }}</span>-->
         <!--          </template>-->
-        <!--        </el-table-column>-->
+        <!--        </el-table-column>
-        <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>
+        <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>-->
         <el-table-column
             label="最新值"
             prop="pointValue"

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)"
+          <!--          <pcs-switch v-if="scope.row.deviceCategory === 'PCS' && ![null,'',undefined].includes(scope.row.deviceStatus)"-->
-                      style="margin-left:5px;"
+          <!--                      style="margin-left:5px;"-->
-                      :data="{siteId:scope.row.siteId,deviceStatus:scope.row.deviceStatus,deviceId:scope.row.deviceId,deviceName:scope.row.deviceName}"
+          <!--                      :data="{siteId:scope.row.siteId,deviceStatus:scope.row.deviceStatus,deviceId:scope.row.deviceId,deviceName:scope.row.deviceName}"-->
-                      @updateSuccess="getData"/>
+          <!--                      @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, PcsSwitch},
+  components: {AddDevice, PointTable, PointUpload},
   data() {
     return {
       loading: false,

src/views/screen/index.vue

@@ -0,0 +1,418 @@
+<template>
+  <div class="big-screen-container">
+    <!-- 背景容器 -->
+    <div class="bg-wrapper">
+      <!-- 右侧功率曲线图表 -->
+      <div class="chart-box power-chart">
+        <div ref="powerChart" class="chart-content"></div>
+      </div>
+
+      <!-- 底部中间电力需求曲线图表（width:980px, bottom:26px） -->
+      <div class="chart-box demand-chart">
+        <div ref="demandChart" class="chart-content"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import { getPointData } from '@/api/ems/dzjk'
+
+export default {
+  name: 'PowerCurveScreen',
+  data() {
+    return {
+      powerChartInstance: null, // 功率曲线实例
+      demandChartInstance: null, // 电力需求曲线实例
+      timer: null,
+      siteId: '021_DDS_01',
+    }
+  },
+  mounted() {
+    this.initPowerChart() // 初始化功率曲线
+    this.initDemandChart() // 初始化电力需求曲线
+    
+    // Initial fetch
+    this.fetchData()
+    // Polling every 5 seconds
+    this.timer = setInterval(() => {
+      this.fetchData()
+    }, 5000)
+
+    window.addEventListener('resize', this.resizeAllCharts)
+  },
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer)
+      this.timer = null
+    }
+    // 销毁两个图表实例
+    if (this.powerChartInstance) {
+      this.powerChartInstance.dispose()
+      this.powerChartInstance = null
+    }
+    if (this.demandChartInstance) {
+      this.demandChartInstance.dispose()
+      this.demandChartInstance = null
+    }
+    window.removeEventListener('resize', this.resizeAllCharts)
+  },
+  methods: {
+    getTodayDate() {
+      const now = new Date()
+      const year = now.getFullYear()
+      const month = String(now.getMonth() + 1).padStart(2, '0')
+      const day = String(now.getDate()).padStart(2, '0')
+      return `${year}-${month}-${day}`
+    },
+    fetchData() {
+      const today = this.getTodayDate()
+      getPointData({
+        siteId: this.siteId,
+        startDate: today,
+        endDate: today
+      }).then(response => {
+        if (response.code === 200 && response.data) {
+          this.updateCharts(response.data)
+        }
+      }).catch(error => {
+        console.error('Failed to fetch point data:', error)
+      })
+    },
+    updateCharts(data) {
+      if (!data || !Array.isArray(data)) return
+      const source = [['日期', '电网功率', '负载功率', '储能功率', '光伏功率']];
+      const demandSource = [['日期', '电网功率', '负载功率']]
+
+      data.forEach(item => {
+        source.push([
+          item.statisDate,
+          item.gridPower,
+          item.loadPower,
+          item.storagePower,
+          item.pvPower
+        ]);
+        demandSource.push([
+          item.statisDate,
+          item.gridPower,  // Mapping Grid Power to Plan Demand (or just as 2nd series)
+          item.loadPower, // Mapping Load Power to Actual Demand
+        ])
+      })
+
+      if (this.powerChartInstance) {
+        this.powerChartInstance.setOption({
+          dataset: {
+            source: source
+          }
+        })
+      }
+
+      if (this.demandChartInstance) {
+        this.demandChartInstance.setOption({
+          dataset: {
+            source: demandSource
+          }
+        })
+      }
+    },
+    // 初始化右侧功率曲线
+    initPowerChart() {
+      this.powerChartInstance = echarts.init(this.$refs.powerChart)
+      
+      const option = {
+        backgroundColor: 'transparent',
+        tooltip: {
+          trigger: 'axis',
+          confine: true,
+          backgroundColor: 'rgba(0, 30, 60, 0.9)',
+          borderColor: '#00ccff',
+          textStyle: { color: '#fff' },
+          axisPointer: { 
+            type: 'line',
+            lineStyle: {
+              color: 'rgba(0, 204, 255, 0.5)',
+              type: 'dashed'
+            }
+          }
+        },
+        legend: {
+          textStyle: { color: '#00ccff', fontSize: 10 },
+          bottom: 0,
+          left: 'center',
+          itemWidth: 9,
+          itemHeight: 9,
+          itemGap: 8,
+          padding: [0, 0, 0, 0]
+        },
+        grid: {
+          left: '2%',
+          right: '2%',
+          top: '15%',
+          bottom: '12%',
+          containLabel: true
+        },
+        dataset: {
+          source: [] // Initial empty source
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          axisLabel: { 
+            color: '#00ccff', 
+            fontSize: 10, 
+            rotate: 0, // 取消旋转，因为标签较少
+            margin: 10,
+          },
+          axisLine: { 
+            show: true,
+            lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { show: false },
+          axisTick: { show: true }
+        },
+        yAxis: {
+          type: 'value',
+          min: 0, // Remove fixed min/max to let it auto-scale
+          max: 350,
+          interval: 50,
+          axisLabel: { 
+            color: '#00ccff', 
+            fontSize: 12,
+            margin: 10,
+            fontWeight: 'bold'
+          },
+          axisLine: { 
+            show: false,
+            lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { lineStyle: { color: 'rgba(0, 100, 150, 0.2)' } },
+          axisTick: { show: false }
+        },
+        series: [
+          {
+            // name: '电网功率', // Removed, auto-matched from dataset header
+            type: 'line',
+            // data: [], // Removed
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#0099ff', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 153, 255, 0.4)' },
+                { offset: 1, color: 'rgba(0, 153, 255, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '负载功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#00cc66', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 204, 102, 0.4)' },
+                { offset: 1, color: 'rgba(0, 204, 102, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '储能功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#ffcc00', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(255, 204, 0, 0.4)' },
+                { offset: 1, color: 'rgba(255, 204, 0, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '光伏功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#ff3333', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(255, 51, 51, 0.4)' },
+                { offset: 1, color: 'rgba(255, 51, 51, 0.05)' }
+              ])
+            }
+          }
+        ]
+      }
+      this.powerChartInstance.setOption(option)
+    },
+
+    // 初始化底部中间电力需求曲线（适配980px宽度+130px高度+bottom:26px，两条曲线区分配色）
+    initDemandChart() {
+      this.demandChartInstance = echarts.init(this.$refs.demandChart)
+      
+      const option = {
+        backgroundColor: 'transparent', // 透明背景
+        tooltip: {
+          trigger: 'axis',
+          backgroundColor: 'rgba(0, 30, 60, 0.9)',
+          borderColor: '#00ccff', // 匹配图片主色
+          textStyle: { color: '#fff' },
+          axisPointer: { type: 'shadow' },
+          confine: true,
+        },
+        grid: {
+          left: '2%',
+          right: '2%',
+          top: '5%',
+          bottom: '8%',
+          containLabel: true
+        },
+        dataset: {
+          source: [] // Initial empty
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          // data: [], // Handled by dataset
+          axisLabel: { 
+            color: '#00ccff', // 匹配图片主色
+            fontSize: 10,
+            margin: 10,
+          },
+          axisLine: { 
+            show: true,
+            lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { show: false },
+          axisTick: { show: true }
+        },
+        yAxis: {
+          type: 'value',
+          min: 0,
+          max: 300,
+          interval: 50,
+          axisLabel: { 
+            color: '#00ccff', // 匹配图片主色
+            fontSize: 12,
+            margin: 10,
+            fontWeight: 'bold'
+          },
+          axisLine: { 
+            show: false,
+            // lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { lineStyle: { color: 'rgba(0, 100, 150, 0.2)' } },
+          axisTick: { show: false }
+        },
+        series: [
+                    {
+            type: 'line',
+            // data: [],
+            smooth: true, // 平滑曲线
+            symbol: 'none', // 无数据点
+            // lineStyle: { color: '#00F2FF', width: 2.5 }, // 匹配图片主题色
+            // areaStyle: {
+            //   // 匹配图片的线性渐变：#00F2FF 从100%不透明到0%不透明
+            //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            //     { offset: 0, color: 'rgba(0, 242, 255, 1)' },    // 0%位置：#00F2FF 100%不透明
+            //     { offset: 1, color: 'rgba(0, 242, 255, 0)' }     // 100%位置：#00F2FF 0%不透明
+            //   ])
+            // }
+                        lineStyle: { color: '#0099ff', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 153, 255, 0.4)' },
+                { offset: 1, color: 'rgba(0, 153, 255, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '负载功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#00cc66', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 204, 102, 0.4)' },
+                { offset: 1, color: 'rgba(0, 204, 102, 0.05)' }
+              ])
+            }
+          },
+        ]
+      }
+      this.demandChartInstance.setOption(option)
+    },
+
+    // 统一处理窗口缩放（适配两个图表）
+    resizeAllCharts() {
+      if (this.powerChartInstance) this.powerChartInstance.resize()
+      if (this.demandChartInstance) this.demandChartInstance.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 大屏容器：固定1920x1080尺寸 */
+.big-screen-container {
+  width: 1920px;
+  height: 1080px;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+  position: relative;
+}
+
+/* 背景容器：相对路径 ./background.png */
+.bg-wrapper {
+  width: 100%;
+  height: 100%;
+  background-image: url("./background.png");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  position: relative;
+}
+
+/* 通用图表容器样式 */
+.chart-box {
+  background-color: transparent;
+  padding: 0;
+  border: none;
+  box-shadow: none;
+  border-radius: 0;
+  z-index: 10;
+}
+
+/* 右侧功率曲线图表定位+尺寸 */
+.power-chart {
+  position: absolute;
+  top: 143px;
+  right: 40px;
+  width: 380px;
+  height: 270px;
+}
+
+/* 底部中间电力需求曲线图表（核心修改：width:980px, bottom:26px, height:130px） */
+.demand-chart {
+  position: absolute;
+  bottom: 26px;    /* 修改为26px底部间距 */
+  left: 50%;
+  transform: translateX(-50%);
+  width: 980px;    /* 修改为980px宽度 */
+  height: 130px;   /* 保持130px高度不变 */
+}
+
+/* 图表内容区：填满容器 */
+.chart-content {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/views/system/user/index.vue

@@ -6,30 +6,39 @@
         <pane size="16">
           <el-col>
             <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
+              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small"
+                        prefix-icon="el-icon-search" style="margin-bottom: 20px"/>
             </div>
             <div class="head-container">
-              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+                       :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+                       @node-click="handleNodeClick"/>
             </div>
           </el-col>
         </pane>
         <!--用户数据-->
         <pane size="84">
           <el-col>
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                     label-width="68px">
               <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
               </el-form-item>
               <el-form-item label="手机号码" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
               </el-form-item>
               <el-form-item label="状态" prop="status">
                 <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                             :value="dict.value"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+                                range-separator="-" start-placeholder="开始日期"
+                                end-placeholder="结束日期"></el-date-picker>
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -39,33 +48,48 @@
 
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                           v-hasPermi="['system:user:add']">新增
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                           v-hasPermi="['system:user:edit']">修改
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                           @click="handleDelete" v-hasPermi="['system:user:remove']">删除
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
+                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+                           v-hasPermi="['system:user:import']">导入
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                           v-hasPermi="['system:user:export']">导出
+                </el-button>
               </el-col>
               <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column type="selection" width="50" align="center"/>
-              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+                               :show-overflow-tooltip="true"/>
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+                               v-if="columns[4].visible" width="120"/>
               <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
                 <template slot-scope="scope">
-                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                             @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
               </el-table-column>
               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -75,20 +99,30 @@
               </el-table-column>
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
                 <template slot-scope="scope" v-if="scope.row.userId !== 1">
-                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
+                             v-hasPermi="['system:user:edit']">修改
-                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                  </el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                             v-hasPermi="['system:user:remove']">删除
+                  </el-button>
+                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                               v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                                        v-hasPermi="['system:user:resetPwd']">重置密码
+                      </el-dropdown-item>
+                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                                        v-hasPermi="['system:user:edit']">分配角色
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </template>
               </el-table-column>
             </el-table>
 
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                        :limit.sync="queryParams.pageSize" @pagination="getList"/>
           </el-col>
         </pane>
       </splitpanes>
@@ -100,36 +134,38 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true"
+                          placeholder="请选择归属部门"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                        show-password/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -137,14 +173,17 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                           :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -153,14 +192,33 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1" ></el-option>
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
+                           :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
+                           :disabled="item.status == 1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="归属站点" name="belongSite">
+              <el-select
+                  v-model="form.belongSite"
+                  multiple
+                  collapse-tags
+                  placeholder="请选择"
+                  style="width:100%"
+                  @change="selectBelongSite">
+                <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
+                           :disabled="item.siteId!== 'all' && (form.belongSite || []).includes('all')"
+                           :key="index+'zdxeSelect'"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -181,15 +239,20 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+                 :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+                 :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport"/>
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+                   @click="importTemplate">下载模板
+          </el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -201,17 +264,27 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import {
-import { getToken } from "@/utils/auth"
+  addUser,
+  changeUserStatus,
+  delUser,
+  deptTreeSelect,
+  getUser,
+  listUser,
+  resetUserPwd,
+  updateUser
+} from "@/api/system/user"
+import {getAllSites} from '@/api/ems/zddt'
+import {getToken} from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
-import { Splitpanes, Pane } from "splitpanes"
+import {Pane, Splitpanes} from "splitpanes"
 import "splitpanes/dist/splitpanes.css"
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect, Splitpanes, Pane },
+  components: {Treeselect, Splitpanes, Pane},
   data() {
     return {
       // 遮罩层
@@ -228,6 +301,8 @@ export default {
       total: 0,
       // 用户表格数据
       userList: null,
+      // 站点列表数据
+      siteList: [],
       // 弹出层标题
       title: "",
       // 所有部门树选项
@@ -263,7 +338,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/user/importData"
       },
@@ -278,27 +353,27 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `用户编号`, visible: true },
+        {key: 0, label: `用户编号`, visible: true},
-        { key: 1, label: `用户名称`, visible: true },
+        {key: 1, label: `用户名称`, visible: true},
-        { key: 2, label: `用户昵称`, visible: true },
+        {key: 2, label: `用户昵称`, visible: true},
-        { key: 3, label: `部门`, visible: true },
+        {key: 3, label: `部门`, visible: true},
-        { key: 4, label: `手机号码`, visible: true },
+        {key: 4, label: `手机号码`, visible: true},
-        { key: 5, label: `状态`, visible: true },
+        {key: 5, label: `状态`, visible: true},
-        { key: 6, label: `创建时间`, visible: true }
+        {key: 6, label: `创建时间`, visible: true}
       ],
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          {required: true, message: "用户名称不能为空", trigger: "blur"},
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          {required: true, message: "用户昵称不能为空", trigger: "blur"}
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          {required: true, message: "用户密码不能为空", trigger: "blur"},
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
+          {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'},
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          {pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur"}
         ],
         email: [
           {
@@ -313,7 +388,8 @@ export default {
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
-        ]
+        ],
+
       }
     }
   },
@@ -324,6 +400,7 @@ export default {
     }
   },
   created() {
+    this.getZdList()
     this.getList()
     this.getDeptTree()
     this.getConfigKey("sys.user.initPassword").then(response => {
@@ -331,14 +408,37 @@ export default {
     })
   },
   methods: {
+    selectBelongSite(data) {
+      console.log('选中的站点', data)
+      if (data.includes("all")) {
+        this.form.belongSite = ['all']
+        return
+      }
+      if (this.siteList.length && data.length === (this.siteList.length - 1)) {
+        this.form.belongSite = ['all']
+      }
+    },
+    //获取站点列表
+    getZdList() {
+      return getAllSites().then(response => {
+        this.siteList = response?.data || []
+        if (this.siteList.length > 0) {
+          this.siteList.unshift({
+            id: 'all',
+            siteId: "all",
+            siteName: "全部"
+          })
+        }
+      })
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows
+            this.userList = response.rows
-          this.total = response.total
+            this.total = response.total
-          this.loading = false
+            this.loading = false
-        }
+          }
       )
     },
     /** 查询部门下拉树结构 */
@@ -373,11 +473,11 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用"
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
         return changeUserStatus(row.userId, row.status)
       }).then(() => {
         this.$modal.msgSuccess(text + "成功")
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "1" : "0"
       })
     },
@@ -400,7 +500,8 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
+        belongSite: []
       }
       this.resetForm("form")
     },
@@ -455,6 +556,7 @@ export default {
         this.form = response.data
         this.postOptions = response.posts
         this.roleOptions = response.roles
+        this.$set(this.form, "belongSite", response?.data?.belongSite ? JSON.parse(response.data.belongSite) : [])
         this.$set(this.form, "postIds", response.postIds)
         this.$set(this.form, "roleIds", response.roleIds)
         this.open = true
@@ -475,29 +577,30 @@ export default {
             return "不能包含非法字符：< > \" ' \\\ |"
           }
         },
-      }).then(({ value }) => {
+      }).then(({value}) => {
-          resetUserPwd(row.userId, value).then(response => {
+        resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value)
+          this.$modal.msgSuccess("修改成功，新密码是：" + value)
-          })
+        })
-        }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole: function (row) {
       const userId = row.userId
       this.$router.push("/system/user-auth/role/" + userId)
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+            updateUser({...this.form, belongSite: JSON.stringify(this.form.belongSite)}).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addUser(this.form).then(response => {
+            addUser({...this.form, belongSite: JSON.stringify(this.form.belongSite)}).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
@@ -509,12 +612,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
         return delUser(userIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -529,8 +633,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
+      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
-      }, `user_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -541,7 +644,7 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true})
       this.getList()
     },
     // 提交上传文件