|
@@ -69,13 +69,13 @@ class jf_pump_center():
|
|
|
for i in range(len(val)):
|
|
for i in range(len(val)):
|
|
|
ck = val[i]['key']
|
|
ck = val[i]['key']
|
|
|
if ck in self.point_dict.keys():
|
|
if ck in self.point_dict.keys():
|
|
|
- data[key][i]['val'] = self.point_dict[ck]
|
|
|
|
|
|
|
+ data[key][i]['value'] = self.point_dict[ck]
|
|
|
if 'parameter' in val[i].keys():
|
|
if 'parameter' in val[i].keys():
|
|
|
p = val[i]['parameter']
|
|
p = val[i]['parameter']
|
|
|
for j in range(len(p)):
|
|
for j in range(len(p)):
|
|
|
kk = p[j]['key']
|
|
kk = p[j]['key']
|
|
|
if kk in self.point_dict.keys():
|
|
if kk in self.point_dict.keys():
|
|
|
- data[key][i]['parameter'][j]['val'] = self.point_dict[kk]
|
|
|
|
|
|
|
+ data[key][i]['parameter'][j]['value'] = self.point_dict[kk]
|
|
|
data[key] = val
|
|
data[key] = val
|
|
|
self.jdata['sys_point'] = data
|
|
self.jdata['sys_point'] = data
|
|
|
|
|
|
