1、格式化

2、档案尺寸结构调整

ReportBase.js

@@ -1,18 +1,18 @@
-import { formatterDate } from "@/utils/date";
+import { formatterDate } from '@/utils/date';
 
 class ReportBase {
     constructor(params) {
         if (!params) {
             params = {};
         }
-    this.documentNumber = formatterDate(new Date(), "YYYYMMDDHHmmss");
+        this.documentNumber = formatterDate(new Date(), 'YYYYMMDDHHmmss');
         this.reportName = params.reportName || null;
         this.checkDate = params.checkDate || new Date().getTime();
-    this.checkLocation = params.checkLocation || "";
+        this.checkLocation = params.checkLocation || ''; //目的地详细地址
         this.checkLocationGeometry = params.checkLocationGeometry || null; //geometry格式
 
-    this.checkBy = params.checkBy || "";
-    this.reportBy = params.reportBy || "";
+        this.checkBy = params.checkBy || '';
+        this.reportBy = params.reportBy || '';
         this.coverImage = params.coverImage; //报告封面图
         this.conditionTypes = [];
 
@@ -119,7 +119,7 @@ class ReportBase {
     }
 
     setLogo(val) {
-    this.logo = window.GLOBAL["BASE_URL"] + val;
+        this.logo = window.GLOBAL['BASE_URL'] + val;
     }
 
     setCoverLogo(val) {
@@ -139,8 +139,8 @@ class ReportBase {
     }
 
     setGrids(gridNumber, girdList) {
-    this.grids["gridsNumber"] = gridNumber;
-    this.grids["gridsImgs"] = girdList;
+        this.grids['gridsNumber'] = gridNumber;
+        this.grids['gridsImgs'] = girdList;
     }
 
     setCheckLocation(checkLocation) {
@@ -150,7 +150,7 @@ class ReportBase {
     setCheckLocationGeometry(geometry) {
         if (geometry) {
             this.checkLocationGeometry = {
-        type: "Point",
+                type: 'Point',
                 coordinates: geometry.coordinates,
             };
         }

cellsysArt.js

@@ -20,9 +20,7 @@ class CellsysArt {
         this.textureName = params.texture_name; //材质名称
         this.countryId = params.country_id;
         this.countryName = params.country_name;
-        this.length = params.length;
-        this.width = params.width;
-        this.height = params.height;
+
         this.categoryOne = params.category_one;
         this.categoryOneName = params.category_one_name;
         this.categoryTwo = params.category_two;
@@ -50,6 +48,7 @@ class CellsysArt {
         }
         this.materialIds = params.material_ids; //材料Id数组
         this.geometry = params.geometry; //当前位置
+        this.size = params.size || [];
     }
     get oldNameFormat() {
         //带书名号
@@ -224,4 +223,14 @@ class CellsysArt {
     }
 }
 
+class ArtSize {
+    constructor(params = {}) {
+        let { name, width, length, height } = params;
+        this.name = name;
+        this.length = length;
+        this.width = width;
+        this.height = height;
+    }
+}
+export { ArtSize };
 export default CellsysArt;

godownEntry.js

@@ -2,6 +2,7 @@ import { EditTask, Query, QueryTask } from './artUtil.js';
 import { artApi } from './artApi';
 import { formatterMillisecond } from './utils/date';
 import { godownEntryStatus } from './artEnum';
+import CellsysArt from './cellsysArt';
 
 //入库记录
 class GodownEntry {
@@ -40,27 +41,18 @@ class GodownEntry {
         this.contractorSignatureImage = params.contractor_signature_image || null; //接收方签名
         let artworkRecord = params.artwork_record;
         if (artworkRecord) {
-            this.artworkRecord = {
-                recordNumber: artworkRecord.record_number,
+            this.artworkRecord = new CellsysArt({
+                id: this.artworkRecordId,
+                record_number: artworkRecord.record_number,
                 author: artworkRecord.author,
-                oldName: artworkRecord.old_name,
-                createPeriod: artworkRecord.create_period || '未知',
-                width: artworkRecord.width,
-                height: artworkRecord.height,
-                length: artworkRecord.length,
-                materialId: artworkRecord.material_id,
-            };
+                old_name: artworkRecord.old_name,
+                create_period: artworkRecord.create_period,
+                material_id: artworkRecord.material_id,
+            });
         } else {
-            this.artworkRecord = {
-                recordNumber: null,
-                author: null,
-                oldName: null,
-                createPeriod: null,
-                width: null,
-                height: null,
-                length: null,
-                materialId: null,
-            };
+            this.artworkRecord = new CellsysArt({
+                id: this.artworkRecordId,
+            });
         }
     }
     get statusMsg() {