From 625d2b6dd9bd4a1c63bf7e1b2701393d908f7a81 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 五月 2024 08:31:12 +0800
Subject: [PATCH] 客户数据库变更,部分铝框没有对应玻璃信息,扫码添加出片队列时,当铝框没有对应玻璃时直接添加到出片队列

---
 CanadaMes-ui/src/views/Electrical/Parameter2.vue |   40 ++++++++++------------------------------
 1 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index df63997..fce0e2d 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -8,35 +8,20 @@
         active-class="blue-button"
         >{{ $t("Alarm") }}</router-link
       >
-      <router-link
-        to="/Electrical/State"
-        tag="el-button"
-        type="text"
-        active-class="blue-button"
-        >{{ $t("State") }}</router-link
-      >
-      <!-- <router-link
-        to="/Electrical/Action"
-        tag="el-button"
-        type="text"
-        active-class="blue-button"
-        >{{ $t("Action") }}</router-link -->
-
-      <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
-        }}</router-link> -->
+     
       <router-link
         to="/Electrical/Sign"
         tag="el-button"
         type="text"
         active-class="blue-button"
-        >{{ $t("Sign") }}</router-link
+        >{{ $t("I/O") }}</router-link
       >
       <router-link
         to="/Electrical/Servomanual"
         tag="el-button"
         type="text"
         active-class="blue-button"
-        >{{ $t("Parameter") }}</router-link
+        >{{ $t("Manual/Automatic") }}</router-link
       >
     </el-breadcrumb>
 
@@ -46,31 +31,25 @@
         tag="el-button"
         type="text"
         active-class="blue-button"
-        >{{ $t("Automatic State") }}</router-link
+        >{{ $t("Glass Data") }}</router-link
       >
-      <!-- <router-link
-        to="/Electrical/ManualJog"
-        tag="el-button"
-        type="text"
-        active-class="blue-button"
-        >{{ $t("ManualJog") }}</router-link
-      > -->
+
 
       <router-link
         to="/Electrical/ManualonePosition"
         tag="el-button"
         type="text"
         active-class="blue-button"
-        >{{ $t("ManualonePosition") }}</router-link
+        >{{ $t("Manual Control") }}</router-link
       >
 
-      <router-link v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">
+      <router-link v-show="false" v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">
     {{ $t('Servomanualone') }}
   </router-link>
       
      
       <router-link   v-if="hasPermission" to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
-        $t('Address parameter settings')
+        $t('Cage Positions')
       }}</router-link>
   
       <router-link   v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
@@ -82,7 +61,7 @@
         tag="el-button"
         type="text"
         active-class="blue-button"
-        >{{ $t("InteractionState") }}</router-link
+        >{{ $t("PLC-MES Info") }}</router-link
       >
     </el-breadcrumb>
 
@@ -241,6 +220,7 @@
   },
 
   activated() {
+    document.body.style.zoom = "90%";
     this.initWebSocket();
     this.filteredData();
     const language = this.$i18n.locale;

--
Gitblit v1.8.0