From b2c1b4a28305682192125abf8c4cd7c2a7e07f26 Mon Sep 17 00:00:00 2001
From: yangrd <1020519285@qq.com>
Date: Wed, 26 Mar 2025 16:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=9B=BE=E8=A1=A8=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 equipment.js     | 23 ++++++++++++++++++++++-
 equipmentType.js | 26 +++-----------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/equipment.js b/equipment.js
index 80750f3..e22df2f 100644
--- a/equipment.js
+++ b/equipment.js
@@ -22,7 +22,27 @@ class Equipment {
             this.chartConfiguration = chart_option;
             this.dataType = data_type;
         }
+        this.dataType = params.data_type||0;
 
+        if (params.chart_option) {
+            this.chartConfiguration = {
+                type: '折线图',
+                xAxis: params.chart_option.xAxis,
+                yAxis: params.chart_option.yAxis,
+            };
+        } else {
+            this.chartConfiguration = {
+                type: '折线图',
+                xAxis: {
+                    key: null,
+                    unit: null,
+                },
+                yAxis: {
+                    key: null,
+                    unit: null,
+                },
+            };
+        }
         this.creator = params.creator;
         this.updater = params.updater;
         this.createTime = params.create_time;
@@ -38,7 +58,8 @@ class Equipment {
         editTask.addParam('_model', params.equipmentModel);
         editTask.addParam('_laboratory_id', params.laboratoryId);
         editTask.addParam('_name', params.name);
-
+        editTask.addParam('_data_type', params.dataType);
+        editTask.addParam('_chart_option', params.chartConfiguration);
         return new Promise((resolve, reject) => {
             editTask
                 .execute()
diff --git a/equipmentType.js b/equipmentType.js
index c633c43..f3d0d0d 100644
--- a/equipmentType.js
+++ b/equipmentType.js
@@ -10,27 +10,7 @@ class ArtworkEquipmentType {
         this.id = params.id;
         this.name = params.name;
         this.description = params.description;
-        this.dataType = params.data_type;
 
-        if (params.chart_option) {
-            this.chartConfiguration = {
-                type: '折线图',
-                xAxis: params.chart_option.xAxis,
-                yAxis: params.chart_option.yAxis,
-            };
-        } else {
-            this.chartConfiguration = {
-                type: '折线图',
-                xAxis: {
-                    key: null,
-                    unit: null,
-                },
-                yAxis: {
-                    key: null,
-                    unit: null,
-                },
-            };
-        }
         this.equipmentCount = params.equipment_count || 0;
         this.style = params.style;
         this.tags = [];
@@ -51,8 +31,7 @@ class ArtworkEquipmentType {
         editTask.addParam('_description', description);
         editTask.addParam('_name', name);
         editTask.addParam('_style', style);
-        editTask.addParam('_data_type', dataType);
-        editTask.addParam('_chart_option', chartConfiguration);
+
 
         return new Promise((resolve, reject) => {
             editTask
@@ -82,7 +61,8 @@ class ArtworkEquipmentType {
         editTask.addParam('_model', params.equipmentModel);
         editTask.addParam('_laboratory_id', params.laboratoryId);
         editTask.addParam('_name', params.name);
-
+        editTask.addParam('_data_type', params.dataType);
+        editTask.addParam('_chart_option', params.chartConfiguration);
         return new Promise((resolve, reject) => {
             editTask
                 .execute()