@@ -300,21 +310,40 @@
let AQWTChart = null; // 瀹夊叏闂缁熻鏌辩姸鍥剧殑瀹炰綋
// 5鍒嗛挓鍒锋柊涓娆℃暟鎹
setInterval(function () {
- // 闂绫诲瀷缁熻
+ // 闂绫诲瀷缁熻
problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
// 鍔冲姟鏁版嵁缁熻
- serviceData($("#labour").val())
+ serviceData()
}, 300000)
$(document).ready(function () {
// 鍒濆鍖栧姵鍔℃暟鎹
- $("#labour").val(nowDate())
- serviceData(nowDate())
+ $("#labour_start").val(nowDate())
+ $("#labour_end").val(nowDate())
+ serviceData()
// 鍒囨崲鏃ユ湡鏃惰姹傛暟鎹
- $('#labour').on("change", function (e) {
- serviceData($("#labour").val())
+ $('#labour_start').on('change', function () {
+ let labour_start = $('#labour_start').val()
+ let labour_end = $('#labour_end').val()
+ if (new Date(labour_start).getTime() > new Date(labour_end)) {
+ alert("璇烽夋嫨灏忎簬" + labour_end + "鏃ユ湡")
+ $('#labour_start').val(labour_end)
+ }
+ serviceData()
+
})
+ $('#labour_end').on('change', function () {
+ let labour_start = $('#labour_start').val()
+ let labour_end = $('#labour_end').val()
+ if (new Date(labour_start).getTime() > new Date(labour_end)) {
+ $('#labour_start').val(nowDate())
+
+ alert("璇烽夋嫨澶т簬" + labour_start + "鏃ユ湡")
+ }
+ serviceData()
+ })
+
// 缁欏畨鍏ㄩ棶棰樼粺璁¤祴鍊
@@ -333,9 +362,8 @@
if (new Date(safe_start).getTime() > new Date(safe_end)) {
alert("璇烽夋嫨灏忎簬" + safe_end + "鏃ユ湡")
$('#safe_start').val(safe_end)
- } else {
- problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
}
+ problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
})
$('#safe_end').on('change', function () {
@@ -344,13 +372,41 @@
if (new Date(safe_start).getTime() > new Date(safe_end)) {
$('#safe_start').val(nowDate())
alert("璇烽夋嫨澶т簬" + safe_start + "鏃ユ湡")
- } else {
- problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
}
+ problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
})
createChinaMap()
})
+ // 璐ㄩ噺闂缁熻
+ function getQualityProblemStatistics() {
+ $.ajax({
+ url: "main3.aspx/GetQualityProblemStatistics",
+ type: "POST",
+ contentType: "application/json; charset=utf-8",
+ dataType: "json",
+ data: JSON.stringify({
+ startdate: startdate,
+ enddate: enddate
+ }),
+ success: function (data) {
+ console.log(data)
+ let d = data.d
+ $("#all").text(d.AllCount)
+ $("#done").text(d.DoneCount)
+ $("#undone").text(d.UnDoneCount)
+ let tits = []
+ let vals = []
+ d.CheckList.map(e => {
+ tits.push(e.type)
+ vals.push(e.count)
+ })
+
+ initAQWTap('aqtj', tits, vals)
+
+ }
+ })
+ }
// 瀹夊叏闂缁熻
function problemTypeStatistics(startdate, enddate) {
$.ajax({
@@ -375,21 +431,24 @@
tits.push(e.type)
vals.push(e.count)
})
-
+
initAQWTap('aqtj', tits, vals)
}
})
}
// 璇锋眰鍔冲姟鏁版嵁
- function serviceData(date) {
+ function serviceData() {
+ let labour_start = $('#labour_start').val()
+ let labour_end = $('#labour_end').val()
$.ajax({
url: "main3.aspx/GetServiceData",
type: "POST",
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
- date: date
+ startdate: labour_start,
+ enddate: labour_end
}),
success: function (data) {
console.log(data)
@@ -423,8 +482,9 @@
var option = {
grid: {
containLabel: true,
+ top: 30,
left: 0,
- bottom: resetSize(10),
+ height: 180,
},
xAxis: {
@@ -435,8 +495,8 @@
rotate: -25,
interval: 0,
textStyle: {
- fontSize: 14,
- color: '#84D7FE'
+ fontSize: 12,
+ color: '#FFFFFF'
}
}
},
@@ -480,7 +540,7 @@
right: '0',
bottom: 0,
start: 0,//婊氬姩鏉＄殑璧峰浣嶇疆
- end: 50, //婊氬姩鏉＄殑鎴浣嶇疆锛堟寜姣斾緥鍒嗗壊浣犵殑鏌辩姸鍥緓杞撮暱搴︼級
+ end: 8/tit.length*100, //婊氬姩鏉＄殑鎴浣嶇疆锛堟寜姣斾緥鍒嗗壊浣犵殑鏌辩姸鍥緓杞撮暱搴︼級
fillerColor: '#6B7388', //婊戝潡鐨勯鑹
backgroundColor: '#2B3755', 聽// 婊戝潡杞ㄩ亾鐨勯鑹
borderColor: 'transparent', // 婊戝潡杞ㄩ亾杈规鐨勯鑹
@@ -523,9 +583,9 @@
$(".swiper-button-next").on("click", function () {
mySwiper.slideNext()
})
-
-
+
+
function initZLMap(el, val, tit = "") {
const gaugeData = [
@@ -629,7 +689,7 @@
var myChart = echarts.init(chartDom);
option && myChart.setOption(option);
}
-
+
function createChinaMap() {
var chinaData = JSON.parse('<%=ProjectInfo %>')
// 鍦板浘 鐐
diff --git a/SGGL/FineUIPro.Web/common/main3.aspx.cs b/SGGL/FineUIPro.Web/common/main3.aspx.cs
index a02630f..3e34905 100644
--- a/SGGL/FineUIPro.Web/common/main3.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main3.aspx.cs
@@ -82,12 +82,13 @@ namespace FineUIPro.Web.common
#region 鍔冲姟鏁版嵁
[WebMethod]
- public static Object GetServiceData(string date)
+ public static Object GetServiceData(string startdate, string enddate)
{
- DateTime mdate = Funs.GetNewDateTimeOrNow(date);
+ DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
+ DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
int m_count = Funs.DB.Project_ProjectUser.Count();
int job_count = (from x in Funs.DB.Meeting_ClassMeeting
- where x.ClassMeetingDate.Value.Year == mdate.Year && x.ClassMeetingDate.Value.Month == mdate.Month && x.ClassMeetingDate.Value.Day == mdate.Day
+ where x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
select new Model.MeetingItem
{
AttentPersonNum = x.AttentPersonNum ?? 0,
@@ -103,8 +104,23 @@ namespace FineUIPro.Web.common
}
#endregion
+ #region 璐ㄩ噺闂缁熻
+ [WebMethod]
+ public static Object GetQualityProblemStatistics(string startdate, string enddate)
+ {
+ DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
+ DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
+ List
list = (from x in Funs.DB.Inspect_InspectionItem
+ join i in Funs.DB.Inspect_Inspection on x.InspectionId equals i.InspectionId
+ where i.InspectType == "1" && x.CompileTime > startd && x.CompileTime < endd
+ select new Model.Inspect_InspectionItem()
+ ).ToList();
- #region
+ return null;
+ }
+ #endregion
+
+ #region 瀹夊叏闂缁熻
[WebMethod]
public static Object GetSafetyProblemStatistics( string startdate, string enddate)
{
@@ -135,16 +151,10 @@ namespace FineUIPro.Web.common
).Concat(
from i in Funs.DB.Inspect_Inspection
join itm in Funs.DB.Inspect_InspectionItem on i.InspectionId equals itm.InspectionId
- where i.ProblemTypeName != null && i.CreateTime > startd && i.CreateTime < endd
+ where i.ProblemTypeName != null && i.CreateTime > startd && i.CreateTime < endd && i.InspectType == "1"
group i by i.ProblemTypeName into g2
select new { type = g2.Key, count = g2.Count() }
-).Concat(
- from ins in Funs.DB.Inspect_Inspection
- join itm in Funs.DB.Inspect_InspectionItem on ins.InspectionId equals itm.InspectionId
- where ins.Place != null && ins.CreateTime > startd && ins.CreateTime < endd
- group ins by ins.Place into g3
- select new { type = g3.Key, count = g3.Count() }
)
.GroupBy(x => x.type)
.Select(g => new { type = g.Key, count = g.Sum(x => x.count) });
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx b/SGGL/FineUIPro.Web/common/mainProject.aspx
index f0ae325..73bcd6a 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx
@@ -178,7 +178,9 @@
@@ -186,8 +188,8 @@
-
浜
-
+
浜
+
瑙嗛鐩戞帶
@@ -573,28 +574,46 @@
// 闂绫诲瀷缁熻
problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
// 鍔冲姟鏁版嵁缁熻
- serviceData($("#labour").val())
+ serviceData()
}, 300000)
$(document).ready(function () {
let ProjectId = "<%= ProjectId%>"
- // 缁欏姵鍔℃暟鎹棩鏈熼夋嫨妗嗚祴褰撳ぉ鏃ユ湡
- $('#labour').val(nowDate());
- serviceData(nowDate())
+ // 鍒濆鍖栧姵鍔℃暟鎹
+ $("#labour_start").val(nowDate())
+ $("#labour_end").val(nowDate())
+ serviceData()
// 鍒囨崲鏃ユ湡鏃惰姹傛暟鎹
- $('#labour').on("change", function (e) {
- serviceData($(this).val())
+ $('#labour_start').on('change', function () {
+ let labour_start = $('#labour_start').val()
+ let labour_end = $('#labour_end').val()
+ if (new Date(labour_start).getTime() > new Date(labour_end)) {
+ alert("璇烽夋嫨灏忎簬" + labour_end + "鏃ユ湡")
+ $('#labour_start').val(labour_end)
+ }
+ serviceData()
+
})
-
+ $('#labour_end').on('change', function () {
+ let labour_start = $('#labour_start').val()
+ let labour_end = $('#labour_end').val()
+ if (new Date(labour_start).getTime() > new Date(labour_end)) {
+ $('#labour_start').val(nowDate())
+
+ alert("璇烽夋嫨澶т簬" + labour_start + "鏃ユ湡")
+ }
+ serviceData()
+ })
+
// 缁欏畨鍏ㄩ棶棰樼粺璁¤祴鍊
let date = new Date()
let year = date.getFullYear()
let month = date.getMonth() + 1
- $('#safe_start').val(`${year}-${month.toString().padStart(2, '0') }-01`);
- $('#safe_end').val(`${year}-${month.toString().padStart(2, '0')}-${new Date(year, month, 0).getDate() }`);
+ $('#safe_start').val(`${year}-${month.toString().padStart(2, '0')}-01`);
+ $('#safe_end').val(`${year}-${month.toString().padStart(2, '0')}-${new Date(year, month, 0).getDate()}`);
problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
-
+
$('#safe_start').on('change', function () {
let safe_start = $('#safe_start').val()
let safe_end = $('#safe_end').val()
@@ -604,7 +623,7 @@
} else {
problemTypeStatistics($('#safe_start').val(), $('#safe_end').val())
}
-
+
})
$('#safe_end').on('change', function () {
let safe_start = $('#safe_start').val()
@@ -638,8 +657,7 @@
data: JSON.stringify({
ProjectId: ProjectId,
startdate: startdate,
- enddate: enddate,
-
+ enddate: enddate
}),
success: function (data) {
console.log(data)
@@ -654,31 +672,22 @@
vals.push(e.count)
})
initAQWTap('lw-map', tits, vals)
- //if (d.CheckList.length > 0) {
- // d.CheckList.map(e => {
- // tits.push(e.type)
- // vals.push(e.count)
- // })
- // $("#lw-map").show()
- // $(".lw-map>p").hide()
- // initAQWTap('lw-map', tits, vals)
- //} else {
- // $("#lw-map").hide()
- // $(".lw-map>p").show()
- //}
-
+
}
})
}
// 璇锋眰鍔冲姟鏁版嵁
- function serviceData(date) {
+ function serviceData() {
+ let labour_start = $('#labour_start').val()
+ let labour_end = $('#labour_end').val()
$.ajax({
url: "mainProject.aspx/GetServiceData",
type: "POST",
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
- date: date,
+ startdate: labour_start,
+ enddate: labour_end,
ProjectId: ProjectId,
}),
success: function (data) {
@@ -702,9 +711,9 @@
var option = {
grid: {
containLabel: true,
+ top: 30,
left: 0,
- bottom: resetSize(10),
-
+ height: 220,
},
xAxis: {
type: 'category',
@@ -714,8 +723,8 @@
rotate: -25,
interval: 0,
textStyle: {
- fontSize: 14,
- color: '#84D7FE'
+ fontSize: 12,
+ color: '#FFFFFF'
}
}
},
@@ -735,7 +744,7 @@
},
series: [
{
- barWidth: resetSize(20),
+ barWidth: 20,
data: val,
type: 'bar',
label: {
@@ -759,7 +768,7 @@
right: '0',
bottom: 0,
start: 0,//婊氬姩鏉＄殑璧峰浣嶇疆
- end: 50, //婊氬姩鏉＄殑鎴浣嶇疆锛堟寜姣斾緥鍒嗗壊浣犵殑鏌辩姸鍥緓杞撮暱搴︼級
+ end: 8 / tit.length * 100, //婊氬姩鏉＄殑鎴浣嶇疆锛堟寜姣斾緥鍒嗗壊浣犵殑鏌辩姸鍥緓杞撮暱搴︼級
fillerColor: '#6B7388', //婊戝潡鐨勯鑹
backgroundColor: '#2B3755', 聽// 婊戝潡杞ㄩ亾鐨勯鑹
borderColor: 'transparent', // 婊戝潡杞ㄩ亾杈规鐨勯鑹
@@ -974,7 +983,7 @@
}
-
+
function resetSize(size, initWidth = 1920) {
let clientWidth = document.body.clientWidth
@@ -1021,8 +1030,8 @@
}, 'json');
}
- initVideo();
- runShowVideo();
+ //initVideo();
+ //runShowVideo();
var videoURL = '<%= VideoHost %>';
let more = document.getElementById('more')
@@ -1033,7 +1042,7 @@
//var password = $('#SimpleForm1_hfMonitorPW-inputEl').val();
console.log(videoURL);
debugger
- window.open(videoURL + "#/screen?username=" + '<%= VideoUserName %>' + "&password=" + '<%= VideoPassWord %>', '_blank');
+ ////////window.open(videoURL + "#/screen?username=" + '<%= VideoUserName %>' + "&password=" + '<%= VideoPassWord %>', '_blank');
}
else {
alert("鎮ㄦ病鏈夋潈闄愶紒");
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
index 21a373c..2a4414d 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
@@ -12,6 +12,7 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
using System.Web.Services;
namespace FineUIPro.Web.common
@@ -50,7 +51,7 @@ namespace FineUIPro.Web.common
this.ProjectId = this.CurrUser.LoginProjectId;
}
/// 鑾峰彇瀹夊叏浜哄伐鏃
- getPersonWorkTime();
+ //getPersonWorkTime();
///鍔冲姟缁熻
getSitePerson();
///椤圭洰姒傚喌
@@ -81,13 +82,14 @@ namespace FineUIPro.Web.common
#region 鑾峰彇椤圭洰鍔冲姟鏁版嵁
[WebMethod]
- public static Object GetServiceData(string ProjectId, string date)
+ public static Object GetServiceData(string ProjectId, string startdate, string enddate)
{
- DateTime mdate = Funs.GetNewDateTimeOrNow(date);
+ DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
+ DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
int m_count = Funs.DB.Project_ProjectUser.Count(x => x.ProjectId == ProjectId);
int job_count = (from x in Funs.DB.Meeting_ClassMeeting
- where x.ProjectId == ProjectId
- && x.ClassMeetingDate.Value.Year == mdate.Year && x.ClassMeetingDate.Value.Month == mdate.Month && x.ClassMeetingDate.Value.Day == mdate.Day
+ where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
+
select new Model.MeetingItem
{
AttentPersonNum = x.AttentPersonNum ?? 0,
@@ -130,12 +132,12 @@ namespace FineUIPro.Web.common
group hsse by hsse.RectifyName into g1
select new { type = g1.Key, count = g1.Count() }).Union((from i in Funs.DB.Inspect_Inspection
join itm in Funs.DB.Inspect_InspectionItem on i.InspectionId equals itm.InspectionId
- where i.ProblemTypeName != null && i.ProjectId == ProjectId && i.CreateTime > startd && i.CreateTime < endd
+ where i.ProblemTypeName != null && i.ProjectId == ProjectId && i.CreateTime > startd && i.CreateTime < endd && i.InspectType == "1"
group i by i.ProblemTypeName into g2
select new { type = g2.Key, count = g2.Count() })
.Union(from ins in Funs.DB.Inspect_Inspection
join itm in Funs.DB.Inspect_InspectionItem on ins.InspectionId equals itm.InspectionId
- where ins.Place != null && ins.ProjectId == ProjectId && ins.CreateTime > startd && ins.CreateTime < endd
+ where ins.Place != null && ins.ProjectId == ProjectId && ins.CreateTime > startd && ins.CreateTime < endd && ins.InspectType == "1"
group ins by ins.Place into g3
select new { type = g3.Key, count = g3.Count() })).ToList();
@@ -173,7 +175,6 @@ namespace FineUIPro.Web.common
///
private void getPersonWorkTime()
{
- //this.divSafeWorkTime.InnerHtml = "0000000000";
var monthReportB = from y in Funs.DB.Manager_MonthReportB
where y.ProjectId == this.CurrUser.LoginProjectId
orderby y.Months descending
@@ -245,90 +246,96 @@ namespace FineUIPro.Web.common
///
private void getSitePerson()
{
- int AllCount = 0;
- int MCount = 0;
- //var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
- DateTime dateValue = DateTime.Now.AddDays(-1);
- List getallin = new List();
- var getInMaxs = from x in Funs.DB.SitePerson_Person
- join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
- where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
- select new Model.PageDataPersonInOutItem
- {
- PersonId = x.PersonId,
- PostType = y.PostType,
- WorkPostId = x.WorkPostId,
- IdentityCard = x.IdentityCard
-
- };
- if (getInMaxs.Count() > 0)
- {
- getallin = getInMaxs.Distinct().ToList();
- }
- var AllInOut = (from x in Funs.DB.T_d_EmployInOutRecord
- join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard }
- where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
- select x.IDCardNo).Distinct();
- AllCount = AllInOut.Count();
- if (AllCount > 0)
+ try
{
+ int AllCount = 0;
+ int MCount = 0;
+ //var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
+ DateTime dateValue = DateTime.Now.AddDays(-1);
+ List getallin = new List();
+ var getInMaxs = from x in Funs.DB.SitePerson_Person
+ join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+ where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
+ select new Model.PageDataPersonInOutItem
+ {
+ PersonId = x.PersonId,
+ PostType = y.PostType,
+ WorkPostId = x.WorkPostId,
+ IdentityCard = x.IdentityCard
- HashSet idCardNoSet = new HashSet();
- foreach (string idCardNo in AllInOut)
+ };
+ if (getInMaxs.Count() > 0)
{
- idCardNoSet.Add(idCardNo);
+ getallin = getInMaxs.Distinct().ToList();
}
- foreach (var i in getallin)
+ var AllInOut = (from x in Funs.DB.T_d_EmployInOutRecord
+ join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard }
+ where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
+ select x.IDCardNo).Distinct();
+ AllCount = AllInOut.Count();
+ if (AllCount > 0)
{
- if (i.PostType == Const.PostType_1 && idCardNoSet.Contains(i.IdentityCard))
+
+ HashSet idCardNoSet = new HashSet();
+ foreach (string idCardNo in AllInOut)
{
- MCount++;
+ idCardNoSet.Add(idCardNo);
}
- }
-
-
- }
-
- WorkPostS = "[]";
- InPostCounts = "[]";
- InDutyCounts = "[]";
- List InPostCountList = new List();
- List InDutyCountList = new List();
- List worksList = new List();
- //if (this.CurrUser.UserId != Const.hfnbdId)
- //{
- var getPersons = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == this.ProjectId && x.IsUsed == true && x.InTime <= DateTime.Now
- && !x.OutTime.HasValue);
- if (getPersons.Count() > 0)
- {
- var getWorkIds = getPersons.Where(x => x.WorkPostId != null).Select(x => x.WorkPostId).Distinct();
- if (getWorkIds.Count() > 0)
- {
- foreach (var item in getWorkIds)
+ foreach (var i in getallin)
{
- worksList.Add(WorkPostService.getWorkPostNameById(item));
- int isPost = getPersons.Where(x => x.WorkPostId == item).Count();
- InPostCountList.Add(isPost);
- int inDuty = 0;
- if (getallin.Count() > 0)
+ if (i.PostType == Const.PostType_1 && idCardNoSet.Contains(i.IdentityCard))
{
- inDuty = getallin.Where(x => x.WorkPostId == item).Count();
+ MCount++;
+ }
+ }
+
+
+ }
+
+ WorkPostS = "[]";
+ InPostCounts = "[]";
+ InDutyCounts = "[]";
+ List InPostCountList = new List();
+ List InDutyCountList = new List();
+ List worksList = new List();
+ //if (this.CurrUser.UserId != Const.hfnbdId)
+ //{
+ var getPersons = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == this.ProjectId && x.IsUsed == true && x.InTime <= DateTime.Now
+ && !x.OutTime.HasValue);
+ if (getPersons.Count() > 0)
+ {
+ var getWorkIds = getPersons.Where(x => x.WorkPostId != null).Select(x => x.WorkPostId).Distinct();
+ if (getWorkIds.Count() > 0)
+ {
+ foreach (var item in getWorkIds)
+ {
+ worksList.Add(WorkPostService.getWorkPostNameById(item));
+ int isPost = getPersons.Where(x => x.WorkPostId == item).Count();
+ InPostCountList.Add(isPost);
+ int inDuty = 0;
+ if (getallin.Count() > 0)
+ {
+ inDuty = getallin.Where(x => x.WorkPostId == item).Count();
+ }
+ InDutyCountList.Add(inDuty);
}
- InDutyCountList.Add(inDuty);
}
}
- }
- else
- {
- worksList.Add(" ");
- InPostCountList.Add(0);
- InDutyCountList.Add(0);
- }
- //}
+ else
+ {
+ worksList.Add(" ");
+ InPostCountList.Add(0);
+ InDutyCountList.Add(0);
+ }
+ //}
- WorkPostS = JsonConvert.SerializeObject(worksList);
- InPostCounts = JsonConvert.SerializeObject(InPostCountList);
- InDutyCounts = JsonConvert.SerializeObject(InDutyCountList);
+ WorkPostS = JsonConvert.SerializeObject(worksList);
+ InPostCounts = JsonConvert.SerializeObject(InPostCountList);
+ InDutyCounts = JsonConvert.SerializeObject(InDutyCountList);
+ } catch (Exception ex)
+ {
+
+ }
}
#endregion
diff --git a/SGGL/FineUIPro.Web/res/css/mainindex.css b/SGGL/FineUIPro.Web/res/css/mainindex.css
index e18ce6f..3235a73 100644
--- a/SGGL/FineUIPro.Web/res/css/mainindex.css
+++ b/SGGL/FineUIPro.Web/res/css/mainindex.css
@@ -191,7 +191,8 @@ body::-webkit-scrollbar{
.t-aqtj{
width: 100%;
- height: 2.625rem;
+ height: 2.3rem;
+ margin-bottom: .25rem;
}
.t-xcsp {
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index d41e85c..e2fed88 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -74,6 +74,9 @@ namespace Model
partial void InsertBase_AccidentType(Base_AccidentType instance);
partial void UpdateBase_AccidentType(Base_AccidentType instance);
partial void DeleteBase_AccidentType(Base_AccidentType instance);
+ partial void InsertBase_AloneProject(Base_AloneProject instance);
+ partial void UpdateBase_AloneProject(Base_AloneProject instance);
+ partial void DeleteBase_AloneProject(Base_AloneProject instance);
partial void InsertBase_BranchTeamList(Base_BranchTeamList instance);
partial void UpdateBase_BranchTeamList(Base_BranchTeamList instance);
partial void DeleteBase_BranchTeamList(Base_BranchTeamList instance);
@@ -491,6 +494,66 @@ namespace Model
partial void InsertCheck_ViolationPerson(Check_ViolationPerson instance);
partial void UpdateCheck_ViolationPerson(Check_ViolationPerson instance);
partial void DeleteCheck_ViolationPerson(Check_ViolationPerson instance);
+ partial void InsertCl_b_AcceptanceResult(Cl_b_AcceptanceResult instance);
+ partial void UpdateCl_b_AcceptanceResult(Cl_b_AcceptanceResult instance);
+ partial void DeleteCl_b_AcceptanceResult(Cl_b_AcceptanceResult instance);
+ partial void InsertCl_b_area(Cl_b_area instance);
+ partial void UpdateCl_b_area(Cl_b_area instance);
+ partial void DeleteCl_b_area(Cl_b_area instance);
+ partial void InsertCl_b_DocumentType(Cl_b_DocumentType instance);
+ partial void UpdateCl_b_DocumentType(Cl_b_DocumentType instance);
+ partial void DeleteCl_b_DocumentType(Cl_b_DocumentType instance);
+ partial void InsertCl_b_Installation(Cl_b_Installation instance);
+ partial void UpdateCl_b_Installation(Cl_b_Installation instance);
+ partial void DeleteCl_b_Installation(Cl_b_Installation instance);
+ partial void InsertCL_B_Material(CL_B_Material instance);
+ partial void UpdateCL_B_Material(CL_B_Material instance);
+ partial void DeleteCL_B_Material(CL_B_Material instance);
+ partial void InsertCl_b_NDTRate(Cl_b_NDTRate instance);
+ partial void UpdateCl_b_NDTRate(Cl_b_NDTRate instance);
+ partial void DeleteCl_b_NDTRate(Cl_b_NDTRate instance);
+ partial void InsertCl_b_NDTType(Cl_b_NDTType instance);
+ partial void UpdateCl_b_NDTType(Cl_b_NDTType instance);
+ partial void DeleteCl_b_NDTType(Cl_b_NDTType instance);
+ partial void InsertCl_b_netcilent(Cl_b_netcilent instance);
+ partial void UpdateCl_b_netcilent(Cl_b_netcilent instance);
+ partial void DeleteCl_b_netcilent(Cl_b_netcilent instance);
+ partial void InsertCl_b_Properties(Cl_b_Properties instance);
+ partial void UpdateCl_b_Properties(Cl_b_Properties instance);
+ partial void DeleteCl_b_Properties(Cl_b_Properties instance);
+ partial void InsertCl_b_ReturnReason(Cl_b_ReturnReason instance);
+ partial void UpdateCl_b_ReturnReason(Cl_b_ReturnReason instance);
+ partial void DeleteCl_b_ReturnReason(Cl_b_ReturnReason instance);
+ partial void InsertCL_B_SingleLineM(CL_B_SingleLineM instance);
+ partial void UpdateCL_B_SingleLineM(CL_B_SingleLineM instance);
+ partial void DeleteCL_B_SingleLineM(CL_B_SingleLineM instance);
+ partial void InsertCL_B_SingleLineS(CL_B_SingleLineS instance);
+ partial void UpdateCL_B_SingleLineS(CL_B_SingleLineS instance);
+ partial void DeleteCL_B_SingleLineS(CL_B_SingleLineS instance);
+ partial void InsertCL_B_Speciality(CL_B_Speciality instance);
+ partial void UpdateCL_B_Speciality(CL_B_Speciality instance);
+ partial void DeleteCL_B_Speciality(CL_B_Speciality instance);
+ partial void InsertCl_b_Storehouse(Cl_b_Storehouse instance);
+ partial void UpdateCl_b_Storehouse(Cl_b_Storehouse instance);
+ partial void DeleteCl_b_Storehouse(Cl_b_Storehouse instance);
+ partial void InsertCl_b_SumType(Cl_b_SumType instance);
+ partial void UpdateCl_b_SumType(Cl_b_SumType instance);
+ partial void DeleteCl_b_SumType(Cl_b_SumType instance);
+ partial void InsertCl_b_SupplyChannel(Cl_b_SupplyChannel instance);
+ partial void UpdateCl_b_SupplyChannel(Cl_b_SupplyChannel instance);
+ partial void DeleteCl_b_SupplyChannel(Cl_b_SupplyChannel instance);
+ partial void InsertCl_b_TableOptions(Cl_b_TableOptions instance);
+ partial void UpdateCl_b_TableOptions(Cl_b_TableOptions instance);
+ partial void DeleteCl_b_TableOptions(Cl_b_TableOptions instance);
+ partial void InsertCl_b_Type(Cl_b_Type instance);
+ partial void UpdateCl_b_Type(Cl_b_Type instance);
+ partial void DeleteCl_b_Type(Cl_b_Type instance);
+ partial void InsertCl_b_unitapp(Cl_b_unitapp instance);
+ partial void UpdateCl_b_unitapp(Cl_b_unitapp instance);
+ partial void DeleteCl_b_unitapp(Cl_b_unitapp instance);
+ partial void InsertCl_file(Cl_file instance);
+ partial void UpdateCl_file(Cl_file instance);
+ partial void DeleteCl_file(Cl_file instance);
partial void InsertCL_MatchingM(CL_MatchingM instance);
partial void UpdateCL_MatchingM(CL_MatchingM instance);
partial void DeleteCL_MatchingM(CL_MatchingM instance);
@@ -509,6 +572,9 @@ namespace Model
partial void InsertCL_MSBFildS(CL_MSBFildS instance);
partial void UpdateCL_MSBFildS(CL_MSBFildS instance);
partial void DeleteCL_MSBFildS(CL_MSBFildS instance);
+ partial void InsertCl_Operationlog(Cl_Operationlog instance);
+ partial void UpdateCl_Operationlog(Cl_Operationlog instance);
+ partial void DeleteCl_Operationlog(Cl_Operationlog instance);
partial void InsertCL_PMaterialM(CL_PMaterialM instance);
partial void UpdateCL_PMaterialM(CL_PMaterialM instance);
partial void DeleteCL_PMaterialM(CL_PMaterialM instance);
@@ -527,6 +593,90 @@ namespace Model
partial void InsertCL_PMateriaSBS_bak(CL_PMateriaSBS_bak instance);
partial void UpdateCL_PMateriaSBS_bak(CL_PMateriaSBS_bak instance);
partial void DeleteCL_PMateriaSBS_bak(CL_PMateriaSBS_bak instance);
+ partial void InsertCL_T_AreaMaterialM(CL_T_AreaMaterialM instance);
+ partial void UpdateCL_T_AreaMaterialM(CL_T_AreaMaterialM instance);
+ partial void DeleteCL_T_AreaMaterialM(CL_T_AreaMaterialM instance);
+ partial void InsertCL_T_AreaMaterialS(CL_T_AreaMaterialS instance);
+ partial void UpdateCL_T_AreaMaterialS(CL_T_AreaMaterialS instance);
+ partial void DeleteCL_T_AreaMaterialS(CL_T_AreaMaterialS instance);
+ partial void InsertCL_T_Material(CL_T_Material instance);
+ partial void UpdateCL_T_Material(CL_T_Material instance);
+ partial void DeleteCL_T_Material(CL_T_Material instance);
+ partial void InsertCl_T_MaterialStorageS(Cl_T_MaterialStorageS instance);
+ partial void UpdateCl_T_MaterialStorageS(Cl_T_MaterialStorageS instance);
+ partial void DeleteCl_T_MaterialStorageS(Cl_T_MaterialStorageS instance);
+ partial void InsertCL_T_SumAreaMaterialM(CL_T_SumAreaMaterialM instance);
+ partial void UpdateCL_T_SumAreaMaterialM(CL_T_SumAreaMaterialM instance);
+ partial void DeleteCL_T_SumAreaMaterialM(CL_T_SumAreaMaterialM instance);
+ partial void InsertCL_T_SumAreaMaterialS(CL_T_SumAreaMaterialS instance);
+ partial void UpdateCL_T_SumAreaMaterialS(CL_T_SumAreaMaterialS instance);
+ partial void DeleteCL_T_SumAreaMaterialS(CL_T_SumAreaMaterialS instance);
+ partial void InsertCl_tongbu(Cl_tongbu instance);
+ partial void UpdateCl_tongbu(Cl_tongbu instance);
+ partial void DeleteCl_tongbu(Cl_tongbu instance);
+ partial void InsertCl_tongbu_p(Cl_tongbu_p instance);
+ partial void UpdateCl_tongbu_p(Cl_tongbu_p instance);
+ partial void DeleteCl_tongbu_p(Cl_tongbu_p instance);
+ partial void InsertCl_user_pass(Cl_user_pass instance);
+ partial void UpdateCl_user_pass(Cl_user_pass instance);
+ partial void DeleteCl_user_pass(Cl_user_pass instance);
+ partial void InsertCL_W_AreaMaterialS(CL_W_AreaMaterialS instance);
+ partial void UpdateCL_W_AreaMaterialS(CL_W_AreaMaterialS instance);
+ partial void DeleteCL_W_AreaMaterialS(CL_W_AreaMaterialS instance);
+ partial void InsertCl_w_comp(Cl_w_comp instance);
+ partial void UpdateCl_w_comp(Cl_w_comp instance);
+ partial void DeleteCl_w_comp(Cl_w_comp instance);
+ partial void InsertCl_W_MaterialOutM(Cl_W_MaterialOutM instance);
+ partial void UpdateCl_W_MaterialOutM(Cl_W_MaterialOutM instance);
+ partial void DeleteCl_W_MaterialOutM(Cl_W_MaterialOutM instance);
+ partial void InsertCl_W_MaterialOutS(Cl_W_MaterialOutS instance);
+ partial void UpdateCl_W_MaterialOutS(Cl_W_MaterialOutS instance);
+ partial void DeleteCl_W_MaterialOutS(Cl_W_MaterialOutS instance);
+ partial void InsertCl_W_MaterialPlanM(Cl_W_MaterialPlanM instance);
+ partial void UpdateCl_W_MaterialPlanM(Cl_W_MaterialPlanM instance);
+ partial void DeleteCl_W_MaterialPlanM(Cl_W_MaterialPlanM instance);
+ partial void InsertCl_W_MaterialPlanS(Cl_W_MaterialPlanS instance);
+ partial void UpdateCl_W_MaterialPlanS(Cl_W_MaterialPlanS instance);
+ partial void DeleteCl_W_MaterialPlanS(Cl_W_MaterialPlanS instance);
+ partial void InsertCl_W_MaterialReturnM(Cl_W_MaterialReturnM instance);
+ partial void UpdateCl_W_MaterialReturnM(Cl_W_MaterialReturnM instance);
+ partial void DeleteCl_W_MaterialReturnM(Cl_W_MaterialReturnM instance);
+ partial void InsertCl_W_MaterialReturnS(Cl_W_MaterialReturnS instance);
+ partial void UpdateCl_W_MaterialReturnS(Cl_W_MaterialReturnS instance);
+ partial void DeleteCl_W_MaterialReturnS(Cl_W_MaterialReturnS instance);
+ partial void InsertCl_W_MaterialStorageM(Cl_W_MaterialStorageM instance);
+ partial void UpdateCl_W_MaterialStorageM(Cl_W_MaterialStorageM instance);
+ partial void DeleteCl_W_MaterialStorageM(Cl_W_MaterialStorageM instance);
+ partial void InsertCl_W_MaterialStoragem_hj(Cl_W_MaterialStoragem_hj instance);
+ partial void UpdateCl_W_MaterialStoragem_hj(Cl_W_MaterialStoragem_hj instance);
+ partial void DeleteCl_W_MaterialStoragem_hj(Cl_W_MaterialStoragem_hj instance);
+ partial void InsertCl_W_MaterialStorageS(Cl_W_MaterialStorageS instance);
+ partial void UpdateCl_W_MaterialStorageS(Cl_W_MaterialStorageS instance);
+ partial void DeleteCl_W_MaterialStorageS(Cl_W_MaterialStorageS instance);
+ partial void InsertCl_W_MaterialStorageS_hj(Cl_W_MaterialStorageS_hj instance);
+ partial void UpdateCl_W_MaterialStorageS_hj(Cl_W_MaterialStorageS_hj instance);
+ partial void DeleteCl_W_MaterialStorageS_hj(Cl_W_MaterialStorageS_hj instance);
+ partial void InsertCl_W_PurchaseSheetm(Cl_W_PurchaseSheetm instance);
+ partial void UpdateCl_W_PurchaseSheetm(Cl_W_PurchaseSheetm instance);
+ partial void DeleteCl_W_PurchaseSheetm(Cl_W_PurchaseSheetm instance);
+ partial void InsertCl_W_PurchaseSheets(Cl_W_PurchaseSheets instance);
+ partial void UpdateCl_W_PurchaseSheets(Cl_W_PurchaseSheets instance);
+ partial void DeleteCl_W_PurchaseSheets(Cl_W_PurchaseSheets instance);
+ partial void InsertCl_W_SingleLineOutM(Cl_W_SingleLineOutM instance);
+ partial void UpdateCl_W_SingleLineOutM(Cl_W_SingleLineOutM instance);
+ partial void DeleteCl_W_SingleLineOutM(Cl_W_SingleLineOutM instance);
+ partial void InsertCl_W_SingleLineOutS(Cl_W_SingleLineOutS instance);
+ partial void UpdateCl_W_SingleLineOutS(Cl_W_SingleLineOutS instance);
+ partial void DeleteCl_W_SingleLineOutS(Cl_W_SingleLineOutS instance);
+ partial void InsertCl_W_SingleLineOutT(Cl_W_SingleLineOutT instance);
+ partial void UpdateCl_W_SingleLineOutT(Cl_W_SingleLineOutT instance);
+ partial void DeleteCl_W_SingleLineOutT(Cl_W_SingleLineOutT instance);
+ partial void InsertCL_W_StorageAccept(CL_W_StorageAccept instance);
+ partial void UpdateCL_W_StorageAccept(CL_W_StorageAccept instance);
+ partial void DeleteCL_W_StorageAccept(CL_W_StorageAccept instance);
+ partial void InsertCL_W_UIRecords(CL_W_UIRecords instance);
+ partial void UpdateCL_W_UIRecords(CL_W_UIRecords instance);
+ partial void DeleteCL_W_UIRecords(CL_W_UIRecords instance);
partial void InsertComprehensive_ContactList(Comprehensive_ContactList instance);
partial void UpdateComprehensive_ContactList(Comprehensive_ContactList instance);
partial void DeleteComprehensive_ContactList(Comprehensive_ContactList instance);
@@ -2312,6 +2462,9 @@ namespace Model
partial void InsertSys_AccessToken(Sys_AccessToken instance);
partial void UpdateSys_AccessToken(Sys_AccessToken instance);
partial void DeleteSys_AccessToken(Sys_AccessToken instance);
+ partial void InsertSys_admin(Sys_admin instance);
+ partial void UpdateSys_admin(Sys_admin instance);
+ partial void DeleteSys_admin(Sys_admin instance);
partial void InsertSys_ButtonPower(Sys_ButtonPower instance);
partial void UpdateSys_ButtonPower(Sys_ButtonPower instance);
partial void DeleteSys_ButtonPower(Sys_ButtonPower instance);
@@ -2339,6 +2492,15 @@ namespace Model
partial void InsertSys_FlowOperate(Sys_FlowOperate instance);
partial void UpdateSys_FlowOperate(Sys_FlowOperate instance);
partial void DeleteSys_FlowOperate(Sys_FlowOperate instance);
+ partial void InsertSYS_GROUP(SYS_GROUP instance);
+ partial void UpdateSYS_GROUP(SYS_GROUP instance);
+ partial void DeleteSYS_GROUP(SYS_GROUP instance);
+ partial void InsertSYS_GROUP_LC(SYS_GROUP_LC instance);
+ partial void UpdateSYS_GROUP_LC(SYS_GROUP_LC instance);
+ partial void DeleteSYS_GROUP_LC(SYS_GROUP_LC instance);
+ partial void InsertSYS_GROUP_USER(SYS_GROUP_USER instance);
+ partial void UpdateSYS_GROUP_USER(SYS_GROUP_USER instance);
+ partial void DeleteSYS_GROUP_USER(SYS_GROUP_USER instance);
partial void InsertSys_HttpLog(Sys_HttpLog instance);
partial void UpdateSys_HttpLog(Sys_HttpLog instance);
partial void DeleteSys_HttpLog(Sys_HttpLog instance);
@@ -2393,6 +2555,9 @@ namespace Model
partial void InsertSys_User(Sys_User instance);
partial void UpdateSys_User(Sys_User instance);
partial void DeleteSys_User(Sys_User instance);
+ partial void InsertSYS_UseRole(SYS_UseRole instance);
+ partial void UpdateSYS_UseRole(SYS_UseRole instance);
+ partial void DeleteSYS_UseRole(SYS_UseRole instance);
partial void InsertSys_UserRead(Sys_UserRead instance);
partial void UpdateSys_UserRead(Sys_UserRead instance);
partial void DeleteSys_UserRead(Sys_UserRead instance);
@@ -2851,6 +3016,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table Base_AloneProject
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Base_BranchTeamList
{
get
@@ -3963,6 +4136,166 @@ namespace Model
}
}
+ public System.Data.Linq.Table Cl_b_AcceptanceResult
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_area
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_DocumentType
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_Installation
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_B_Material
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_NDTRate
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_NDTType
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_netcilent
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_Properties
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_ReturnReason
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_B_SingleLineM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_B_SingleLineS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_B_Speciality
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_Storehouse
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_SumType
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_SupplyChannel
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_TableOptions
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_Type
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_b_unitapp
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_file
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table CL_MatchingM
{
get
@@ -4011,6 +4344,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table Cl_Operationlog
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table CL_PMaterialM
{
get
@@ -4059,6 +4400,230 @@ namespace Model
}
}
+ public System.Data.Linq.Table CL_T_AreaMaterialM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_T_AreaMaterialS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_T_Material
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_T_MaterialStorageS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_T_SumAreaMaterialM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_T_SumAreaMaterialS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_tongbu
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_tongbu_p
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_user_pass
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_W_AreaMaterialS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_w_comp
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialOutM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialOutS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialPlanM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialPlanS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialReturnM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialReturnS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialStorageM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialStoragem_hj
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialStorageS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_MaterialStorageS_hj
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_PurchaseSheetm
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_PurchaseSheets
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_SingleLineOutM
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_SingleLineOutS
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table Cl_W_SingleLineOutT
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_W_StorageAccept
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table CL_W_UIRecords
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Comprehensive_ContactList
{
get
@@ -8859,6 +9424,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table Sys_admin
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Sys_ButtonPower
{
get
@@ -8931,6 +9504,30 @@ namespace Model
}
}
+ public System.Data.Linq.Table SYS_GROUP
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table SYS_GROUP_LC
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
+ public System.Data.Linq.Table SYS_GROUP_USER
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Sys_HttpLog
{
get
@@ -9075,6 +9672,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table SYS_UseRole
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Sys_UserRead
{
get
@@ -9579,6 +10184,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table V_user_cl
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table View_ActionPlan_ManagerRule
{
get
@@ -18634,6 +19247,229 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.base_AloneProject")]
+ public partial class Base_AloneProject : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _APid;
+
+ private string _ProjectId;
+
+ private string _APcode;
+
+ private string _APname;
+
+ private System.Data.Linq.Binary _Last_modified;
+
+ private string _ISupload;
+
+ private EntityRef _Base_Project;
+
+ #region 鍙墿灞曟ф柟娉曞畾涔
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnAPidChanging(string value);
+ partial void OnAPidChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnAPcodeChanging(string value);
+ partial void OnAPcodeChanged();
+ partial void OnAPnameChanging(string value);
+ partial void OnAPnameChanged();
+ partial void OnLast_modifiedChanging(System.Data.Linq.Binary value);
+ partial void OnLast_modifiedChanged();
+ partial void OnISuploadChanging(string value);
+ partial void OnISuploadChanged();
+ #endregion
+
+ public Base_AloneProject()
+ {
+ this._Base_Project = default(EntityRef);
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_APid", DbType="Char(36) NOT NULL", CanBeNull=false, IsPrimaryKey=true, UpdateCheck=UpdateCheck.Never)]
+ public string APid
+ {
+ get
+ {
+ return this._APid;
+ }
+ set
+ {
+ if ((this._APid != value))
+ {
+ this.OnAPidChanging(value);
+ this.SendPropertyChanging();
+ this._APid = value;
+ this.SendPropertyChanged("APid");
+ this.OnAPidChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)", UpdateCheck=UpdateCheck.Never)]
+ public string ProjectId
+ {
+ get
+ {
+ return this._ProjectId;
+ }
+ set
+ {
+ if ((this._ProjectId != value))
+ {
+ if (this._Base_Project.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
+ this.OnProjectIdChanging(value);
+ this.SendPropertyChanging();
+ this._ProjectId = value;
+ this.SendPropertyChanged("ProjectId");
+ this.OnProjectIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_APcode", DbType="NVarChar(20)", UpdateCheck=UpdateCheck.Never)]
+ public string APcode
+ {
+ get
+ {
+ return this._APcode;
+ }
+ set
+ {
+ if ((this._APcode != value))
+ {
+ this.OnAPcodeChanging(value);
+ this.SendPropertyChanging();
+ this._APcode = value;
+ this.SendPropertyChanged("APcode");
+ this.OnAPcodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_APname", DbType="NVarChar(200)", UpdateCheck=UpdateCheck.Never)]
+ public string APname
+ {
+ get
+ {
+ return this._APname;
+ }
+ set
+ {
+ if ((this._APname != value))
+ {
+ this.OnAPnameChanging(value);
+ this.SendPropertyChanging();
+ this._APname = value;
+ this.SendPropertyChanged("APname");
+ this.OnAPnameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="last_modified", Storage="_Last_modified", AutoSync=AutoSync.Always, DbType="rowversion", CanBeNull=true, IsDbGenerated=true, IsVersion=true, UpdateCheck=UpdateCheck.Never)]
+ public System.Data.Linq.Binary Last_modified
+ {
+ get
+ {
+ return this._Last_modified;
+ }
+ set
+ {
+ if ((this._Last_modified != value))
+ {
+ this.OnLast_modifiedChanging(value);
+ this.SendPropertyChanging();
+ this._Last_modified = value;
+ this.SendPropertyChanged("Last_modified");
+ this.OnLast_modifiedChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ISupload", DbType="Char(1)", UpdateCheck=UpdateCheck.Never)]
+ public string ISupload
+ {
+ get
+ {
+ return this._ISupload;
+ }
+ set
+ {
+ if ((this._ISupload != value))
+ {
+ this.OnISuploadChanging(value);
+ this.SendPropertyChanging();
+ this._ISupload = value;
+ this.SendPropertyChanged("ISupload");
+ this.OnISuploadChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_BASE_ALO_REFERENCE_BASE_PRO", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+ public Base_Project Base_Project
+ {
+ get
+ {
+ return this._Base_Project.Entity;
+ }
+ set
+ {
+ Base_Project previousValue = this._Base_Project.Entity;
+ if (((previousValue != value)
+ || (this._Base_Project.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._Base_Project.Entity = null;
+ previousValue.Base_AloneProject.Remove(this);
+ }
+ this._Base_Project.Entity = value;
+ if ((value != null))
+ {
+ value.Base_AloneProject.Add(this);
+ this._ProjectId = value.ProjectId;
+ }
+ else
+ {
+ this._ProjectId = default(string);
+ }
+ this.SendPropertyChanged("Base_Project");
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_BranchTeamList")]
public partial class Base_BranchTeamList : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -28137,6 +28973,8 @@ namespace Model
private EntitySet _Administrative_DriverManager;
+ private EntitySet _Base_AloneProject;
+
private EntitySet _Base_Components;
private EntitySet _Base_Medium;
@@ -28209,6 +29047,24 @@ namespace Model
private EntitySet _Check_ViolationPerson;
+ private EntitySet _Cl_b_area;
+
+ private EntitySet _CL_B_Material;
+
+ private EntitySet _CL_B_Speciality;
+
+ private EntitySet _Cl_b_Storehouse;
+
+ private EntitySet _CL_T_AreaMaterialS;
+
+ private EntitySet _CL_T_AreaMaterialM;
+
+ private EntitySet _Cl_W_MaterialStorageS;
+
+ private EntitySet _Cl_W_MaterialOutM;
+
+ private EntitySet _Cl_W_MaterialStorageM;
+
private EntitySet _InformationProject_ConstructionStandardIdentify;
private EntitySet _Comprehensive_DataDistribution;
@@ -28817,6 +29673,7 @@ namespace Model
this._ActionPlan_ProjectManagerRule = new EntitySet(new Action(this.attach_ActionPlan_ProjectManagerRule), new Action(this.detach_ActionPlan_ProjectManagerRule));
this._Administrative_CarManager = new EntitySet(new Action(this.attach_Administrative_CarManager), new Action(this.detach_Administrative_CarManager));
this._Administrative_DriverManager = new EntitySet(new Action(this.attach_Administrative_DriverManager), new Action(this.detach_Administrative_DriverManager));
+ this._Base_AloneProject = new EntitySet(new Action(this.attach_Base_AloneProject), new Action(this.detach_Base_AloneProject));
this._Base_Components = new EntitySet(new Action(this.attach_Base_Components), new Action(this.detach_Base_Components));
this._Base_Medium = new EntitySet(new Action(this.attach_Base_Medium), new Action(this.detach_Base_Medium));
this._Base_PipingClass = new EntitySet(new Action(this.attach_Base_PipingClass), new Action(this.detach_Base_PipingClass));
@@ -28853,6 +29710,15 @@ namespace Model
this._Check_SupervisionNotice = new EntitySet(new Action(this.attach_Check_SupervisionNotice), new Action(this.detach_Check_SupervisionNotice));
this._Check_TechnicalContactList = new EntitySet(new Action(this.attach_Check_TechnicalContactList), new Action(this.detach_Check_TechnicalContactList));
this._Check_ViolationPerson = new EntitySet(new Action(this.attach_Check_ViolationPerson), new Action(this.detach_Check_ViolationPerson));
+ this._Cl_b_area = new EntitySet(new Action(this.attach_Cl_b_area), new Action(this.detach_Cl_b_area));
+ this._CL_B_Material = new EntitySet(new Action(this.attach_CL_B_Material), new Action(this.detach_CL_B_Material));
+ this._CL_B_Speciality = new EntitySet(new Action(this.attach_CL_B_Speciality), new Action(this.detach_CL_B_Speciality));
+ this._Cl_b_Storehouse = new EntitySet(new Action(this.attach_Cl_b_Storehouse), new Action(this.detach_Cl_b_Storehouse));
+ this._CL_T_AreaMaterialS = new EntitySet(new Action(this.attach_CL_T_AreaMaterialS), new Action(this.detach_CL_T_AreaMaterialS));
+ this._CL_T_AreaMaterialM = new EntitySet(new Action(this.attach_CL_T_AreaMaterialM), new Action(this.detach_CL_T_AreaMaterialM));
+ this._Cl_W_MaterialStorageS = new EntitySet(new Action(this.attach_Cl_W_MaterialStorageS), new Action(this.detach_Cl_W_MaterialStorageS));
+ this._Cl_W_MaterialOutM = new EntitySet(new Action(this.attach_Cl_W_MaterialOutM), new Action(this.detach_Cl_W_MaterialOutM));
+ this._Cl_W_MaterialStorageM = new EntitySet(new Action(this.attach_Cl_W_MaterialStorageM), new Action(this.detach_Cl_W_MaterialStorageM));
this._InformationProject_ConstructionStandardIdentify = new EntitySet(new Action(this.attach_InformationProject_ConstructionStandardIdentify), new Action(this.detach_InformationProject_ConstructionStandardIdentify));
this._Comprehensive_DataDistribution = new EntitySet(new Action(this.attach_Comprehensive_DataDistribution), new Action(this.detach_Comprehensive_DataDistribution));
this._Comprehensive_DataReceiving = new EntitySet(new Action(this.attach_Comprehensive_DataReceiving), new Action(this.detach_Comprehensive_DataReceiving));
@@ -30017,6 +30883,19 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_BASE_ALO_REFERENCE_BASE_PRO", Storage="_Base_AloneProject", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet Base_AloneProject
+ {
+ get
+ {
+ return this._Base_AloneProject;
+ }
+ set
+ {
+ this._Base_AloneProject.Assign(value);
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Components_Base_Project", Storage="_Base_Components", ThisKey="ProjectId", OtherKey="ProjeceId", DeleteRule="NO ACTION")]
public EntitySet Base_Components
{
@@ -30527,6 +31406,123 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_B_ARE_REFERENCE_BASE_PRO", Storage="_Cl_b_area", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet Cl_b_area
+ {
+ get
+ {
+ return this._Cl_b_area;
+ }
+ set
+ {
+ this._Cl_b_area.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_B_MAT_REFERENCE_BASE_PRO", Storage="_CL_B_Material", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet CL_B_Material
+ {
+ get
+ {
+ return this._CL_B_Material;
+ }
+ set
+ {
+ this._CL_B_Material.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_B_SPE_REFERENCE_BASE_PRO", Storage="_CL_B_Speciality", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet CL_B_Speciality
+ {
+ get
+ {
+ return this._CL_B_Speciality;
+ }
+ set
+ {
+ this._CL_B_Speciality.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_B_STO_REFERENCE_BASE_PRO", Storage="_Cl_b_Storehouse", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet Cl_b_Storehouse
+ {
+ get
+ {
+ return this._Cl_b_Storehouse;
+ }
+ set
+ {
+ this._Cl_b_Storehouse.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_T_ARE_3_BASE_PRO", Storage="_CL_T_AreaMaterialS", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet CL_T_AreaMaterialS
+ {
+ get
+ {
+ return this._CL_T_AreaMaterialS;
+ }
+ set
+ {
+ this._CL_T_AreaMaterialS.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_T_ARE_7_BASE_PRO", Storage="_CL_T_AreaMaterialM", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet CL_T_AreaMaterialM
+ {
+ get
+ {
+ return this._CL_T_AreaMaterialM;
+ }
+ set
+ {
+ this._CL_T_AreaMaterialM.Assign(value);
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_W_MAS_REFERENCE_BASE_PRO", Storage="_Cl_W_MaterialStorageS", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet