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

中国地图 世界地图 切换

This commit is contained in:
李超 2023-05-01 21:43:19 +08:00
parent c96a443c37
commit d80899aec8
6 changed files with 469 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -398,3 +398,195 @@ IP地址:::1
出错时间:04/30/2023 09:45:56
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Hazard.HazardListEdit.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Hazard\HazardListEdit.aspx.cs:行号 94
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:05/01/2023 19:16:03
出错文件:http://localhost:1295/HSSE/Hazard/HazardListEdit.aspx
IP地址:::1
出错时间:05/01/2023 19:16:03
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:51:05
出错时间:05/01/2023 20:51:05
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:51:11
出错时间:05/01/2023 20:51:11
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:51:13
出错时间:05/01/2023 20:51:13
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:53:07
出错时间:05/01/2023 20:53:07
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:54:58
出错时间:05/01/2023 20:54:58
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:55:26
出错时间:05/01/2023 20:55:26
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:57:16
出错时间:05/01/2023 20:57:16
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:57:26
出错时间:05/01/2023 20:57:26
错误信息开始=====>
错误类型:HttpException
错误信息:文件“/indexs.aspx”不存在。
错误堆栈:
在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
出错时间:05/01/2023 20:59:02
出错文件:http://localhost:1295/indexs.aspx
IP地址:::1
出错时间:05/01/2023 20:59:02
错误信息开始=====>
错误类型:JsonReaderException
错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0.
错误堆栈:
在 Newtonsoft.Json.JsonTextReader.ParseValue()
在 Newtonsoft.Json.JsonTextReader.Read()
在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter)
在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value)
在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96
出错时间:05/01/2023 20:59:45
出错时间:05/01/2023 20:59:45

2
SGGL/FineUIPro.Web/HSSE/Hazard/HazardListEdit.aspx
View File

@ -28,7 +28,7 @@
<f:TextBox ID="txtWorkArea" runat="server" Label="单位工程" MaxLength="500" ShowRedStar="true"
Required="true" FocusOnPageLoad="true" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpWorkArea" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpWorkArea_SelectedIndexChanged">
<f:DropDownList ID="drpWorkArea" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpWorkArea_SelectedIndexChanged" EnableMultiSelect="true" EnableCheckBoxSelect="true">
</f:DropDownList>
<f:Label ID="Label1" runat="server" Text="说明：检查区域可选择也可手动编辑。" CssClass="lab" MarginLeft="5px">
</f:Label>

24
SGGL/FineUIPro.Web/HSSE/Hazard/HazardListEdit.aspx.cs
View File

@ -140,6 +140,18 @@ namespace FineUIPro.Web.HSSE.Hazard
}
this.txtIdentificationDate.Text = string.Format("{0:yyyy-MM-dd}", hazardList.IdentificationDate);
this.txtWorkArea.Text = hazardList.WorkAreaName;
if (!string.IsNullOrEmpty(hazardList.WorkAreaName))
{
List<string> ids = new List<string>();
for (int i = 0; i < drpWorkArea.Items.Count; i++)
{
if (hazardList.WorkAreaName.Contains(drpWorkArea.Items[i].Text))
{
ids.Add(drpWorkArea.Items[i].Value);
}
}
drpWorkArea.SelectedValueArray=ids.ToArray();
}
this.txtContents.Text = HttpUtility.HtmlDecode(hazardList.Contents);
//this.HazardSortSetDataBind();
this.SelectedCheckedHazardItem();
@ -167,7 +179,8 @@ namespace FineUIPro.Web.HSSE.Hazard
private void InitDropDownList()
{
///区域下拉框
BLL.UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.ProjectId, true);
BLL.UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.ProjectId, false);
this.drpWorkArea.SelectedValueArray =new string []{ };
///编制人
BLL.UserService.InitUserDropDownList(this.drpCompileMan, this.ProjectId, false);
///控制责任人
@ -675,9 +688,14 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void drpWorkArea_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpWorkArea.SelectedValue != BLL.Const._Null)
if (this.drpWorkArea.SelectedValueArray != null && this.drpWorkArea.SelectedValueArray.Count() > 0)
{
this.txtWorkArea.Text = this.drpWorkArea.SelectedText;
string text = "";
foreach(var item in this.drpWorkArea.SelectedItemArray)
{
text += item.Text +",";
}
this.txtWorkArea.Text = text.TrimEnd(',');
}
else
{

255
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx
View File

File diff suppressed because one or more lines are too long

2
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.cs
View File

@ -85,7 +85,7 @@ namespace FineUIPro.Web.common
string unit_yz = ProjectService.getProjectUnitNameByUnitType(p.ProjectId, Const.ProjectUnitType_4);
string unit_JL = ProjectService.getProjectUnitNameByUnitType(p.ProjectId, Const.ProjectUnitType_3);
string unit_FB = ProjectService.getProjectUnitNameByUnitType(p.ProjectId, Const.ProjectUnitType_2);
projectData += "{name:'" + p.ShortName + "',value:[" + p.MapCoordinates + "],address:'" + p.ProjectAddress + "',id:'" + p.ProjectId + "',ownUnit:'" + unit_yz + "',jLUnit:'" + unit_JL + "',SGUnit:'" + unit_FB + "',ProjectMoney:'" + p.ProjectMoney.ToString() + "'},";
projectData += "{name:'" + p.ShortName + "',cityName:'"+p.City+"',value:[" + p.MapCoordinates + "],address:'" + p.ProjectAddress + "',id:'" + p.ProjectId + "',ownUnit:'" + unit_yz + "',jLUnit:'" + unit_JL + "',SGUnit:'" + unit_FB + "',ProjectMoney:'" + p.ProjectMoney.ToString() + "'},";
}
projectData = projectData.TrimEnd(',');
}

10
SGGL/Model/Model.cs
View File

@ -22,7 +22,7 @@ namespace Model
using System;
public partial class SGGLDB_CD : System.Data.Linq.DataContext
public partial class SGGLDB : System.Data.Linq.DataContext
{
private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();
@ -2389,25 +2389,25 @@ namespace Model
partial void DeleteZHGL_WorkHandoverDetail(ZHGL_WorkHandoverDetail instance);
#endregion
public SGGLDB_CD(string connection) :
public SGGLDB(string connection) :
base(connection, mappingSource)
{
OnCreated();
}
public SGGLDB_CD(System.Data.IDbConnection connection) :
public SGGLDB(System.Data.IDbConnection connection) :
base(connection, mappingSource)
{
OnCreated();
}
public SGGLDB_CD(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) :
public SGGLDB(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) :
base(connection, mappingSource)
{
OnCreated();
}
public SGGLDB_CD(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) :
public SGGLDB(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) :
base(connection, mappingSource)
{
OnCreated();