From 5409ce7e3cb77bc612a99aec515f2c97f762e75b Mon Sep 17 00:00:00 2001
From: "DESKTOP-3D7M4SA\\Hicent" <452669850@qq.com>
Date: Mon, 15 Dec 2025 20:38:37 +0800
Subject: [PATCH] 1215

---
 Static/Area.qss                      |  4 ----
 UI/Main/Main.py                      | 36 ++--------------------------
 UI/ProfibusWidgets/ProfibusWindow.py |  4 ++--
 UI/ProjectManages/ProjectModel.py    | 10 ++++----
 model/ProjectModel/ProjectManage.py  |  3 ++-
 utils/Globals.py                     |  2 +-
 6 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/Static/Area.qss b/Static/Area.qss
index 829f31e..2057716 100644
--- a/Static/Area.qss
+++ b/Static/Area.qss
@@ -237,7 +237,3 @@ QComboBox#orderCombox::drop-down {
     border-radius: 5px;
 }
 
-QComboBox#dataTypeCombox::item,
-QComboBox#orderCombox::item {
-    padding: 8px 5px;
-}
\ No newline at end of file
diff --git a/UI/Main/Main.py b/UI/Main/Main.py
index 7aa7bd3..41b00fd 100644
--- a/UI/Main/Main.py
+++ b/UI/Main/Main.py
@@ -217,41 +217,9 @@ class MainWindow(QMainWindow):
                         
         except Exception as e:
             print(f"创建动态变量管理标签页失败: {e}")
-            # 如果出错，创建默认的标签页
-            self.createDefaultVarTabs()
+            # # 如果出错，创建默认的标签页
+            # self.createDefaultVarTabs()
     
-    def createDefaultVarTabs(self):
-        """创建默认的变量管理标签页（兼容性备用方案）"""
-        try:
-            # 创建默认widgets
-            defaultWidgets = [
-                (VarWidgets('ModbusTcpMaster'), 'MODBUSTCP主站'),
-                (VarWidgets('ModbusTcpSlave'), 'MODBUSTCP从站'),
-                (VarWidgets('ModbusRtuMaster'), 'MODBUSRTU主站'),
-                (VarWidgets('ModbusRtuSlave'), 'MODBUSRTU从站'),
-                (AnalogWidgets(), 'IO'),
-                (TcRtdWidgets(), 'TCRTD'),
-                (HartMainWindow(), 'HART读取'),
-                (HartSimulateWidgets(), 'HART模拟'),
-                (ProfibusWidgets(), 'PROFIBUS'),
-                (RpcVarTableView(), '远程通讯')
-            ]
-            
-            for widget, name in defaultWidgets:
-                if hasattr(widget, 'setObjectName'):
-                    if 'Modbus' in name:
-                        widget.setObjectName('varWidget')
-                    elif name == 'IO':
-                        widget.setObjectName('analogWidget')
-                    elif name == 'HART模拟':
-                        widget.setObjectName('hartsimulateWidget')
-                    elif name == 'HART读取':
-                        widget.setObjectName('hartWidget')
-                
-                self.varManageTabWidget.addTab(widget, name)
-                
-        except Exception as e:
-            print(f"创建默认变量管理标签页失败: {e}")
     
     def updateVarTabs(self, globalConfig=None):
         """更新变量管理标签页（供外部调用）"""
diff --git a/UI/ProfibusWidgets/ProfibusWindow.py b/UI/ProfibusWidgets/ProfibusWindow.py
index a171e1f..2b79b56 100644
--- a/UI/ProfibusWidgets/ProfibusWindow.py
+++ b/UI/ProfibusWidgets/ProfibusWindow.py
@@ -189,8 +189,8 @@ class ProfibusWidgets(QWidget):
         toolbarLayout.addWidget(self.addressLabel, 1)
         toolbarLayout.addWidget(QWidget(), 10)
         # toolbarLayout.addWidget(QLabel('电量:'), 1)
-        toolbarLayout.addWidget(self.batteryProBar, 1)
-        toolbarLayout.addWidget(self.batteryStateLabel, 1)
+        # toolbarLayout.addWidget(self.batteryProBar, 1)
+        # toolbarLayout.addWidget(self.batteryStateLabel, 1)
         toolbarLayout.addWidget(QWidget(), 1)
         # toolbarLayout.addLayout(hLayout, 1)
 
diff --git a/UI/ProjectManages/ProjectModel.py b/UI/ProjectManages/ProjectModel.py
index 14b0c12..5dc39a0 100644
--- a/UI/ProjectManages/ProjectModel.py
+++ b/UI/ProjectManages/ProjectModel.py
@@ -259,11 +259,11 @@ class ProjectButtonDelegate(QItemDelegate):
         QtWidgets.QApplication.processEvents()
         ProjectManage.switchProject(str(self.parent().model.datas[sender.index[0]][1]))
 
-        if  not Globals.getValue('switchState'):
-            pass
-        else:
-            Globals.getValue('MainWindows').delecteWidget()
-            Globals.getValue('MainWindows').createWidgets()
+        # if  not Globals.getValue('switchState'):
+        #     pass
+        # else:
+        #     Globals.getValue('MainWindows').delecteWidget()
+        #     Globals.getValue('MainWindows').createWidgets()
         
         # 根据全局配置获取启用的模型表列表
         modelLists = GlobalConfigManager.getEnabledModelTables()
diff --git a/model/ProjectModel/ProjectManage.py b/model/ProjectModel/ProjectManage.py
index 9ad7077..7349919 100644
--- a/model/ProjectModel/ProjectManage.py
+++ b/model/ProjectModel/ProjectManage.py
@@ -169,7 +169,8 @@ class ProjectManage(object):
 		Globals.getValue('MainWindow').procedureManagerWidget.initUI()
 		
 		# 根据全局配置动态更新变量管理界面
-		self.updateDynamicVarWidgets(globalConfig)
+		if not currentDB:
+			self.updateDynamicVarWidgets(globalConfig)
 		
 		# 通知控制系统工程已切换
 		try:
diff --git a/utils/Globals.py b/utils/Globals.py
index b39a19c..e700b1d 100644
--- a/utils/Globals.py
+++ b/utils/Globals.py
@@ -7,7 +7,7 @@ def _init():#初始化
     _globalDict['ModBusTcp'] = 0
     _globalDict['ModBusRtu'] = 1
     _globalDict['currentPro'] = -1     # 当前工程名
-    _globalDict['currentProDB'] = 0   # 当前工程的数据库连接
+    _globalDict['currentProDB'] = None   # 当前工程的数据库连接
     _globalDict['varTable'] = 0       # 变量表
     _globalDict['userTable'] = 0      # 用户表
     _globalDict['popen'] = 0          # 通讯进程