update

bigdata_django/zhijian/cbd_zhijian.py

@@ -909,7 +909,7 @@ class CBDThread(QtCore.QThread):
             score = []
             print(sorted_dict, "----------------")
             for v in sorted_dict:
-                rank = 50 if self.set_product == "水稻测报灯" else 68
+                rank = 60 if self.set_product == "水稻测报灯" else 68
                 if v[1] < rank:
                     lte.append(str(v[1]))
                     score.append(str(round(v[1], 3)))

bigdata_django/zhijian/qxz/main.py

@@ -217,7 +217,8 @@ class Ui_MainWindow(object):
                 for d_i in col_value[1:]:
                     try:
                         d_i_v = str(d_i).strip()
-                        d_list.append(d_i_v)
+                        if d_i_v:
+                            d_list.append(d_i_v)
                     except Exception as e:
                         continue
                 read_dict["设备ID"] = d_list

bigdata_django/zhijian/qxz/mongoclient.py

@@ -67,7 +67,7 @@ def get_qxz_conf(device_id):
     db = get_table()
     qxz_conf = db.sa_qxz_conf
     query = {'device_id': device_id}
-    conf = qxz_conf.find_one(query, {"_id": 0, "uptime": 0, "device_id": 0, "id": 0})
+    conf = qxz_conf.find_one(query, {"_id": 0, "uptime": 0, "device_id": 0, "id": 0, "manual_change": 0})
     conf = {k: v for k, v in conf.items() if v is not None and v != ""}
     conf.update({"uptime": "上传数据条数#999#个"})
     return conf