修复索引错位bug

UI/VarManages/TCRTDModel.py

@@ -351,7 +351,6 @@ class TcRtdTypeDelegate(TcRtdButtonDelegate):
             # 定义所有可能的类型
             tcTypes = ['R', 'S', 'B', 'J', 'T','E', 'K', 'N', 'C', 'A']
             rtdTypes = ['PT100']
-            print(currentValue,2321312)
             
             
             # 如果当前值是热电偶类型

model/ProjectModel/VarManage.py

@@ -292,15 +292,14 @@ class HartVarManage(object):
 
 
     @classmethod
-    def editVar(self, name, Nname, des, varModel):
+    def editVar(self, name, Nname, des):
         # 修改变量信息
         name = str(name)
         Nname = str(Nname)
         des = str(des)
-        varModel = str(varModel)
 
         if Nname == name:
-            HartVar.update(varName = Nname, description = des, varModel = varModel).where(HartVar.varName == name).execute()
+            HartVar.update(varName = Nname, description = des).where(HartVar.varName == name).execute()
         elif HartVar.getByName(Nname):
             print('已有同名变量')
             return
@@ -308,7 +307,7 @@ class HartVarManage(object):
             print('不存在的变量')
             return
         else:
-            HartVar.update(varName = Nname, description = des, varModel = varModel).where(HartVar.varName == name).execute()
+            HartVar.update(varName = Nname, description = des).where(HartVar.varName == name).execute()
         # 操作后刷新缓存
         refreshCache()
 
@@ -325,7 +324,7 @@ class HartVarManage(object):
         # 查询指定变量信息
         var = HartVar.getByName(name)
         if var:
-            varMes = [var.id, var.varName, var.description, var.varModel]
+            varMes = [var.id, var.varName, var.description]
             [varMes.append('') for x in range(10)]
             return varMes
         else:
@@ -565,7 +564,7 @@ class AnalogManage(object):
         var = AnalogVar.getByName(name)
         if var:
 
-            return [var.id, var.varName, var. channelNumber, var.description, var.varType, var.min, var.max, var.varModel, var.unit]
+            return [var.id, var.varName, var.channelNumber, var.description, var.varType, var.min, var.max, var.unit, var.varModel]
         else:
             return False
 
@@ -670,14 +669,14 @@ class HartSimulateVarManage(object):
 
 
     @classmethod
-    def editVar(self, name, Nname, des, varModel):
+    def editVar(self, name, Nname, des):
         # 修改变量信息
         name = str(name)
         Nname = str(Nname)
         des = str(des)
 
         if Nname == name:
-            HartSimulateVar.update(varName = Nname, description = des, varModel = varModel).where(HartSimulateVar.varName == name).execute()
+            HartSimulateVar.update(varName = Nname, description = des).where(HartSimulateVar.varName == name).execute()
         elif HartSimulateVar.getByName(Nname):
             print('已有同名变量')
             return
@@ -685,7 +684,7 @@ class HartSimulateVarManage(object):
             print('不存在的变量')
             return
         else:
-            HartSimulateVar.update(varName = Nname, description = des, varModel = varModel).where(HartSimulateVar.varName == name).execute()
+            HartSimulateVar.update(varName = Nname, description = des).where(HartSimulateVar.varName == name).execute()
         # 操作后刷新缓存
         refreshCache()
     
@@ -700,7 +699,7 @@ class HartSimulateVarManage(object):
         # 查询指定变量信息
         var = HartSimulateVar.getByName(name)
         if var:
-            varMes = [var.id, var.varName, var.description, var.varModel]
+            varMes = [var.id, var.varName, var.description]
             [varMes.append('') for x in range(10)]
             return varMes
         else: