pcs顶部方块样式调整

src/api/ems/site.js

@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+// 站点列表
+export function getSiteInfoList({siteName,startTime, endTime,pageSize,pageNum}) {
+  return request({
+    url: `/ems/siteConfig/getSiteInfoList?siteName=${siteName}&startTime=${startTime}&endTime=${endTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
+    method: 'get'
+  })
+}
+
+// 设备列表
+export function getDeviceInfoList({siteId,pageSize,pageNum}) {
+  return request({
+    url: `/ems/siteConfig/getDeviceInfoList?siteId=${siteId}&pageSize=${pageSize}&pageNum=${pageNum}`,
+    method: 'get'
+  })
+}
+
+// 设备详情
+export function getDeviceDetailInfo(deviceId) {
+  return request({
+    url: `/ems/siteConfig/getDeviceDetailInfo?deviceId=${deviceId}`,
+    method: 'get'
+  })
+}

src/components/Ems/SingleSquareBox/index.vue

@@ -24,7 +24,7 @@
       font-weight: 500;
     }
     ::v-deep .el-card__body{
-      padding: 12px 16px;
+      padding: 12px 10px;
     }
   }
 </style>

src/router/ems.js

@@ -41,7 +41,7 @@ export const dzjk=[
             path: '/dzjk/home',
             component: () => import('@/views/ems/dzjk/home/index.vue'),
             name: 'DzjkHome',
-            meta: { title: '首页',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkHome' }
+            meta: { title: '站点首页',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkHome' }
           },
           {
             path: '/dzjk/sbjk',

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

@@ -157,6 +157,7 @@ export default {
     },
     // 搜索
     onSearch(){
+      this.pageNum =1//每次搜索从1开始搜索
       const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
       // 选中了时间范围
       if(alarmStartTime && alarmStartTime){
@@ -175,6 +176,7 @@ export default {
     onReset(){
       this.search={deviceType:'',alarmLevel:''}
       this.dateRange=[]
+      this.pageNum =1//每次搜索从1开始搜索
       this.getData()
     },
     // 切换今日、历史告警

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

@@ -20,9 +20,9 @@
           <!--        进度-->
           <div class="process-container">
             <div class="process-line-bg">
-              <div class="process-line" :style="{height:baseInfo.currentSoc+'%'}"></div>
+              <div class="process-line" :style="{height:baseInfo.stackSoc+'%'}"></div>
             </div>
-            <div class="process">当前SOC : {{baseInfo.currentSoc}}%</div>
+            <div class="process">当前SOC : {{baseInfo.stackSoc}}%</div>
           </div>
         </div>
         <el-table
@@ -58,27 +58,27 @@
             prop="maxVoltage"
             label="单体最高电压">
             <template slot-scope="scope">
-              <span>{{scope.row.maxVoltage}} V</span>
+              <span>{{scope.row.maxCellVoltage}} V</span>
             </template>
           </el-table-column>
           <el-table-column
             prop="minVoltage"
             label="单体最低电压">
             <template slot-scope="scope">
-              <span>{{scope.row.minVoltage}} V</span>
+              <span>{{scope.row.minCellVoltage}} V</span>
             </template>
           </el-table-column>
           <el-table-column
             label="单体最高温度">
             <template slot-scope="scope">
-              <span>{{scope.row.maxTemperature}} &#8451;</span>
+              <span>{{scope.row.maxCellTemp}} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
             prop="minTemperature"
             label="单体最低温度">
             <template slot-scope="scope">
-              <span>{{scope.row.minTemperature}} &#8451;</span>
+              <span>{{scope.row.minCellTemp}} &#8451;</span>
             </template>
           </el-table-column>
 
@@ -100,15 +100,15 @@ export default {
       loading:false,
       baseInfoList:[],
       infoData:[
-        {label:'电池堆总电压',attr:'totalVoltage',unit:'V'},
-        {label:'可充电量',attr:'chargeableCapacity',unit:'kWh'},
-        {label:'累计充电量',attr:'totalChargedCapacity',unit:'kWh'},
-        {label:'电池堆总电流',attr:'totalCurrent',unit:'A'},
-        {label:'可放电量',attr:'dischargeableCapacity',unit:'kWh'},
-        {label:'累计放电量',attr:'totalDischargedCapacity',unit:'kWh'},
-        {label:'SOH',attr:'soh',unit:'%'},
-        {label:'平均温度',attr:'averageTemperature',unit:'&#8451;'},
-        {label:'绝缘电阻',attr:'insulationResistance',unit:'&Omega;'},
+        {label:'电池堆总电压',attr:'stackVoltage',unit:'V'},
+        {label:'可充电量',attr:'availableChargeCapacity',unit:'kWh'},
+        {label:'累计充电量',attr:'totalChargeCapacity',unit:'kWh'},
+        {label:'电池堆总电流',attr:'stackCurrent',unit:'A'},
+        {label:'可放电量',attr:'availableDischargeCapacity',unit:'kWh'},
+        {label:'累计放电量',attr:'totalDischargeCapacity',unit:'kWh'},
+        {label:'SOH',attr:'stackSoh',unit:'%'},
+        {label:'平均温度',attr:'operatingTemp',unit:'&#8451;'},
+        {label:'绝缘电阻',attr:'stackInsulationResistance',unit:'&Omega;'},
       ]
     }
   },

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

@@ -117,6 +117,7 @@ export default {
     },
     // 搜索
     onSearch(){
+      this.pageNum =1//每次搜索从1开始搜索
       this.getTableData()
     },
     // 重置
@@ -125,6 +126,7 @@ export default {
     onReset(){
       this.search={stackId:'',clusterId:''}
       this.clusterOptions=[]
+      this.pageNum = 1
       this.getTableData()
     },
     changeStackId(val){

src/views/ems/dzjk/tjbb/gltj/Dlzb.vue

@@ -81,6 +81,7 @@ export default {
         xAxis: { type: 'category' },
         yAxis: [{
           type: 'value',
+          name:'充电量/放电量kWh',
           axisLine: {
             lineStyle:{
               color: '#333333',
@@ -89,6 +90,7 @@ export default {
           }
         },{
           type: 'value',
+          name:'效率%',
           axisLine: {
             lineStyle:{
               color: '#333333',
@@ -96,7 +98,7 @@ export default {
             onZero:false
           }
         }],
-        grid:{top:30},
+        grid:{top:40},
         dataset:{
           source
         },
@@ -123,7 +125,7 @@ export default {
       const startDate=formatDate(start),endDate = formatDate(end)
       getElectricData({siteId:this.siteId,startDate,endDate}).then(response => {
         const {totalChargedCap='',totalDisChargedCap='',efficiency='',sevenDayDisChargeStats=[]}=response?.data || {}
-        this.setOption(sevenDayDisChargeStats)
+        this.setOption(sevenDayDisChargeStats || [])
         this.totalChargedCap=totalChargedCap
         this.totalDisChargedCap=totalDisChargedCap
         this.efficiency=efficiency

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

@@ -0,0 +1,197 @@
+
+<template>
+  <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
+    <el-form :inline="true" class="select-container">
+        <el-form-item label="站点选择">
+          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据">
+            <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
+          </el-select>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+        <el-button @click="onReset" native-type="button">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      class="common-table"
+      :data="tableData"
+      stripe
+      max-height="600px"
+      style="width: 100%;margin-top: 25px">
+      <el-table-column
+        prop="siteId"
+        label="站点ID">
+      </el-table-column>
+      <el-table-column
+        prop="siteName"
+        label="站点名称">
+      </el-table-column>
+      <el-table-column
+        prop="deviceId"
+        label="设备ID"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="deviceName"
+        label="设备名称">
+      </el-table-column>
+      <el-table-column
+        prop="deviceType"
+        label="设备类型">
+      </el-table-column>
+      <el-table-column
+        prop="communicationStatus"
+        label="通信状态">
+        <template slot-scope="scope">
+          <span>{{$store.state.ems.communicationStatusOptions[scope.row.communicationStatus]}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        label="操作"
+        width="140">
+        <template slot-scope="scope">
+          <el-button
+            @click="toDetail(scope.row.deviceId)"
+            type="primary"
+            size="small">
+            查看详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      v-show="tableData.length>0"
+      background
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="totalSize"
+      style="margin-top:15px;text-align: center"
+    >
+    </el-pagination>
+    <el-dialog :visible.sync="dialogTableVisible" class="ems-dialog" title=" 详细信息" :close-on-click-modal="false" :before-close="handleClosed">
+      <div class="descriptions-main" style="padding: 0" >
+        <el-descriptions direction="vertical" :column="2" :colon="false" border>
+          <el-descriptions-item v-for="item in detailData" labelClassName="descriptions-label" contentClassName="descriptions-direction" :span="1" :label="item.label">{{item.value}}</el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getDeviceInfoList,getDeviceDetailInfo} from'@/api/ems/site'
+import {getAllSites} from '@/api/ems/zddt'
+import {formatNumber} from "@/filters/ems";
+export default {
+  name: "Sblb",
+  data() {
+    return {
+      loading:false,
+      searchLoading:false,
+      siteId:'',
+      siteList:[],
+      tableData:[],
+      pageSize:10,//分页栏当前每个数据总数
+      pageNum:1,//分页栏当前页数
+      totalSize:0,//table表格数据总数
+      dialogTableVisible:false,
+      detailData:[
+        {label:'设备ID',value:'',attr:'deviceId'},
+        {label:'设备名称',value:'',attr:'deviceName'},
+        {label:'设备类型',value:'',attr:'deviceType'},
+        {label:'通信状态',value:'',attr:'communicationStatus'},
+        {label:'TCP设备的IP地址',value:'',attr:'ipAddress'},
+        {label:'TCP端口号',value:'',attr:'ipPort'},
+        {label:'串口路径',value:'',attr:'serialPort'},
+        {label:'波特率',value:'',attr:'baudRate'},
+        {label:'数据位',value:'',attr:'dataBits'},
+        {label:'停止位',value:'',attr:'stopBits'},
+        {label:'校验位',value:'',attr:'parity'},
+        {label:'设备描述',value:'',attr:'description'},
+        {label:'设备类别',value:'',attr:'deviceCategory'},
+        {label:'上级设备ID',value:'',attr:'parentId'},
+        {label:'设备唯一标识符',value:'',attr:'deviceId'},
+      ],
+      detailformatAttr:{
+        'deviceType':'deviceTypeOptions',
+        'communicationStatus':'communicationStatusOptions',
+      }
+    }
+  },
+  methods:{
+    handleClosed(done){
+      this.detailData.forEach((item)=>{item.value = ''})
+      done()
+    },
+    toDetail(deviceId){
+      this.loading = true
+      getDeviceDetailInfo(deviceId).then(response => {
+        const data = response?.data || {};
+        this.detailData.forEach(item=>{
+          if(this.detailformatAttr[item.attr]){
+            item.value=formatNumber(this.$store.state.ems[this.detailformatAttr[item.attr]][data[item.attr]]);
+          }else{
+            item.value=formatNumber(data[item.attr]);
+          }
+
+        })
+        this.dialogTableVisible = true
+      }).finally(() => {this.loading = false})
+
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    // 搜索
+    onSearch(){
+      this.pageNum =1//每次搜索从1开始搜索
+      this.getData()
+    },
+    // 重置
+    onReset(){
+      this.siteId=''
+      this.pageNum =1//每次搜索从1开始搜索
+      this.getData()
+    },
+    // 获取数据
+    getData(){
+      this.loading=true
+      const {siteId,pageNum,pageSize} =this
+      getDeviceInfoList({siteId,pageNum,pageSize}).then(response => {
+        this.tableData=response?.rows || [];
+        this.totalSize = response?.total || 0
+      }).finally(() => {this.loading=false})
+    },
+    //获取站点列表
+    getZdList(){
+      this.searchLoading=true
+      getAllSites().then(response => {
+        this.siteList = response?.data || []
+      }).finally(() => {this.searchLoading=false})
+    }
+  },
+  mounted() {
+    this.onReset()
+    this.getZdList()
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/ems/site/zdlb/index.vue

@@ -0,0 +1,147 @@
+
+<template>
+  <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
+    <el-form :inline="true" class="select-container">
+      <el-form-item label="站点名称">
+        <el-input
+          v-model="siteName"
+          placeholder="请输入"
+          clearable
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item label="运营时间">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+          :default-value="defaultDateRange"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+        <el-button @click="onReset" native-type="button">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      class="common-table"
+      :data="tableData"
+      stripe
+      max-height="500px"
+      style="width: 100%;margin-top: 25px">
+      <el-table-column
+        prop="siteId"
+        label="站点ID">
+      </el-table-column>
+      <el-table-column
+        prop="siteName"
+        label="站点名称">
+      </el-table-column>
+      <el-table-column
+        prop="siteAddress"
+        label="站点地址"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="runningTime"
+        label="运营时间">
+      </el-table-column>
+      <el-table-column
+        prop="installPower"
+        label="装机功率">
+      </el-table-column>
+      <el-table-column
+        prop="installCapacity"
+        label="装机容量">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      v-show="tableData.length>0"
+      background
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="totalSize"
+      style="margin-top:15px;text-align: center"
+    >
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import {getSiteInfoList} from '@/api/ems/site'
+import { formatDate } from '@/filters/ems'
+export default {
+  name: "Zdlb",
+  data() {
+    return {
+      loading:false,
+      siteName:"",
+      pickerOptions:{
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+      defaultDateRange:[],//默认展示的时间
+      dateRange:[],//startTime,endTime
+      tableData:[],
+      pageSize:10,//分页栏当前每个数据总数
+      pageNum:1,//分页栏当前页数
+      totalSize:0,//table表格数据总数
+    }
+  },
+  methods:{
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    // 搜索
+    onSearch(){
+      this.pageNum =1//每次搜索从1开始搜索
+      this.getData()
+    },
+    // 重置
+    onReset(){
+      this.siteName=''
+      this.dateRange=[]
+      this.pageNum =1//每次搜索从1开始搜索
+      this.getData()
+    },
+    // 获取数据
+    getData(){
+      this.loading=true
+      const {siteName,pageNum,pageSize} =this
+      const [startTime='',endTime='']=(this.dateRange || [])
+      getSiteInfoList({siteName,pageSize,pageNum,startTime:formatDate(startTime),endTime:formatDate(endTime)}).then(response => {
+        this.tableData=response?.rows || [];
+        this.totalSize = response?.total || 0
+      }).finally(() => {this.loading=false})
+    },
+  },
+  mounted() {
+    this.onReset()
+    const now = new Date();
+    const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
+    this.defaultDateRange = [lastMonth, now];
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>