1、格式化
2、档案尺寸结构调整
This commit is contained in:
ag
parent
9bb82d3e22
commit
d477c36d9b
274
ReportBase.js
274
ReportBase.js
@ -1,160 +1,160 @@
|
|||||||
import { formatterDate } from "@/utils/date";
|
import { formatterDate } from '@/utils/date';
|
||||||
|
|
||||||
class ReportBase {
|
class ReportBase {
|
||||||
constructor(params) {
|
constructor(params) {
|
||||||
if (!params) {
|
if (!params) {
|
||||||
params = {};
|
params = {};
|
||||||
}
|
}
|
||||||
this.documentNumber = formatterDate(new Date(), "YYYYMMDDHHmmss");
|
this.documentNumber = formatterDate(new Date(), 'YYYYMMDDHHmmss');
|
||||||
this.reportName = params.reportName || null;
|
this.reportName = params.reportName || null;
|
||||||
this.checkDate = params.checkDate || new Date().getTime();
|
this.checkDate = params.checkDate || new Date().getTime();
|
||||||
this.checkLocation = params.checkLocation || "";
|
this.checkLocation = params.checkLocation || ''; //目的地详细地址
|
||||||
this.checkLocationGeometry = params.checkLocationGeometry || null; //geometry格式
|
this.checkLocationGeometry = params.checkLocationGeometry || null; //geometry格式
|
||||||
|
|
||||||
this.checkBy = params.checkBy || "";
|
this.checkBy = params.checkBy || '';
|
||||||
this.reportBy = params.reportBy || "";
|
this.reportBy = params.reportBy || '';
|
||||||
this.coverImage = params.coverImage; //报告封面图
|
this.coverImage = params.coverImage; //报告封面图
|
||||||
this.conditionTypes = [];
|
this.conditionTypes = [];
|
||||||
|
|
||||||
this.conditionImageList = []; // 状况分析详情图{title,description,image}
|
this.conditionImageList = []; // 状况分析详情图{title,description,image}
|
||||||
this.conditionMapping = []; //状况图对象数组 {original,graphing,superposition,legend} legend包含{key,desc,color}
|
this.conditionMapping = []; //状况图对象数组 {original,graphing,superposition,legend} legend包含{key,desc,color}
|
||||||
this.grids = {
|
this.grids = {
|
||||||
gridsNumber: 4,
|
gridsNumber: 4,
|
||||||
gridsImgs: [],
|
gridsImgs: [],
|
||||||
};
|
};
|
||||||
this.conservation = params.conservation || null;
|
this.conservation = params.conservation || null;
|
||||||
this.suggest = params.suggest || null;
|
this.suggest = params.suggest || null;
|
||||||
this.environmentTemperature = params.environmentTemperature || null; //不带单位
|
this.environmentTemperature = params.environmentTemperature || null; //不带单位
|
||||||
this.environmentHumidity = params.environmentHumidity || null; //不带单位
|
this.environmentHumidity = params.environmentHumidity || null; //不带单位
|
||||||
this.logo = null;
|
this.logo = null;
|
||||||
// this.coverLogo = `${window.GLOBAL["BASE_URL"]}/AppTemplate/conditionReport/images/reportLogo.png`;
|
// this.coverLogo = `${window.GLOBAL["BASE_URL"]}/AppTemplate/conditionReport/images/reportLogo.png`;
|
||||||
// this.organizationName = params.organizationName;
|
// this.organizationName = params.organizationName;
|
||||||
// this.organizationEmail = 'ja.atelier@hotmail.com';
|
// this.organizationEmail = 'ja.atelier@hotmail.com';
|
||||||
// this.organizationPhone = '+86-13911819084 / +33 (0)7.82.15.72.97';
|
// this.organizationPhone = '+86-13911819084 / +33 (0)7.82.15.72.97';
|
||||||
// this.signatureInfo = {
|
// this.signatureInfo = {
|
||||||
// "weChatImg": `${window.GLOBAL["BASE_URL"]}/AppTemplate/conditionReport/images/erm.png`,
|
// "weChatImg": `${window.GLOBAL["BASE_URL"]}/AppTemplate/conditionReport/images/erm.png`,
|
||||||
// "signer": "Jia Peng",
|
// "signer": "Jia Peng",
|
||||||
// "signerInfo":"Conservator - Restorer of the cultural heritage recognized by the Direction of the museums of France (D.M.F)\n" +
|
// "signerInfo":"Conservator - Restorer of the cultural heritage recognized by the Direction of the museums of France (D.M.F)\n" +
|
||||||
// "Professor of Conservation-Restoration & Material research of Art of Guangzhou Academy of Fine Art (GAFA)\n" +
|
// "Professor of Conservation-Restoration & Material research of Art of Guangzhou Academy of Fine Art (GAFA)\n" +
|
||||||
// "Director of Guangdong Provincial Key Laboratory of Conservation-Restoration & Materials Research of Artworks"
|
// "Director of Guangdong Provincial Key Laboratory of Conservation-Restoration & Materials Research of Artworks"
|
||||||
// }
|
// }
|
||||||
}
|
|
||||||
|
|
||||||
setAttribute(reportBase) {
|
|
||||||
if (!reportBase) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (reportBase.documentNumber) {
|
|
||||||
this.documentNumber = reportBase.documentNumber;
|
|
||||||
}
|
|
||||||
if (reportBase.checkDate) {
|
|
||||||
this.checkDate = reportBase.checkDate;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.reportName = reportBase.reportName;
|
setAttribute(reportBase) {
|
||||||
|
if (!reportBase) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (reportBase.documentNumber) {
|
||||||
|
this.documentNumber = reportBase.documentNumber;
|
||||||
|
}
|
||||||
|
if (reportBase.checkDate) {
|
||||||
|
this.checkDate = reportBase.checkDate;
|
||||||
|
}
|
||||||
|
|
||||||
this.checkLocation = reportBase.checkLocation;
|
this.reportName = reportBase.reportName;
|
||||||
|
|
||||||
this.checkBy = reportBase.checkBy;
|
this.checkLocation = reportBase.checkLocation;
|
||||||
|
|
||||||
this.reportBy = reportBase.reportBy;
|
this.checkBy = reportBase.checkBy;
|
||||||
if (reportBase.coverImage) {
|
|
||||||
this.coverImage = reportBase.coverImage;
|
this.reportBy = reportBase.reportBy;
|
||||||
}
|
if (reportBase.coverImage) {
|
||||||
if (reportBase.conservation) {
|
this.coverImage = reportBase.coverImage;
|
||||||
this.conservation = reportBase.conservation;
|
}
|
||||||
}
|
if (reportBase.conservation) {
|
||||||
if (reportBase.suggest) {
|
this.conservation = reportBase.conservation;
|
||||||
this.suggest = reportBase.suggest;
|
}
|
||||||
}
|
if (reportBase.suggest) {
|
||||||
if (reportBase.grids) {
|
this.suggest = reportBase.suggest;
|
||||||
//宫格图
|
}
|
||||||
this.grids = reportBase.grids;
|
if (reportBase.grids) {
|
||||||
}
|
//宫格图
|
||||||
if (reportBase.conditionMapping) {
|
this.grids = reportBase.grids;
|
||||||
this.conditionMapping = reportBase.conditionMapping;
|
}
|
||||||
|
if (reportBase.conditionMapping) {
|
||||||
|
this.conditionMapping = reportBase.conditionMapping;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (reportBase.conditionTypes) {
|
||||||
|
this.conditionTypes = reportBase.conditionTypes;
|
||||||
|
}
|
||||||
|
if (reportBase.conditionImageList) {
|
||||||
|
this.conditionImageList = reportBase.conditionImageList;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.checkLocationGeometry = reportBase.checkLocationGeometry || null; //geometry格式
|
||||||
|
this.environmentTemperature = reportBase.environmentTemperature || null;
|
||||||
|
this.environmentHumidity = reportBase.environmentHumidity || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reportBase.conditionTypes) {
|
setReportBy(val) {
|
||||||
this.conditionTypes = reportBase.conditionTypes;
|
this.reportBy = val;
|
||||||
}
|
|
||||||
if (reportBase.conditionImageList) {
|
|
||||||
this.conditionImageList = reportBase.conditionImageList;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.checkLocationGeometry = reportBase.checkLocationGeometry || null; //geometry格式
|
setCoverImage(imageSrc) {
|
||||||
this.environmentTemperature = reportBase.environmentTemperature || null;
|
this.coverImage = imageSrc;
|
||||||
this.environmentHumidity = reportBase.environmentHumidity || null;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
setReportBy(val) {
|
setConditionTypes(val) {
|
||||||
this.reportBy = val;
|
this.conditionTypes = val || [];
|
||||||
}
|
}
|
||||||
|
|
||||||
setCoverImage(imageSrc) {
|
setConditionImageList(fileList) {
|
||||||
this.coverImage = imageSrc;
|
this.conditionImageList = fileList;
|
||||||
}
|
}
|
||||||
|
|
||||||
setConditionTypes(val) {
|
/* setImagesLegend(imgSrc, legend) {
|
||||||
this.conditionTypes = val || [];
|
|
||||||
}
|
|
||||||
|
|
||||||
setConditionImageList(fileList) {
|
|
||||||
this.conditionImageList = fileList;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* setImagesLegend(imgSrc, legend) {
|
|
||||||
this.conditionMapping["images"] = imgSrc;
|
this.conditionMapping["images"] = imgSrc;
|
||||||
this.conditionMapping["legend"] = legend;
|
this.conditionMapping["legend"] = legend;
|
||||||
}*/
|
}*/
|
||||||
setConditionMapping(items) {
|
setConditionMapping(items) {
|
||||||
this.conditionMapping = items;
|
this.conditionMapping = items;
|
||||||
}
|
}
|
||||||
setConservation(val) {
|
setConservation(val) {
|
||||||
this.conservation = val;
|
this.conservation = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
setSuggest(val) {
|
setSuggest(val) {
|
||||||
this.suggest = val;
|
this.suggest = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
setLogo(val) {
|
setLogo(val) {
|
||||||
this.logo = window.GLOBAL["BASE_URL"] + val;
|
this.logo = window.GLOBAL['BASE_URL'] + val;
|
||||||
}
|
}
|
||||||
|
|
||||||
setCoverLogo(val) {
|
setCoverLogo(val) {
|
||||||
this.coverLogo = val;
|
this.coverLogo = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
setOrgName(val) {
|
setOrgName(val) {
|
||||||
this.organizationName = val;
|
this.organizationName = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
setOrgEmail(val) {
|
setOrgEmail(val) {
|
||||||
this.organizationEmail = val;
|
this.organizationEmail = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
setOrgPhone(val) {
|
setOrgPhone(val) {
|
||||||
this.organizationPhone = val;
|
this.organizationPhone = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
setGrids(gridNumber, girdList) {
|
setGrids(gridNumber, girdList) {
|
||||||
this.grids["gridsNumber"] = gridNumber;
|
this.grids['gridsNumber'] = gridNumber;
|
||||||
this.grids["gridsImgs"] = girdList;
|
this.grids['gridsImgs'] = girdList;
|
||||||
}
|
}
|
||||||
|
|
||||||
setCheckLocation(checkLocation) {
|
setCheckLocation(checkLocation) {
|
||||||
this.checkLocation = checkLocation;
|
this.checkLocation = checkLocation;
|
||||||
}
|
}
|
||||||
|
|
||||||
setCheckLocationGeometry(geometry) {
|
setCheckLocationGeometry(geometry) {
|
||||||
if (geometry) {
|
if (geometry) {
|
||||||
this.checkLocationGeometry = {
|
this.checkLocationGeometry = {
|
||||||
type: "Point",
|
type: 'Point',
|
||||||
coordinates: geometry.coordinates,
|
coordinates: geometry.coordinates,
|
||||||
};
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ReportBase;
|
export default ReportBase;
|
||||||
|
|||||||
@ -20,9 +20,7 @@ class CellsysArt {
|
|||||||
this.textureName = params.texture_name; //材质名称
|
this.textureName = params.texture_name; //材质名称
|
||||||
this.countryId = params.country_id;
|
this.countryId = params.country_id;
|
||||||
this.countryName = params.country_name;
|
this.countryName = params.country_name;
|
||||||
this.length = params.length;
|
|
||||||
this.width = params.width;
|
|
||||||
this.height = params.height;
|
|
||||||
this.categoryOne = params.category_one;
|
this.categoryOne = params.category_one;
|
||||||
this.categoryOneName = params.category_one_name;
|
this.categoryOneName = params.category_one_name;
|
||||||
this.categoryTwo = params.category_two;
|
this.categoryTwo = params.category_two;
|
||||||
@ -50,6 +48,7 @@ class CellsysArt {
|
|||||||
}
|
}
|
||||||
this.materialIds = params.material_ids; //材料Id数组
|
this.materialIds = params.material_ids; //材料Id数组
|
||||||
this.geometry = params.geometry; //当前位置
|
this.geometry = params.geometry; //当前位置
|
||||||
|
this.size = params.size || [];
|
||||||
}
|
}
|
||||||
get oldNameFormat() {
|
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;
|
export default CellsysArt;
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import { EditTask, Query, QueryTask } from './artUtil.js';
|
|||||||
import { artApi } from './artApi';
|
import { artApi } from './artApi';
|
||||||
import { formatterMillisecond } from './utils/date';
|
import { formatterMillisecond } from './utils/date';
|
||||||
import { godownEntryStatus } from './artEnum';
|
import { godownEntryStatus } from './artEnum';
|
||||||
|
import CellsysArt from './cellsysArt';
|
||||||
|
|
||||||
//入库记录
|
//入库记录
|
||||||
class GodownEntry {
|
class GodownEntry {
|
||||||
@ -40,27 +41,18 @@ class GodownEntry {
|
|||||||
this.contractorSignatureImage = params.contractor_signature_image || null; //接收方签名
|
this.contractorSignatureImage = params.contractor_signature_image || null; //接收方签名
|
||||||
let artworkRecord = params.artwork_record;
|
let artworkRecord = params.artwork_record;
|
||||||
if (artworkRecord) {
|
if (artworkRecord) {
|
||||||
this.artworkRecord = {
|
this.artworkRecord = new CellsysArt({
|
||||||
recordNumber: artworkRecord.record_number,
|
id: this.artworkRecordId,
|
||||||
|
record_number: artworkRecord.record_number,
|
||||||
author: artworkRecord.author,
|
author: artworkRecord.author,
|
||||||
oldName: artworkRecord.old_name,
|
old_name: artworkRecord.old_name,
|
||||||
createPeriod: artworkRecord.create_period || '未知',
|
create_period: artworkRecord.create_period,
|
||||||
width: artworkRecord.width,
|
material_id: artworkRecord.material_id,
|
||||||
height: artworkRecord.height,
|
});
|
||||||
length: artworkRecord.length,
|
|
||||||
materialId: artworkRecord.material_id,
|
|
||||||
};
|
|
||||||
} else {
|
} else {
|
||||||
this.artworkRecord = {
|
this.artworkRecord = new CellsysArt({
|
||||||
recordNumber: null,
|
id: this.artworkRecordId,
|
||||||
author: null,
|
});
|
||||||
oldName: null,
|
|
||||||
createPeriod: null,
|
|
||||||
width: null,
|
|
||||||
height: null,
|
|
||||||
length: null,
|
|
||||||
materialId: null,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
get statusMsg() {
|
get statusMsg() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user