Просмотр исходного кода

修改一些UI,完善交互逻辑

wzp 2 месяцев назад
Родитель
Сommit
5ca0908c22
2 измененных файлов: 39 добавлений и 24 удалений
  1. 1
    1
      Front/back/Program_Run/database_operations.py
  2. 38
    23
      Front/modules/ui_main.py

+ 1
- 1
Front/back/Program_Run/database_operations.py Просмотреть файл

@@ -38,7 +38,7 @@ def create_database_and_tables(main_window, ui):
38 38
     db_name = main_window.ui.lineEdit.text().strip()
39 39
 
40 40
     if not db_name:
41
-        QMessageBox.warning(main_window, "警告", "请输入数据库名称")
41
+        QMessageBox.warning(main_window, "警告", "请输入项目名称")
42 42
         return
43 43
 
44 44
     # 获取 SQL 文件夹路径

+ 38
- 23
Front/modules/ui_main.py Просмотреть файл

@@ -1237,7 +1237,7 @@ class Ui_MainWindow(object):
1237 1237
         self.frame_5.setMidLineWidth(0)
1238 1238
         self.label_2 = QLabel(self.frame_5)
1239 1239
         self.label_2.setObjectName(u"label_2")
1240
-        self.label_2.setGeometry(QRect(10, 10, 61, 21))
1240
+        self.label_2.setGeometry(QRect(10, 10, 70, 21))
1241 1241
         self.label_3 = QLabel(self.frame_5)
1242 1242
         self.label_3.setObjectName(u"label_3")
1243 1243
         self.label_3.setGeometry(QRect(13, 35, 761, 181))
@@ -1280,14 +1280,14 @@ class Ui_MainWindow(object):
1280 1280
         self.frame_title_wid_1.setMaximumSize(QSize(16777215, 34))
1281 1281
         self.frame_title_wid_1.setFrameShape(QFrame.Shape.NoFrame)
1282 1282
         self.frame_title_wid_1.setFrameShadow(QFrame.Shadow.Raised)
1283
-        self.verticalLayout_18 = QVBoxLayout(self.frame_title_wid_1)
1284
-        self.verticalLayout_18.setObjectName(u"verticalLayout_18")
1285
-        self.labelBoxBlenderInstalation = QLabel(self.frame_title_wid_1)
1286
-        self.labelBoxBlenderInstalation.setObjectName(u"labelBoxBlenderInstalation")
1287
-        self.labelBoxBlenderInstalation.setFont(font)
1288
-        self.labelBoxBlenderInstalation.setStyleSheet(u"")
1283
+        # self.verticalLayout_18 = QVBoxLayout(self.frame_title_wid_1)
1284
+        # self.verticalLayout_18.setObjectName(u"verticalLayout_18")
1285
+        # self.labelBoxBlenderInstalation = QLabel(self.frame_title_wid_1)
1286
+        # self.labelBoxBlenderInstalation.setObjectName(u"labelBoxBlenderInstalation")
1287
+        # self.labelBoxBlenderInstalation.setFont(font)
1288
+        # self.labelBoxBlenderInstalation.setStyleSheet(u"")
1289 1289
 
1290
-        self.verticalLayout_18.addWidget(self.labelBoxBlenderInstalation)
1290
+        # self.verticalLayout_18.addWidget(self.labelBoxBlenderInstalation)
1291 1291
 
1292 1292
         self.verticalLayout_17.addWidget(self.frame_title_wid_1)
1293 1293
 
@@ -1304,11 +1304,22 @@ class Ui_MainWindow(object):
1304 1304
         self.gridLayout.setHorizontalSpacing(7)
1305 1305
         self.gridLayout.setVerticalSpacing(4)
1306 1306
         self.gridLayout.setContentsMargins(-1, -1, -1, 0)
1307
+
1308
+        self.label_notice_1 = QLabel(self.frame_content_wid_1)
1309
+        self.label_notice_1.setObjectName(u"label")
1310
+        self.label_notice_1.setMaximumSize(QSize(16777215, 16777215))
1311
+        self.gridLayout.addWidget(self.label_notice_1, 0, 1, 1, 1)
1312
+
1313
+        self.label_notice_2 = QLabel(self.frame_content_wid_1)
1314
+        self.label_notice_2.setObjectName(u"label")
1315
+        self.label_notice_2.setMaximumSize(QSize(16777215, 16777215))
1316
+        self.gridLayout.addWidget(self.label_notice_2, 0, 2, 1, 1)
1317
+
1318
+
1307 1319
         self.label = QLabel(self.frame_content_wid_1)
1308 1320
         self.label.setObjectName(u"label")
1309 1321
         self.label.setMaximumSize(QSize(60, 16777215))
