|
|
@@ -74,22 +74,26 @@ class jf_power_center():
|
|
|
data['switch'][i]['value'] = self.point_dict[sk]
|
|
|
|
|
|
power_parameter_arr = data['power_parameter_new']
|
|
|
+ pp_arr = [];
|
|
|
+ i=0
|
|
|
for i in range(len(power_parameter_arr)):
|
|
|
keys_arr = power_parameter_arr[i]['keys']
|
|
|
- for j in range(leng(keys_arr)):
|
|
|
+ for j in range(len(keys_arr)):
|
|
|
k = keys_arr[j]
|
|
|
v = self.point_dict[k]
|
|
|
- data['power_parameter_new'][i]['data'][j] = v
|
|
|
+ pp_arr.append(v)
|
|
|
+ data['power_parameter_new'][j]['data']=pp_arr
|
|
|
|
|
|
power_parameter = data['power_parameter']
|
|
|
- for i in range(leng(power_parameter)):
|
|
|
+ for i in range(len(power_parameter)):
|
|
|
if 'data' in power_parameter[i].keys():
|
|
|
- p = val[i]['data']
|
|
|
+ p = power_parameter[i]['data']
|
|
|
for j in range(len(p)):
|
|
|
kk = p[j]['key']
|
|
|
if kk in self.point_dict.keys():
|
|
|
data['power_parameter'][i]['data'][j]['value'] = self.point_dict[kk]
|
|
|
|
|
|
+
|
|
|
# for key, val in data.items():
|
|
|
# for i in range(len(val)):
|
|
|
# ck = val[i]['key']
|
