git gui提交测试

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-.idea
+.idea
+.svn

artSystem.js

@@ -17,7 +17,7 @@ import ArtCategory from './artCategory';
 import Equipment from './equipment';
 import Laboratory from './laboratory';
 import ArtworkEquipmentType from './equipmentType';
-import EquipmentData from "./equipmentData";
+import EquipmentData from './equipmentData';
 
 class ArtSystem {
     constructor(orgId) {}
@@ -233,6 +233,7 @@ class ArtSystem {
         editTask.addParam('_original_registration_number', params.originalRegistrationNumber);
         editTask.addParam('_remark', params.remarks);
         editTask.addParam('_images', params.images);
+        editTask.addParam('_size', params.size);
         return new Promise((resolve, reject) => {
             editTask
                 .execute()
@@ -418,7 +419,7 @@ class ArtSystem {
     //查询系统修复记录列表
     static queryRepairLogs(params) {
         let query = new Query();
-        let { filter, pageInfo,order } = params;
+        let { filter, pageInfo, order } = params;
         if (filter) {
             filter.forEach((item) => {
                 query.addFilter(item['name'], item['operator'], item['value']);
@@ -647,13 +648,13 @@ class ArtSystem {
                 });
         });
     }
-    static viewArtworkEquipmentData(params){
+    static viewArtworkEquipmentData(params) {
         let query = new Query();
         let { filter, pageInfo, order } = params;
         // query.addFilter('equipment_id', '=', this.id);
         if (filter) {
             filter.forEach((item) => {
-                query.addFilter(item["name"], item["operator"], item["value"]);
+                query.addFilter(item['name'], item['operator'], item['value']);
             });
         }
 
@@ -672,7 +673,7 @@ class ArtSystem {
                             });
                             resolve(res);
                         } else {
-                            reject(new Error("数据格式异常"));
+                            reject(new Error('数据格式异常'));
                         }
                     } else {
                         let resArr = res.map((item) => {

cellsysArt.js

@@ -213,9 +213,9 @@ class CellsysArt {
 
     //获取艺术品所属类别的病害信息
     queryCategoryDiseases() {
-        if (!this.categoryTwo) {
+        /* if (!this.categoryTwo) {
             throw new Error('该艺术品没有二级类别，无法获取类别病害信息！');
-        }
+        }*/
         let artCategory = new ArtCategory({
             id: this.categoryTwo,
             name: this.categoryTwoName,

conditionMap.js

@@ -0,0 +1,19 @@
+class ConditionMap {
+    constructor(params = {}) {
+        let { original, graphing, superposition, legends } = params;
+        this.original = original; //原图地址
+        this.graphing = graphing; //绘制图层地址
+        this.superposition = superposition; //合并图层地址
+        this.legends = legends || []; //conditionLegend对象集合
+    }
+}
+
+class ConditionLegend {
+    constructor(params = {}) {
+        let { name, img } = params;
+        this.name = name; //病害名称
+        this.img = img; //图例
+    }
+}
+
+export { ConditionMap, ConditionLegend };