From 0c1011f411c4aae5b31428e50bc4f5e858753436 Mon Sep 17 00:00:00 2001
From: xins <xins@mesnac.com>
Date: Wed, 17 Apr 2024 14:02:59 +0800
Subject: [PATCH] =?UTF-8?q?2.1.6=20=E8=BD=A6=E9=97=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw-ui/src/layout/components/Navbar.vue        | 20 +++++-----
 hw-ui/src/views/board/fifthFloor/index.vue    | 38 +++++++++++--------
 hw-ui/src/views/board/firstFloor/index.vue    |  8 +++-
 .../src/views/board/fourthFloor/assemble.vue  |  2 +-
 hw-ui/src/views/board/fourthFloor/weld.vue    | 13 +++----
 5 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/hw-ui/src/layout/components/Navbar.vue b/hw-ui/src/layout/components/Navbar.vue
index 86a2a6ba..0ba58ae1 100644
--- a/hw-ui/src/layout/components/Navbar.vue
+++ b/hw-ui/src/layout/components/Navbar.vue
@@ -145,16 +145,16 @@ export default {
     localStorage.setItem("this.devicetotal", 0);
   },
   mounted() {
-    this.getAlarmData();
-    setInterval(() => this.getAlarmData(), 1000 * 60);
-    this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
-    this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
-    if(this.$route.query.id) {
-      changePoolName(this.$route.query.id).then((res) => {
-        localStorage.setItem("USER_POOL_NAME_CURRENT", this.$route.query.id);
-        this.poolName = this.$route.query.id;
-      });
-    }
+    // this.getAlarmData();
+    // setInterval(() => this.getAlarmData(), 1000 * 60);
+    // this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
+    // this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
+    // if(this.$route.query.id) {
+    //   changePoolName(this.$route.query.id).then((res) => {
+    //     localStorage.setItem("USER_POOL_NAME_CURRENT", this.$route.query.id);
+    //     this.poolName = this.$route.query.id;
+    //   });
+    // }
   },
   components: {
     Breadcrumb,
diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue
index 2704068c..cd250469 100644
--- a/hw-ui/src/views/board/fifthFloor/index.vue
+++ b/hw-ui/src/views/board/fifthFloor/index.vue
@@ -152,6 +152,13 @@
               width="120"
             >
               <template slot-scope="scope">
+                <el-button
+                  size="small"
+                  style="margin-right: 12px"
+                  type="text"
+                >
+                  SOP预览
+                </el-button>
                 <el-button
                   v-if="($route.query && $route.query.id) === '2'"
                   size="small"
@@ -168,21 +175,21 @@
                 <!--                  SOP预览-->
                 <!--                </el-button>-->
 
-<!--                <el-popconfirm-->
-<!--                  v-if="($route.query && $route.query.id) === '2'"-->
-<!--                  cancel-button-text='否'-->
-<!--                  confirm-button-text='是'-->
-<!--                  icon="el-icon-info"-->
-<!--                  icon-color="red"-->
-<!--                  title="确定开始计划吗？"-->
-<!--                  @confirm="startPlan(scope.row)"-->
-<!--                >-->
-<!--                  <el-button-->
-<!--                    slot="reference"-->
-<!--                    size="small"-->
-<!--                    type="text">开始-->
-<!--                  </el-button>-->
-<!--                </el-popconfirm>-->
+                <el-popconfirm
+                  v-if="($route.query && $route.query.id) === '2'"
+                  cancel-button-text='否'
+                  confirm-button-text='是'
+                  icon="el-icon-info"
+                  icon-color="red"
+                  title="确定开始计划吗？"
+                  @confirm="startPlan(scope.row)"
+                >
+                  <el-button
+                    slot="reference"
+                    size="small"
+                    type="text">开始
+                  </el-button>
+                </el-popconfirm>
 
                 <el-popover
                   placement="top"
@@ -235,7 +242,6 @@
       <el-row>
         <el-button type="primary">首页</el-button>
         <!--        <el-button type="success" @click="getMaterialsModel = true">条码打印</el-button>-->
-        <el-button type="info">SOP预览</el-button>
         <el-button type="danger" @click="logout">退出</el-button>
       </el-row>
     </div>
diff --git a/hw-ui/src/views/board/firstFloor/index.vue b/hw-ui/src/views/board/firstFloor/index.vue
index ede2d959..5a00d4cb 100644
--- a/hw-ui/src/views/board/firstFloor/index.vue
+++ b/hw-ui/src/views/board/firstFloor/index.vue
@@ -62,6 +62,12 @@
               width="120"
             >
               <template slot-scope="scope">
+                <el-button
+                  size="small"
+                  type="text"
+                >
+                  SOP预览
+                </el-button>
                 <el-button
                   size="small"
                   type="text"
@@ -373,9 +379,7 @@
     <div class="bottom">
       <el-row>
         <el-button type="primary">首页</el-button>
-        <el-button type="success">SOP预览</el-button>
         <el-button type="success" @click="handleProductInstock">成品入库</el-button>
-        <el-button type="info">最小化</el-button>
         <el-button type="danger" @click="logout">退出</el-button>
       </el-row>
     </div>
diff --git a/hw-ui/src/views/board/fourthFloor/assemble.vue b/hw-ui/src/views/board/fourthFloor/assemble.vue
index 613521c5..3051fb52 100644
--- a/hw-ui/src/views/board/fourthFloor/assemble.vue
+++ b/hw-ui/src/views/board/fourthFloor/assemble.vue
@@ -209,7 +209,7 @@
       <el-row>
         <el-button type="primary">首页</el-button>
         <el-button type="success" @click="handleProductInstock">成品入库</el-button>
-        <el-button type="info">最小化</el-button>
+        <!--el-button type="info">最小化</el-button-->
         <el-button type="danger" @click="logout">退出</el-button>
       </el-row>
     </div>
diff --git a/hw-ui/src/views/board/fourthFloor/weld.vue b/hw-ui/src/views/board/fourthFloor/weld.vue
index 577c7937..d7cf6953 100644
--- a/hw-ui/src/views/board/fourthFloor/weld.vue
+++ b/hw-ui/src/views/board/fourthFloor/weld.vue
@@ -112,12 +112,12 @@
               width="120"
             >
               <template slot-scope="scope">
-                <!--                <el-button-->
-                <!--                  size="small"-->
-                <!--                  type="text"-->
-                <!--                >-->
-                <!--                  SOP预览-->
-                <!--                </el-button>-->
+                                <el-button
+                                  size="small"
+                                  type="text"
+                                >
+                                  SOP预览
+                                </el-button>
                 <el-popconfirm
                   cancel-button-text='否'
                   confirm-button-text='是'
@@ -157,7 +157,6 @@
     <div class="bottom">
       <el-row>
         <el-button type="primary">首页</el-button>
-        <el-button type="info">SOP预览</el-button>
         <el-button type="danger" @click="logout">退出</el-button>
       </el-row>
     </div>