g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导入提示的当前行显示未初始

Browse Source
This commit is contained in:
2248356998 qq.com
2023-07-15 22:35:12 +08:00
parent fb51a08cc6
commit 05bd21bdd5
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ThingsGateway.Web.Foundation/Services/CollectDevice/CollectDeviceService.cs
View File

@@ -377,7 +377,6 @@ public class CollectDeviceService : DbRepository<CollectDevice>, ICollectDeviceS
Dictionary<string, ImportPreviewOutputBase> ImportPreviews = new();
//设备页
ImportPreviewOutput<CollectDevice> deviceImportPreview = new();
int row = 1;
foreach (var sheetName in sheetNames)
{
//单页数据
@@ -385,6 +384,7 @@ public class CollectDeviceService : DbRepository<CollectDevice>, ICollectDeviceS
#region 采集设备sheet
if (sheetName == ExportHelpers.CollectDeviceSheetName)
{
int row = 1;
ImportPreviewOutput<CollectDevice> importPreviewOutput = new();
ImportPreviews.Add(sheetName, importPreviewOutput);
deviceImportPreview = importPreviewOutput;
@@ -442,6 +442,7 @@ public class CollectDeviceService : DbRepository<CollectDevice>, ICollectDeviceS
#endregion
else
{
int row = 1;
ImportPreviewOutput<string> importPreviewOutput = new();
ImportPreviews.Add(sheetName, importPreviewOutput);
//插件属性需加上前置名称

3
src/ThingsGateway.Web.Foundation/Services/UploadDevice/UploadDeviceService.cs
View File

@@ -298,7 +298,6 @@ public class UploadDeviceService : DbRepository<UploadDevice>, IUploadDeviceServ
Dictionary<string, ImportPreviewOutputBase> ImportPreviews = new();
//设备页
ImportPreviewOutput<UploadDevice> deviceImportPreview = new();
int row = 1;
foreach (var sheetName in sheetNames)
{
//单页数据
@@ -306,6 +305,7 @@ public class UploadDeviceService : DbRepository<UploadDevice>, IUploadDeviceServ
#region 上传设备sheet
if (sheetName == ExportHelpers.UploadDeviceSheetName)
{
int row = 1;
ImportPreviewOutput<UploadDevice> importPreviewOutput = new();
ImportPreviews.Add(sheetName, importPreviewOutput);
deviceImportPreview = importPreviewOutput;
@@ -356,6 +356,7 @@ public class UploadDeviceService : DbRepository<UploadDevice>, IUploadDeviceServ
#endregion
else
{
int row = 1;
ImportPreviewOutput<string> importPreviewOutput = new();
ImportPreviews.Add(sheetName, importPreviewOutput);
//插件属性需加上前置名称

5
src/ThingsGateway.Web.Foundation/Services/Variable/VariableService.cs
View File

@@ -438,7 +438,6 @@ public class VariableService : DbRepository<DeviceVariable>, IVariableService
Dictionary<string, ImportPreviewOutputBase> ImportPreviews = new();
//设备页
ImportPreviewOutput<DeviceVariable> deviceImportPreview = new();
int row = 1;
foreach (var sheetName in sheetNames)
{
//单页数据
@@ -447,6 +446,7 @@ public class VariableService : DbRepository<DeviceVariable>, IVariableService
if (sheetName == ExportHelpers.DeviceVariableSheetName)
{
int row = 1;
ImportPreviewOutput<DeviceVariable> importPreviewOutput = new();
ImportPreviews.Add(sheetName, importPreviewOutput);
deviceImportPreview = importPreviewOutput;
@@ -512,7 +512,6 @@ public class VariableService : DbRepository<DeviceVariable>, IVariableService
Dictionary<string, ImportPreviewOutputBase> ImportPreviews = new();
//设备页
ImportPreviewOutput<DeviceVariable> deviceImportPreview = new();
int row = 1;
foreach (var sheetName in sheetNames)
{
//单页数据
@@ -521,6 +520,7 @@ public class VariableService : DbRepository<DeviceVariable>, IVariableService
if (sheetName == ExportHelpers.DeviceVariableSheetName)
{
int row = 1;
ImportPreviewOutput<DeviceVariable> importPreviewOutput = new();
ImportPreviews.Add(sheetName, importPreviewOutput);
deviceImportPreview = importPreviewOutput;
@@ -574,6 +574,7 @@ public class VariableService : DbRepository<DeviceVariable>, IVariableService
}
else
{
int row = 1;
ImportPreviewOutput<string> importPreviewOutput = new();
ImportPreviews.Add(sheetName, importPreviewOutput);