diff --git a/ReportBase.js b/ReportBase.js index 6115e30..79b2e4f 100644 --- a/ReportBase.js +++ b/ReportBase.js @@ -76,7 +76,7 @@ class ReportBase { this.grids = reportBase.grids; } if(reportBase.conditionTypes){ - this.conditionType = reportBase.conditionTypes; + this.conditionTypes = reportBase.conditionTypes; } this.checkLocationGeometry = reportBase.checkLocationGeometry || null; //geometry格式 this.environmentTemperature = reportBase.environmentTemperature || null; diff --git a/artReport.js b/artReport.js deleted file mode 100644 index b11b957..0000000 --- a/artReport.js +++ /dev/null @@ -1,24 +0,0 @@ -import CellsysApp from "@airkoon/cellsys/cellsysApp"; - -class ArtReport extends CellsysApp{ - constructor(params) { - super(params); - this.reportName = params.name; - this.artId = null; - this.artNumber = 1; - this.documentNumber = null; - let modelOptions = params.model_options; - if(modelOptions){ - this.artId = modelOptions.artworkId; - let reportInformation = modelOptions.reportInformation; - if(reportInformation){ - this.artNumber = reportInformation.artworkNumber; - this.documentNumber = reportInformation.documentNumber; - } - - } - - } -} - -export default ArtReport \ No newline at end of file diff --git a/conditionReport.js b/conditionReport.js index 02b8cf2..9855e71 100644 --- a/conditionReport.js +++ b/conditionReport.js @@ -1,8 +1,6 @@ -import artReport from './artReport'; -import ArtImage from './artImage'; + import {EditTask} from "@airkoon/cellsys/cellsysUtil"; import {artApi} from "./artApi"; -import ReportBase from "./ReportBase"; class ConditionReport { constructor(params) {