From 111d44b09fd4f53d718e30a9643c4d004a1a4333 Mon Sep 17 00:00:00 2001
From: zhangxuxutm <951937200@qq.com>
Date: Thu, 8 Jun 2023 15:50:02 +0800
Subject: [PATCH] =?UTF-8?q?0608=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow.h             | 18 +++++++++---------
 MonitorUI/MonitorTagUI.h |  4 ++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/MainWindow.h b/MainWindow.h
index b035d0e..9682185 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -135,9 +135,9 @@ public:
         verticalLayout->setStretch(2, 40);
         MainWindow->setCentralWidget(centralwidget);
 
-        retranslateUi(MainWindow);
+        setButtonMes();
 
-        //        设置按钮点击跳转窗口
+        //        ���ð�ť�����ת����
         connect(monitorButton, &QPushButton::clicked, this, [=](){this->stackedWidget->setCurrentIndex(0); });
         connect(flangeButton, &QPushButton::clicked, this, [=](){this->stackedWidget->setCurrentIndex(1); });
         connect(clearanceButton, &QPushButton::clicked, this, [=](){this->stackedWidget->setCurrentIndex(2); });
@@ -145,21 +145,21 @@ public:
 
         connect(closeButton, &QPushButton::clicked, MainWindow, &QMainWindow::close);
 
-//        设置无边框窗口
+//        �����ޱ߿򴰿�
         MainWindow->setWindowFlags(Qt::FramelessWindowHint);
 
         QMetaObject::connectSlotsByName(MainWindow);
     } // setupUi
 
-    void retranslateUi(QMainWindow *MainWindow)
+
+    void setButtonMes()
     {
-        MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "MainWindow", nullptr));
         minButton->setText(QString());
         closeButton->setText(QString());
-        monitorButton->setText(QCoreApplication::translate("MainWindow", "\347\233\221\346\216\247\346\200\273\350\247\210", nullptr));
-        flangeButton->setText(QCoreApplication::translate("MainWindow", "\346\263\225\345\205\260\345\210\206\346\236\220", nullptr));
-        clearanceButton->setText(QCoreApplication::translate("MainWindow", "\345\207\200\347\251\272\345\210\206\346\236\220", nullptr));
-        gyroscopeButton->setText(QCoreApplication::translate("MainWindow", "\351\231\200\350\236\272\344\273\252\347\233\221\346\265\213", nullptr));
+        monitorButton->setText(u8"�� �� �� ��");
+        flangeButton->setText(u8"�� �� �� ��");
+        clearanceButton->setText(u8"�� �� �� ��");
+        gyroscopeButton->setText(u8"�� �� �� �� ��");
     } // retranslateUi
 
     MainWindow(){
diff --git a/MonitorUI/MonitorTagUI.h b/MonitorUI/MonitorTagUI.h
index a5c2579..b1e8363 100644
--- a/MonitorUI/MonitorTagUI.h
+++ b/MonitorUI/MonitorTagUI.h
@@ -14,6 +14,7 @@
 #include <QTimer>
 #include <QContextMenuEvent>
 #include <QComboBox>
+#include <QLineEdit>
 #include <QDebug>
 
 
@@ -71,9 +72,12 @@ public:
         verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
 
         stateBox = new QComboBox(MonitorTag);
+        stateBox->setEditable(true);
+        stateBox->lineEdit()->setAlignment(Qt::AlignCenter);
         QStringList options = {"远程模式", "待机等风", "停机维护", "启动"};
         stateBox->addItems(options);
 
+
         auto it1 = std::find(fans.standbyFans.begin(), fans.standbyFans.end(), fan.fanCode);
         auto it2 = std::find(fans.hutdownFans.begin(), fans.hutdownFans.end(), fan.fanCode);
         auto it3 = std::find(fans.runFans.begin(), fans.runFans.end(), fan.fanCode);