diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js
index 893c2df..a574030 100644
--- a/src/api/ems/dzjk.js
+++ b/src/api/ems/dzjk.js
@@ -92,6 +92,35 @@ export function getElectricData({siteId,startDate,endDate}) {
     method: 'get'
   })
 }
+//获取pcs列表
+export function getPcsNameList(siteId) {
+  return request({
+    url: `/ems/siteMonitor/getPcsNameList?siteId=${siteId}`,
+    method: 'get'
+  })
+}
+//pcs曲线
+export function getPCSData({siteId,deviceId,startTime,endTime,dataType}) {
+  return request({
+    url: `/ems/statsReport/getPCSData?siteId=${siteId}&deviceId=${deviceId}&startTime=${startTime}&endTime=${endTime}&dataType=${dataType}`,
+    method: 'get'
+  })
+}
+//电池堆曲线
+export function getStackData({siteId,deviceId,startTime,endTime,dataType}) {
+  return request({
+    url: `/ems/statsReport/getStackData?siteId=${siteId}&deviceId=${deviceId}&startTime=${startTime}&endTime=${endTime}&dataType=${dataType}`,
+    method: 'get'
+  })
+}
+//电池温度
+export function getClusterData({siteId,stackId,clusterId,dateTime,pageNum,pageSize}) {
+  return request({
+    url: `/ems/statsReport/getClusterData?stackId=${stackId}&clusterId=${clusterId}&dateTime=${dateTime}&pageNum=${pageNum}&pageSize=${pageSize}`,
+    method: 'get'
+  })
+}
+
 
 // 实时运行
 //储能
@@ -122,3 +151,6 @@ export function batteryAveTemp(siteId) {
     method: 'get'
   })
 }
+
+
+
diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue
index a3b0426..4cc861f 100644
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@@ -41,7 +41,7 @@
               </el-table-column>
             </el-table>
         </el-card>
-        <el-card shadow="always" class="common-card-container" :class="cnbInfo.emsCommunicationStatus === '1' ? 'zb-common-card-container' : 'cnb-common-card-container'">
+        <el-card shadow="always" class="common-card-container" style="margin-top:20px" :class="cnbInfo.emsCommunicationStatus === '1' ? 'zb-common-card-container' : 'cnb-common-card-container'">
           <div slot="header">
             <span class="large-title">2#{{cnbInfo.deviceName}}</span>
             <div class="status">
diff --git a/src/views/ems/dzjk/tjbb/dcdqx/index.vue b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
index 469a95b..9c77683 100644
--- a/src/views/ems/dzjk/tjbb/dcdqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
@@ -1,17 +1,17 @@
 
 <template>
-  <div>
+  <div v-loading="loading">
     <div class="select-container">
       <el-form :inline="true">
         <el-form-item label="PCS">
           <el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'sblxOptions'"></el-option>
+            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="时间选择">
           <el-date-picker
             v-model="dateRange"
-            type="date"
+            type="daterange"
             range-separator="至"
             start-placeholder="开始时间"
             :picker-options="pickerOptions"
@@ -32,7 +32,7 @@
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
           <el-button-group class="ems-btns-group">
