From d68d48ddee4e30e8e61daef0be75eebe8f1fa16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Tue, 24 Jun 2025 23:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/ems.js                        |  2 +-
 src/views/ems/dzjk/gzgj/index.vue        |  5 +-
 src/views/ems/dzjk/home/index.vue        |  1 +
 src/views/ems/dzjk/sbjk/bmsdcc/index.vue | 98 +++++++++--------------
 src/views/ems/dzjk/sbjk/bmszl/index.vue  | 99 +++++++++++++++---------
 src/views/ems/dzjk/sbjk/index.vue        |  1 +
 src/views/ems/dzjk/sbjk/pcs/index.vue    | 69 ++++++++++++++++-
 src/views/ems/dzjk/sbjk/ssyx/index.vue   |  1 +
 src/views/ems/dzjk/tjbb/dcdqx/index.vue  | 14 ++--
 src/views/ems/dzjk/tjbb/glqx/index.vue   |  2 +-
 src/views/ems/dzjk/tjbb/gltj/Dlzb.vue    |  2 +-
 src/views/ems/dzjk/tjbb/index.vue        |  5 --
 src/views/ems/dzjk/tjbb/pcsqx/index.vue  |  2 +-
 13 files changed, 183 insertions(+), 118 deletions(-)

diff --git a/src/router/ems.js b/src/router/ems.js
index 044119c..46f9caa 100644
--- a/src/router/ems.js
+++ b/src/router/ems.js
@@ -123,7 +123,7 @@ export const dzjk=[
                 path: 'pcsqx',
                 component: () => import('@/views/ems/dzjk/tjbb/pcsqx/index.vue'),
                 name: 'DjzkTjbbPcsqx',
-                meta: { title: 'Pcs曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DjzkTjbb'},
+                meta: { title: 'PCS曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DjzkTjbb'},
               },
               {
                 path: 'dcdqx',
diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index 809a5a7..f948dfb 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -128,8 +128,9 @@ export default {
     },
     // 重置
     onReset(){
-      this.search.dcd=''
-      this.search.dcc=''
+      this.search.sblx=''
+      this.search.gjdj=''
+      this.dateRange=[]
       this.getData()
     },
     // 获取数据
diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue
index 7ed3e03..a8ae753 100644
--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@@ -58,6 +58,7 @@
 import {getDzjkHomeView} from '@/api/ems/dzjk'
 import NllzChart from "./NllzChart.vue";
 export default {
+  name:'DzjkSbjkHome',
   components: {NllzChart},
   watch: {
     '$route.query':{
diff --git a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
index 9d05673..c7da8b6 100644
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@@ -26,70 +26,47 @@
         </div>
     </el-card>
     <el-table
-        class="common-table"
-        :data="tableData"
-        stripe
-        max-height="500"
-        style="width: 100%;margin-top:25px;">
-        <el-table-column
-          prop="name"
-          width="190"
-          label="簇号">
-        </el-table-column>
-        <el-table-column
-          label="簇电压"
-        >
-          <template slot-scope="scope">
-            <span>{{scope.row.voltage}} V</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="簇电流">
-          <template slot-scope="scope">
-            <span>{{scope.row.electric}} A</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="簇SOC">
-          <template slot-scope="scope">
-            <span>{{scope.row.soc}} %</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="maxVoltage"
-          label="单体最高电压">
-          <template slot-scope="scope">
-            <span>{{scope.row.maxVoltage}} V</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="minVoltage"
-          label="单体最低电压">
-          <template slot-scope="scope">
-            <span>{{scope.row.minVoltage}} V</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="单体最高温度">
-          <template slot-scope="scope">
-            <span>{{scope.row.maxTemperature}} &#8451;</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="minTemperature"
-          label="单体最低温度">
-          <template slot-scope="scope">
-            <span>{{scope.row.minTemperature}} &#8451;</span>
-          </template>
-        </el-table-column>
+      class="common-table"
+      :data="tableData"
+      stripe
+      style="width: 100%;margin-top:25px;">
+      <el-table-column
+        prop=""
+        label="名称">
+        <template slot-scope="scope">
+          <span v-html="scope.row.name"></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="average"
+        label="单体平均值"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="min"
+        label="单体最小值">
+      </el-table-column>
+      <el-table-column
+        prop="minID"
+        label="单体最小值ID">
+      </el-table-column>
+      <el-table-column
+        prop="max"
+        label="单体最大值">
+      </el-table-column>
+      <el-table-column
+        prop="maxID"
+        label="单体最大值ID">
+      </el-table-column>
+    </el-table>
 
-      </el-table>
   </div>
 </template>
 
 <script>
 
 export default {
+  name:'DzjkSbjkBmsdcc',
   components:{},
   data() {
     return {
@@ -105,10 +82,9 @@ export default {
         {label:'绝缘电阻',value:'2000',attr:'',unit:'&Omega;'},
       ],
       tableData:[
-        {name:'1#电池堆-1#电池簇',voltage:'742.8',electric:'-4.4',soc:'98',maxVoltage:'3.301',minVoltage:'3.102',maxTemperature:'12.8',minTemperature:'11.3'},
-        {name:'1#电池堆-2#电池簇',voltage:'790.1',electric:'-4.2',soc:'90',maxVoltage:'3.391',minVoltage:'3.192',maxTemperature:'13.5',minTemperature:'11.4'},
-        {name:'1#电池堆-3#电池簇',voltage:'740.3',electric:'-4.5',soc:'94',maxVoltage:'3.101',minVoltage:'3.198',maxTemperature:'10.9',minTemperature:'11.5'},
-        {name:'1#电池堆-4#电池簇',voltage:'744.9',electric:'-4.5',soc:'99',maxVoltage:'3.221',minVoltage:'3.234',maxTemperature:'11.4',minTemperature:'11.6'},
+        {name:'电压（V）',average:'20',min:10,minID:'1',max:'30',maxID:'2'},
+        {name:'温度（&#8451;）',average:'20',min:10,minID:'1',max:'30',maxID:'2'},
+        {name:'SOC（%）',average:'20',min:10,minID:'1',max:'30',maxID:'2'},
       ]
     }
   },
diff --git a/src/views/ems/dzjk/sbjk/bmszl/index.vue b/src/views/ems/dzjk/sbjk/bmszl/index.vue
index 40d0a16..4410522 100644
--- a/src/views/ems/dzjk/sbjk/bmszl/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue
@@ -26,45 +26,71 @@
       </div>
     </el-card>
     <el-table
-        class="common-table"
-        :data="tableData"
-        stripe
-        style="width: 100%;margin-top:25px;">
-        <el-table-column
-          prop=""
-          label="名称">
-          <template slot-scope="scope">
-            <span v-html="scope.row.name"></span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="average"
-          label="单体平均值"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="min"
-          label="单体最小值">
-        </el-table-column>
-        <el-table-column
-          prop="minID"
-          label="单体最小值ID">
-        </el-table-column>
-        <el-table-column
-          prop="max"
-          label="单体最大值">
-        </el-table-column>
-        <el-table-column
-          prop="maxID"
-          label="单体最大值ID">
-        </el-table-column>
-  </el-table>
+      class="common-table"
+      :data="tableData"
+      stripe
+      max-height="500"
+      style="width: 100%;margin-top:25px;">
+      <el-table-column
+        prop="name"
+        width="190"
+        label="簇号">
+      </el-table-column>
+      <el-table-column
+        label="簇电压"
+      >
+        <template slot-scope="scope">
+          <span>{{scope.row.voltage}} V</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="簇电流">
+        <template slot-scope="scope">
+          <span>{{scope.row.electric}} A</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="簇SOC">
+        <template slot-scope="scope">
+          <span>{{scope.row.soc}} %</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="maxVoltage"
+        label="单体最高电压">
+        <template slot-scope="scope">
+          <span>{{scope.row.maxVoltage}} V</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="minVoltage"
+        label="单体最低电压">
+        <template slot-scope="scope">
+          <span>{{scope.row.minVoltage}} V</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="单体最高温度">
+        <template slot-scope="scope">
+          <span>{{scope.row.maxTemperature}} &#8451;</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="minTemperature"
+        label="单体最低温度">
+        <template slot-scope="scope">
+          <span>{{scope.row.minTemperature}} &#8451;</span>
+        </template>
+      </el-table-column>
+
+    </el-table>
   </div>
 </template>
 
 <script>
 
 export default {
+  name:'DzjkSbjkBmszl',
   components:{},
   data() {
     return {
@@ -85,9 +111,10 @@ export default {
         {label:'绝缘电阻',value:'1000',attr:'',unit:'&Omega;'},
       ],
       tableData:[
-        {name:'电压（V）',average:'20',min:10,minID:'1',max:'30',maxID:'2'},
-        {name:'温度（&#8451;）',average:'20',min:10,minID:'1',max:'30',maxID:'2'},
-        {name:'SOC（%）',average:'20',min:10,minID:'1',max:'30',maxID:'2'},
+        {name:'1#电池堆-1#电池簇',voltage:'742.8',electric:'-4.4',soc:'98',maxVoltage:'3.301',minVoltage:'3.102',maxTemperature:'12.8',minTemperature:'11.3'},
+        {name:'1#电池堆-2#电池簇',voltage:'790.1',electric:'-4.2',soc:'90',maxVoltage:'3.391',minVoltage:'3.192',maxTemperature:'13.5',minTemperature:'11.4'},
+        {name:'1#电池堆-3#电池簇',voltage:'740.3',electric:'-4.5',soc:'94',maxVoltage:'3.101',minVoltage:'3.198',maxTemperature:'10.9',minTemperature:'11.5'},
+        {name:'1#电池堆-4#电池簇',voltage:'744.9',electric:'-4.5',soc:'99',maxVoltage:'3.221',minVoltage:'3.234',maxTemperature:'11.4',minTemperature:'11.6'},
       ]
     }
   },
diff --git a/src/views/ems/dzjk/sbjk/index.vue b/src/views/ems/dzjk/sbjk/index.vue
index d3d1f9f..4a5f643 100644
--- a/src/views/ems/dzjk/sbjk/index.vue
+++ b/src/views/ems/dzjk/sbjk/index.vue
@@ -27,6 +27,7 @@ import { dzjk } from '@/router/ems'
 const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DjzkSbjk').children//获取到单站监控-设备监控下面的字路由
 console.log('设备监控子路由',childrenRoute)
 export default {
+  name:'ZdjkSbjk',
   data(){
     return {
       childrenRoute,
diff --git a/src/views/ems/dzjk/sbjk/pcs/index.vue b/src/views/ems/dzjk/sbjk/pcs/index.vue
index 0a1e13b..117f609 100644
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@@ -10,8 +10,8 @@
           <div>数据更新时间：2024-10-11 12:00:00</div>
         </div>
         <div class="pcs-btns">
-          <el-button type="warning" size="small">警告按钮</el-button>
-          <el-button size="small">默认按钮</el-button>
+          <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">
@@ -45,6 +45,7 @@
 import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 
 export default {
+  name:'ZdjkSbjkPcs',
   components:{RealTimeBaseInfo},
   data() {
     return {
@@ -67,6 +68,70 @@ export default {
       ],
     }
   },
+  methods:{
+    problemSaved(){
+      this.$confirm('确认故障已复位?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        showClose:false,
+        closeOnClickModal:false,
+        type: 'warning',
+        beforeClose: (action, instance, done) => {
+          if (action === 'confirm') {
+            instance.confirmButtonLoading = true;
+            setTimeout(() => {
+              // todo 调用接口如果关机成功 调用done方法 否则不关闭弹窗
+              done();
+              // setTimeout(() => {
+              instance.confirmButtonLoading = false;
+              // }, 300);
+            }, 3000);
+          } else {
+            done();
+          }
+        }
+      }).then(() => {
+        //只有在故障复位成功的情况下会走到这里
+        this.$message({
+          type: 'success',
+          message: '故障复位成功!'
+        });
+      }).catch(() => {
+        //取消复位
+      });
+    },
+    machineClosed(){
+      this.$confirm('确认要关机吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        showClose:false,
+        closeOnClickModal:false,
+        type: 'warning',
+        beforeClose: (action, instance, done) => {
+          if (action === 'confirm') {
+            instance.confirmButtonLoading = true;
+            setTimeout(() => {
+              // todo 调用接口如果关机成功 调用done方法 否则不关闭弹窗
+              done();
+              // setTimeout(() => {
+              instance.confirmButtonLoading = false;
+              // }, 300);
+            }, 3000);
+          } else {
+            done();
+          }
+        }
+      }).then(() => {
+        //只有在关机成功的情况下会走到这里
+        this.$message({
+          type: 'success',
+          message: '关机成功!'
+        });
+      }).catch(() => {
+        //取消关机
+      });
+    }
+  }
 
 }
 </script>
diff --git a/src/views/ems/dzjk/sbjk/ssyx/index.vue b/src/views/ems/dzjk/sbjk/ssyx/index.vue
index a7a3272..1209676 100644
--- a/src/views/ems/dzjk/sbjk/ssyx/index.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/index.vue
@@ -34,6 +34,7 @@ import DcpjwdChart from './DcpjwdChart.vue'
 import DcpjsocChart from './DcpjsocChart.vue'
 
 export default {
+  name:'ZdjkSbjkSsyx',
   components:{RealTimeBaseInfo,CnglqxChart,PocpjwdChart,DcpjwdChart,DcpjsocChart},
   data() {
     return {
diff --git a/src/views/ems/dzjk/tjbb/dcdqx/index.vue b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
index 4974574..469a95b 100644
--- a/src/views/ems/dzjk/tjbb/dcdqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="select-container">
       <el-form :inline="true">
-        <el-form-item label="Pcs">
+        <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-select>
@@ -11,7 +11,7 @@
         <el-form-item label="时间选择">
           <el-date-picker
             v-model="dateRange"
-            type="daterange"
+            type="date"
             range-separator="至"
             start-placeholder="开始时间"
             :picker-options="pickerOptions"
@@ -56,8 +56,8 @@ export default {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:[],//默认展示的时间
-      dateRange:[],
+      defaultDateRange:'',//默认展示的时间
+      dateRange:'',
       loading:false,
       pcs:'',
       pcsOptions: [
@@ -88,7 +88,7 @@ export default {
     // 重置
     onReset(){
       this.pcs = ''
-      this.dateRange=[]
+      this.dateRange=''
       this.getData()
     },
     getData(){
@@ -140,9 +140,7 @@ export default {
     }
   },
   mounted(){
-    const now = new Date();
-    const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
-    this.defaultDateRange = [lastMonth, now];
+    this.defaultDateRange =new Date();
     this.initChart()
     this.getData()
   },
diff --git a/src/views/ems/dzjk/tjbb/glqx/index.vue b/src/views/ems/dzjk/tjbb/glqx/index.vue
index ecc2259..c6225fa 100644
--- a/src/views/ems/dzjk/tjbb/glqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/glqx/index.vue
@@ -69,7 +69,7 @@ export default {
       btnList:[
         {name:'电网功率',id:'dwgl'},
         {name:'负载功率',id:'fzgl'},
-        {name:'电储能功率',id:'cngl'},
+        {name:'储能功率',id:'cngl'},
         {name:'光伏功率',id:'gfgl'},
       ],
 
diff --git a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
index dd6d0a2..39eb325 100644
--- a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
+++ b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
@@ -29,7 +29,7 @@
       <div class="total-data">
         <div>总充电量:<span class="point">1390988kWh</span></div>
         <div>总放电量:<span class="point">988kWh</span></div>
-        <div>总效益:<span class="point">99%</span></div>
+        <div>综合效率:<span class="point">99%</span></div>
       </div>
       <div id="dlzbChart" style="height: 310px"></div>
     </div>
diff --git a/src/views/ems/dzjk/tjbb/index.vue b/src/views/ems/dzjk/tjbb/index.vue
index 13fa142..f456084 100644
--- a/src/views/ems/dzjk/tjbb/index.vue
+++ b/src/views/ems/dzjk/tjbb/index.vue
@@ -29,11 +29,6 @@ const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='Djzk
 console.log('设备监控子路由',childrenRoute)
 export default {
   name:'DzjkTjbb',
-  computed: {
-    theme() {
-      return this.$store.state.settings.theme
-    },
-  },
   data(){
     return {
       childrenRoute,
diff --git a/src/views/ems/dzjk/tjbb/pcsqx/index.vue b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
index 1bbda47..5d6ab84 100644
--- a/src/views/ems/dzjk/tjbb/pcsqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
@@ -3,7 +3,7 @@
   <div>
     <div class="select-container">
       <el-form :inline="true">
-        <el-form-item label="Pcs">
+        <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-select>