diff --git a/FCL/BLL/Common/HttpHelper.cs b/FCL/BLL/Common/HttpHelper.cs
index ce7fd27..15c9871 100644
--- a/FCL/BLL/Common/HttpHelper.cs
+++ b/FCL/BLL/Common/HttpHelper.cs
@@ -15,12 +15,12 @@ namespace BLL.Common
///
///
///
- public static string HttpGetRequest(string url)
+ public static string HttpGetRequest(string url, string token ="")
{
string strGetResponse = string.Empty;
try
{
- var getRequest = CreateHttpRequest(url,"GET", "");
+ var getRequest = CreateHttpRequest(url,"GET", token);
var getResponse = getRequest.GetResponse() as HttpWebResponse;
strGetResponse = GetHttpResponse(getResponse, "GET");
}
diff --git a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
index c9da7d5..6128036 100644
--- a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
+++ b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
@@ -67,6 +67,9 @@
+
+
+
@@ -182,26 +185,55 @@
//用户评分事件
function renderRateUser(value, row) {
var evaltype = row.rowValue["IsEvaluateType"];
- return F.rateHtml(value, {
+ var html= F.rateHtml(value, {
+ allowClear:true,
readonly: evaltype == 1 ? true : false,
allowHalf: true,
textVisible: false
});
+ return html;
}
F.ready(function () {
var grid1 = F(grid1ClientID);
+ var control1 = '<%=this.hidMaxScore1.ClientID%>';
+ var control2 = '<%=this.hidMaxScore2.ClientID%>';
// 注册评分事件
F.rateEvents(grid1.el, function (event, value) {
var target = $(event.target);
var cellEl = target.closest('.f-grid-cell');
-
var rowId = grid1.getRowId(cellEl);
var columnId = grid1.getColumnId(cellEl);
+ var columnName = grid1.getColumn(columnId).columnId;
+ //获取控件值1（）
+ var maxScore1 = grid1.getItem(control1).value;
+ //获取控件值2（）
+ var maxScore2 = grid1.getItem(control2).value;
- //更新单元格的值
- grid1.updateCellValue(rowId, columnId, value);
+ if (columnName = "Score1" && value >= parseFloat(maxScore1)) {
+ F.alert("最大只能评" + maxScore1 + "分");
+ var html = F.rateHtml(0, {
+ allowClear: true,
+ allowHalf: true,
+ textVisible: false
+ });
+ grid1.getCellEl(rowId, columnId).html(html)
+ }
+ else if (columnName == "Score2" && value >= parseFloat(maxScore2)) {
+ F.alert("最大只能评" + maxScore2 + "分");
+ var html = F.rateHtml(0, {
+ allowClear: true,
+ allowHalf: true,
+ textVisible: false
+ });
+ grid1.getCellEl(rowId, columnId).html(html)
+ }
+ else {
+ //更新单元格的值
+ grid1.updateCellValue(rowId, columnId, value);
+ }
});
});
+