Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding2/ControlNetwork

Back/GC/GC.py

@@ -254,13 +254,17 @@ def get_data_from_excel1(list1):
             d_value = float(list1[row][4])
             e_value = float(list1[row][5])
         except:
-            d_value = ''
-            e_value = ''
+            d_value = None
+            e_value = None
         f_value = list1[row][0]
         g_value = list1[row][7]
         h_value = list1[row][8]
-        i_value = float(list1[row][9])
-        j_value = float(list1[row][10])
+        try:
+            i_value = float(list1[row][9])
+            j_value = float(list1[row][10])
+        except:
+            i_value = None
+            j_value = None
         if a_value is not None or f_value is not None:
             data.append((a_value, b_value, c_value, d_value, e_value, f_value, g_value, h_value, i_value, j_value))
     return data