From 79f2cc2f4deb4e900ce8635078933aa924284d6a Mon Sep 17 00:00:00 2001
From: XingCheng3 <1773407212@qq.com>
Date: Mon, 1 Jun 2026 15:33:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=86=8D=E6=AC=A1=E5=B7=A5=E4=BD=9C=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/index.vue | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index b363d2f..c85fa1a 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -104,6 +104,25 @@
         </div>
       </span>
     </el-dialog>
+    <!-- 工作过工件提示框（文本和颜色由后端传入，用于区分报错类型） -->
+    <el-dialog
+        :append-to-body="true"
+        :before-close="handleClose"
+        :visible.sync="twoWorkMsgDialogVisible"
+        center
+        title="提示"
+        width="30%"
+    >
+      <div :style="{ fontSize: '22px', color: twoWorkMsgColor }">
+        {{ twoWorkMsg }}
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <div style="display: flex;justify-content: center">
+          <el-button type="primary" @click="twoWork">重新工作</el-button>
+          <el-button @click="twoWorkSkip">工件下线</el-button>
+        </div>
+      </span>
+    </el-dialog>
     <!-- 拧紧工位 确认工件复位提示框 -->
     <el-dialog
         :append-to-body="true"
@@ -371,6 +390,9 @@ export default {
       ],
       workAgainDialogVisible: false,
       twoWorkDialogVisible: false,
+      twoWorkMsgDialogVisible: false, // 后端控制的工件提示弹窗
+      twoWorkMsg: '', // 弹窗文本（后端传入）
+      twoWorkMsgColor: '#ff0000', // 弹窗文本颜色（后端传入，用于区分报错类型）
       workOver_Is_ShowWindow: false,
       workOver_Is_ShowWindow_msg: '',
       BarCodeCheckNGDialogVisible: false,
@@ -1625,6 +1647,18 @@ export default {
                 this.$message.error('错误断点：PartLoad!!!')
               }
               break
+              // 已工作过工件（文本和颜色由后端传入，用于区分报错类型）m_Value 格式：文本&颜色
+            case 'Engine_Is_TwoWork_Msg':
+              try {
+                const twoWorkMsgList = m_Value.split('&')
+                this.twoWorkMsg = twoWorkMsgList[0]
+                this.twoWorkMsgColor = twoWorkMsgList[1] || '#ff0000'
+                this.twoWorkMsgDialogVisible = true
+                console.log('Engine_Is_TwoWork_Msg', this.twoWorkMsg, this.twoWorkMsgColor)
+              } catch (exception) {
+                this.$message.error('错误断点：Engine_Is_TwoWork_Msg!!!')
+              }
+              break
               // 在MA110 与 140 工位需要弹窗确认的工件,弹出确认复位
             case 'WorkOver_Is_ShowWindow':
               try {
@@ -1907,6 +1941,7 @@ export default {
       console.log(result)
       if (result) {
         this.twoWorkDialogVisible = false
+        this.twoWorkMsgDialogVisible = false
         this.$message.success('工件下线成功')
       } else {
         this.$message.error('工件下线失败')
@@ -1924,6 +1959,7 @@ export default {
         const result = window.g.mqttClient.doPublish(this.publication)
         if (result) {
           this.twoWorkDialogVisible = false
+          this.twoWorkMsgDialogVisible = false
           this.$message.success('重新工作成功')
         } else {
           this.$message.error('重新工作失败')