lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lpf:5c6ba467f25b0363c9d29cd3a720e8e7cba87852
Branches Tags
lpf:master
..
compare: lpf:2b1680c9bc71dfa68069fcd0fc5b2955bec64204
Branches Tags
lpf:master

No commits in common. "5c6ba467f25b0363c9d29cd3a720e8e7cba87852" and "2b1680c9bc71dfa68069fcd0fc5b2955bec64204" have entirely different histories.
5c6ba467f2 ... 2b1680c9bc

6 changed files with 3 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
View File

@ -174,8 +174,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId); var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId);
if (result != null) if (result != null)
{ {
result.ExchangeTime = null;
result.ExchangeTime2 = null;
result.IsBlacklist = false; result.IsBlacklist = false;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
BindGrid(); BindGrid();

2
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
View File

@ -723,8 +723,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId); var result = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == PersonId);
if (result != null) if (result != null)
{ {
result.ExchangeTime = null;
result.ExchangeTime2 = null;
result.IsBlacklist = true; result.IsBlacklist = true;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
BindGrid(); BindGrid();

8
SGGL/FineUIPro.Web/WorkBench.aspx
View File

@ -239,11 +239,6 @@
console.log(response.d) console.log(response.d)
console.log($('#divdbyj')) console.log($('#divdbyj'))
$('#divdbyj').html(response.d) $('#divdbyj').html(response.d)
setTimeout(function () {
getToDo(1);
}, 60000);
}, },
error: function (xhr, status, error) { error: function (xhr, status, error) {
console.log(error) console.log(error)
@ -286,9 +281,6 @@
} }
}) })
page(9, '.todo', 0) page(9, '.todo', 0)
page(40, '.project', 2) page(40, '.project', 2)
page(30, '.note', 1) page(30, '.note', 1)

0
SGGL/Microsoft.PowerShell_profile.ps1
View File

3
SGGL/WebAPI/Controllers/PersonController.cs
View File

@ -847,8 +847,7 @@ namespace WebAPI.Controllers
x.ExchangeTime, x.ExchangeTime,
x.ExchangeTime2, x.ExchangeTime2,
x.PhotoUrl, x.PhotoUrl,
x.IsUsed, x.IsUsed
Blacklist=x.IsBlacklist
}).Take(400).ToList(); }).Take(400).ToList();
} }
catch (Exception ex) catch (Exception ex)

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>