储能智慧云

.env.development

@@ -17,7 +17,7 @@ VITE_API_URL = /api
 
 # 开发环境接口地址
 # 开发环境跨域代理，支持配置多个 http://192.168.8.198:8888
-# VITE_PROXY = [["/api","http://192.168.8.160:8888"]]
+# VITE_PROXY = [["/api","http://192.168.8.172:8888"]]
 # VITE_PROXY = [["/api","http://zlink.bjdexn.cn:8888"]]
 
 VITE_PROXY = [["/api","https://esos-iot.bjdexn.cn"]]

src/api/interface/index.ts

@@ -148,6 +148,7 @@ export namespace Station {
   // 设备监控 tap标签
   export interface deviceList {
     deviceClass: number;
+    deviceType: number;
     deviceClassName: string;
     devices: deviceLists[];
   }

src/views/Alarm/index.vue

@@ -17,7 +17,7 @@
       <el-select
         v-model="emsDeviceId"
         collapse-tags
-        placeholder="选择电站"
+        placeholder="选择设备编号"
         popper-class="custom-header"
         :max-collapse-tags="1"
         style="width: 240px"

src/views/home/index.vue

@@ -102,7 +102,6 @@
                 <div id="income" v-show="tabpropslabel == '收益统计'"></div>
               </div>
             </el-tabs>
-
             <div class="grid_divright">
               <div :class="recentlytype == 7 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(7)">近7日</div>
               <div :class="recentlytype == 31 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(31)">近31日</div>
@@ -184,7 +183,7 @@ import { onMounted, ref } from "vue";
 import type { TabsPaneContext } from "element-plus";
 import * as echarts from "echarts";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
-//
+
 import {
   gethomesite,
   multiStationday,
@@ -604,7 +603,8 @@ const query = async (val: number) => {
   } else {
     onlineStatus.value = "";
     modelinput.value = "";
-    pageable.value.ps = 1;
+    pageable.value.pn = 1;
+    pageable.value.ps = 10;
     postmultiStationpagebaseInfo();
   }
 };

src/views/monitor/index.vue

@@ -17,7 +17,7 @@
       <el-select
         v-model="emsDeviceId"
         collapse-tags
-        placeholder="选择电站"
+        placeholder="选择编号"
         popper-class="custom-header"
         :max-collapse-tags="1"
         style="width: 240px"
@@ -28,11 +28,11 @@
       </el-select>
     </div>
     <!-- <div>
-
+    
   </div> -->
     <div class="equipment">
       <el-card>
-        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handletabs">
           <el-tab-pane v-for="(item, index) in deviceList" :key="index" :label="item.deviceClassName" :name="index">
             <div class="demo_div">
               <div v-for="(items, indexs) in item.devices" :key="indexs">
@@ -44,7 +44,7 @@
           </el-tab-pane>
         </el-tabs>
 
-        <div class="equipmentdiv" v-if="activeName == 0">
+        <div class="equipmentdiv" v-if="deviceType == 1">
           <div class="equipmenttime">末次数据时间：{{ pcslist.ts }}</div>
           <div style="height: 33px"></div>
           <div>设备状态</div>
@@ -114,7 +114,7 @@
                 <div class="equipment2">控制模式</div>
               </div>
             </el-card> -->
-            <el-card>
+            <!-- <el-card>
               <div class="equipmentdevice1">
                 <div class="equipmentname" v-if="pcslist.emsCommStatus == 'GOOD'">
                   <div class="equipmentborder"></div>
@@ -126,10 +126,10 @@
                 </div>
                 <div class="equipment2">与EMS通信</div>
               </div>
-            </el-card>
+            </el-card> -->
           </div>
           <div class="equipmentdata">设备数据</div>
-          <!-- 1 -->
+          <!--  -->
           <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">当日充电量</div>
@@ -140,37 +140,63 @@
               <div>{{ pcslist.todayAcDischargeKwh ?? "-" }} kWh</div>
             </div>
             <div class="equipmentdata_div">
+              <div class="equipment_title">累计充电量</div>
+              <div>{{ (pcslist.totalAcChargeKwh * 1).toFixed(2) ?? "-" }} kWh</div>
+            </div>
+            <div class="equipmentdata_div4">
+              <div class="equipment_title">累计放电量</div>
+              <!-- <div>{{ pcslist.totalAcActivePower ?? "-" }} kW</div> -->
+              <div>{{ pcslist.totalAcDischargeKwh ?? "-" }} kWh</div>
+            </div>
+          </div>
+          <!-- 1 -->
+          <div class="equipmentdata_equipment">
+            <!-- <div class="equipmentdata_div">
+              <div class="equipment_title">当日充电量</div>
+              <div>{{ pcslist.todayAcChargeKwh ?? "-" }} kWh</div>
+            </div>
+            <div class="equipmentdata_div">
+              <div class="equipment_title">当日放电量</div>
+              <div>{{ pcslist.todayAcDischargeKwh ?? "-" }} kWh</div>
+            </div> -->
+            <div class="equipmentdata_div">
               <div class="equipment_title">交流频率</div>
               <div>{{ (pcslist.acFrequency * 1).toFixed(2) ?? "-" }} Hz</div>
             </div>
             <div class="equipmentdata_div4">
               <div class="equipment_title">总交流有功功率</div>
               <div>{{ pcslist.totalAcActivePower ?? "-" }} kW</div>
+              <!-- <div>{{ pcslist.totalAcPowerFactor ?? "-" }} kW</div> -->
+            </div>
+            <div class="equipmentdata_div">
+              <div class="equipment_title">总交流无功功率</div>
+              <div>{{ pcslist.totalAcReactivePower ?? "-" }} kW</div>
+            </div>
+            <div class="equipmentdata_div">
+              <div class="equipment_title">总交流视在功率</div>
+              <div>{{ pcslist.totalAcApparentPower ?? "-" }} kW</div>
             </div>
           </div>
           <!-- 2 -->
           <div class="equipmentdata_equipment">
-            <div class="equipmentdata_div">
+            <!-- <div class="equipmentdata_div">
               <div class="equipment_title">总交流无功功率</div>
-              <div>{{ pcslist.totalAcReactivePower ?? "-" }} kvar</div>
+              <div>{{ pcslist.totalAcReactivePower ?? "-" }} kW</div>
             </div>
             <div class="equipmentdata_div">
               <div class="equipment_title">总交流视在功率</div>
-              <div>{{ pcslist.totalAcApparentPower ?? "-" }} kVA</div>
-            </div>
+              <div>{{ pcslist.totalAcApparentPower ?? "-" }} kW</div>
+            </div> -->
             <div class="equipmentdata_div">
               <!-- <div class="equipment_title">总交流功率因数</div> -->
               <div class="equipment_title">交流电流</div>
-              <!-- <div>{{ pcslist.totalAcPowerFactor ?? "-" }}</div> -->
+              <!-- <div>{{ pcslist.aphaseActivePower ?? "-" }}A</div> -->
               <div>{{ (pcslist.acAbCurrent * 1).toFixed(2) ?? "-" }}A</div>
             </div>
             <div class="equipmentdata_div4">
               <div class="equipment_title">A相有功功率</div>
               <div>{{ pcslist.aphaseActivePower ?? "-" }} kW</div>
             </div>
-          </div>
-          <!-- 3  -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">B相有功功率</div>
               <div>{{ pcslist.bphaseActivePower ?? "-" }} kW</div>
@@ -179,25 +205,28 @@
               <div class="equipment_title">C相有功功率</div>
               <div>{{ pcslist.cphaseActivePower ?? "-" }} kW</div>
             </div>
+          </div>
+          <!-- 3  -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">A相无功功率</div>
-              <div>{{ pcslist.aphaseReactivePower ?? "-" }} kvar</div>
+              <div>{{ pcslist.aphaseReactivePower ?? "-" }} kW</div>
             </div>
             <div class="equipmentdata_div4">
               <div class="equipment_title">B相无功功率</div>
-              <div>{{ pcslist.bphaseReactivePower ?? "-" }} kvar</div>
+              <div>{{ pcslist.bphaseReactivePower ?? "-" }} kW</div>
             </div>
-          </div>
-          <!-- 4  -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">C相无功功率</div>
-              <div>{{ pcslist.cphaseReactivePower ?? "-" }} kvar</div>
+              <div>{{ pcslist.cphaseReactivePower ?? "-" }} kW</div>
             </div>
             <div class="equipmentdata_div">
               <div class="equipment_title">A相视在功率</div>
               <div>{{ pcslist.aphaseApparentPower ?? "-" }} kVA</div>
             </div>
+          </div>
+          <!-- 4  -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">B相视在功率</div>
               <div>{{ pcslist.bphaseApparentPower ?? "-" }} kVA</div>
@@ -206,30 +235,27 @@
               <div class="equipment_title">C相视在功率</div>
               <div>{{ pcslist.cphaseApparentPower ?? "-" }} kVA</div>
             </div>
-          </div>
-          <!-- 5  -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
-              <!-- <div class="equipment_title">AB电压</div>
-              <div>{{ pcslist.acAbVolt ?? "-" }} V</div> -->
-              <div class="equipment_title">AB离网电压</div>
-              <div>{{ (pcslist.abOffGridVolt * 1).toFixed(2) ?? "-" }} V</div>
+              <div class="equipment_title">AB电压</div>
+              <div>{{ (pcslist.acAbVolt * 1).toFixed(2) ?? "-" }} V</div>
+              <!-- <div class="equipment_title">AB离网电压</div> -->
+              <!-- <div>{{ (pcslist.abOffGridVolt * 1).toFixed(2) ?? "-" }} V</div> -->
             </div>
             <div class="equipmentdata_div">
               <div class="equipment_title">BC电压</div>
               <div>{{ (pcslist.acBcVolt * 1).toFixed(2) ?? "-" }} V</div>
             </div>
+          </div>
+          <!-- 5  -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">CA电压</div>
               <div>{{ (pcslist.acCaVolt * 1).toFixed(2) ?? "-" }} V</div>
             </div>
             <div class="equipmentdata_div4">
               <div class="equipment_title">AB电流</div>
-              <div>{{ (pcslist.acAbVolt * 1).toFixed(2) ?? "-" }} A</div>
+              <div>{{ (pcslist.acAbCurrent * 1).toFixed(2) ?? "-" }} A</div>
             </div>
-          </div>
-          <!-- 6 -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">BC电流</div>
               <div>{{ (pcslist.acBcCurrent * 1).toFixed(2) ?? "-" }} A</div>
@@ -238,6 +264,9 @@
               <div class="equipment_title">CA电流</div>
               <div>{{ (pcslist.acCaCurrent * 1).toFixed(2) ?? "-" }} A</div>
             </div>
+          </div>
+          <!-- 6 -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">A相电压</div>
               <div>{{ (pcslist.acAphaseVolt * 1).toFixed(2) ?? "-" }} V</div>
@@ -246,9 +275,6 @@
               <div class="equipment_title">B相电压</div>
               <div>{{ (pcslist.acBphaseVolt * 1).toFixed(2) ?? "-" }} V</div>
             </div>
-          </div>
-          <!-- 7 -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">C相电压</div>
               <div>{{ (pcslist.acCphaseVolt * 1).toFixed(2) ?? "-" }} V</div>
@@ -256,7 +282,11 @@
             <div class="equipmentdata_div">
               <div class="equipment_title">A相电流</div>
               <div>{{ (pcslist.acAphaseCurrent * 1).toFixed(2) ?? "-" }} A</div>
+              <!-- <div>{{ (pcslist.acAbCurrent * 1).toFixed(2) ?? "-" }} A</div> -->
             </div>
+          </div>
+          <!-- 7 -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">B相电流</div>
               <div>{{ (pcslist.acBphaseCurrent * 1).toFixed(2) ?? "-" }} A</div>
@@ -265,9 +295,6 @@
               <div class="equipment_title">C相电流</div>
               <div>{{ (pcslist.acCphaseCurrent * 1).toFixed(2) ?? "-" }} A</div>
             </div>
-          </div>
-          <!-- 8 -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">PCS模块温度</div>
               <div>{{ pcslist.moduleTempr ?? "-" }} ℃</div>
@@ -276,6 +303,9 @@
               <div class="equipment_title">PCS环境温度</div>
               <div>{{ pcslist.envTempr ?? "-" }} ℃</div>
             </div>
+          </div>
+          <!-- 8 -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">PCS散热器温度</div>
               <div>{{ pcslist.radiatorTemp ?? "-" }} ℃</div>
@@ -284,9 +314,6 @@
               <div class="equipment_title">A1模块温度</div>
               <div>{{ pcslist.aphaseIgbtMaxTempr ?? "-" }} ℃</div>
             </div>
-          </div>
-          <!-- 9 -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">B1模块温度</div>
               <div>{{ pcslist.bphaseIgbtMaxTempr ?? "-" }} ℃</div>
@@ -295,6 +322,9 @@
               <div class="equipment_title">C1模块温度</div>
               <div>{{ pcslist.cphaseIgbtMaxTempr ?? "-" }} ℃</div>
             </div>
+          </div>
+          <!-- 9 -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">A2模块温度</div>
               <div>{{ pcslist.aphaseIgbtMinTempr ?? "-" }} ℃</div>
@@ -303,9 +333,6 @@
               <div class="equipment_title">B2模块温度</div>
               <div>{{ pcslist.bphaseIgbtMinTempr ?? "-" }} ℃</div>
             </div>
-          </div>
-          <!-- 10 -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">C2模块温度</div>
               <div>{{ pcslist.cphaseIgbtMaxTempr ?? "-" }} ℃</div>
@@ -314,6 +341,9 @@
               <div class="equipment_title">进风口温度</div>
               <div>{{ pcslist.airInletTemp ?? "-" }} ℃</div>
             </div>
+          </div>
+          <!-- 10 -->
+          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">出风口温度</div>
               <div>{{ pcslist.airOutletTemp ?? "-" }} ℃</div>
@@ -339,12 +369,12 @@
             <el-table-column prop="dcCurrent" label="直流电压(A)" align="center" />
           </el-table>
         </div>
-        <div class="equipmentdiv" v-if="activeName == 1">
+        <div class="equipmentdiv" v-if="deviceType == 2">
           <div class="equipmenttime">末次数据时间：{{ datalist.ts }}</div>
           <div style="height: 33px"></div>
           <div>设备状态</div>
           <div class="equipmentdevice">
-            <el-card>
+            <!-- <el-card>
               <div class="equipmentdevice1">
                 <div class="equipmentname" v-if="datalist.emsCommStatus == 1">
                   <div class="equipmentborder"></div>
@@ -356,21 +386,34 @@
                 </div>
                 <div class="equipment2">运行状态</div>
               </div>
-            </el-card>
+            </el-card> -->
             <!-- <el-card>
               <div class="equipmentdevice1">
-                <div class="equipmentname" v-if="pcslist.faultStatus == 0">
+                <div class="equipmentname" v-if="pcslist.emsCommStatus == 0">
+                  <div class="equipmentborder"></div>
+                  <div class="equipment1">正常</div>
+                </div>
+                <div class="equipmentname" v-else>
+                  <div class="equipmentborderif"></div>
+                  <div class="equipment1red">故障</div>
+                </div>
+                <div class="equipment2">工作状态</div>
+              </div>
+            </el-card> -->
+            <el-card>
+              <div class="equipmentdevice1">
+                <div class="equipmentname" v-if="pcslist.emsCommStatus == 0">
                   <div class="equipmentborder"></div>
                   <div class="equipment1">正常</div>
                 </div>
                 <div class="equipmentname" v-else>
                   <div class="equipmentborderif"></div>
-                  <div class="equipment1">故障</div>
+                  <div class="equipment1red">故障</div>
                 </div>
                 <div class="equipment2">故障状态</div>
               </div>
             </el-card>
-            <el-card>
+            <!-- <el-card>
               <div class="equipmentdevice1">
                 <div class="equipmentname" v-if="pcslist.emsCommStatus == 'GOOD'">
                   <div class="equipmentborder"></div>
@@ -378,7 +421,7 @@
                 </div>
                 <div class="equipmentname" v-else>
                   <div class="equipmentborderif"></div>
-                  <div class="equipment1">失败</div>
+                  <div class="equipment1red">失败</div>
                 </div>
                 <div class="equipment2">与EMS通信</div>
               </div>
@@ -393,15 +436,15 @@
             </div>
             <div class="equipmentdata_div">
               <div class="equipment_title">无功功率</div>
-              <div>{{ datalist.totalReactivePower ?? "-" }} kvar</div>
+              <div>{{ datalist.totalReactivePower ?? "-" }} kW</div>
             </div>
             <div class="equipmentdata_div">
               <div class="equipment_title">视在功率</div>
-              <div>{{ datalist.totalApparentPower ?? "-" }} kVA</div>
+              <div>{{ datalist.aphaseApparentPower ?? "-" }} kW</div>
             </div>
             <div class="equipmentdata_div4">
               <div class="equipment_title">功率因数</div>
-              <div>{{ datalist.totalPowerFactor ?? "-" }}</div>
+              <div>{{ datalist.totalAcPowerFactor ?? "-" }}</div>
             </div>
           </div>
           <div class="equipmentdata_equipment">
@@ -442,20 +485,36 @@
 
           <!--  -->
         </div>
-        <div class="equipmentdiv" v-if="activeName == 2">
+        <div class="equipmentdiv" v-if="deviceType == 3">
           <div class="equipmenttime">末次数据时间：{{ BMSlist.ts }}</div>
           <div style="height: 33px"></div>
           <div>设备状态</div>
           <div class="equipmentdevice">
             <el-card>
               <div class="equipmentdevice1">
+                <div class="equipmentname" v-if="BMSlist.workStatus == 0">
+                  <div class="equipmentborder"></div>
+                  <div class="equipment1">空闲</div>
+                </div>
                 <div class="equipmentname" v-if="BMSlist.workStatus == 1">
                   <div class="equipmentborder"></div>
-                  <div class="equipment1">正常</div>
+                  <div class="equipment1">充电</div>
                 </div>
-                <div class="equipmentname" v-else>
+                <div class="equipmentname" v-if="BMSlist.workStatus == 2">
+                  <div class="equipmentborder"></div>
+                  <div class="equipment1">放电</div>
+                </div>
+                <div class="equipmentname" v-if="BMSlist.workStatus == 3">
+                  <div class="equipmentborder"></div>
+                  <div class="equipment1">充满</div>
+                </div>
+                <div class="equipmentname" v-if="BMSlist.workStatus == 4">
+                  <div class="equipmentborder"></div>
+                  <div class="equipment1">放空</div>
+                </div>
+                <div class="equipmentname" v-if="BMSlist.workStatus == 5">
                   <div class="equipmentborderif"></div>
-                  <div class="equipment1red">停止</div>
+                  <div class="equipment1red">故障</div>
                 </div>
                 <div class="equipment2">充放电状态</div>
               </div>
@@ -486,7 +545,7 @@
                 <div class="equipment2">与PCS通信</div>
               </div>
             </el-card> -->
-            <el-card>
+            <!-- <el-card>
               <div class="equipmentdevice1">
                 <div class="equipmentname" v-if="BMSlist.emsCommStatus == 'GOOD'">
                   <div class="equipmentborder"></div>
@@ -498,7 +557,7 @@
                 </div>
                 <div class="equipment2">与EMS通信</div>
               </div>
-            </el-card>
+            </el-card> -->
           </div>
 
           <div class="equipmentdata">设备数据</div>
@@ -587,7 +646,7 @@
           </div>
           <!--  -->
         </div>
-        <div class="equipmentdiv" v-if="activeName == 3">
+        <div class="equipmentdiv" v-if="deviceType == 4">
           <div class="equipmenttime">末次数据时间：{{ Conditionerdata.ts }}</div>
           <div style="height: 33px"></div>
           <div>设备状态</div>
@@ -602,7 +661,7 @@
                   <div class="equipmentborderif"></div>
                   <div class="equipment1red">停止</div>
                 </div>
-                <div class="equipment2">工作状态</div>
+                <div class="equipment2">运行状态</div>
               </div>
             </el-card>
             <!-- <el-card>
@@ -683,7 +742,7 @@
                 <div class="equipment2">排氢状态</div>
               </div>
             </el-card> -->
-            <el-card>
+            <!-- <el-card>
               <div class="equipmentdevice1">
                 <div class="equipmentname" v-if="Conditionerdata.emsCommStatus == 1">
                   <div class="equipmentborder"></div>
@@ -695,7 +754,7 @@
                 </div>
                 <div class="equipment2">与EMS通信</div>
               </div>
-            </el-card>
+            </el-card> -->
             <!-- <el-card>
               <div class="equipmentdevice1">
                 <div class="equipmentname" v-if="Conditionerdata.sysStatus == 1">
@@ -713,11 +772,11 @@
               <div class="equipmentdevice1">
                 <div class="equipmentname" v-if="Conditionerdata.alarmStatus == 1">
                   <div class="equipmentborder"></div>
-                  <div class="equipment1">-</div>
+                  <div class="equipment1">正常</div>
                 </div>
                 <div class="equipmentname" v-else>
                   <div class="equipmentborderif"></div>
-                  <div class="equipment1">-</div>
+                  <div class="equipment1red">故障</div>
                 </div>
                 <div class="equipment2">故障状态</div>
               </div>
@@ -888,10 +947,23 @@ const postemsDevice = async (value: any) => {
   } else {
     emsDeviceId.value = data[0].id;
   }
-  console.log(emsDeviceId.value);
+  for (let index = 0; index < data.length; index++) {
+    if (data[index].emsDeviceId.length > 20) {
+      data[index].emsDeviceId = data[index].emsDeviceId.substring(7);
+    }
+  }
 
   emsDevice.value = data;
   getstationrealtime();
+};
+const deviceList: Ref<Station.deviceList[]> = ref([]);
+const deviceType = ref(1);
+
+const getstationrealtime = async () => {
+  const { data } = await poststationdeviceList({ emsId: emsDeviceId.value }, Singlevalue.value);
+  if (data.length == 0) return;
+  deviceList.value = data;
+  deviceType.value = data[0].deviceType;
   handleClick();
   // 清除定时器的示例
   clearInterval(intervalID.value);
@@ -899,31 +971,31 @@ const postemsDevice = async (value: any) => {
     handleClick();
   }, 10000);
 };
