|
|
|
@ -109,13 +109,13 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon |
|
|
|
|
//UNION ALL |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//UNION ALL |
|
|
|
|
// SELECT NULL fnKeySeq, |
|
|
|
|
// 'DataSort' fnKey, |
|
|
|
|
// 'GHR_Common_000045' fnTitle, |
|
|
|
|
// 'table', |
|
|
|
|
// 'left', |
|
|
|
|
// 'ghr-data-sort' |
|
|
|
|
//UNION ALL |
|
|
|
|
// SELECT NULL fnKeySeq, |
|
|
|
|
// 'DataSort' fnKey, |
|
|
|
|
// 'GHR_Common_000045' fnTitle, |
|
|
|
|
// 'table', |
|
|
|
|
// 'left', |
|
|
|
|
// 'ghr-data-sort' |
|
|
|
|
|
|
|
|
|
#region 定义页面的操作按钮 |
|
|
|
|
string sql = @"SELECT fnKey,
|
|
|
|
@ -279,7 +279,8 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon |
|
|
|
|
if (toolbar != null) { toolbar.fnKey = "TBD1YN"; } |
|
|
|
|
toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault(); |
|
|
|
|
if (toolbar != null) { toolbar.fnKey = "TBD2YN"; } |
|
|
|
|
}else if (param.menuName == "F_ExamPaperDraft") |
|
|
|
|
} |
|
|
|
|
else if (param.menuName == "F_ExamPaperDraft") |
|
|
|
|
{ |
|
|
|
|
var toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); |
|
|
|
|
if (toolbar != null) { toolbar.fnKey = "TBD1YN"; } |
|
|
|
@ -319,7 +320,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon |
|
|
|
|
AND a.UserID = '{1}' |
|
|
|
|
AND a.IsEnable = 1 |
|
|
|
|
AND a.PageSettingQueryId = b.PageSettingQueryId";
|
|
|
|
|
sql = string.Format(sql, param.menuName, App.User.ID, param.langId); |
|
|
|
|
sql = string.Format(sql, param.menuName, App.User.ID, param.langId); |
|
|
|
|
int UserHasSetting = Db.Ado.GetInt(sql); |
|
|
|
|
if (UserHasSetting == 0) |
|
|
|
|
{ |
|
|
|
@ -1049,41 +1050,120 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon |
|
|
|
|
JArray TableColumn = new JArray(); |
|
|
|
|
JArray DT_TablePageInfoT1 = new JArray(); |
|
|
|
|
JArray DT_TableDataT1 = new JArray(); |
|
|
|
|
if (type == "Ghre_Course") |
|
|
|
|
JObject searchItem = new JObject(); |
|
|
|
|
JObject item; |
|
|
|
|
DataTable dt; |
|
|
|
|
string sql; |
|
|
|
|
switch (type) |
|
|
|
|
{ |
|
|
|
|
JObject searchItem = [ |
|
|
|
|
new JProperty("defaultHidden", true), |
|
|
|
|
case "Ghre_Course": |
|
|
|
|
searchItem = [ |
|
|
|
|
new JProperty("defaultHidden", true), |
|
|
|
|
new JProperty("field","value"), |
|
|
|
|
new JProperty("label","课程ID"), |
|
|
|
|
]; |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
searchItem = [ |
|
|
|
|
new JProperty("field","label"), |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
searchItem = [ |
|
|
|
|
new JProperty("field","label"), |
|
|
|
|
new JProperty("label","课程编号"), |
|
|
|
|
]; |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
|
|
|
|
|
string sql = "SELECT Id, CourseNo, CourseName FROM Ghre_Course"; |
|
|
|
|
DataTable dt = await Db.Ado.GetDataTableAsync(sql); |
|
|
|
|
sql = "SELECT Id, CourseNo, CourseName FROM Ghre_Course"; |
|
|
|
|
dt = await Db.Ado.GetDataTableAsync(sql); |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < dt.Rows.Count; i++) |
|
|
|
|
{ |
|
|
|
|
JObject item = [ |
|
|
|
|
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())), |
|
|
|
|
new JProperty("label",dt.Rows[i]["CourseNo"].ToString()+"-"+dt.Rows[i]["CourseName"].ToString()) |
|
|
|
|
]; |
|
|
|
|
DT_TableDataT1.Add(item); |
|
|
|
|
} |
|
|
|
|
for (int i = 0; i < dt.Rows.Count; i++) |
|
|
|
|
{ |
|
|
|
|
item = [ |
|
|
|
|
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())), |
|
|
|
|
new JProperty("label",dt.Rows[i]["CourseNo"].ToString()+"-"+dt.Rows[i]["CourseName"].ToString()) |
|
|
|
|
]; |
|
|
|
|
DT_TableDataT1.Add(item); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
item = [ |
|
|
|
|
new JProperty("ListMax",100), |
|
|
|
|
new JProperty("ListMin",10), |
|
|
|
|
new JProperty("PageNum",1), |
|
|
|
|
new JProperty("PageSize",99999), |
|
|
|
|
new JProperty("TotalCount",dt.Rows.Count), |
|
|
|
|
new JProperty("UIType","Auto") |
|
|
|
|
]; |
|
|
|
|
DT_TablePageInfoT1.Add(item); |
|
|
|
|
break; |
|
|
|
|
case "Ghre_CourseScene": |
|
|
|
|
searchItem = [ |
|
|
|
|
new JProperty("defaultHidden", true), |
|
|
|
|
new JProperty("field","value"), |
|
|
|
|
new JProperty("label","场景ID"), |
|
|
|
|
]; |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
searchItem = [ |
|
|
|
|
new JProperty("field","label"), |
|
|
|
|
new JProperty("label","场景"), |
|
|
|
|
]; |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
|
|
|
|
|
sql = "SELECT Id, SceneNo, SceneName FROM Ghre_CourseScene"; |
|
|
|
|
dt = await Db.Ado.GetDataTableAsync(sql); |
|
|
|
|
|
|
|
|
|
JObject item1 = [ |
|
|
|
|
for (int i = 0; i < dt.Rows.Count; i++) |
|
|
|
|
{ |
|
|
|
|
item = [ |
|
|
|
|
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())), |
|
|
|
|
new JProperty("label",dt.Rows[i]["SceneNo"].ToString()+"-"+dt.Rows[i]["SceneName"].ToString()) |
|
|
|
|
]; |
|
|
|
|
DT_TableDataT1.Add(item); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
item = [ |
|
|
|
|
new JProperty("ListMax",100), |
|
|
|
|
new JProperty("ListMin",10), |
|
|
|
|
new JProperty("PageNum",1), |
|
|
|
|
new JProperty("PageSize",99999), |
|
|
|
|
new JProperty("TotalCount",dt.Rows.Count), |
|
|
|
|
new JProperty("UIType","Auto") |
|
|
|
|
]; |
|
|
|
|
DT_TablePageInfoT1.Add(item1); |
|
|
|
|
]; |
|
|
|
|
DT_TablePageInfoT1.Add(item); |
|
|
|
|
break; |
|
|
|
|
case "ScoreMethod": |
|
|
|
|
searchItem = [ |
|
|
|
|
new JProperty("defaultHidden", true), |
|
|
|
|
new JProperty("field","value"), |
|
|
|
|
new JProperty("label","value"), |
|
|
|
|
]; |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
searchItem = [ |
|
|
|
|
new JProperty("field","label"), |
|
|
|
|
new JProperty("label","label"), |
|
|
|
|
]; |
|
|
|
|
TableColumn.Add(searchItem); |
|
|
|
|
|
|
|
|
|
sql = "SELECT Id, CourseNo, CourseName FROM Ghre_Course"; |
|
|
|
|
dt = await Db.Ado.GetDataTableAsync(sql); |
|
|
|
|
|
|
|
|
|
item = [ |
|
|
|
|
new JProperty("value","Manual"), |
|
|
|
|
new JProperty("label","人工评分") |
|
|
|
|
]; |
|
|
|
|
DT_TableDataT1.Add(item); |
|
|
|
|
item = [ |
|
|
|
|
new JProperty("value","System"), |
|
|
|
|
new JProperty("label","系统评分") |
|
|
|
|
]; |
|
|
|
|
DT_TableDataT1.Add(item); |
|
|
|
|
|
|
|
|
|
item = [ |
|
|
|
|
new JProperty("ListMax",100), |
|
|
|
|
new JProperty("ListMin",10), |
|
|
|
|
new JProperty("PageNum",1), |
|
|
|
|
new JProperty("PageSize",99999), |
|
|
|
|
new JProperty("TotalCount",dt.Rows.Count), |
|
|
|
|
new JProperty("UIType","Auto") |
|
|
|
|
]; |
|
|
|
|
DT_TablePageInfoT1.Add(item); |
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
result.JM_TableColumnT1.TableColumn = TableColumn; |
|
|
|
|
result.DT_TableDataT1 = DT_TableDataT1; |
|
|
|
|