hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 修改排序

Browse Source 
2. 拿掉電站 icon
This commit is contained in:
Kai 2021-09-01 16:27:20 +08:00
parent d939a0ebfd
commit 4a04e22ce2
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SolarPower/Repository/Implement/PowerStationRepository.cs
View File

@ -5192,6 +5192,8 @@ namespace SolarPower.Repository.Implement
{
sql += @" AND ps.Name LIKE CONCAT('%', @Filter, '%')";
}
sql += @" ORDER BY city.Priority";
result = (await conn.QueryAsync<PowerStationIdAndCity>(sql, new { Filter = filter })).ToList();
}
catch (Exception exception)
@ -5226,6 +5228,8 @@ namespace SolarPower.Repository.Implement
{
sql += @" AND ps.Name LIKE CONCAT('%', @Filter, '%')";
}
sql += @" ORDER BY city.Priority";
result = (await conn.QueryAsync<PowerStationIdAndCity>(sql, new { CompanyId = myUser.CompanyId, UserId = myUser.Id, Filter = filter })).ToList();
}
catch (Exception exception)

4
SolarPower/Views/AnalysisInverter/Index.cshtml
View File

@ -466,8 +466,8 @@
'<input type="checkbox" class="" name="selectedInverterLayer2[]" >' +
'</div>' +
'<a href="javascript:;" class="" data-toggle="collapse" data-target="#cp-' + index1 + '-' + index2 + ' > .card-body" aria-expanded="true">' +
'<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-down fs-xl ml-2"></i></h5></span>' +
'<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
'<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-down fs-xl ml-2"></i></h5></span>' +
'<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
'</a>' +
'</div>' +
'<div class="card-body p-0">' +

2
SolarPower/Views/AnalysisStationCombine/Index.cshtml
View File

@ -661,7 +661,7 @@
'<div class="">' +
'<input type="checkbox" class="mr-2" name="selectedPowerStationLayer2[]" value="' + powerStation.powerStationId + '" valueName ="' + powerStation.powerStationName + '">' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + powerStation.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + powerStation.powerStationName + '</h5>' +
'</div>' +
'</li>';
});

4
SolarPower/Views/AnalysisStationInfo/Index.cshtml
View File

@ -481,8 +481,8 @@
'<input type="checkbox" class="" name="selectedDeviceLayer2[]" >' +
'</div>' +
'<a href="javascript:;" class="" data-toggle="collapse" data-target="#cp-' + index1 + '-' + index2 + ' > .card-body" aria-expanded="true">' +
'<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-down fs-xl ml-2"></i></h5></span>' +
'<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
'<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-down fs-xl ml-2"></i></h5></span>' +
'<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
'</a>' +
'</div>' +
'<div class="card-body p-0">' +

4
SolarPower/Views/ElectricitySoldRecord/Index.cshtml
View File

@ -398,7 +398,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}
@ -408,7 +408,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}

4
SolarPower/Views/NoticeSchedule/Index.cshtml
View File

@ -502,7 +502,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}
@ -512,7 +512,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}

4
SolarPower/Views/PowerGeneration/Index.cshtml
View File

@ -420,7 +420,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}
@ -430,7 +430,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}

4
SolarPower/Views/StationReport/Index.cshtml
View File

@ -614,7 +614,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}
@ -624,7 +624,7 @@
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h5 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h5>' +
'<h5 class="font-weight-bold">' + inverter.powerStationName + '</h5>' +
'</div>' +
'</li>';
}