-const deviceList: Ref<Station.deviceList[]> = ref([]);
-
-const getstationrealtime = async () => {
-  const { data } = await poststationdeviceList({ emsId: emsDeviceId.value }, Singlevalue.value);
-  deviceList.value = data.reverse();
-};
 const activeName = ref(0);
+const handletabs = (e: any) => {
+  activeName.value = e;
+  handleClick();
+};
 const handleClick = async () => {
+  deviceType.value = deviceList.value[activeName.value].deviceType;
   // clearInterval(intervalID.value);
-  if (activeName.value == 0) {
+  if (deviceList.value[activeName.value].deviceType == 1) {
     getpcsdata();
-  } else if (activeName.value == 1) {
+  } else if (deviceList.value[activeName.value].deviceType == 2) {
     // devicesClickid.value
     devicesClickid.value = deviceList.value[activeName.value].devices[0].id;
     Electricitymeter();
-  } else if (activeName.value == 2) {
+  } else if (deviceList.value[activeName.value].deviceType == 3) {
     BMSfieldCodeid.value = deviceList.value[activeName.value].devices[0].id;
 
     getBMSfieldCode();
     getBMSbatteryStackInfo();
-  } else if (activeName.value == 3) {
+  } else if (deviceList.value[activeName.value].deviceType == 4) {
     airConditionerInfoid.value = deviceList.value[activeName.value].devices[0].id;
     getgetairConditionerInfo();
   }
 };
+//
 const devicesClickindex = ref(0);
 const devicesClickid = ref("1");
 const devicesClick = async (val: number, id: string) => {
@@ -942,7 +1014,6 @@ const getpcsdata = async () => {
   pcslist.value = data;
 };
 // 电表
-
 const Electricitymeterlist = ref();
 const datalist = ref();
 const Electricitymeter = async () => {

src/views/overview/index.vue

@@ -326,9 +326,7 @@
     </el-dialog>
   </div>
 </template>
-<!-- 收益统计 
-                        
-充放电统计 -->
+<!--    -->
 <script setup lang="ts">
 import { onMounted, Ref, ref } from "vue";
 import type { TabsPaneContext } from "element-plus";

src/views/powerStation/addition.vue

@@ -18,7 +18,14 @@
                 />
               </el-form-item>
               <el-form-item label="绑定设备" prop="emsId" :rules="[{ required: true, message: '请选择绑定设备' }]">
-                <el-select v-model="numberValidateForm.emsId" placeholder="请选择绑定设备" size="large" style="width: 300px">
+                <el-select
+                  multiple
+                  v-model="selectemsId"
+                  placeholder="请选择绑定设备"
+                  size="large"
+                  style="width: 300px"
+                  @change="onselect"
+                >
                   <el-option v-for="item in equipmentdata" :key="item.eid" :label="item.emsDeviceId" :value="item.eid" />
                 </el-select>
               </el-form-item>
@@ -87,7 +94,7 @@
             <div class="elform">
               <el-form-item label="装机功率" prop="installedPower" :rules="[{ required: true, message: '请输入装机功率' }]">
                 <el-input
-                  v-model.number="numberValidateForm.installedPower"
+                  v-model="numberValidateForm.installedPower"
                   style="width: 300px"
                   size="large"
                   type="text"
@@ -231,10 +238,13 @@ const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
 };
 
 const submitForm = (formEl: FormInstance | undefined) => {
+  console.log(numberValidateForm.emsId);
+
   if (!formEl) return;
   formEl.validate(async valid => {
     if (valid) {
       if (route.query.type == "电站新增") {
+        // numberValidateForm.emsId;
         const { data } = await insertpowerURL(numberValidateForm);
         console.log(data);
       } else {
@@ -248,7 +258,10 @@ const submitForm = (formEl: FormInstance | undefined) => {
     }
   });
 };
-
+const selectemsId = ref([]);
+const onselect = () => {
+  numberValidateForm.emsId = selectemsId.value.join();
+};
 const resetForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   formEl.resetFields();

src/views/powerStation/index.vue

@@ -4,10 +4,12 @@
       电站管理
       <div class="title_time">{{ currentDate }}</div>
     </div>
-
+    <!--  -->
     <el-card>
       <div class="selectsite">
-        <el-button type="primary" size="large" color="#0052d9" @click="newaddition">新增</el-button>
+        <el-button v-if="BUTTONS.powerStationadd" type="primary" size="large" color="#0052d9" @click="newaddition">
+          新增
+        </el-button>
         <div class="selectsite_right">
           <div class="tabpane_1">电站状态：</div>
           <el-select v-model="Singlevalue" placeholder="Select" size="large" style="width: 240px" @change="postemsDevice">
@@ -39,7 +41,7 @@
         <el-table-column label="操作">
           <template #default="scope">
             <el-button @click="details(scope.row)">查看</el-button>
-            <el-button type="primary" color="#0052d9" @click="newition(scope.row)">编辑</el-button>
+            <!-- <el-button type="primary" color="#0052d9" @click="newition(scope.row)">编辑</el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -124,6 +126,10 @@ import { onMounted, ref } from "vue";
 import { stationmanage } from "@/api/home/Multisite";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
 import { useRouter } from "vue-router";
+import { useAuthButtons } from "@/hooks/useAuthButtons";
+const { BUTTONS } = useAuthButtons();
+console.log(BUTTONS);
+
 const router = useRouter();
 
 const currentDate = ref();
@@ -214,15 +220,15 @@ const newaddition = () => {
   });
 };
 // 编辑
-const newition = (row: any) => {
-  router.push({
-    path: "/powerStation/addition",
-    query: {
-      type: "电站编辑", // 传递的参数
-      id: row.id
-    }
-  });
-};
+// const newition = (row: any) => {
+//   router.push({
+//     path: "/powerStation/addition",
+//     query: {
+//       type: "电站编辑", // 传递的参数
+//       id: row.id
+//     }
+//   });
+// };
 onMounted(() => {
   const current = localStorage.getItem("currentDate");
   if (current) {

src/views/system/index.vue

@@ -17,7 +17,7 @@
       <el-select
         v-model="emsDeviceId"
         collapse-tags
-        placeholder="选择电站"
+        placeholder="选择设备编号"
         popper-class="custom-header"
         :max-collapse-tags="1"
         style="width: 240px"