修改了界面显示(生产进度条、上料斗位置状态)、增加了将角度信息上传opc
This commit is contained in:
@ -208,7 +208,7 @@ class MainWindow(QWidget):
|
||||
|
||||
if artifact.MouldCode: # 更新模具号
|
||||
self.segment_task_widget.set_task_id(f"task{index}", artifact.MouldCode)
|
||||
if artifact.BetonVolume: # 更新浇筑方量
|
||||
if artifact.BetonVolume is not None: # 更新浇筑方量
|
||||
self.segment_task_widget.set_task_volume(f"task{index}", artifact.BetonVolume)
|
||||
if artifact.BeginTime: # 更新时间 (管片任务的开始时间)
|
||||
# print("artifact.BeginTime: ", artifact.BeginTime)
|
||||
@ -285,7 +285,7 @@ class MainWindow(QWidget):
|
||||
# 设置派单任务的tasks信息
|
||||
if record.MouldCode:
|
||||
self.dispatch_task_widget.set_task_id(task_name, record.MouldCode)
|
||||
if record.FBetonVolume:
|
||||
if record.FBetonVolume is not None:
|
||||
self.dispatch_task_widget.set_task_volume(task_name, record.FBetonVolume)
|
||||
if record.CreateTime:
|
||||
self.dispatch_task_widget.set_task_time(task_name, self.convert_to_ampm(record.CreateTime))
|
||||
|
||||
@ -193,7 +193,7 @@ class HopperWidget(QWidget):
|
||||
# 此时,点击按钮为关闭破拱
|
||||
self.lower_arch_breaking_status = False
|
||||
self.lower_arch_label.setHidden(True)
|
||||
self.upper_arch_breaking_signal.emit(self.lower_arch_breaking_status)
|
||||
self.lower_arch_breaking_signal.emit(self.lower_arch_breaking_status)
|
||||
|
||||
def create_lower_hopper(self):
|
||||
"""创建下位料斗Widget"""
|
||||
|
||||
@ -89,11 +89,11 @@ class LinearProductionProgress(QWidget):
|
||||
self.fg_label.move(0, 0)
|
||||
self.fg_label.raise_()
|
||||
|
||||
# 百分比标签(宽33px,高19px,右偏9px)
|
||||
# 百分比标签(宽39px,高19px,右偏9px)
|
||||
self.percent_label = QLabel(self)
|
||||
self.percent_label.setText("0%")
|
||||
self.percent_label.setAlignment(Qt.AlignCenter)
|
||||
self.percent_label.setFixedSize(33, 19)
|
||||
self.percent_label.setFixedSize(39, 19)
|
||||
# self.percent_label.setStyleSheet(
|
||||
# """
|
||||
# color: white;
|
||||
@ -135,9 +135,9 @@ class LinearProductionProgress(QWidget):
|
||||
fg_width = int(450 * (self._progress + 4) / 100)
|
||||
self.fg_label.setFixedWidth(fg_width)
|
||||
|
||||
# 计算百分比标签位置:进度条右边缘 - 9px(偏移) - 标签宽度(33px)
|
||||
# 计算百分比标签位置:进度条右边缘 - 9px(偏移) - 标签宽度(39px)
|
||||
if fg_width > 60: # 当上层进度条宽度大于60px,开始移动
|
||||
label_x = fg_width - 9 - 33
|
||||
label_x = fg_width - 9 - 39
|
||||
# 移动百分比标签
|
||||
self.percent_label.move(label_x, 0)
|
||||
else:
|
||||
|
||||
@ -131,8 +131,8 @@ class TaskWidget(QWidget):
|
||||
# 水平布局2:方量 + / + 时间 + 状态图标
|
||||
row2_layout = QHBoxLayout()
|
||||
# 方量标签
|
||||
volume_label = QLabel("方量 200")
|
||||
volume_label.setStyleSheet("color: #a1c1d7; font-size: 14px;padding-left: 6px;")
|
||||
volume_label = QLabel("方量 99")
|
||||
volume_label.setStyleSheet("color: #a1c1d7; font-size: 14px;padding-left: 1px;")
|
||||
controls["volume_label"] = volume_label
|
||||
row2_layout.addWidget(volume_label)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user