Browse Source

优化可能为空的情况

张世豪 2 months ago
parent
commit
29f9b0bbd9
2 changed files with 6 additions and 2 deletions
  1. 4 2
      index.py
  2. 2 0
      report.py

+ 4 - 2
index.py

@@ -1856,9 +1856,11 @@ def saveFile():
             # 插入分析图
             imgData_NPK = nowTable_NPK.dropna(subset=['有机质g/kg', '全氮g/kg'])
             cationImgData = nowTable_NPK.dropna(subset=['有机质g/kg', '阳离子交换量'])
-            getImg(imgData_NPK['有机质g/kg'],imgData_NPK['全氮g/kg'],mkdir_path,'有机质和全氮相关性分析图','土壤氮磷钾数据',
+            if not imgData_NPK.empty:
+                getImg(imgData_NPK['有机质g/kg'],imgData_NPK['全氮g/kg'],mkdir_path,'有机质和全氮相关性分析图','土壤氮磷钾数据',
                    '有机质g/kg','全氮g/kg',imgData_NPK['编号'],mkdir_path + '/土壤氮磷钾数据-' + nowTime + '.xlsx','P1')
-            getImg(cationImgData['有机质g/kg'], cationImgData['阳离子交换量'], mkdir_path,
+            if not cationImgData.empty:
+                getImg(cationImgData['有机质g/kg'], cationImgData['阳离子交换量'], mkdir_path,
                    '有机质和阳离子交换量相关性分析图',
                    '土壤氮磷钾数据',
                    '有机质g/kg', '阳离子交换量', cationImgData['编号'],

+ 2 - 0
report.py

@@ -763,6 +763,8 @@ def getNAndC(data, url):
     # 去掉nan的值
     data = data.dropna(subset=['有机质', '全氮'])
     # 绘制散点图 拟合直线 计算方差
+    if data.empty:
+        return pd.DataFrame({})
     x = data['有机质']
     y = data['全氮']
     plt.scatter(x, y)