From 2674b389e6203a8b8d12aa51e900699962b7ab4c Mon Sep 17 00:00:00 2001
From: tiansf
Date: Fri, 5 Jul 2024 03:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/controller/Base.php | 2 +-
application/admin/controller/Estimate.php | 226 +-
.../admin/view/estimate/estimate_add.html | 205 +-
.../estimate/estimate_content_observe.html | 359 +
application/admin/view/estimate/index.html | 23 +-
application/route.php | 4 +-
vendor/.gitignore | 2 -
vendor/PHPExcel/PHPExcel.php | 1153 +++
vendor/PHPExcel/PHPExcel/Autoloader.php | 81 +
.../PHPExcel/CachedObjectStorage/APC.php | 290 +
.../CachedObjectStorage/CacheBase.php | 368 +
.../PHPExcel/CachedObjectStorage/DiscISAM.php | 208 +
.../PHPExcel/CachedObjectStorage/ICache.php | 103 +
.../PHPExcel/CachedObjectStorage/Igbinary.php | 149 +
.../PHPExcel/CachedObjectStorage/Memcache.php | 308 +
.../PHPExcel/CachedObjectStorage/Memory.php | 118 +
.../CachedObjectStorage/MemoryGZip.php | 133 +
.../CachedObjectStorage/MemorySerialized.php | 129 +
.../PHPExcel/CachedObjectStorage/PHPTemp.php | 200 +
.../PHPExcel/CachedObjectStorage/SQLite.php | 307 +
.../PHPExcel/CachedObjectStorage/SQLite3.php | 346 +
.../PHPExcel/CachedObjectStorage/Wincache.php | 289 +
.../PHPExcel/CachedObjectStorageFactory.php | 231 +
.../CalcEngine/CyclicReferenceStack.php | 94 +
.../PHPExcel/PHPExcel/CalcEngine/Logger.php | 151 +
vendor/PHPExcel/PHPExcel/Calculation.php | 4391 ++++++++++
.../PHPExcel/Calculation/Database.php | 676 ++
.../PHPExcel/Calculation/DateTime.php | 1553 ++++
.../PHPExcel/Calculation/Engineering.php | 2650 ++++++
.../PHPExcel/Calculation/Exception.php | 46 +
.../PHPExcel/Calculation/ExceptionHandler.php | 45 +
.../PHPExcel/Calculation/Financial.php | 2359 +++++
.../PHPExcel/Calculation/FormulaParser.php | 622 ++
.../PHPExcel/Calculation/FormulaToken.php | 176 +
.../PHPExcel/Calculation/Function.php | 148 +
.../PHPExcel/Calculation/Functions.php | 760 ++
.../PHPExcel/PHPExcel/Calculation/Logical.php | 285 +
.../PHPExcel/Calculation/LookupRef.php | 879 ++
.../PHPExcel/Calculation/MathTrig.php | 1459 ++++
.../PHPExcel/Calculation/Statistical.php | 3745 ++++++++
.../PHPExcel/Calculation/TextData.php | 651 ++
.../PHPExcel/Calculation/Token/Stack.php | 111 +
.../PHPExcel/Calculation/functionlist.txt | 351 +
vendor/PHPExcel/PHPExcel/Cell.php | 1032 +++
.../PHPExcel/Cell/AdvancedValueBinder.php | 187 +
vendor/PHPExcel/PHPExcel/Cell/DataType.php | 115 +
.../PHPExcel/PHPExcel/Cell/DataValidation.php | 492 ++
.../PHPExcel/Cell/DefaultValueBinder.php | 102 +
vendor/PHPExcel/PHPExcel/Cell/Hyperlink.php | 124 +
.../PHPExcel/PHPExcel/Cell/IValueBinder.php | 47 +
vendor/PHPExcel/PHPExcel/Chart.php | 680 ++
vendor/PHPExcel/PHPExcel/Chart/Axis.php | 561 ++
vendor/PHPExcel/PHPExcel/Chart/DataSeries.php | 390 +
.../PHPExcel/Chart/DataSeriesValues.php | 333 +
vendor/PHPExcel/PHPExcel/Chart/Exception.php | 46 +
vendor/PHPExcel/PHPExcel/Chart/GridLines.php | 472 +
vendor/PHPExcel/PHPExcel/Chart/Layout.php | 486 ++
vendor/PHPExcel/PHPExcel/Chart/Legend.php | 170 +
vendor/PHPExcel/PHPExcel/Chart/PlotArea.php | 126 +
vendor/PHPExcel/PHPExcel/Chart/Properties.php | 363 +
.../Chart/Renderer/PHP Charting Libraries.txt | 20 +
.../PHPExcel/Chart/Renderer/jpgraph.php | 883 ++
vendor/PHPExcel/PHPExcel/Chart/Title.php | 86 +
vendor/PHPExcel/PHPExcel/Comment.php | 338 +
.../PHPExcel/PHPExcel/DocumentProperties.php | 611 ++
vendor/PHPExcel/PHPExcel/DocumentSecurity.php | 222 +
vendor/PHPExcel/PHPExcel/Exception.php | 54 +
vendor/PHPExcel/PHPExcel/HashTable.php | 204 +
vendor/PHPExcel/PHPExcel/Helper/HTML.php | 808 ++
vendor/PHPExcel/PHPExcel/IComparable.php | 34 +
vendor/PHPExcel/PHPExcel/IOFactory.php | 289 +
vendor/PHPExcel/PHPExcel/NamedRange.php | 249 +
vendor/PHPExcel/PHPExcel/Reader/Abstract.php | 289 +
vendor/PHPExcel/PHPExcel/Reader/CSV.php | 406 +
.../PHPExcel/Reader/DefaultReadFilter.php | 51 +
.../PHPExcel/PHPExcel/Reader/Excel2003XML.php | 801 ++
vendor/PHPExcel/PHPExcel/Reader/Excel2007.php | 2051 +++++
.../PHPExcel/Reader/Excel2007/Chart.php | 520 ++
.../PHPExcel/Reader/Excel2007/Theme.php | 127 +
vendor/PHPExcel/PHPExcel/Reader/Excel5.php | 7594 +++++++++++++++++
.../PHPExcel/PHPExcel/Reader/Excel5/Color.php | 32 +
.../PHPExcel/Reader/Excel5/Color/BIFF5.php | 77 +
.../PHPExcel/Reader/Excel5/Color/BIFF8.php | 77 +
.../PHPExcel/Reader/Excel5/Color/BuiltIn.php | 31 +
.../PHPExcel/Reader/Excel5/ErrorCode.php | 28 +
.../PHPExcel/Reader/Excel5/Escher.php | 669 ++
.../PHPExcel/PHPExcel/Reader/Excel5/MD5.php | 203 +
.../PHPExcel/PHPExcel/Reader/Excel5/RC4.php | 81 +
.../PHPExcel/Reader/Excel5/Style/Border.php | 36 +
.../Reader/Excel5/Style/FillPattern.php | 41 +
vendor/PHPExcel/PHPExcel/Reader/Exception.php | 46 +
vendor/PHPExcel/PHPExcel/Reader/Gnumeric.php | 850 ++
vendor/PHPExcel/PHPExcel/Reader/HTML.php | 549 ++
.../PHPExcel/PHPExcel/Reader/IReadFilter.php | 39 +
vendor/PHPExcel/PHPExcel/Reader/IReader.php | 46 +
vendor/PHPExcel/PHPExcel/Reader/OOCalc.php | 696 ++
vendor/PHPExcel/PHPExcel/Reader/SYLK.php | 478 ++
vendor/PHPExcel/PHPExcel/ReferenceHelper.php | 913 ++
vendor/PHPExcel/PHPExcel/RichText.php | 191 +
.../PHPExcel/RichText/ITextElement.php | 56 +
vendor/PHPExcel/PHPExcel/RichText/Run.php | 98 +
.../PHPExcel/RichText/TextElement.php | 105 +
vendor/PHPExcel/PHPExcel/Settings.php | 389 +
vendor/PHPExcel/PHPExcel/Shared/CodePage.php | 156 +
vendor/PHPExcel/PHPExcel/Shared/Date.php | 418 +
vendor/PHPExcel/PHPExcel/Shared/Drawing.php | 270 +
vendor/PHPExcel/PHPExcel/Shared/Escher.php | 83 +
.../PHPExcel/Shared/Escher/DgContainer.php | 75 +
.../Escher/DgContainer/SpgrContainer.php | 102 +
.../DgContainer/SpgrContainer/SpContainer.php | 388 +
.../PHPExcel/Shared/Escher/DggContainer.php | 196 +
.../Escher/DggContainer/BstoreContainer.php | 57 +
.../DggContainer/BstoreContainer/BSE.php | 112 +
.../DggContainer/BstoreContainer/BSE/Blip.php | 83 +
vendor/PHPExcel/PHPExcel/Shared/Excel5.php | 298 +
vendor/PHPExcel/PHPExcel/Shared/File.php | 180 +
vendor/PHPExcel/PHPExcel/Shared/Font.php | 741 ++
.../PHPExcel/Shared/JAMA/CHANGELOG.TXT | 16 +
.../Shared/JAMA/CholeskyDecomposition.php | 148 +
.../Shared/JAMA/EigenvalueDecomposition.php | 864 ++
.../PHPExcel/Shared/JAMA/LUDecomposition.php | 257 +
.../PHPExcel/PHPExcel/Shared/JAMA/Matrix.php | 1159 +++
.../PHPExcel/Shared/JAMA/QRDecomposition.php | 235 +
.../JAMA/SingularValueDecomposition.php | 528 ++
.../PHPExcel/Shared/JAMA/utils/Error.php | 83 +
.../PHPExcel/Shared/JAMA/utils/Maths.php | 44 +
vendor/PHPExcel/PHPExcel/Shared/OLE.php | 526 ++
.../Shared/OLE/ChainedBlockStream.php | 206 +
vendor/PHPExcel/PHPExcel/Shared/OLE/PPS.php | 230 +
.../PHPExcel/PHPExcel/Shared/OLE/PPS/File.php | 74 +
.../PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php | 462 +
vendor/PHPExcel/PHPExcel/Shared/OLERead.php | 318 +
.../PHPExcel/Shared/PCLZip/gnu-lgpl.txt | 504 ++
.../PHPExcel/Shared/PCLZip/pclzip.lib.php | 5173 +++++++++++
.../PHPExcel/Shared/PCLZip/readme.txt | 421 +
.../PHPExcel/Shared/PasswordHasher.php | 67 +
vendor/PHPExcel/PHPExcel/Shared/String.php | 819 ++
vendor/PHPExcel/PHPExcel/Shared/TimeZone.php | 144 +
vendor/PHPExcel/PHPExcel/Shared/XMLWriter.php | 124 +
.../PHPExcel/PHPExcel/Shared/ZipArchive.php | 163 +
.../PHPExcel/Shared/ZipStreamWrapper.php | 200 +
.../PHPExcel/Shared/trend/bestFitClass.php | 425 +
.../Shared/trend/exponentialBestFitClass.php | 138 +
.../Shared/trend/linearBestFitClass.php | 102 +
.../Shared/trend/logarithmicBestFitClass.php | 110 +
.../Shared/trend/polynomialBestFitClass.php | 222 +
.../Shared/trend/powerBestFitClass.php | 138 +
.../PHPExcel/Shared/trend/trendClass.php | 147 +
vendor/PHPExcel/PHPExcel/Style.php | 644 ++
vendor/PHPExcel/PHPExcel/Style/Alignment.php | 464 +
vendor/PHPExcel/PHPExcel/Style/Border.php | 282 +
vendor/PHPExcel/PHPExcel/Style/Borders.php | 429 +
vendor/PHPExcel/PHPExcel/Style/Color.php | 443 +
.../PHPExcel/PHPExcel/Style/Conditional.php | 293 +
vendor/PHPExcel/PHPExcel/Style/Fill.php | 322 +
vendor/PHPExcel/PHPExcel/Style/Font.php | 543 ++
.../PHPExcel/PHPExcel/Style/NumberFormat.php | 751 ++
vendor/PHPExcel/PHPExcel/Style/Protection.php | 204 +
vendor/PHPExcel/PHPExcel/Style/Supervisor.php | 125 +
vendor/PHPExcel/PHPExcel/Worksheet.php | 2968 +++++++
.../PHPExcel/Worksheet/AutoFilter.php | 846 ++
.../PHPExcel/Worksheet/AutoFilter/Column.php | 405 +
.../Worksheet/AutoFilter/Column/Rule.php | 468 +
.../PHPExcel/Worksheet/BaseDrawing.php | 507 ++
.../PHPExcel/Worksheet/CellIterator.php | 88 +
vendor/PHPExcel/PHPExcel/Worksheet/Column.php | 86 +
.../PHPExcel/Worksheet/ColumnCellIterator.php | 216 +
.../PHPExcel/Worksheet/ColumnDimension.php | 132 +
.../PHPExcel/Worksheet/ColumnIterator.php | 201 +
.../PHPExcel/PHPExcel/Worksheet/Dimension.php | 178 +
.../PHPExcel/PHPExcel/Worksheet/Drawing.php | 147 +
.../PHPExcel/Worksheet/Drawing/Shadow.php | 296 +
.../PHPExcel/Worksheet/HeaderFooter.php | 494 ++
.../Worksheet/HeaderFooterDrawing.php | 361 +
.../PHPExcel/Worksheet/MemoryDrawing.php | 201 +
.../PHPExcel/Worksheet/PageMargins.php | 233 +
.../PHPExcel/PHPExcel/Worksheet/PageSetup.php | 839 ++
.../PHPExcel/Worksheet/Protection.php | 581 ++
vendor/PHPExcel/PHPExcel/Worksheet/Row.php | 86 +
.../PHPExcel/Worksheet/RowCellIterator.php | 225 +
.../PHPExcel/Worksheet/RowDimension.php | 132 +
.../PHPExcel/Worksheet/RowIterator.php | 192 +
.../PHPExcel/PHPExcel/Worksheet/SheetView.php | 187 +
.../PHPExcel/PHPExcel/WorksheetIterator.php | 108 +
vendor/PHPExcel/PHPExcel/Writer/Abstract.php | 157 +
vendor/PHPExcel/PHPExcel/Writer/CSV.php | 352 +
vendor/PHPExcel/PHPExcel/Writer/Excel2007.php | 533 ++
.../PHPExcel/Writer/Excel2007/Chart.php | 1520 ++++
.../PHPExcel/Writer/Excel2007/Comments.php | 260 +
.../Writer/Excel2007/ContentTypes.php | 240 +
.../PHPExcel/Writer/Excel2007/DocProps.php | 262 +
.../PHPExcel/Writer/Excel2007/Drawing.php | 589 ++
.../PHPExcel/Writer/Excel2007/Rels.php | 424 +
.../PHPExcel/Writer/Excel2007/RelsRibbon.php | 67 +
.../PHPExcel/Writer/Excel2007/RelsVBA.php | 63 +
.../PHPExcel/Writer/Excel2007/StringTable.php | 313 +
.../PHPExcel/Writer/Excel2007/Style.php | 696 ++
.../PHPExcel/Writer/Excel2007/Theme.php | 869 ++
.../PHPExcel/Writer/Excel2007/Workbook.php | 448 +
.../PHPExcel/Writer/Excel2007/Worksheet.php | 1219 +++
.../PHPExcel/Writer/Excel2007/WriterPart.php | 75 +
vendor/PHPExcel/PHPExcel/Writer/Excel5.php | 904 ++
.../PHPExcel/Writer/Excel5/BIFFwriter.php | 246 +
.../PHPExcel/Writer/Excel5/Escher.php | 523 ++
.../PHPExcel/PHPExcel/Writer/Excel5/Font.php | 166 +
.../PHPExcel/Writer/Excel5/Parser.php | 1531 ++++
.../PHPExcel/Writer/Excel5/Workbook.php | 1444 ++++
.../PHPExcel/Writer/Excel5/Worksheet.php | 4240 +++++++++
vendor/PHPExcel/PHPExcel/Writer/Excel5/Xf.php | 557 ++
vendor/PHPExcel/PHPExcel/Writer/Exception.php | 46 +
vendor/PHPExcel/PHPExcel/Writer/HTML.php | 1612 ++++
vendor/PHPExcel/PHPExcel/Writer/IWriter.php | 37 +
.../PHPExcel/PHPExcel/Writer/OpenDocument.php | 190 +
.../Writer/OpenDocument/Cell/Comment.php | 63 +
.../PHPExcel/Writer/OpenDocument/Content.php | 272 +
.../PHPExcel/Writer/OpenDocument/Meta.php | 95 +
.../PHPExcel/Writer/OpenDocument/MetaInf.php | 87 +
.../PHPExcel/Writer/OpenDocument/Mimetype.php | 41 +
.../PHPExcel/Writer/OpenDocument/Settings.php | 76 +
.../PHPExcel/Writer/OpenDocument/Styles.php | 92 +
.../Writer/OpenDocument/Thumbnails.php | 41 +
.../Writer/OpenDocument/WriterPart.php | 30 +
vendor/PHPExcel/PHPExcel/Writer/PDF.php | 89 +
vendor/PHPExcel/PHPExcel/Writer/PDF/Core.php | 355 +
.../PHPExcel/PHPExcel/Writer/PDF/DomPDF.php | 108 +
vendor/PHPExcel/PHPExcel/Writer/PDF/mPDF.php | 118 +
vendor/PHPExcel/PHPExcel/Writer/PDF/tcPDF.php | 123 +
vendor/PHPExcel/PHPExcel/locale/bg/config | 49 +
vendor/PHPExcel/PHPExcel/locale/cs/config | 47 +
vendor/PHPExcel/PHPExcel/locale/cs/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/da/config | 48 +
vendor/PHPExcel/PHPExcel/locale/da/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/de/config | 47 +
vendor/PHPExcel/PHPExcel/locale/de/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/en/uk/config | 32 +
vendor/PHPExcel/PHPExcel/locale/es/config | 47 +
vendor/PHPExcel/PHPExcel/locale/es/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/fi/config | 47 +
vendor/PHPExcel/PHPExcel/locale/fi/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/fr/config | 47 +
vendor/PHPExcel/PHPExcel/locale/fr/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/hu/config | 47 +
vendor/PHPExcel/PHPExcel/locale/hu/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/it/config | 47 +
vendor/PHPExcel/PHPExcel/locale/it/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/nl/config | 47 +
vendor/PHPExcel/PHPExcel/locale/nl/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/no/config | 47 +
vendor/PHPExcel/PHPExcel/locale/no/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/pl/config | 47 +
vendor/PHPExcel/PHPExcel/locale/pl/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/pt/br/config | 47 +
.../PHPExcel/PHPExcel/locale/pt/br/functions | 408 +
vendor/PHPExcel/PHPExcel/locale/pt/config | 47 +
vendor/PHPExcel/PHPExcel/locale/pt/functions | 408 +
vendor/PHPExcel/PHPExcel/locale/ru/config | 47 +
vendor/PHPExcel/PHPExcel/locale/ru/functions | 438 +
vendor/PHPExcel/PHPExcel/locale/sv/config | 47 +
vendor/PHPExcel/PHPExcel/locale/sv/functions | 408 +
vendor/PHPExcel/PHPExcel/locale/tr/config | 47 +
vendor/PHPExcel/PHPExcel/locale/tr/functions | 438 +
261 files changed, 114143 insertions(+), 145 deletions(-)
create mode 100644 application/admin/view/estimate/estimate_content_observe.html
delete mode 100644 vendor/.gitignore
create mode 100644 vendor/PHPExcel/PHPExcel.php
create mode 100644 vendor/PHPExcel/PHPExcel/Autoloader.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/APC.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/Igbinary.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/SQLite.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/SQLite3.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php
create mode 100644 vendor/PHPExcel/PHPExcel/CachedObjectStorageFactory.php
create mode 100644 vendor/PHPExcel/PHPExcel/CalcEngine/CyclicReferenceStack.php
create mode 100644 vendor/PHPExcel/PHPExcel/CalcEngine/Logger.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Database.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/DateTime.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Engineering.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Exception.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Financial.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/FormulaParser.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/FormulaToken.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Function.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Functions.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Logical.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/LookupRef.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/MathTrig.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Statistical.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/TextData.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/Token/Stack.php
create mode 100644 vendor/PHPExcel/PHPExcel/Calculation/functionlist.txt
create mode 100644 vendor/PHPExcel/PHPExcel/Cell.php
create mode 100644 vendor/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php
create mode 100644 vendor/PHPExcel/PHPExcel/Cell/DataType.php
create mode 100644 vendor/PHPExcel/PHPExcel/Cell/DataValidation.php
create mode 100644 vendor/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php
create mode 100644 vendor/PHPExcel/PHPExcel/Cell/Hyperlink.php
create mode 100644 vendor/PHPExcel/PHPExcel/Cell/IValueBinder.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Axis.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/DataSeries.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/DataSeriesValues.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Exception.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/GridLines.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Layout.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Legend.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/PlotArea.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Properties.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Renderer/jpgraph.php
create mode 100644 vendor/PHPExcel/PHPExcel/Chart/Title.php
create mode 100644 vendor/PHPExcel/PHPExcel/Comment.php
create mode 100644 vendor/PHPExcel/PHPExcel/DocumentProperties.php
create mode 100644 vendor/PHPExcel/PHPExcel/DocumentSecurity.php
create mode 100644 vendor/PHPExcel/PHPExcel/Exception.php
create mode 100644 vendor/PHPExcel/PHPExcel/HashTable.php
create mode 100644 vendor/PHPExcel/PHPExcel/Helper/HTML.php
create mode 100644 vendor/PHPExcel/PHPExcel/IComparable.php
create mode 100644 vendor/PHPExcel/PHPExcel/IOFactory.php
create mode 100644 vendor/PHPExcel/PHPExcel/NamedRange.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Abstract.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/CSV.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel2003XML.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel2007.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel2007/Chart.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel2007/Theme.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/Color.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/Color/BIFF5.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/Color/BIFF8.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/Color/BuiltIn.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/ErrorCode.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/Escher.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/MD5.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/RC4.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/Style/Border.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Excel5/Style/FillPattern.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Exception.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/Gnumeric.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/HTML.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/IReadFilter.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/IReader.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/OOCalc.php
create mode 100644 vendor/PHPExcel/PHPExcel/Reader/SYLK.php
create mode 100644 vendor/PHPExcel/PHPExcel/ReferenceHelper.php
create mode 100644 vendor/PHPExcel/PHPExcel/RichText.php
create mode 100644 vendor/PHPExcel/PHPExcel/RichText/ITextElement.php
create mode 100644 vendor/PHPExcel/PHPExcel/RichText/Run.php
create mode 100644 vendor/PHPExcel/PHPExcel/RichText/TextElement.php
create mode 100644 vendor/PHPExcel/PHPExcel/Settings.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/CodePage.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Date.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Drawing.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Excel5.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/File.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/Font.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/OLE.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/OLE/PPS.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/OLERead.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/PCLZip/readme.txt
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/PasswordHasher.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/String.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/TimeZone.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/XMLWriter.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/ZipArchive.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php
create mode 100644 vendor/PHPExcel/PHPExcel/Shared/trend/trendClass.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Alignment.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Border.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Borders.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Color.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Conditional.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Fill.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Font.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/NumberFormat.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Protection.php
create mode 100644 vendor/PHPExcel/PHPExcel/Style/Supervisor.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/AutoFilter.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/CellIterator.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/Column.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/ColumnCellIterator.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/ColumnIterator.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/Dimension.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/Drawing.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/PageMargins.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/PageSetup.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/Protection.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/Row.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/RowCellIterator.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/RowDimension.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/RowIterator.php
create mode 100644 vendor/PHPExcel/PHPExcel/Worksheet/SheetView.php
create mode 100644 vendor/PHPExcel/PHPExcel/WorksheetIterator.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Abstract.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/CSV.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Chart.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/RelsRibbon.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/RelsVBA.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Style.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5/Escher.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5/Font.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5/Parser.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Excel5/Xf.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/Exception.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/HTML.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/IWriter.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/Cell/Comment.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/Content.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/Meta.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/MetaInf.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/Mimetype.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/Settings.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/Styles.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/Thumbnails.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/OpenDocument/WriterPart.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/PDF.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/PDF/Core.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/PDF/DomPDF.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/PDF/mPDF.php
create mode 100644 vendor/PHPExcel/PHPExcel/Writer/PDF/tcPDF.php
create mode 100644 vendor/PHPExcel/PHPExcel/locale/bg/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/cs/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/cs/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/da/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/da/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/de/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/de/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/en/uk/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/es/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/es/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/fi/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/fi/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/fr/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/fr/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/hu/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/hu/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/it/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/it/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/nl/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/nl/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/no/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/no/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/pl/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/pl/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/pt/br/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/pt/br/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/pt/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/pt/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/ru/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/ru/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/sv/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/sv/functions
create mode 100644 vendor/PHPExcel/PHPExcel/locale/tr/config
create mode 100644 vendor/PHPExcel/PHPExcel/locale/tr/functions
diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php
index 304091e..19006e4 100644
--- a/application/admin/controller/Base.php
+++ b/application/admin/controller/Base.php
@@ -19,7 +19,7 @@ class Base extends Controller{
'10004'=>'未找到有效数据',
'10005'=>'参数格式错误',
'10006'=>'参数不能为空',
- '10007'=>'',
+ '10007'=>'数据已存在',
'10008'=>'',
'10009'=>'',
'10010'=>'',
diff --git a/application/admin/controller/Estimate.php b/application/admin/controller/Estimate.php
index 5ef2dbb..c80e8c6 100644
--- a/application/admin/controller/Estimate.php
+++ b/application/admin/controller/Estimate.php
@@ -4,6 +4,10 @@ namespace app\admin\controller;
use think\Db;
use think\Log;
+use PHPExcel;
+use PHPExcel_Cell_DataType;
+use PHPExcel_IOFactory;
+use PHPExcel_Style_NumberFormat;
class Estimate extends Base{
@@ -58,22 +62,220 @@ class Estimate extends Base{
public function estimate_add(){
return $this->fetch();
}
-
- ################################################################业务接口################################################################
- ################################################################业务接口################################################################
-
- ################################################device_data_list
- public function device_data_list_action($data){
- $result = Db::table('app_device_data')->where(['is_del'=>0])->field('id,name,pic,content,page_measure,bluetooth_type,device_model')->select();
- foreach ($result as $key => $value) {
- unset($result[$key]['ROW_NUMBER']);
+ public function estimate_content_observe(){
+ $data = input();
+ $result = Db::table('admin_estimate')->where(['id'=>$data['id']])->find();
+ // dump($result);
+ $data = [
+ 'province'=>$result['province'],
+ 'city'=>$result['city']=='无'?'':'-'.$result['city'],
+ 'list'=>[],
+ ];
+ $temporary_array = json_decode($result['content'],true);
+ $temporary_array2 = [];
+ foreach ($temporary_array as $key => $value) {
+ $num = array_push($temporary_array2,[
+ 'title'=>$key.'评定标准',
+ 'list'=>[],
+ ]);
+ foreach ($value as $k1 => $v1) {
+ $num2 = array_push($temporary_array2[$num-1]['list'],[
+ 'title'=>$k1,
+ 'score'=>'',
+ 'gender'=>'',
+ 'choose_num'=>'',
+ 'list'=>[],
+ ]);
+ foreach ($v1 as $k2 => $v2) {
+ $temporary_array2[$num-1]['list'][$num2-1]['score'] = $v2['score'];
+ $temporary_array2[$num-1]['list'][$num2-1]['gender'] = $v2['gender'];
+ $temporary_array2[$num-1]['list'][$num2-1]['choose_num'] = $v2['choose_num'];
+ // $num3 = array_push($temporary_array2[$num-1]['list'][$num2-1]['list'],[
+ // 'title'=>$k2,
+ // 'list'=>[],
+ // ]);
+ }
+ }
}
- if(empty($result)){
- return $this->msg(10004);
+ $data['list'] = $temporary_array2;
+ // foreach ($variable as $key => $value) {
+ // # code...
+ // }
+ // foreach ($temporary_array as $key => $value) {
+ // array_push($temporary_array2,[
+ // 'province'=>$result['province'],
+ // 'city'=>$result['city']=='无'?'':'-'.$result['city'],
+ // 'title'=>$key.'评定标准',
+ // 'list'=>[],
+ // ]);
+ // }
+
+ dump($data);
+ // dump($temporary_array2);
+ dump($temporary_array);
+ die;
+ // return $this->fetch();
+ }
+
+ ################################################################业务接口################################################################
+ ################################################################业务接口################################################################
+
+ ################################################获取execl中数组
+ public function submit_rule(){
+ // $file = request()->file('file');
+ $file = request()->file('execl');
+ $name = request()->param();
+ $address_data = explode(',',$name['address']);
+ // dump($name);
+ // die;
+ if($name['type'] == 'create'){
+ $rule_is_true = Db::table('admin_estimate')->where(['province'=>$address_data[0],'city'=>$address_data[1]==''?'无':$address_data[1]])->count();
+ if($rule_is_true > 0){
+ return $this->msg(10007);
+ }
+ }
+ if($file){
+ // 移动到框架应用根目录/public/uploads/ 目录下
+ $file_name_new = time().'_ceshi.xlsx';
+ $info = $file->validate(['size' => 2048000, 'ext' => 'xlsx'])->move(ROOT_PATH . 'public' . DS . 'estimate',$file_name_new);
+ if($info){
+ $original_data = $this->excelToArray(ROOT_PATH . 'public' . DS . 'estimate' . DS . $info->getSaveName());
+ $handle_data = $this->transformation_data($original_data,$address_data,$name['type']);
+ if($name['type'] == 'create'){
+ $result = Db::table('admin_estimate')->insert($handle_data);
+ }else{
+ $result = Db::table('admin_estimate')->where(['id'=>$name['id']])->update($handle_data);
+ }
+
+ // return $this->msg(10002);
+ // 成功上传后 获取上传信息
+ // 输出 jpg
+ // echo $info->getExtension();
+ // // 输出 20160820/42a79759f284b767dfcb2a0197904287.jpg
+ // echo $info->getSaveName();
+ // // 输出 42a79759f284b767dfcb2a0197904287.jpg
+ // echo $info->getFilename();
+ if($result){
+ return $this->msg([]);
+ }else{
+ return $this->msg(10002);
+ }
+
+ }else{
+ // 上传失败获取错误信息
+ return $this->msg(10001, $file->getError());
+ // echo $file->getError();
+ }
}else{
- return $this->msg(['list'=>$result]);
+ return $this->msg(10001, '文件缺失');
}
}
+ // 读取execl文件数据
+ private function excelToArray($filename){
+ vendor('PHPExcel.PHPExcel');
+ $objPHPExcelReader = \PHPExcel_IOFactory::load($filename);
+
+ $sheet = $objPHPExcelReader->getSheet(0); // 读取第一个工作表(编号从 0 开始)
+ $highestRow = $sheet->getHighestRow(); // 取得总行数
+ $highestColumn = \PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn()); // 取得总列数
+
+ // 一次读取一列
+ $res_arr = array();
+ for ($row = 2; $row <= $highestRow; $row++) {
+ $row_arr = array();
+ for ($column = 0; $column < $highestColumn; $column++) {
+ //判断单元格是否包含公式
+ if ($sheet->getCellByColumnAndRow($column, $row)->isFormula()) {
+ $val = $sheet->getCellByColumnAndRow($column, $row)->getFormattedValue();
+ } else {
+ $val = $sheet->getCellByColumnAndRow($column, $row)->getValue();
+ }
+ $row_arr[] = $val;
+ }
+
+ if (count($row_arr) > 0) {
+ $res_arr[] = $row_arr;
+ }
+ }
+
+ return $res_arr;
+ }
+
+ //处理估分数据格式
+ private function transformation_data($data,$daaress,$type='create'){
+ // dump($daaress);
+ $temporary_daaress = explode(',',$daaress);
+ // dump($temporary_daaress);
+ // die;
+ if($type == 'create'){
+ $return_result = [
+ 'province'=>$temporary_daaress[0] == ''?'无':$temporary_daaress[0],
+ 'city'=>$temporary_daaress[1] == ''?'无':$temporary_daaress[1],
+ 'area'=>'无',
+ 'create_time'=>date('Y-m-d H:i:s'),
+ 'update_time'=>date('Y-m-d H:i:s'),
+ 'content'=>[]
+ ];
+ }else{
+ $return_result = [
+ 'update_time'=>date('Y-m-d H:i:s'),
+ 'content'=>[]
+ ];
+ }
+ $temporary_array = [];
+ foreach ($data as $key => $value) {
+ if(!array_key_exists($value[0],$temporary_array)){
+ // 如果第一分类不存在
+ $temporary_array[$value[0]][$value[1]][$value[3]] = [
+ 'score'=>$value[2],
+ 'unit_data'=>$value[4],
+ 'gender'=>$value[5],
+ 'choose_num'=>$value[9],
+ 'proportion'=>$value[10],
+ 'content'=>[
+ [$value[6],$value[7],$value[8]]
+ ],
+ ];
+ }else{
+ // 第一分类存在
+ if(!array_key_exists($value[1],$temporary_array[$value[0]])){
+ // 如果第二分类不存在
+ // array_push($temporary_array[$value[0]]);
+ $temporary_array[$value[0]][$value[1]][$value[3]] = [
+ 'score'=>$value[2],
+ 'unit_data'=>$value[4],
+ 'gender'=>$value[5],
+ 'choose_num'=>$value[9],
+ 'proportion'=>$value[10],
+ 'content'=>[
+ [$value[6],$value[7],$value[8]]
+ ],
+ ];
+ }else{
+ // 第二分类存在
+ if(!array_key_exists($value[3],$temporary_array[$value[0]][$value[1]])){
+ // 如果项目名不存在
+ $temporary_array[$value[0]][$value[1]][$value[3]] = [
+ 'score'=>$value[2],
+ 'unit_data'=>$value[4],
+ 'gender'=>$value[5],
+ 'choose_num'=>$value[9],
+ 'proportion'=>$value[10],
+ 'content'=>[
+ [$value[6],$value[7],$value[8]]
+ ],
+ ];
+ }else{
+ array_push($temporary_array[$value[0]][$value[1]][$value[3]]['content'],[$value[6],$value[7],$value[8]]);
+ }
+ }
+ }
+ }
+ // return $temporary_array;
+ $temporary_array = json_encode($temporary_array);
+ $return_result['content'] = $temporary_array;
+ return $return_result;
+ }
diff --git a/application/admin/view/estimate/estimate_add.html b/application/admin/view/estimate/estimate_add.html
index aeacbcd..0c4a61e 100644
--- a/application/admin/view/estimate/estimate_add.html
+++ b/application/admin/view/estimate/estimate_add.html
@@ -55,14 +55,14 @@
+
+
+
diff --git a/application/admin/view/estimate/estimate_content_observe.html b/application/admin/view/estimate/estimate_content_observe.html
new file mode 100644
index 0000000..4f849f6
--- /dev/null
+++ b/application/admin/view/estimate/estimate_content_observe.html
@@ -0,0 +1,359 @@
+
+
+