diff --git a/Static/变量表.xlsx b/Static/变量表.xlsx index 17301f8..a3965f8 100644 Binary files a/Static/变量表.xlsx and b/Static/变量表.xlsx differ diff --git a/UI/VarManages/VarTable.py b/UI/VarManages/VarTable.py index cacc49d..9efd083 100644 --- a/UI/VarManages/VarTable.py +++ b/UI/VarManages/VarTable.py @@ -188,7 +188,7 @@ class TcRtdTableView(VarTableView): def setHeader(self): self.setItemDelegateForColumn(12, TcRtdButtonDelegate(self)) self.setItemDelegateForColumn(11, TcRtdVarModelBox(self)) - self.model = TcRtdModel([' ID', '强制值', '当前值', '变量名', '通道序号', '变量描述', '变量类型', '工程量下限', '工程量上限', '单位', '补偿值', '值类型', '操作', ], [], table=self) + self.model = TcRtdModel([' ID', '强制值', '当前值', '变量名', '通道序号', '变量描述', '变量类型', '工程量下限', '工程量上限', '单位', '补偿值', '值类型', '操作'], [], table=self) class AnalogTableView(VarTableView): def __init__(self, parent=None): diff --git a/model/ProjectModel/VarManage.py b/model/ProjectModel/VarManage.py index d95513d..c5e6461 100644 --- a/model/ProjectModel/VarManage.py +++ b/model/ProjectModel/VarManage.py @@ -510,7 +510,7 @@ class AnalogManage(object): return l = [] for var in vars: - l.append([var.id, var.initialValue, var.varName, var.channelNumber, var.description, var.varType, var.min, var.max, var.varModel, var.unit]) + l.append([var.id, var.initialValue, var.varName, var.channelNumber, var.description, var.varType, var.min, var.max, var.unit, var.varModel]) return l