1310
-
1311
-        self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
1322
+        self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
1312 1323
 
1313 1324
         self.comboBox = QComboBox(self.frame_content_wid_1)
1314 1325
         self.comboBox.setObjectName(u"comboBox")
@@ -1345,20 +1356,20 @@ class Ui_MainWindow(object):
1345 1356
         # 更新 comboBox 的初始内容
1346 1357
         self.updater.update_combo_box()
1347 1358
 
1348
-        self.gridLayout.addWidget(self.comboBox, 0, 1, 1, 1)
1359
+        self.gridLayout.addWidget(self.comboBox, 1, 1, 1, 1)
1349 1360
 
1350 1361
         self.lineEdit = CustomLineEdit(self.frame_content_wid_1)
1351 1362
         self.lineEdit.setObjectName(u"lineEdit")
1352 1363
         self.lineEdit.setMinimumSize(QSize(0, 25))
1353
-        self.lineEdit.setMaximumSize(QSize(250, 35))
1364
+        self.lineEdit.setMaximumSize(QSize(250, 34))
1354 1365
         self.lineEdit.setStyleSheet(u"background-color: rgb(33, 37, 43);")
1355 1366
 
1356
-        self.gridLayout.addWidget(self.lineEdit, 0, 2, 1, 1)
1367
+        self.gridLayout.addWidget(self.lineEdit, 1, 2, 1, 1)
1357 1368
 
1358 1369
         self.createFile = QPushButton(self.frame_content_wid_1)
1359 1370
         self.createFile.setObjectName(u"createFile")
1360
-        self.createFile.setMinimumSize(QSize(150, 26))
1361
-        self.createFile.setMaximumSize(QSize(60, 16777215))
1371
+        self.createFile.setMinimumSize(QSize(150, 33))
1372
+        self.createFile.setMaximumSize(QSize(16777215, 16777215))
1362 1373
         self.createFile.setFont(font)
1363 1374
         self.createFile.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
1364 1375
         self.createFile.setStyleSheet(u"background-color: rgb(52, 59, 72);")
@@ -1368,12 +1379,12 @@ class Ui_MainWindow(object):
1368 1379
         icon4.addFile(u":/icons/images/icons/cil-folder-open.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1369 1380
         self.createFile.setIcon(icon4)
1370 1381
 
1371
-        self.gridLayout.addWidget(self.createFile, 0, 3, 1, 1)
1382
+        self.gridLayout.addWidget(self.createFile, 2, 2, 1, 1)
1372 1383
 
1373 1384
         self.label_4 = QLabel(self.frame_content_wid_1)
1374 1385
         self.label_4.setObjectName(u"label_4")
1375 1386
 
1376
-        self.gridLayout.addWidget(self.label_4, 1, 0, 1, 1)
1387
+        self.gridLayout.addWidget(self.label_4, 2, 0, 1, 1)
1377 1388
 
1378 1389
         self.comboBox_2 = QComboBox(self.frame_content_wid_1)
1379 1390
         self.comboBox_2.addItem("")
@@ -1390,7 +1401,7 @@ class Ui_MainWindow(object):
1390 1401
                                       "    min-width: 9em;   \n"
1391 1402
                                       "}")
1392 1403
 
1393
-        self.gridLayout.addWidget(self.comboBox_2, 1, 1, 1, 1)
1404
+        self.gridLayout.addWidget(self.comboBox_2, 2, 1, 1, 1)
1394 1405
 
1395 1406
         self.horizontalLayout_9.addLayout(self.gridLayout)
1396 1407
 
@@ -1994,10 +2005,14 @@ class Ui_MainWindow(object):
1994 2005
                                                         u"<html><head/><body><p>1.\u5728\u201c\u8f93\u5165\u8868\u683c\u201d\u754c\u9762\uff0c\u5bfc\u5165\u6309\u683c\u5f0f\u7f16\u5199\u597d\u7684\u8f93\u5165\u6570\u636e\uff08\u652f\u6301.xls\u3001.xlsx\u683c\u5f0f\uff09\uff0c\u70b9\u51fb\u201c\u8ba1\u7b97\u201d\u3002</p><p>2.\u81ea\u52a8\u8df3\u8f6c\u201c\u6210\u679c\u9884\u89c8\u201d\u754c\u9762\uff0c\u53ef\u9009\u62e9\u201c\u4fdd\u5b58\u6570\u636e\u201d\u53ca\u201c\u5bfc\u51fa\u6570\u636e\u201d\uff08\u5982\u9700\u4fee\u6539\u8f93\u5165\u503c\uff0c\u8bf7\u5728\u201c\u6570\u636e\u4e00\u89c8\u201d\u5185\u4fee\u6539\uff0c\u65e0\u9700\u518d\u6b21\u4e0a\u4f20Excel\uff09</p><p>3.\u201c\u6570\u636e\u4e00\u89c8\u201d\u754c\u9762\u53ef\u901a\u8fc7\u540d\u79f0/\u5173\u952e\u8bcd\u6a21\u7cca\u67e5\u8be2\u8868\uff0c\u901a\u8fc7\u7b5b\u9009\u6309\u94ae\u53ef\u7b5b\u9009\u7a33\u5b9a\u70b9\u3001\u4f4d\u79fb\u70b9\u3001\u65b0\u5efa\u70b9\u548c\u590d\u5efa\u70b9\u3002</p><p>4.\u201c\u6570\u636e\u4e00\u89c8\u201d\u5de5\u5177\u680f\u4ece\u5de6\u5230\u53f3\u5206\u522b\u5b9e\u73b0\u5168"
