Просмотр исходного кода

气象站设备质检工具: 修复输入表格末尾出现空行导致检测结果出错的问题

zhaiyifei 2 лет назад
Родитель
Сommit
4380703d77
1 измененных файлов с 16 добавлено и 4 удалено
  1. 16 4
      bigdata_django/zhijian/qxz_zhijian_new.py

+ 16 - 4
bigdata_django/zhijian/qxz_zhijian_new.py

@@ -661,15 +661,27 @@ class Ui_MainWindow(object):
                 d_list = []
                 d_list = []
                 for row in range(2, row_num + 1):
                 for row in range(2, row_num + 1):
                     cell = sheet.cell(row, 1)
                     cell = sheet.cell(row, 1)
-                    d_list.append(cell.value)
+                    try:
+                        cell_value = cell.value.strip()
+                        if cell_value:
+                            d_list.append(cell.value)
+                    except Exception as e:
+                        continue
+
                 read_dict["设备ID"] = d_list
                 read_dict["设备ID"] = d_list
             else:
             else:
                 xls = open_workbook(file_path)
                 xls = open_workbook(file_path)
                 sheet_object = xls.sheets()[0]
                 sheet_object = xls.sheets()[0]
                 ncols = sheet_object.ncols
                 ncols = sheet_object.ncols
-                for i in range(ncols):
-                    col_value = sheet_object.col_values(i)
-                    read_dict[col_value[0]] = col_value[1:]
+                d_list = []
+                col_value = sheet_object.col_values(0)
+                for d_i in col_value[1:]:
+                    try:
+                        d_i_v = d_i.strip()
+                        d_list.append(d_i_v)
+                    except Exception as e:
+                        continue
+                read_dict["设备ID"] = d_list
             device_list = read_dict.get("设备ID")
             device_list = read_dict.get("设备ID")
 
 
             if device_list:
             if device_list: