diff --git a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml index 66e59f4..e4b1515 100644 --- a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml +++ b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml @@ -398,7 +398,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '' + ''; } @@ -408,7 +408,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '' + ''; } diff --git a/SolarPower/Views/NoticeSchedule/Index.cshtml b/SolarPower/Views/NoticeSchedule/Index.cshtml index c58a73a..5f8f33c 100644 --- a/SolarPower/Views/NoticeSchedule/Index.cshtml +++ b/SolarPower/Views/NoticeSchedule/Index.cshtml @@ -502,7 +502,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '' + ''; } @@ -512,7 +512,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '' + ''; } diff --git a/SolarPower/Views/Operation/Index.cshtml b/SolarPower/Views/Operation/Index.cshtml index b3ae91c..8a3d197 100644 --- a/SolarPower/Views/Operation/Index.cshtml +++ b/SolarPower/Views/Operation/Index.cshtml @@ -297,7 +297,7 @@ "info": true, "autoWidth": false, "responsive": true, - "order": [[9, "desc"]], + "order": [[8, "desc"]], "columns": [{ "data": "planId" }, { diff --git a/SolarPower/Views/PowerGeneration/Index.cshtml b/SolarPower/Views/PowerGeneration/Index.cshtml index eb62c43..8ad6541 100644 --- a/SolarPower/Views/PowerGeneration/Index.cshtml +++ b/SolarPower/Views/PowerGeneration/Index.cshtml @@ -416,7 +416,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '' + ''; } @@ -426,7 +426,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '' + ''; } diff --git a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml index 6a9e475..6b24bfd 100644 --- a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml +++ b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml @@ -743,6 +743,9 @@ return data; } + }, + "error": function (xhr, error, thrown) { + console.log(xhr); } }); @@ -1624,7 +1627,6 @@ $("#generating_capacity_text").html(powerStationData.generatingCapacity); $("#escrow_name_text").html(powerStationData.escrowName); - $("#power_rate_text").html(powerStationData.powerRate); $("#coordinate_text").html(powerStationData.coordinate); $("#created_at_text").html(powerStationData.createdAt); $("#power_station_operation_personnel").val(powerStationData.operationPersonnelIds).trigger("change"); diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index 5a774c9..dee90d7 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -1731,17 +1731,16 @@ $("#city_name_text").html(powerStationData.cityName); $("#area_name_text").html(powerStationData.areaName); $("#address_detail_text").html(powerStationData.address); + $("#power_station_code_text").html(powerStationData.code); $("#power_station_name_text").html(powerStationData.name); - $("#electricity_meter_at_text").html(powerStationData.electricityMeterAt); - $("#estimated_recovery_time_text").html(powerStationData.estimatedRecoveryTime); - $("#created_by_text").html(powerStationData.creatorName); - - $("#generating_capacity_text").html(powerStationData.generatingCapacity); $("#escrow_name_text").html(powerStationData.escrowName); - $("#power_rate_text").html(powerStationData.powerRate); + $("#created_by_text").html(powerStationData.creatorName); + + $("#generating_capacity_text").html(powerStationData.generatingCapacity); + $("#estimated_recovery_time_text").html(powerStationData.estimatedRecoveryTime); + $("#coordinate_text").html(powerStationData.coordinate); - $("#created_at_text").html(powerStationData.createdAt); $("#power_station_operation_personnel").val(powerStationData.operationPersonnelIds).trigger("change"); $("#power_station_operation_personnel").attr("disabled", true); @@ -1749,6 +1748,7 @@ $("#estimate_kwh_text").html(powerStationData.estimate_kwh); $("#estimate_efficacy_text").html(powerStationData.estimateEfficacy); + $("#created_at_text").html(powerStationData.createdAt); @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformUser) { @@ -1785,16 +1785,23 @@ //#region 設定能源局與台電資料 function SetBoETPCInfo() { $("#link-boe-file").html(powerStationData.boEFileName).attr("href", powerStationData.boEFile); - $("#BoE_discount_rate_text").html(powerStationData.boEDiscountRate); + @*$("#BoE_discount_rate_text").html(powerStationData.boEDiscountRate);*@ + $("#BoE_register_post_at_text").html(powerStationData.boERegisterPostAt); $("#BoE_device_register_number_text").html(powerStationData.boEDeviceRegisterNumber); - $("#BoE_rent_ratio_text").html(powerStationData.boERentRatio); + @*$("#BoE_rent_ratio_text").html(powerStationData.boERentRatio);*@ $("#TPC_contract_number_text").html(powerStationData.tpcContractNumber); $("#TPC_contract_at_text").html(powerStationData.tpcContractAt); $("#TPC_sell_deadline_text").html(powerStationData.tpcSellDeadline); + $("#electricity_meter_at_text").html(powerStationData.electricityMeterAt); + $("#power_rate_text").html(powerStationData.powerRate); $("#TPC_meter_reading_text").html(powerStationData.tpcMeterReading); $("#TPC_purchase_electricity_at_text").html(powerStationData.tpcPurchaseElectricityAt); $("#TPC_sell_electricity_at_text").html(powerStationData.tpcSellElectricityAt); + $("#TPC_invoice_buyer_text").html(powerStationData.tpcInvoiceBuyer); + $("#GUI_number_text").html(powerStationData.guiNumber); + $("#TPC_invoice_address_text").html(powerStationData.tpcInvoiceAddress); + $("#TPC_meter_number_text").html(powerStationData.tpcMeterNumber); $("#BOE_TPC_created_by_text").html(powerStationData.creatorName); $("#BOE_TPC_created_at_text").html(powerStationData.createdAt); } @@ -1825,7 +1832,7 @@ var appendStr = ""; appendStr += '
' + - '
' + + '
' + '
土地房屋資料
' + '
'; @@ -1839,11 +1846,17 @@ '
' + '
' + '
' + + '' + + '
' + + '' + + '
' + + '
' + + @*'
' + '' + '
' + '' + '
' + - '
' + + '' +*@ '' + '
' + '
' + @@ -1852,34 +1865,29 @@ '' + '
' + '
' + - '
' + - '' + - '
' + - '' + - '
' + - '
' + + '' + '
' + '
' + - '' + + '' + '
' + '' + '
' + '
' + - '
' + + @*'
' + '' + '
' + '' + '
' + - '
' + + '
' +*@ '
' + '
' + - '
' + + @*'
' + '' + '
' + '' + '
' + - '
' + + '
' +*@ '
' + '
' + '
' + diff --git a/SolarPower/Views/StationOverview/_Info.cshtml b/SolarPower/Views/StationOverview/_Info.cshtml index adb867d..c8228d1 100644 --- a/SolarPower/Views/StationOverview/_Info.cshtml +++ b/SolarPower/Views/StationOverview/_Info.cshtml @@ -69,25 +69,44 @@
-
- +
- +
- +
- + +
+
+
+ +
+ +
+
+
+ +
+
-
- -
+
+ +
@@ -104,29 +123,14 @@
-
- -
- -
-
-
- -
- -
-
-
-
@@ -240,16 +253,30 @@
+ @*
+ +
+ +
+
+
+ +
+ +
+
*@
- +
- +
- +
- +
@@ -258,16 +285,36 @@
-
- +
+
- +
-
- +
+
- + +
+
+
+ +
+ +
+
+
+ +
+
diff --git a/SolarPower/Views/StationReport/Index.cshtml b/SolarPower/Views/StationReport/Index.cshtml index 33b94ed..6d9f426 100644 --- a/SolarPower/Views/StationReport/Index.cshtml +++ b/SolarPower/Views/StationReport/Index.cshtml @@ -614,7 +614,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '
' + ''; } @@ -624,7 +624,7 @@ '
' + '' + '
' + - '

' + inverter.powerStationName + '

' + + '
' + inverter.powerStationName + '
' + '
' + ''; }