接口联调

2025-06-30 17:32:04 +08:00
parent 37d2d9bde5
commit e42f1204ee
14 changed files with 441 additions and 109 deletions
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@ -8,9 +8,9 @@
        </div>
          <div class="descriptions-main">
            <el-descriptions direction="vertical" :column="3" :colon="false">
-              <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction keep" :span="1" label="工作状态" >{{baseInfo.workStatus}}</el-descriptions-item>
-              <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与PCS通信">{{baseInfo.pcsCommunicationStatus}}</el-descriptions-item>
-              <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与EMS通信">{{baseInfo.emsCommunicationStatus}}</el-descriptions-item>
+              <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1"  label="工作状态" >{{$store.state.ems.workStatusOptions[baseInfo.workStatus]}}</el-descriptions-item>
+              <el-descriptions-item labelClassName="descriptions-label" 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"  :span="1" label="与EMS通信">{{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}</el-descriptions-item>
            </el-descriptions>
          </div>
          <div class="descriptions-main descriptions-main-bg-color">
--- a/src/views/ems/dzjk/sbjk/bmszl/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue
@ -8,9 +8,9 @@
        </div>
        <div class="descriptions-main">
          <el-descriptions direction="vertical" :column="3" :colon="false">
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction keep" :span="1" label="工作状态" >{{baseInfo.workStatus}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与PCS通信">{{baseInfo.pcsCommunicationStatus}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与EMS通信">{{baseInfo.emsCommunicationStatus}}</el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1" label="工作状态" >{{$store.state.ems.workStatusOptions[baseInfo.workStatus]}}</el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" 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"  :span="1" label="与EMS通信">{{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}</el-descriptions-item>
          </el-descriptions>
        </div>
        <div class="descriptions-main descriptions-main-bg-color">
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@ -1,46 +1,47 @@

 <template>
-      <div>
-        <el-card shadow="always" class="common-card-container zb-common-card-container">
+      <div v-loading="loading">
+        <el-card shadow="always" class="common-card-container" :class="info.emsCommunicationStatus === '0' ? 'cnb-common-card-container' : 'zb-common-card-container'">
          <div slot="header">
              <span class="large-title">1#总表</span>
              <div class="status">
-                <div>通信中断</div>
-                <div>数据更新时间：2024-10-11 12:00:00</div>
+                <div>{{$store.state.ems.communicationStatusOptions[info.emsCommunicationStatus]}}</div>
+                <div>数据更新时间：{{info.dataUpdateTime}}</div>
              </div>
          </div>
          <el-table
            class="common-table"
-            :data="zbTableData"
+            :data="info.ammeterDataDetailInfos"
              stripe
              style="width: 100%;">
              <el-table-column
-                prop="name"
+                prop="category"
                label="类别">
              </el-table-column>
              <el-table-column
-                prop="zong"
+                prop="totalKwh"
                label="总/kWh"
              >
              </el-table-column>
              <el-table-column
-                prop="jian"
+                prop="sharpKwh"
                label="尖/kWh">
              </el-table-column>
              <el-table-column
-                prop="feng"
+                prop="peakKwh"
                label="峰/kWh">
              </el-table-column>
              <el-table-column
-                prop="ping"
+                prop="flatKwh"
                label="平/kWh">
              </el-table-column>
              <el-table-column
-                prop="gu"
+                prop="valleyKwh"
                label="谷/kWh">
              </el-table-column>
            </el-table>
        </el-card>
+<!--        储能表返回值待定-->
        <el-card shadow="always" class="common-card-container cnb-common-card-container">
          <div slot="header">
            <span class="large-title">2#储能表</span>
@ -86,26 +87,31 @@


 <script>
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import {getAmmeterDataList} from '@/api/ems/dzjk'
 export default {
  name:'DzjkSbjkDb',
+  mixins:[getQuerySiteId],
  data() {
    return {
-      zbTableData:[
-        {name:'累计充电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
-        {name:'累计放电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
-        {name:'日充电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
-        {name:'日放电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
-      ],
+      loading:false,
+      info:{},
      cnbTableData:[
        {name:'累计充电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
        {name:'累计放电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
        {name:'日充电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
        {name:'日放电量',zong:1000,jian:2000,feng:1500,ping:500,gu:40},
-      ]
+      ],
    }
  },
  methods:{
-
+    init(){
+      this.loading = true
+      getAmmeterDataList(this.siteId).then(response => {
+        // todo 返回数据等待确认，是数组吗?
+        this.info =JSON.parse(JSON.stringify(response?.data[0] || {}));
+      }).finally(() => {this.loading = false})
+    }
  },
  mounted(){

--- a/src/views/ems/dzjk/sbjk/dtdc/index.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/index.vue
@ -23,14 +23,51 @@
          <el-button @click="onReset" native-type="button">重置</el-button>
        </el-form-item>
      </el-form>
-      <div style="margin:30px 0;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);">
        <!--    图表-->
-        <el-row style="background:#fff;margin:30px 0;">
-          <el-col :xs="24" :sm="24" :lg="24">
-            <bar-chart ref="barChart"/>
-          </el-col>
-        </el-row>
-      </div>
+<!--      <div style="margin:30px 0;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);">-->
+<!--        <el-row style="background:#fff;margin:30px 0;">-->
+<!--          <el-col :xs="24" :sm="24" :lg="24">-->
+<!--            <bar-chart ref="barChart"/>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--      </div>-->
+        <el-table
+          class="common-table"
+          :data="tableData"
+          stripe
+          style="width: 100%;margin-top: 25px">
+          <el-table-column
+            prop="id"
+            label="单体编号">
+          </el-table-column>
+          <el-table-column
+            prop="dianya"
+            label="电压（V）"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="wendu"
+            label="温度（℃）">
+          </el-table-column>
+          <el-table-column
+            prop="soc"
+            label="SOC（%）">
+          </el-table-column>
+          <el-table-column
+            prop="soh"
+            label="SOH（%）">
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pageNum"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalSize">
+        </el-pagination>
    </el-card>
 </template>

@ -49,10 +86,28 @@ export default {
      clusterloading:false,
      search:{stackId:'',clusterId:''},
      stackOptions:[],//{id:'',deviceName:''}
-      clusterOptions:[]//{id:'',deviceName:''}
+      clusterOptions:[],//{id:'',deviceName:''}
+      tableData:[],
+      currentPage:1,
+      pageSize:10,//分页栏当前每个数据总数
+      pageNum:1,//分页栏当前页数
+      totalSize:1000,//table表格数据总数
    }
  },
  methods:{
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(()=>{
+        this.init(false)
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(()=>{
+        this.init(false)
+      })
+    },
    // 搜索
    onSearch(){
      this.init(false)
@ -87,7 +142,7 @@ export default {
      this.loading=true;
      // todo 获取单体电池数据
      this.loading=false;
-      this.$refs.barChart.setOption()
+      // this.$refs.barChart.setOption()
      // 只有页面初次加载或切换站点的时候调用电池堆列表，其他情况不需要
      if(mounted){
        this.search={stackId:'',clusterId:''}//保证切换站点时，清空选择项
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@ -5,24 +5,25 @@
    <real-time-base-info :data="runningHeadData"/>
 <!--    内容-->
    <el-container class="pcs-container" v-for="(pcsItem,pcsIndex) in pcsList" :key="pcsIndex+'PcsHome'">
-      <el-header class="pcs-header">
+<!--      背景颜色根据工作状态来展示-->
+      <el-header class="pcs-header" :class="pcsItem.workStatus === '1' ? 'warn' : pcsItem.workStatus === '2' ? 'close' : ''">
        <div class="pcs-title">{{pcsItem.deviceName}}</div>
        <div class="pcs-status">
-          <div>{{pcsItem.communicationStatus}}</div>
+          <div>{{$store.state.ems.communicationStatusOptions[pcsItem.communicationStatus]}}</div>
          <div>数据更新时间：{{pcsItem.dataUpdateTime}}</div>
        </div>
-        <div class="pcs-btns">
-          <el-button type="warning" size="small" @click="problemSaved">故障复位</el-button>
-          <el-button size="small" @click="machineClosed">关机</el-button>
-        </div>
+<!--        <div class="pcs-btns">-->
+<!--          <el-button type="warning" size="small" @click="problemSaved">故障复位</el-button>-->
+<!--          <el-button size="small" @click="machineClosed">关机</el-button>-->
+<!--        </div>-->
      </el-header>
      <el-main style="padding: 0">
        <div class="descriptions-main">
          <el-descriptions direction="vertical" :column="4" :colon="false">
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction danger"  :span="1" label="工作状态">{{pcsItem.workStatus}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="并网状态">{{pcsItem.gridStatus}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction save"  :span="1" label="设备状态">{{pcsItem.deviceStatus}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="控制模式">{{pcsItem.controlMode}}</el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${pcsItem.workStatus === '0' ? 'save' :'danger'}`" :span="1" label="工作状态">{{$store.state.ems.workStatusOptions[pcsItem.workStatus]}}</el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="并网状态">{{$store.state.ems.gridStatusOptions[pcsItem.gridStatus]}}</el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${pcsItem.deviceStatus === '0' ? 'save' : 'danger'}`" :span="1" label="设备状态">{{$store.state.ems.deviceStatusOptions[pcsItem.deviceStatus]}}</el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="控制模式">{{$store.state.ems.controlModeOptions[pcsItem.controlMode]}}</el-descriptions-item>
          </el-descriptions>
        </div>
        <div class="descriptions-main descriptions-main-bg-color">
@ -75,7 +76,7 @@ export default {
        {label:'PCS环境温度',attr:'pcsEnvironmentTemperature',unit:'&#8451;'},
        {label:'交流频率',attr:'acFrequency',unit:'Hz'}
      ],
-      pcsBranchList:[]//pcs的支路列表
+      pcsBranchList:[],//pcs的支路列表
    }
  },
  methods:{
@ -170,7 +171,7 @@ export default {
  border-radius: 6px 6px 0 0;
  //红色标题
  .pcs-header{
-    background: #FC6B69;
+    background: #05AEA3;
    display: flex;
    position: relative;
    justify-content: flex-start;
@ -197,5 +198,11 @@ export default {
      transform: translateY(-50%);
    }
  }
+  .pcs-header.warn{
+    background-color:#FC6B69 ;
+  }
+  .pcs-header.close{
+    background-color:#666666 ;
+  }
 }
 </style>
--- a/src/views/ems/dzjk/sbjk/yl/index.vue
+++ b/src/views/ems/dzjk/sbjk/yl/index.vue
@ -1,78 +1,52 @@

 <template>
-    <div>
-      <div class="yl-item-container">
+    <div v-loading="loading">
+<!--      todo 判断条件是否需要更新-->
+      <div class="yl-item-container" :class="{'yl-warn-item-container':item.workMode !== '0'}" v-for="(item,index) in list" :key="index+'ylLise'">
        <div class="header">
-          <div class="header-title">1#液冷</div>
-          <div>工作模式：<span class="header-values">运行</span></div>
-          <div>当前温度：<span class="header-values">12&#8451;</span></div>
+          <div class="header-title">{{item.systemName}}</div>
+          <div>工作模式：<span class="header-values">{{$store.state.ems.workModeOptions[item.workMode]}}</span></div>
+          <div>当前温度：<span class="header-values">{{item.currentTemperature}}&#8451;</span></div>
        </div>
        <div class="content">
          <el-row>
-            <el-col v-for="(item,index) in tempData" :key="index+'ylTempData'" :span="8">{{item.title}}：{{item.value}}&#8451;</el-col>
+            <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'ylTempData'" :span="8">{{tempDataItem.title}}：{{item[tempDataItem.attr]}}&#8451;</el-col>
          </el-row>
        </div>
      </div>
-
-      <div class="yl-item-container yl-warn-item-container">
-        <div class="header">
-          <div class="header-title">2#液冷</div>
-          <div>工作模式：<span class="header-values">运行</span></div>
-          <div>当前温度：<span class="header-values">12&#8451;</span></div>
-        </div>
-        <div class="content">
-          <el-row>
-            <el-col v-for="(item,index) in tempData" :key="index+'ylTempData'" :span="8">{{item.title}}：{{item.value}}&#8451;</el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="yl-item-container">
-        <div class="header">
-          <div class="header-title">3#液冷</div>
-          <div>工作模式：<span class="header-values">运行</span></div>
-          <div>当前温度：<span class="header-values">12&#8451;</span></div>
-        </div>
-        <div class="content">
-          <el-row>
-            <el-col v-for="(item,index) in tempData" :key="index+'ylTempData'" :span="8">{{item.title}}：{{item.value}}&#8451;</el-col>
-          </el-row>
-        </div>
-      </div>
-
-      <div class="yl-item-container yl-warn-item-container">
-        <div class="header">
-          <div class="header-title">4#液冷</div>
-          <div>工作模式：<span class="header-values">运行</span></div>
-          <div>当前温度：<span class="header-values">12&#8451;</span></div>
-        </div>
-        <div class="content">
-          <el-row>
-            <el-col v-for="(item,index) in tempData" :key="index+'ylTempData'" :span="8">{{item.title}}：{{item.value}}&#8451;</el-col>
-          </el-row>
-        </div>
-      </div>
-  </div>
+      <el-empty v-show="list.length<=0" :image-size="200"></el-empty>
+    </div>
 </template>


 <script>
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import {getCoolingDataList} from '@/api/ems/dzjk'
 export default {
  name:'DzjkSbjkYl',
+  mixins:[getQuerySiteId],
  data() {
    return {
+      loading:false,
+      list:[],
      tempData:[
-        {title:'制热开启点',value:12,attr:''},
-        {title:'制冷开启点',value:23,attr:''},
-        {title:'高温告警点',value:30,attr:''},
-        {title:'制热停止点',value:24,attr:''},
-        {title:'制冷停止点',value:21,attr:''},
-        {title:'低温告警点',value:10,attr:''},
+        {title:'制热开启点',attr:'heatingStartPoint'},
+        {title:'制冷开启点',attr:'coolingStartPoint'},
+        {title:'高温告警点',attr:'highTempAlarmPoint'},
+        {title:'制热停止点',attr:'heatingStopPoint'},
+        {title:'制冷停止点',attr:'coolingStopPoint'},
+        {title:'低温告警点',attr:'lowTempAlarmPoint'},

      ]
    }
  },
  methods:{
-
+    init(){
+      this.loading = true
+      getCoolingDataList(this.siteId).then(response => {
+        this.list =  JSON.parse(JSON.stringify(response?.data || []));
+      }).finally(() => {this.loading = false})
+    }
  },
  mounted(){