1995 2006
                                                         "\u5c4f\u663e\u793a\uff0c\u4e0a\u4e00\u5f20\u8868\uff0c\u4e0b\u4e00\u5f20\u8868\uff0c\u7f16\u8f91\u6570\u636e\uff0c\u4fdd\u5b58\u6570\u636e\uff0c\u5bfc\u51fa\u5f53\u524d\u8868\uff0c\u67e5\u627e\u8868\u5185\u6570\u636e\u64cd\u4f5c\u3002</p><p>5.\u5728\u201c\u6570\u636e\u4e00\u89c8\u201d\u70b9\u51fb\u201c\u7f16\u8f91\u6570\u636e\u201d\u5373\u53ef\u4fee\u6539\u5df2\u5b58\u50a8\u6570\u636e\uff0c\u70b9\u51fb\u201c\u4fdd\u5b58\u6570\u636e\u201d\u5c06\u91cd\u65b0\u8ba1\u7b97\u5e76\u8df3\u8f6c\u201c\u6210\u679c\u9884\u89c8\u201d\u9875\u3002</p><p>6.\u4ec5\u652f\u6301\u5bf9\u57fa\u672c\u6570\u636e\u7684\u4fee\u6539\uff0c\u6210\u679c\u6570\u636e\u8bf7\u5bfc\u51fa\u540e\u81ea\u884c\u4fee\u6539\uff0c\u7cfb\u7edf\u4e0d\u505a\u5b58\u50a8\u3002</p></body></html>",
1996 2007
                                                         None))
1997
-        self.labelBoxBlenderInstalation.setText(QCoreApplication.translate("MainWindow",
1998
-                                                                           u"<html><head/><body><p><span style=\" font-weight:700;\">\u5bfc\u5165Excel\u8868\u683c</span></p></body></html>",
1999
-                                                                           None))
2000
-        self.label.setText(QCoreApplication.translate("MainWindow", u"\u9009\u62e9\u9879\u76ee\uff1a", None))
2008
+        # self.labelBoxBlenderInstalation.setText(QCoreApplication.translate("MainWindow",
2009
+        #                                                                    u"<html><head/><body><p><span style=\" font-weight:700;\">\u5bfc\u5165Excel\u8868\u683c</span></p></body></html>",
2010
+        #                                                                    None))
2011
+
2012
+        self.label_notice_1.setText(QCoreApplication.translate("MainWindow", u"<strong>\u9009\u62e9\u5df2\u6709\u9879\u76ee</strong>", None))
2013
+        self.label_notice_2.setText(QCoreApplication.translate("MainWindow", u"<strong>\u521b\u5efa\u65b0\u9879\u76ee</strong>", None))
2014
+
2015
+        self.label.setText(QCoreApplication.translate("MainWindow", u"\u9879\u76ee\uff1a", None))
2001 2016
 
2002 2017
         self.lineEdit.setText("")
2003 2018
         self.lineEdit.setPlaceholderText(QCoreApplication.translate("MainWindow",
@@ -2005,7 +2020,7 @@ class Ui_MainWindow(object):
2005 2020
                                                                     None))
2006 2021
         self.createFile.setText(QCoreApplication.translate("MainWindow", u"\u65b0\u5efa", None))
2007 2022
         self.label_4.setText(
2008
-            QCoreApplication.translate("MainWindow", u"\u9009\u62e9\u8ba1\u7b97\u65b9\u5f0f\uff1a", None))
2023
+            QCoreApplication.translate("MainWindow", u"\u8ba1\u7b97\u65b9\u5f0f\uff1a", None))
2009 2024
 
2010 2025
         self.comboBox_2.setItemText(0, QCoreApplication.translate("MainWindow",
2011 2026
                                                                   u"\u63a7\u5236\u7f51\u590d\u6d4b\u5e73\u9762\u57fa\u51c6\u8ba1\u7b97",

Загрузка…
Отмена
Сохранить