diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index dcc1279..f3cc207 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -918,6 +918,10 @@
         //频谱分析仪装置
         DataList=BaseCommonApi::getDeviceMeasureItemDataSpectrumAnalyzer(deviceCatoryName,CliTable[0].id,HeadList);
         break;
+         case 10:
+         //信号装置
+         DataList=BaseCommonApi::getDeviceMeasureItemDataSignalGenerator(deviceCatoryName,CliTable[0].id,HeadList);
+         break;
         case 13:
         //示波器标准装置
          DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList);
@@ -3456,6 +3460,28 @@
            }
            break;
        }
+    case 9: {
+           //频谱
+           DeviceMeasureDataSpectrumAnalyzer *analyzer = dynamic_cast<DeviceMeasureDataSpectrumAnalyzer *>(object);
+           if (analyzer != nullptr) {
+               result = BaseCommonApi::InsertDeviceMeasureDataSpectrumAnalyzer(*analyzer);
+           } else {
+               // 处理转换失败的情况
+               result = false;
+           }
+           break;
+       }
+    case 10: {
+           //信号
+           DeviceMeasureDataSignalGenerator *generator = dynamic_cast<DeviceMeasureDataSignalGenerator *>(object);
+           if (generator != nullptr) {
+               result = BaseCommonApi::InsertDeviceMeasureDataSignalGenerator(*generator);
+           } else {
+               // 处理转换失败的情况
+               result = false;
+           }
+           break;
+       }
     case 13: {
            //示波器
            DeviceOscilloscopeCalibration *recordGauge = dynamic_cast<DeviceOscilloscopeCalibration *>(object);
@@ -5094,7 +5120,7 @@
 
 }
 //【结果保存】频谱分析仪
-bool InsertDeviceMeasureDataSpectrumAnalyzer(DeviceMeasureDataSpectrumAnalyzer analyzer)
+bool BaseCommonApi::InsertDeviceMeasureDataSpectrumAnalyzer(DeviceMeasureDataSpectrumAnalyzer analyzer)
 {
     QSqlQuery query;
     query.prepare("INSERT INTO biz_business_device_measure_data_spectrum_analyzer "
@@ -5195,7 +5221,7 @@
 
 
 //【查询】角色 根据分类id
-QList<DeviceRole> getDeviceRoleBydeviceId(QString cateory_id)
+QList<DeviceRole> BaseCommonApi::getDeviceRoleBydeviceId(QString cateory_id)
 {
     QList<DeviceRole> result;
     QSqlQuery query;
@@ -5222,7 +5248,7 @@
    return result;
 }
 //【新增】角色
-bool InsertDeviceRole(DeviceRole role)
+bool BaseCommonApi::InsertDeviceRole(DeviceRole role)
 {
     QSqlQuery query;
     query.prepare("INSERT INTO zd_device_role (id,belong_vername,belong_checkname,cateory_id,device_id,device_type,role,create_time,update_time) "
@@ -5244,7 +5270,7 @@
      return isSuccess;
 }
 //【更新】角色
-bool UpdateDeviceRole(DeviceRole role)
+bool BaseCommonApi::UpdateDeviceRole(DeviceRole role)
 {
         QSqlQuery query;
         query.prepare("UPDATE zd_device_role "
@@ -5403,7 +5429,6 @@
             Data.append(row[2]);  //检定项目
             Data.append(row[7] + row[8]);//频率
             Data.append(row[15] + row[16]);//高通滤波
-
             Data.append(row[17] + row[18]);//低通滤波
             Data.append(row[19] + row[20]);//调制速率
             QString temp_hight = QString::number(row[3].toDouble() + row[12].toDouble());
@@ -5535,7 +5560,7 @@
             Data.append("");//测量值
             Data.append(row[21] + row[22] + row[23]);//指标上限
             Data.append(row[14]);//U(k=2)
-            PhaseModulationPhaseDeviationList.append(Data);
+            NonHarmonicList.append(Data);
         }
 
      }
@@ -5570,7 +5595,7 @@
     return  DataMapList;
 }
 //【保存】信号发生器
-bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator)
+bool BaseCommonApi::InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator)
 {
     QSqlQuery query;
     query.prepare("INSERT INTO biz_business_device_measure_data_signal_generator "