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

Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

Browse Source
This commit is contained in:
b110212000 2021-09-11 19:43:01 +08:00
commit 33737b7919
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SolarPower/Controllers/PowerStationController.cs
View File

@ -1470,7 +1470,7 @@ namespace SolarPower.Controllers
{
Exception.LowerLimit = null;
}
if (Exception.UpperLimit != -9999)
if (Exception.UpperLimit == -9999)
{
Exception.UpperLimit = null;
}

5
SolarPower/DBSchema/solar_power_schema.sql
View File

@ -2207,6 +2207,11 @@ ALTER TABLE `electricity_sold_record`
ALTER TABLE `user`
ADD COLUMN `Logo` VARCHAR(100) NULL DEFAULT NULL COMMENT '公司logo' COLLATE 'utf8mb4_unicode_ci' AFTER `Email`;
-- 修改 電站異常值設定 可允許null
ALTER TABLE `power_station_exception`
CHANGE COLUMN `UpperLimit` `UpperLimit` DECIMAL(10,2) NULL DEFAULT NULL COMMENT '上限值' AFTER `Type`,
CHANGE COLUMN `LowerLimit` `LowerLimit` DECIMAL(10,2) NULL DEFAULT NULL COMMENT '下限值' AFTER `UpperLimit`;
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

4
SolarPower/Views/PowerStation/_Exception.cshtml
View File

@ -54,11 +54,11 @@
</div>
<div class="form-group col-lg-6">
<label class="form-label" for="Exception_LowerLimit_modal">下限</label>
<input type="number" id="Exception_LowerLimit_modal" name="Exception_LowerLimit_modal" class="form-control">
<input type="text" id="Exception_LowerLimit_modal" name="Exception_LowerLimit_modal" oninput="value=value.replace(/[^\-?\d.]/g, '')" class="form-control">
</div>
<div class="form-group col-lg-6">
<label class="form-label" for="Exception_UpperLimit_modal">上限</label>
<input type="number" id="Exception_UpperLimit_modal" name="Exception_UpperLimit_modal" class="form-control">
<input type="text" id="Exception_UpperLimit_modal" name="Exception_UpperLimit_modal" oninput="value=value.replace(/[^\-?\d.]/g, '')" class="form-control">
</div>
</div>