From f43c5acc73d15a6bc60d6a3cb66b6d750b257dc6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十二月 2023 09:05:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ManualJog.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualJog.vue b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
index eb10eca..6cfa63b 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualJog.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -30,27 +30,27 @@
<router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
$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>
- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
+ <!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
$t('Positioning2')
- }}</router-link>
+ }}</router-link> -->
- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ <!-- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualonePosition2')
- }}</router-link>
+ }}</router-link> -->
<router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
$t('Speed parameter settings')
}}</router-link>
</el-breadcrumb>
- <el-row :gutter="40" style="width:100%;">
- <el-col :span="18" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-row :gutter="40" >
+ <el-col :span="16" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
<el-card class="json-block" style="width:100%;">
<div class="button-row" style="display: flex; justify-content: flex-start;flex-wrap:wrap;">
--
Gitblit v1.8.0