describe、desc改为descr,避免关键字冲突

This commit is contained in:
陈劲松
2019-07-22 19:34:50 +08:00
parent ba16de9780
commit 185a1e6d57

View File

@@ -4298,7 +4298,7 @@ data |Object |R | 
   uuid |Integer |R |节点标识    uuid |Integer |R |节点标识
   ip |String |R |节点ip    ip |String |R |节点ip
   name |String |R |节点名称    name |String |R |节点名称
  describe |String |R |任务结果描述信息   descr |String |R |任务结果描述信息
  state |String |R |任务执行状态   state |String |R |任务执行状态
  cycle |Integer |R |第几周期   cycle |Integer |R |第几周期
  file |String |R |回传文件路径   file |String |R |回传文件路径
@@ -4322,7 +4322,7 @@ data |Object |R | 
"ip": "10.20.30.40", "ip": "10.20.30.40",
"name": "node1" "name": "node1"
}, },
"describe": "", "descr": "",
"state": "", "state": "",
"cycle": 1, "cycle": 1,
"file": "", "file": "",
@@ -5042,7 +5042,7 @@ chartType=3
'prefix_font_size':0, 'prefix_font_size':0,
'title':'title', 'title':'title',
'value_font_size':15, 'value_font_size':15,
'describe':'describe', 'descr':'descr',
'is_gauge':1, 'is_gauge':1,
'is_threshold':1, 'is_threshold':1,
'is_scale':1, 'is_scale':1,
@@ -5072,7 +5072,7 @@ chartType=2
'legend':1, 'legend':1,
'legend_x_position':'center', 'legend_x_position':'center',
'legend_y_position':'top', 'legend_y_position':'top',
'describe':'describe', 'descr':'descr',
'series':[{ 'series':[{
"value": 93, "value": 93,
"time": 1547433810000 "time": 1547433810000
@@ -5098,7 +5098,7 @@ chartType=4
{ {
'font_size':15, 'font_size':15,
'title':'title', 'title':'title',
'describe':'describe', 'descr':'descr',
'value_name':'value name', 'value_name':'value name',
'time_name':'time name', 'time_name':'time name',
'decimal':1, 'decimal':1,