diff --git a/src/api/business/inverter/index.ts b/src/api/business/inverter/index.ts
index 34a076e..3157c61 100644
--- a/src/api/business/inverter/index.ts
+++ b/src/api/business/inverter/index.ts
@@ -78,3 +78,14 @@ export const getAll = () => {
method: 'get'
});
};
+
+export const updateInverterBelong = (a: any, b: any) => {
+ return request({
+ url: '/business/inverter/updateProject',
+ method: 'PUT',
+ data: {
+ inverterId: a,
+ projectId: b
+ }
+ });
+};
diff --git a/src/api/business/inverter/types.ts b/src/api/business/inverter/types.ts
index 9ada457..857cd7c 100644
--- a/src/api/business/inverter/types.ts
+++ b/src/api/business/inverter/types.ts
@@ -164,7 +164,6 @@ export interface InverterVO {
* 质保结束时间
*/
updateshelfendtime: number;
-
}
export interface InverterForm extends BaseEntity {
@@ -333,177 +332,172 @@ export interface InverterForm extends BaseEntity {
* 质保结束时间
*/
updateshelfendtime?: number;
-
}
-
-export interface InverterQuery extends PageQuery {
-
- /**
- * 逆变器SN
- */
- sn?: string;
-
- /**
- * 项目id
- */
- projectId?: string | number;
-
- /**
- * 电站id
- */
- stationid?: string | number;
-
- /**
- * 电站名称
- */
- stationname?: string;
-
- /**
- * 业主id
- */
- userid?: string | number;
-
- /**
- * 装机容量
- */
- power?: string;
-
- /**
- * 装机容量单位
- */
- powerstr?: string;
-
- /**
- * 当日能量
- */
- etoday?: string;
-
- /**
- * 当日发电量原始值
- */
- etoday1?: string;
-
- /**
- * 当日能量单位
- */
- etodaystr?: string;
-
- /**
- * 总电量
- */
- etotal?: string;
-
- /**
- * 累计发电量原始值
- */
- etotal1?: string;
-
- /**
- * 总能量单位
- */
- etotalstr?: string;
-
- /**
- * 满发小时数
- */
- fullhour?: string;
-
- /**
- * 功率
- */
- pac?: string;
-
- /**
- * 功率单位
- */
- pacstr?: string;
-
- /**
- * 逆变器状态：
-1 = 在线
-2 = 离线
-3 = 报警
- */
- state?: number;
-
- /**
- * 更新时间
- */
- datatimestamp?: number;
-
- /**
- * 采集器SN
- */
- collectorsn?: string;
-
- /**
- * 逆变器类型
- */
- productmodel?: string;
-
- /**
- * 直流输入路数：值+1 = 实际路数
-如：值0 = 1路，值1 = 2路，值2 = 3路…
- */
- dcinputtype?: number;
-
- /**
- * 交流输出类：0 = 单相，其他 = 三相
- */
- acoutputtype?: number;
-
- /**
- * 逆变器系列
- */
- series?: string;
-
- /**
- * 逆变器名称
- */
- name?: string;
-
- /**
- * 电站地址
- */
- addr?: string;
-
- /**
- * 采集器状态
- */
- collectorstate?: number;
-
- /**
- * 逆变器离线状态：
-0 = 正常离线
-1 = 异常离线
- */
- stateexceptionflag?: number;
-
- /**
- * 累计满发小时数
- */
- totalfullhour?: string;
-
- /**
- * 逆变器电表类型，详见附录3
- */
- invertermetermodel?: number;
-
- /**
- * 创建时间
- */
- createdate?: number;
-
- /**
- * 质保结束时间
- */
- updateshelfendtime?: number;
-
- /**
- * 日期范围参数
- */
- params?: any;
+export interface HistoryInverterForm extends BaseEntity {
+ // 基础信息
+ id?: string | number;
+ sn?: string | number;
+ stationId?: string | number;
+ stationName?: string | number;
+ userId?: string | number;
+ collectorId?: string | number;
+ collectorName?: string | number;
+ collectorsn?: string | number;
+ currentState?: string | number;
+ // 能量信息
+ eToday?: string | number;
+ eTodayStr?: string | number;
+ eMonth?: string | number;
+ eMonthStr?: string | number;
+ eYear?: string | number;
+ eYearStr?: string | number;
+ eTotal?: string | number;
+ eTotalStr?: string | number;
+ // 功率信息
+ facStr?: string | number;
+ pac?: string | number;
+ pacStr?: string | number;
+ pacPec?: string | number;
+ fullHour?: string | number;
+ power?: string | number;
+ powerStr?: string | number;
+ // 交流信息
+ iAc1?: string | number;
+ iAc2?: string | number;
+ iAc3?: string | number;
+ uAc1?: string | number;
+ uAc2?: string | number;
+ uAc3?: string | number;
+ //直流参数
+ iPv1?: string | number;
+ iPv2?: string | number;
+ iPv3?: string | number;
+ iPv4?: string | number;
+ iPv32?: string | number;
+ uPv1?: string | number;
+ uPv2?: string | number;
+ uPv3?: string | number;
+ uPv4?: string | number;
+ uPv32?: string | number;
+ pow1?: string | number;
+ pow2?: string | number;
+ pow32?: string | number;
+ // 状态信息
+ state?: string | number;
+ dataTimestamp?: string | number;
+ inverterTemperature?: string | number;
+ nationalStandardstr?: string | number;
+ acOutputType?: string | number;
+ dcInputtype?: string | number;
+ powerFactor?: string | number;
+ //电池信息
+ batteryPower?: string | number;
+ batteryPowerStr?: string | number;
+ batteryPowerPec?: string | number;
+ batteryCapacitySoc?: string | number;
+ batteryHealthSoh?: string | number;
+ socDischargeSet?: string | number;
+ socChargingSet?: string | number;
+ batteryType?: string | number;
+ batteryVoltage?: string | number;
+ batteryVoltageStr?: string | number;
+ bstteryCurrent?: string | number;
+ bstteryCurrentStr?: string | number;
+ //电池能量信息
+ batteryTodayChargeEnergy?: string | number;
+ batteryTodayChargeEnergyStr?: string | number;
+ batteryMonthChargeEnergy?: string | number;
+ batteryMonthChargeEnergyStr?: string | number;
+ batteryYearChargeEnergy?: string | number;
+ batteryYearChargeEnergyStr?: string | number;
+ batteryTotalChargeEnergy?: string | number;
+ batteryTotalChargeEnergyStr?: string | number;
+ batteryTodayDischargeEnergy?: string | number;
+ batteryTodayDischargeEnergyStr?: string | number;
+ batteryMonthDischargeEnergy?: string | number;
+ batteryMonthDischargeEnergyStr?: string | number;
+ batteryYearDischargeEnergy?: string | number;
+ batteryYearDischargeEnergyStr?: string | number;
+ batteryTotalDischargeEnergy?: string | number;
+ batteryTotalDischargeEnergyStr?: string | number;
+ //电网信息
+ gridPurchasedTodayEnergy?: string | number;
+ gridPurchasedTodayEnergyStr?: string | number;
+ gridPurchasedMonthEnergy?: string | number;
+ gridPurchasedMonthEnergyStr?: string | number;
+ gridPurchasedYearEnergy?: string | number;
+ gridPurchasedYearEnergyStr?: string | number;
+ gridPurchasedTotalEnergy?: string | number;
+ gridPurchasedTotalEnergyStr?: string | number;
+ gridSellTodayEnergy?: string | number;
+ gridSellTodayEnergyStr?: string | number;
+ gridSellMonthEnergy?: string | number;
+ gridSellMonthEnergyStr?: string | number;
+ gridSellYearEnergy?: string | number;
+ gridSellYearEnergyStr?: string | number;
+ gridSellTotalEnergy?: string | number;
+ gridSellTotalEnergyStr?: string | number;
+ //负载信息
+ familyLoadPower?: string | number;
+ familyLoadPowerStr?: string | number;
+ bypassLoadPower?: string | number;
+ bypassLoadPowerStr?: string | number;
+ psum?: string | number;
+ psumStr?: string | number;
+ psumPec?: string | number;
+ homeLoadTodayEnergy?: string | number;
+ homeLoadTodayEnergyStr?: string | number;
+ homeLoadTotalEnergy?: string | number;
+ homeLoadTotalEnergyStr?: string | number;
+ //设备信息
+ model?: string | number;
+ type?: string | number;
+ name?: string | number;
+ inverterMeterModel?: string | number;
+ stateExceptionFlag?: string | number;
+ collectorState?: string | number;
+ collectorModel?: string | number;
+ warningInfoData?: string | number;
+ productModel?: string | number;
+ nationalStandards?: string | number;
+ version?: string | number;
+ //功率参数
+ reactivePower?: string | number;
+ reactivePowerStr?: string | number;
+ apparentPower?: string | number;
+ apparentPowerStr?: string | number;
+ dcPac?: string | number;
+ dcPacStr?: string | number;
+ //时间信息
+ updateShelfEndTime?: string | number;
+ //电表参数
+ iA?: string | number;
+ uA?: string | number;
+ aLookedPower?: string | number;
+ aReactivePower?: string | number;
+ aphasePowerFactor?: string | number;
+ averagePowerFactor?: string | number;
+ iB?: string | number;
+ uB?: string | number;
+ bLookedPower?: string | number;
+ bReactivePower?: string | number;
+ bphasePowerFactor?: string | number;
+ iC?: string | number;
+ uC?: string | number;
+ cLookedPower?: string | number;
+ cReactivePower?: string | number;
+ cphasePowerFactor?: string | number;
+ fac?: string | number;
+ psumMeter?: string | number;
+ // MPPT参数
+ mpptIpv1?: string | number;
+ mpptUpv1?: string | number;
+ //mppt电流电压2-19
+ mpptIpv20?: string | number;
+ mpptUpv20?: string | number;
+ dcInputTypeMppt?: string | number;
+ //其他信息
+ picName?: string | number;
+ batteryFailureInformation01?: string | number;
+ batteryFailureInformation02?: string | number;
}
-
-
-
diff --git a/src/views/business/inverter/index.vue b/src/views/business/inverter/index.vue
index 5391a25..ce0e786 100644
--- a/src/views/business/inverter/index.vue
+++ b/src/views/business/inverter/index.vue
@@ -7,42 +7,43 @@
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
@@ -152,10 +153,10 @@
+
-
@@ -168,14 +169,20 @@
-
-
-
-
-
-
-
-
+
+
+ 在线
+ 离线
+ 报警
+
+
@@ -190,17 +197,37 @@
-
-
-
-
-
-
-
+
+
+ 正常离线
+ 异常离线
+
+
-
+
+
+ 并网电站
+ 储能电站
+ AC Couple 电站
+ EPM电站(并网+电表)
+ 内置电表(并网+电表)
+ 外置电表(显示电表)
+ S5离网并机储能
+ S5并网并机储能
+ 并网+AC Couple 电站
+ 离网储能
+ S6并网并机储能
+
+
+
@@ -215,6 +242,9 @@
v-hasPermi="['business:inverter:edit']"
>
+
+
+
@@ -228,16 +258,16 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -374,7 +404,7 @@
-
+
@@ -388,7 +418,7 @@
prop="state"
>
-
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -625,10 +1172,19 @@