-            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+            <el-button v-for="(item,index) in btnList" :key="index+'dcdqxBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -46,9 +46,12 @@
 <script>
 import * as echarts from 'echarts'
 import resize from "@/mixins/ems/resize";
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import { getStackData, getPcsNameList} from '@/api/ems/dzjk'
+import {formatDate} from "@/filters/ems";
 export default {
-  name:'DzjkTjbbPcsqx',
-  mixins: [resize],
+  name:'DzjkTjbbDcdqx',
+  mixins: [resize,getQuerySiteId],
   data() {
     return {
       pickerOptions:{
@@ -56,29 +59,25 @@ export default {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:'',//默认展示的时间
-      dateRange:'',
+      defaultDateRange:[],//默认展示的时间
+      dateRange:[],
       loading:false,
       pcs:'',
-      pcsOptions: [
-        {name:'Pcs1',id:1},
-        {name:'Pcs2',id:2},
-      ],
-      activeBtn:'dpjwd',
+      pcsOptions: [],
+      activeBtn:'1',
       btnList:[
-        {name:'堆平均维度',id:'dpjwd'},
-        {name:'堆电压',id:'ddy'},
-        {name:'堆电流',id:'dll'},
-        {name:'堆soc',id:'dsoc'},
+        {name:'堆平均维度',id:'1',attr:['temp'],source:[['日期','有功功率']]},
+        {name:'堆电压',id:'2',attr:['voltage'],source:[['日期','堆电压']]},
+        {name:'堆电流',id:'3',attr:['current'],source:[['日期','堆电流']]},
+        {name:'堆soc',id:'4',attr:['soc'],source:[['日期','堆soc']]},
       ],
-
     }
   },
   methods: {
     changeDataType(id){
       if(id !== this.activeBtn){
-        console.log('点击了不同的菜单，更新数据')
         this.activeBtn=id;
+        this.getData()
       }
     },
     // 搜索
@@ -87,19 +86,42 @@ export default {
     },
     // 重置
     onReset(){
-      this.pcs = ''
+      // this.pcs = this.pcsOptions.length > 0 ?this.pcsOptions[0].id : ''
       this.dateRange=''
       this.getData()
     },
+    getPcsList(){
+      return getPcsNameList(this.siteId).then(response => {
+        const data = response?.data || [];
+        this.pcsOptions = data
+        this.pcs = data.length>0?data[0].id:'';
+      })
+    },
     getData(){
       this.loading=true;
-      this.chart.showLoading()
+      const {siteId,pcs,activeBtn}=this;
+      const [start='',end='']=(this.dateRange || [])
       //接口调用完成之后 设置图表、结束loading
-      this.setOption()
-      this.loading=false;
-      this.chart.hideLoading()
+      getStackData({siteId,deviceId:pcs,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
+        this.setOption(response?.data || [])
+      }).finally(()=>{this.loading=false;})
+
     },
-    setOption() {
+    setOption(data) {
+      const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
+      const source = JSON.parse(JSON.stringify(ele.source))
+      const length = ele.attr.length
+      const series = []
+      data.forEach((item)=>{
+        const arr = ele.attr.map(key=>item[key])
+        source.push([item.statisDate,...arr])
+      })
+      ele.attr.forEach((item)=>{
+        series.push({
+          name:length>1?item:ele.name,
+          type:ele.type || 'scatter'
+        })
+      })
       this.chart.setOption({
         color:['#FFBD00','#3C81FF'],
         legend: {
@@ -116,33 +138,30 @@ export default {
           color:"#333333",
         },
         xAxis: {
-          data: ['01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24'],
+          type: 'category',
         },
         yAxis: {
           type: 'value',
         },
-        series: [
-          {
-            name:this.btnList.find(item=>item.id===this.activeBtn).name,
-            data: [80,92,1,34,90,130,320,80,9,91,34,90,80,92,1,34,90,130,320,80,9,91,34,90],
-            type: 'scatter',
-          }
-          // ,{
-          //   name:'实时电池平均SOC',
-          //   data: [820,932,901,934,1290,1330,1320,820,932,901,934,1290],
-          //   type: 'scatter',
-          // }
-          ]
-      })
+        dataset: {source},
+        series
+      },true)
     },
     initChart() {
       this.chart = echarts.init(document.querySelector('#dcdEchart'));
+    },
+    init(){
+      this.loading = true
+      this.initChart()
+      this.getPcsList().then(()=>{
+        this.onReset()
+      })
     }
   },
   mounted(){
-    this.defaultDateRange =new Date();
-    this.initChart()
-    this.getData()
+    const now = new Date();
+    const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
+    this.defaultDateRange = [lastMonth, now];
   },
   beforeDestroy() {
     if (!this.chart) {
diff --git a/src/views/ems/dzjk/tjbb/dcwd/index.vue b/src/views/ems/dzjk/tjbb/dcwd/index.vue
index ad0a16a..7f0854e 100644
--- a/src/views/ems/dzjk/tjbb/dcwd/index.vue
+++ b/src/views/ems/dzjk/tjbb/dcwd/index.vue
@@ -1,16 +1,16 @@
 
 <template>
-  <div>
+  <div v-loading="loading">
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="电池堆">
-        <el-select v-model="search.dcd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-          <el-option :label="item.name" :value="item.id" v-for="(item,index) in dcdOptions" :key="index+'dcdOptions'"></el-option>
+        <el-select v-model="search.stackId" placeholder="请选择" @change="changeStackId">
+          <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in stackOptions" :key="index+'dcdOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="电池簇">
-        <el-select v-model="search.gjdj" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-          <el-option :label="item.name" :value="item.id" v-for="(item,index) in dccOptions" :key="index+'dccOptions'"></el-option>
+        <el-select v-model="search.clusterId" :no-data-text="!search.stackId && stackOptions.length > 0 ? '请先选择电池堆':'无数据'" placeholder="请选择" :loading="clusterloading" loading-text="正在加载数据">
+          <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in clusterOptions" :key="index+'dccOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="时间选择">
@@ -37,7 +37,7 @@
           max-height="500"
           style="width: 100%;margin-top:25px;">
           <el-table-column
-            prop="time"
+            prop="statisDate"
             width="100"
             label="时间">
           </el-table-column>
@@ -46,7 +46,7 @@
             label="最高温（℃）">
           </el-table-column>
           <el-table-column
-            prop="maxTempDtId"
+            prop="maxTempId"
             label="单体ID">
           </el-table-column>
           <el-table-column
@@ -54,84 +54,138 @@
             label="最低温（℃）">
           </el-table-column>
           <el-table-column
-            prop="minTempDtId"
+            prop="minTempId"
             label="单体ID">
           </el-table-column>
           <el-table-column
-            prop="maxPressure"
+            prop="maxVoltage"
             label="最高压（V）">
           </el-table-column>
           <el-table-column
-            prop="maxPressureDtId"
+            prop="maxVoltageId"
             label="单体ID">
           </el-table-column>
           <el-table-column
-            prop="minTemp"
+            prop="minVoltage"
             label="最低压（V）">
           </el-table-column>
           <el-table-column
-            prop="minPressureDtId"
+            prop="minVoltageId"
             label="单体ID">
           </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>
   </div>
 </template>
 
 
 <script>
+import {getStackNameList, getClusterNameList, getClusterData} from '@/api/ems/dzjk'
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import {formatDate} from "@/utils";
 export default {
   name:'DzjkTjbbDcwd',
+  mixins:[getQuerySiteId],
   data() {
     return {
-      loading:false,
       pickerOptions:{
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
       defaultDate:'',//默认展示的时间
-      search:{dcd:'',dcc:'',date:''},
-      dcdOptions:[
-        {name:'电池堆1',id:1},
-        {name:'电池堆2',id:2},
-        {name:'电池堆3',id:3},
-      ],
-      dccOptions:[
-        {name:'电池簇1',id:1},
-        {name:'电池簇2',id:2},
-      ],
-      tableData:[
-        {time:'00:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-        {time:'01:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-        {time:'02:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-        {time:'03:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-        {time:'04:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-        {time:'05:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-        {time:'06:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-        {time:'07:00',maxTemp:'30',maxTempDtId:1,minTemp:'20',minTempDtId:2,maxPressure:50,maxPressureDtId:1,minPressure:10,minPressureDtId:2},
-      ]
+      loading:false,
+      clusterloading:false,
+      search:{stackId:'',clusterId:'',date:''},
+      stackOptions:[],//{id:'',deviceName:''}
+      clusterOptions:[],//{id:'',deviceName:''}
+      tableData:[],
+      pageSize:10,//分页栏当前每个数据总数
+      pageNum:1,//分页栏当前页数
+      totalSize:0,//table表格数据总数
     }
   },
   methods:{
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(()=>{
+        this.getTableData()
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(()=>{
+        this.getTableData()
+      })
+    },
     // 搜索
     onSearch(){
-      this.getData()
+      this.pageNum =1//每次搜索从1开始搜索
+      this.getTableData()
     },
     // 重置
     onReset(){
-      this.search={
-        dcd:'',dcc:'',date:''
+      this.search.date=''
+      this.pageNum = 1
+      this.getTableData()
+    },
+    changeStackId(val){
+      if(val){
+        this.search.clusterId=''
+        this.getClusterList()
       }
-      this.getData()
     },
-    // 获取数据
-    getData(){
-      this.loading=false
+    //表格数据
+    async getTableData(){
+      this.loading=true;
+      const {stackId,clusterId,date} =this.search
+      const {siteId,pageNum,pageSize}=this
+      await getClusterData({dateTime:formatDate(date),stackId,clusterId,siteId,pageNum,pageSize}).then(response => {
+        this.tableData=response?.rows || [];
+        this.totalSize = response?.total || 0
+      }).finally(()=>{
+        this.loading=false;
+      })
     },
+    async getStackList(){
+      await getStackNameList(this.siteId).then(response => {
+        const data = JSON.parse(JSON.stringify(response?.data || []))
+        this.stackOptions = data
+        this.search.stackId = data.length > 0 ? data[0].id : ''
+      })
+    },
+    async getClusterList(){
+      this.clusterloading =true
+      await getClusterNameList(this.search.stackId).then(response => {
+        const data = JSON.parse(JSON.stringify(response?.data || []))
+        this.clusterOptions = data
+        this.search.clusterId = data.length > 0 ? data[0].id : ''
+      }).finally(() => {this.clusterloading =false})
+    },
+    async init(){
+      // 只有页面初次加载或切换站点的时候调用电池堆列表，其他情况不需要
+      await this.getStackList()
+      await this.getClusterList()
+      await this.onReset()
+
+
+    }
   },
   mounted(){
-    this.getData()
     this.defaultDate = new Date()
   }
 }
diff --git a/src/views/ems/dzjk/tjbb/pcsqx/index.vue b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
index 5d6ab84..74fcba3 100644
--- a/src/views/ems/dzjk/tjbb/pcsqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
@@ -1,11 +1,11 @@
 
 <template>
-  <div>
+  <div v-loading="loading">
     <div class="select-container">
       <el-form :inline="true">
         <el-form-item label="PCS">
           <el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.name" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'sblxOptions'"></el-option>
+            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="时间选择">
@@ -46,9 +46,12 @@
 <script>
 import * as echarts from 'echarts'
 import resize from "@/mixins/ems/resize";
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import { getPCSData, getPcsNameList} from '@/api/ems/dzjk'
+import {formatDate} from "@/filters/ems";
 export default {
   name:'DzjkTjbbPcsqx',
-  mixins: [resize],
+  mixins: [resize,getQuerySiteId],
   data() {
     return {
       pickerOptions:{
@@ -60,17 +63,14 @@ export default {
       dateRange:[],
       loading:false,
       pcs:'',
-      pcsOptions: [
-        {name:'Pcs1',id:1},
-        {name:'Pcs2',id:2},
-      ],
-      activeBtn:'yggl',
+      pcsOptions: [],
+      activeBtn:'1',
       btnList:[
-        {name:'有功功率',id:'yggl'},
-        {name:'无功功率',id:'wggl'},
-        {name:'温度',id:'wd'},
-        {name:'三相电压',id:'sxdy'},
-        {name:'三相电流',id:'sxdl'},
+        {name:'有功功率',id:'1',attr:['activePower'],source:[['日期','有功功率']]},
+        {name:'无功功率',id:'2',attr:['reactivePower'],source:[['日期','无功功率']]},
+        // {name:'温度',id:'wd'},
+        // {name:'三相电压',id:'sxdy'},
+        {name:'三相电流',id:'3',attr:['uCurrent','vCurrent','wCurrent'],source:[['日期','u电流','v电流','w电流']],type:'bar'},
       ],
 
     }
@@ -80,6 +80,7 @@ export default {
       if(id !== this.activeBtn){
         console.log('点击了不同的菜单，更新数据')
         this.activeBtn=id;
+        this.getData()
       }
     },
     // 搜索
@@ -88,21 +89,44 @@ export default {
     },
     // 重置
     onReset(){
-      this.pcs = ''
+      // this.pcs = this.pcsOptions.length > 0 ?this.pcsOptions[0].id : ''
       this.dateRange=[]
       this.getData()
     },
+    getPcsList(){
+      return getPcsNameList(this.siteId).then(response => {
+        const data = response?.data || [];
+        this.pcsOptions = data
+        this.pcs = data.length>0?data[0].id:'';
+      })
+    },
     getData(){
       this.loading=true;
-      this.chart.showLoading()
+      const {siteId,pcs,activeBtn}=this;
+      const [start='',end='']=(this.dateRange || [])
       //接口调用完成之后 设置图表、结束loading
-      this.setOption()
-      this.loading=false;
-      this.chart.hideLoading()
+      getPCSData({siteId,deviceId:pcs,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
+        this.setOption(response?.data || [])
+      }).finally(()=>{this.loading=false;})
+
     },
-    setOption() {
+    setOption(data) {
+      const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
+      const source = JSON.parse(JSON.stringify(ele.source))
+      const length = ele.attr.length
+      const series = []
+      data.forEach((item)=>{
+        const arr = ele.attr.map(key=>item[key])
+        source.push([item.statisDate,...arr])
+      })
+      ele.attr.forEach((item)=>{
+        series.push({
+          name:length>1?item:ele.name,
+          type:ele.type || 'scatter'
+        })
+      })
       this.chart.setOption({
-        color:['#FFBD00','#3C81FF'],
+        color:['#FFBD00','#3C81FF','#91cc74'],
         legend: {
           left: 'center',
           bottom: '10',
@@ -117,35 +141,32 @@ export default {
           color:"#333333",
         },
         xAxis: {
-          data: ['01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24'],
+          type: 'category',
         },
         yAxis: {
           type: 'value',
         },
-        series: [
-          {
-            name:this.btnList.find(item=>item.id===this.activeBtn).name,
-            data: [80,92,1,34,90,130,320,80,9,91,34,90,80,92,1,34,90,130,320,80,9,91,34,90],
-            type: 'scatter',
-          }
-          // ,{
-          //   name:'实时电池平均SOC',
-          //   data: [820,932,901,934,1290,1330,1320,820,932,901,934,1290],
-          //   type: 'scatter',
-          // }
-          ]
-      })
+        dataset: {source},
+        series
+
+      },true)
     },
     initChart() {
       this.chart = echarts.init(document.querySelector('#pcsEchart'));
+    },
+    init(){
+      this.loading = true
+      this.initChart()
+      this.getPcsList().then(()=>{
+        this.onReset()
+      })
     }
   },
   mounted(){
     const now = new Date();
     const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
     this.defaultDateRange = [lastMonth, now];
-    this.initChart()
-    this.getData()
+
   },
   beforeDestroy() {
     if (!this.chart) {