diff --git a/.vs/ExcelTool/v15/.suo b/.vs/ExcelTool/v15/.suo index 4c344ce..8054024 100644 Binary files a/.vs/ExcelTool/v15/.suo and b/.vs/ExcelTool/v15/.suo differ diff --git a/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-shm b/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-shm index b7b4965..937ac09 100644 Binary files a/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-shm and b/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal b/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal index 6456804..127b1e6 100644 Binary files a/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal and b/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal differ diff --git a/ExcelTool/ExcelHelper.cs b/ExcelTool/ExcelHelper.cs index 3a34e2a..06b433a 100644 --- a/ExcelTool/ExcelHelper.cs +++ b/ExcelTool/ExcelHelper.cs @@ -63,7 +63,7 @@ namespace ExcelTool { var row = sheet.GetRow(i); var tableExcelRow = new TableExcelRow(); - for (int j = 0; j <= row.LastCellNum; j++) + for (int j = 0; j < excelHeader.Count; j++) { var cellValue = row.GetCell(j); if (cellValue != null) diff --git a/ExcelTool/ExcelTool.csproj b/ExcelTool/ExcelTool.csproj index cc0d5da..c0f0255 100644 --- a/ExcelTool/ExcelTool.csproj +++ b/ExcelTool/ExcelTool.csproj @@ -64,7 +64,6 @@ - diff --git a/ExcelTool/bin/Debug/ExcelTool.exe b/ExcelTool/bin/Debug/ExcelTool.exe index b4da4d0..965ea5f 100644 Binary files a/ExcelTool/bin/Debug/ExcelTool.exe and b/ExcelTool/bin/Debug/ExcelTool.exe differ diff --git a/ExcelTool/bin/Debug/ExcelTool.pdb b/ExcelTool/bin/Debug/ExcelTool.pdb index 5980e77..4170af3 100644 Binary files a/ExcelTool/bin/Debug/ExcelTool.pdb and b/ExcelTool/bin/Debug/ExcelTool.pdb differ diff --git a/ExcelTool/bin/Debug/official_room.bytes b/ExcelTool/bin/Debug/official_room.bytes index e238f47..792e80f 100644 Binary files a/ExcelTool/bin/Debug/official_room.bytes and b/ExcelTool/bin/Debug/official_room.bytes differ diff --git a/ExcelTool/bin/Debug/official_room.csv b/ExcelTool/bin/Debug/official_room.csv index 7607b3c..1a59ec9 100644 --- a/ExcelTool/bin/Debug/official_room.csv +++ b/ExcelTool/bin/Debug/official_room.csv @@ -5,13 +5,13 @@ ""lon"":26.081825, ""name"":""刘齐衔故居"" }",0,100,0,1,"[-497.225,17.536,-107.682]","[0,0,0]" -2,TcjF8790673,101会议室,101会议室,101会议室,101会议室,"{[""path1"":"""",""path2"":""""]}",1002,"{ -""lat"":119.299236, -""lon"":26.081825, -""name"":""刘齐衔故居"" +2,TcjF8790673,101会议室,101会议室,东方万国D栋大会议室,东方万国D栋大会议室,可容纳20余人,"{[""path1"":"""",""path2"":""""]}",1002,"{ +""lat"":121.623633, +""lon"":31.255969, +""name"":""东方万国D栋"" }",0,100,0,1,"[-14243.48, 15.88, -3211.575]","[-14241.71,17.02,-3207.24]" 3,TcjF8790673,外滩广场 ,外滩广场,上海市重要的地标场所之一,看万国建筑,观美丽江景。,外滩是上海市上海重要的地标之一,它全长1.5公里,南起延安东路,北至苏州河上的外白渡桥,东面即黄浦江,西面是旧上海金融、外贸机构的集中地。外滩沿路坐拥二十多幢风格各异的历史建筑,有折衷主义的,也有文艺复兴式的,还有早期现代式的,故而被誉为“万国建筑博览群”。自上海开埠后,外滩就开始成为了上海乃至中国的金融及贸易中心[1],也被称为“东方华尔街”。,"{[""path1"":"""",""path2"":""""]}",1003,"{ ""lat"":121.492156, ""lon"":31.233462, ""name"":""外滩"" -}",1,100,0,1,"[-1632.7,-869,0]","[0,0,0]" +}",1,100,0,1,"[-1631.85,13.904,-888.18]","[-1490,0,-1370]" diff --git a/ExcelTool/obj/Debug/ExcelTool.exe b/ExcelTool/obj/Debug/ExcelTool.exe index b4da4d0..965ea5f 100644 Binary files a/ExcelTool/obj/Debug/ExcelTool.exe and b/ExcelTool/obj/Debug/ExcelTool.exe differ diff --git a/ExcelTool/obj/Debug/ExcelTool.pdb b/ExcelTool/obj/Debug/ExcelTool.pdb index 5980e77..4170af3 100644 Binary files a/ExcelTool/obj/Debug/ExcelTool.pdb and b/ExcelTool/obj/Debug/ExcelTool.pdb differ