zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230229

Browse Source
This commit is contained in:
李超
2023-08-29 18:56:49 +08:00
parent 6b420b5bd8
commit 6c19bf6a3e
56 changed files with 2342 additions and 2166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/EduTrain/Task.aspx.cs
+5 -5
View File
@@ -39,11 +39,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Task.TaskId,Task.PlanId,Task.UserId,Task.TaskDate,(CASE Task.States WHEN '0' THEN '未响应' WHEN '1' THEN '已响应' WHEN '2' THEN '已完成' ELSE '' END) AS States,Plans.PlanName,Person.PersonName"
+ @" FROM dbo.Training_Task AS Task "
+ @" LEFT JOIN dbo.Training_Plan AS Plans ON Plans.PlanId=Task.PlanId"
+ @" LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = Task.UserId "
+ @" WHERE Task.ProjectId='" + this.CurrUser.LoginProjectId + "'";
string strSql = @"SELECT Task.TaskId,Task.PlanId,Task.UserId,Task.TaskDate,(CASE Task.States WHEN '0' THEN '未响应' WHEN '1' THEN '已响应' WHEN '2' THEN '已完成' ELSE '' END) AS States,Plans.PlanName,Person.PersonName
FROM dbo.Training_Task AS Task
LEFT JOIN dbo.Training_Plan AS Plans ON Plans.PlanId=Task.PlanId
LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = Task.UserId
WHERE Task.ProjectId='" + this.CurrUser.LoginProjectId + "'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
{
SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.cs
+10 -33
View File
@@ -96,39 +96,16 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// </summary>
private void BindGrid()
{
var task = BLL.TrainingTaskService.GetTaskById(this.TaskId);
if (task != null)
{
string strSql = @"SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.TrainingCode,Training.TrainingId,Training.TrainingName
,TrainingItem.TrainingItemId,TrainingItem.TrainingItemCode,TrainingItem.TrainingItemName
FROM Training_PlanItem AS PlanItem
LEFT JOIN Training_TrainingItem AS TrainingItem ON PlanItem.TrainingEduItemId =TrainingItem.TrainingItemId
LEFT JOIN Training_Training AS Training ON TrainingItem.TrainingId =Training.TrainingId
WHERE PlanItem.TrainingEduItemId is not null and PlanItem.PlanId=@PlanId
union all
SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.CompanyTrainingCode,Training.CompanyTrainingId,Training.CompanyTrainingName
,TrainingItem.CompanyTrainingItemId,TrainingItem.CompanyTrainingItemCode,TrainingItem.CompanyTrainingItemName
FROM Training_PlanItem AS PlanItem
LEFT JOIN Training_CompanyTrainingItem AS TrainingItem ON PlanItem.CompanyTrainingId =TrainingItem.CompanyTrainingId
LEFT JOIN Training_CompanyTraining AS Training ON TrainingItem.CompanyTrainingId =Training.CompanyTrainingId
WHERE PlanItem.CompanyTrainingId is not null and PlanItem.PlanId=@PlanId";
string strSql = @"select TrainingItemId,d.TrainingCode,c.TrainingId,d.TrainingName, b.[TrainingItemCode],b.[TrainingItemName],b.[AttachUrl], c.TrainingItemCode,c.TrainingItemName from
[dbo].[Training_Task] a
left join [dbo].[Training_TaskItem] b on a.[TaskId]=b.[TaskId]
left join Training_TrainingItem c on b.TrainingItemCode=c.TrainingItemCode
LEFT JOIN Training_Training AS d ON c.TrainingId =d.TrainingId
where b.[TaskId] = @TaskId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@PlanId", task.PlanId));
//var user = BLL.UserService.GetUserByUserId(task.UserId);
//if (user != null && !string.IsNullOrEmpty(user.InstallationId))
//{
// List<string> installs = Funs.GetStrListByStr(user.InstallationId, ',');
// if (installs.Count > 0)
// {
// int i = 0;
// foreach (var item in installs)
// {
// strSql += " AND (TrainingEduItem.InstallationIds LIKE @InstallationId" + i.ToString() + " OR TrainingEduItem.InstallationIds IS NULL)";
// listStr.Add(new SqlParameter("@InstallationId" + i.ToString(), item));
// i++;
// }
// }
//}
listStr.Add(new SqlParameter("@TaskId", this.TaskId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -136,7 +113,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
}
#endregion
SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx
+5 -4
View File
@@ -87,7 +87,7 @@
grid: {
left: '3%',
right: '4%',
bottom: '10%',
bottom: '15%',
containLabel: true
},
xAxis: [
@@ -104,7 +104,7 @@
],
series: series
};
debugger;
if (xAxis.length > 5) {
option.dataZoom = [{
type: 'slider',
@@ -114,7 +114,7 @@
height: '10',
backgroundColor: '#aed0ea',
fillerColor: '#107f8b',
bottom: '0%',
bottom: '10%',
zoomLock: true,
moveOnMouseWheel: true,
brushSelect: true,
@@ -127,6 +127,7 @@
}
rendChart(<%=legend%>,<%=xAxis%>,<%=series%>)
</script>
</html>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+1 -1
View File
@@ -739,7 +739,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
var unit = Funs.DB.Base_Unit.FirstOrDefault(x=>x.UnitId==unitId);
var pu = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.UnitId == unitId && x.ProjectId == projectId);
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/ShowQRImage.aspx?strValue={0}&urlName={1}&title={2}", System.Web.HttpUtility.UrlEncode("https://sgglapi.chengda.com/Home/PersonInfo#/pages/add_personnel/add_personnel?id=" + pu.ProjectUnitId), System.Web.HttpUtility.UrlEncode(unit.UnitName), System.Web.HttpUtility.UrlEncode(unit.UnitName), "查看 - "), "二维码查看", 360, 420));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/ShowQRImage.aspx?strValue={0}&urlName={1}&title={2}", System.Web.HttpUtility.UrlEncode("https://sgglapi.chengda.com/Home/P#/?id" + pu.ProjectUnitId), pu.ProjectUnitId, System.Web.HttpUtility.UrlEncode(unit.UnitName), "查看 - "), "二维码查看", 360, 420));
}
else