update

smartfarming/api/views/weather/weather.py

@@ -393,9 +393,9 @@ def qxz_data_chart(request):
 
     conf = {}
     for i in qxz_list:
-        data.append({"dat":{"e1":i.e1,"e2":i.e2,"e3":i.e3,"e4":i.e4,"e5":i.e5,
-                "e6":i.e6,"e7":i.e7,"e8":i.e8,"e9":i.e9,"e10":i.e10,
-                "e11":i.e11,"e12":i.e12,"e13":i.e13,"e14":i.e14,
+        data.append({"dat":{"e1":i.e1 if i.e1 else "0#0#e1","e2":i.e2 if i.e2 else "0#0#e2","e3":i.e3 if i.e3 else "0#0#e3","e4":i.e4 if i.e4 else "0#0#e4","e5":i.e5 if i.e5 else "0#0#e5" ,
+                "e6":i.e6 if i.e6 else "0#0#e6","e7":i.e7 if i.e7 else "0#0#e7","e8":i.e8 if i.e8 else "0#0#e8","e9":i.e9 if i.e9 else "0#0#e9","e10":i.e10 if i.e10 else "0#0#e10",
+                "e11":i.e11 if i.e11 else "0#0#e11","e12":i.e12 if i.e2 else "0#0#e12","e13":i.e13,"e14":i.e14,
                 "e15":i.e15,"e16":i.e16,"e17":i.e17,"e18":i.e18,
                 "e19":i.e19,"e20":i.e20,"e21":i.e21,"e22":i.e22,
                 "e23":i.e23,"e24":i.e24,"e25":i.e25,"e26":i.e26,

smartfarming/views/pest_image.py

@@ -85,7 +85,10 @@ class PestImageSourceExport(ListView):
                     tuple_result = result.split(",")
                     pest_name = insect_dict.get(tuple_result[0],"未命名")
                     pest_string+=pest_name
-                    pest_dict[pest_name] = int(tuple_result[1])
+                    try:
+                        pest_dict[pest_name] = int(tuple_result[1])
+                    except:
+                        pass 
             if select_name and select_name not in pest_string:
                 continue
             addtime = photo_object.addtime
@@ -172,9 +175,12 @@ class PestBaseDataExport(ListView):
                     pest_name = insect_dict.get(tuple_result[0],"未命名")
                     if select_name and select_name not in pest_name:
                         continue
-                    pest_num = int(tuple_result[1])
-                    pest_dict=dict(pest_name=pest_name,pest_num=pest_num,addtime=addtime)
-                    pest_base_data.append(pest_dict)
+                    try:
+                        pest_num = int(tuple_result[1])
+                        pest_dict=dict(pest_name=pest_name,pest_num=pest_num,addtime=addtime)
+                        pest_base_data.append(pest_dict)
+                    except:
+                        pass
         return_data = pest_base_data[(page-1)*page_size:page*page_size]
         save_data = dict(害虫名称=[],害虫数量=[],上报时间=[])
         for data in return_data: