|
|
@@ -93,8 +93,8 @@ class Ui_MainWindow(object):
|
|
|
self.startTimeLabel.setObjectName("startTimeLabel")
|
|
|
self.startTimeEdit = QtWidgets.QDateTimeEdit(self.centralwidget)
|
|
|
self.startTimeEdit.setGeometry(QtCore.QRect(310, 210, 151, 21))
|
|
|
- self.startTimeEdit.setMaximumDateTime(QtCore.QDateTime(QtCore.QDate(2025, 12, 31), QtCore.QTime(23, 59, 59)))
|
|
|
- self.startTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2023, 1, 1), QtCore.QTime(18, 0, 0)))
|
|
|
+ self.startTimeEdit.setMaximumDateTime(QtCore.QDateTime(QtCore.QDate(2028, 12, 31), QtCore.QTime(23, 59, 59)))
|
|
|
+ self.startTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2024, 1, 1), QtCore.QTime(18, 0, 0)))
|
|
|
self.startTimeEdit.setObjectName("startTimeEdit")
|
|
|
self.endTimeLabel = QtWidgets.QLabel(self.centralwidget)
|
|
|
self.endTimeLabel.setGeometry(QtCore.QRect(180, 250, 121, 21))
|
|
|
@@ -102,7 +102,7 @@ class Ui_MainWindow(object):
|
|
|
self.endTimeEdit = QtWidgets.QDateTimeEdit(self.centralwidget)
|
|
|
self.endTimeEdit.setGeometry(QtCore.QRect(310, 250, 151, 21))
|
|
|
self.endTimeEdit.setMaximumDateTime(QtCore.QDateTime(QtCore.QDate(2025, 12, 31), QtCore.QTime(23, 59, 59)))
|
|
|
- self.endTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2023, 2, 1), QtCore.QTime(20, 0, 0)))
|
|
|
+ self.endTimeEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(2024, 2, 1), QtCore.QTime(20, 0, 0)))
|
|
|
self.endTimeEdit.setObjectName("endTimeEdit")
|
|
|
self.platLabel = QtWidgets.QLabel(self.centralwidget)
|
|
|
self.platLabel.setGeometry(QtCore.QRect(180, 290, 121, 21))
|
|
|
@@ -353,6 +353,7 @@ class SCDThread(QtCore.QThread):
|
|
|
worksheet.set_column(index, index, c_n)
|
|
|
# 输入数据
|
|
|
is_pass_count = 0
|
|
|
+ print(head_dict)
|
|
|
for index, id in enumerate(device_list):
|
|
|
device_id, dver_num, lng, lat, position = device_detail_deivce_id(id)
|
|
|
# 获取电压,信号强度历史数据
|