From 79e0a14068decac12cbd6c670639413f0fa9e18c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/InteractionState.vue | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/InteractionState.vue b/CanadaMes-ui/src/views/Electrical/InteractionState.vue
index 4dd0ec8..101479b 100644
--- a/CanadaMes-ui/src/views/Electrical/InteractionState.vue
+++ b/CanadaMes-ui/src/views/Electrical/InteractionState.vue
@@ -15,21 +15,16 @@
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/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> -->
<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"
@@ -46,7 +41,7 @@
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("Automatic State") }}</router-link
+ >{{ $t("Glass Data") }}</router-link
>
<!-- <router-link
to="/Electrical/ManualJog"
@@ -61,42 +56,33 @@
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("ManualonePosition") }}</router-link
+ >{{ $t("Manual Control") }}</router-link
>
<router-link
to="/Electrical/Servomanualone"
tag="el-button"
type="text"
- active-class="blue-button"
+ active-class="blue-button" v-show="false"
>{{ $t("Servomanualone") }}</router-link
>
- <!-- <router-link
- to="/Electrical/Parameter1"
- tag="el-button"
- type="text"
- active-class="blue-button"
- >{{ $t("Parameter1") }}</router-link
- > -->
+ <!-- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
+ }}</router-link> -->
<router-link
to="/Electrical/Positioning1"
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("Address parameter settings") }}</router-link
+ >{{ $t("Cage Positions") }}</router-link
>
<!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
$t('Positioning2')
}}</router-link> -->
- <!-- <router-link
- to="/Electrical/ManualonePosition2"
- tag="el-button"
- type="text"
- active-class="blue-button"
- >{{ $t("ManualonePosition2") }}</router-link
- > -->
+ <!-- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link> -->
<router-link
to="/Electrical/AutomaticParameterSetting"
tag="el-button"
@@ -104,15 +90,14 @@
active-class="blue-button"
>{{ $t("Speed parameter settings") }}</router-link
>
- <router-link
+
+ <router-link
to="/Electrical/InteractionState"
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("InteractionState") }}</router-link
+ >{{ $t("PLC-MES Info") }}</router-link
>
-
-
</el-breadcrumb>
<el-row :gutter="30" class="card">
@@ -176,6 +161,7 @@
};
},
activated() {
+ document.body.style.zoom = "90%";
this.initWebSocket();
const language = this.$i18n.locale;
console.log(language);
--
Gitblit v1.8.0