diff --git a/main.ui b/main.ui
index 9fc92f4..12f8b10 100644
--- a/main.ui
+++ b/main.ui
@@ -29,7 +29,7 @@
- 总院网络巡查系统
+ 中国建材总院宣传工作信息化管理平台
@@ -84,6 +84,17 @@
24
+
+
+ 11
+
+
+
+ false
+
+
+ background-color:#409EFF; color: white; border-radius: 2px
+
打开工具
@@ -99,7 +110,9 @@
+ 楷体
10
+ false
@@ -136,6 +149,9 @@
24
+
+ background-color:#409EFF; color: white; border-radius: 2px
+
打开网站列表Excel
@@ -151,7 +167,9 @@
+ 楷体
10
+ false
@@ -188,6 +206,9 @@
24
+
+ background-color:#409EFF; color: white; border-radius: 2px
+
打开分析标准Excel
@@ -203,7 +224,9 @@
+ 楷体
10
+ false
@@ -258,6 +281,9 @@
24
+
+ background-color:#409EFF; color: white; border-radius: 2px
+
开始巡查
@@ -273,7 +299,9 @@
+ 楷体
10
+ false
@@ -424,6 +452,9 @@
24
+
+ background-color:#409EFF; color: white; border-radius: 2px
+
打开
@@ -445,15 +476,16 @@
- 430
+ 260
0
- 171
- 41
+ 341
+ 31
- 14
+ 楷体
+ 11
false
true
@@ -462,7 +494,7 @@
color:white;
- 总院网络巡查系统
+ 中国建材总院宣传工作信息化管理平台
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
diff --git a/start.py b/start.py
index 2b991f8..9a6d22c 100644
--- a/start.py
+++ b/start.py
@@ -13,7 +13,6 @@ import pandas as pd
from urllib.parse import urlparse
from openpyxl import load_workbook
import threading
-import select
# from queue import Queue
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -225,5 +224,4 @@ if __name__ == "__main__":
app = MyApplication(sys.argv)
main_window = app.createMainWindow()
main_window.show()
-
sys.exit(app.exec())
\ No newline at end of file
diff --git a/summary/template.xlsx b/summary/template.xlsx
index 0e5e2fd..636b640 100644
Binary files a/summary/template.xlsx and b/summary/template.xlsx differ
diff --git a/ui_mainwindow.py b/ui_mainwindow.py
index 82a41b5..329b77b 100644
--- a/ui_mainwindow.py
+++ b/ui_mainwindow.py
@@ -51,11 +51,16 @@ class Ui_MainWindow(object):
self.bWechat = QPushButton(self.groupBox)
self.bWechat.setObjectName(u"bWechat")
self.bWechat.setGeometry(QRect(20, 30, 75, 24))
+ self.bWechat.setFont(font)
+ self.bWechat.setAutoFillBackground(False)
+ self.bWechat.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.label_5 = QLabel(self.groupBox)
self.label_5.setObjectName(u"label_5")
self.label_5.setGeometry(QRect(20, 60, 161, 16))
font1 = QFont()
+ font1.setFamilies([u"\u6977\u4f53"])
font1.setPointSize(10)
+ font1.setBold(False)
self.label_5.setFont(font1)
self.label_5.setStyleSheet(u"color: red;")
self.groupBox_2 = QGroupBox(self.centralwidget)
@@ -65,6 +70,7 @@ class Ui_MainWindow(object):
self.bWebSite = QPushButton(self.groupBox_2)
self.bWebSite.setObjectName(u"bWebSite")
self.bWebSite.setGeometry(QRect(20, 30, 151, 24))
+ self.bWebSite.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.label_2 = QLabel(self.groupBox_2)
self.label_2.setObjectName(u"label_2")
self.label_2.setGeometry(QRect(20, 70, 151, 16))
@@ -77,6 +83,7 @@ class Ui_MainWindow(object):
self.bBiao = QPushButton(self.groupBox_3)
self.bBiao.setObjectName(u"bBiao")
self.bBiao.setGeometry(QRect(20, 30, 151, 24))
+ self.bBiao.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.label_4 = QLabel(self.groupBox_3)
self.label_4.setObjectName(u"label_4")
self.label_4.setGeometry(QRect(20, 70, 151, 16))
@@ -96,6 +103,7 @@ class Ui_MainWindow(object):
self.bStart = QPushButton(self.groupBox_4)
self.bStart.setObjectName(u"bStart")
self.bStart.setGeometry(QRect(300, 50, 75, 24))
+ self.bStart.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.label_6 = QLabel(self.groupBox_4)
self.label_6.setObjectName(u"label_6")
self.label_6.setGeometry(QRect(10, 30, 251, 41))
@@ -115,11 +123,13 @@ class Ui_MainWindow(object):
self.label_7 = QLabel(self.groupBox_5)
self.label_7.setObjectName(u"label_7")
self.label_7.setGeometry(QRect(10, 20, 91, 16))
- self.label_7.setFont(font1)
+ font3 = QFont()
+ font3.setPointSize(10)
+ self.label_7.setFont(font3)
self.label_8 = QLabel(self.groupBox_5)
self.label_8.setObjectName(u"label_8")
self.label_8.setGeometry(QRect(10, 40, 91, 16))
- self.label_8.setFont(font1)
+ self.label_8.setFont(font3)
self.line = QFrame(self.groupBox_5)
self.line.setObjectName(u"line")
self.line.setGeometry(QRect(10, 30, 561, 16))
@@ -136,17 +146,19 @@ class Ui_MainWindow(object):
self.bRes1 = QPushButton(self.groupBox_5)
self.bRes1.setObjectName(u"bRes1")
self.bRes1.setGeometry(QRect(520, 10, 51, 24))
+ self.bRes1.setStyleSheet(u"background-color:#409EFF; color: white; border-radius: 2px")
self.bRes2 = QPushButton(self.groupBox_5)
self.bRes2.setObjectName(u"bRes2")
self.bRes2.setGeometry(QRect(520, 40, 51, 24))
self.label_9 = QLabel(self.centralwidget)
self.label_9.setObjectName(u"label_9")
- self.label_9.setGeometry(QRect(430, 0, 171, 41))
- font3 = QFont()
- font3.setPointSize(14)
- font3.setBold(True)
- font3.setItalic(False)
- self.label_9.setFont(font3)
+ self.label_9.setGeometry(QRect(260, 0, 341, 31))
+ font4 = QFont()
+ font4.setFamilies([u"\u6977\u4f53"])
+ font4.setPointSize(11)
+ font4.setBold(True)
+ font4.setItalic(False)
+ self.label_9.setFont(font4)
self.label_9.setStyleSheet(u"color:white;")
self.label_9.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter)
self.label_9.setMargin(6)
@@ -165,7 +177,7 @@ class Ui_MainWindow(object):
# setupUi
def retranslateUi(self, MainWindow):
- MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"\u603b\u9662\u7f51\u7edc\u5de1\u67e5\u7cfb\u7edf", None))
+ MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"\u4e2d\u56fd\u5efa\u6750\u603b\u9662\u5ba3\u4f20\u5de5\u4f5c\u4fe1\u606f\u5316\u7ba1\u7406\u5e73\u53f0", None))
self.label.setText("")
self.groupBox.setTitle(QCoreApplication.translate("MainWindow", u"1.\u5fae\u4fe1\u516c\u4f17\u53f7\u4fe1\u606f\u6293\u53d6", None))
self.bWechat.setText(QCoreApplication.translate("MainWindow", u"\u6253\u5f00\u5de5\u5177", None))
@@ -188,6 +200,6 @@ class Ui_MainWindow(object):
self.lRes2.setText("")
self.bRes1.setText(QCoreApplication.translate("MainWindow", u"\u6253\u5f00", None))
self.bRes2.setText(QCoreApplication.translate("MainWindow", u"\u6253\u5f00", None))
- self.label_9.setText(QCoreApplication.translate("MainWindow", u"\u603b\u9662\u7f51\u7edc\u5de1\u67e5\u7cfb\u7edf", None))
+ self.label_9.setText(QCoreApplication.translate("MainWindow", u"\u4e2d\u56fd\u5efa\u6750\u603b\u9662\u5ba3\u4f20\u5de5\u4f5c\u4fe1\u606f\u5316\u7ba1\u7406\u5e73\u53f0", None))
# retranslateUi