From c8c96e57476968a164ad1889c9d7167fe320982e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 19 三月 2024 08:38:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 857ea53..2de9353 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -743,17 +743,9 @@
<el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
== true ? $t('Stop') : $t('Start')
}}</el-button>
- <!-- {{ $t('Sorting State') }}:
- {{
- this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
- }}
- <el-button type="primary" @click="isAllowReorderings()" :disabled="this.isAllowQueue">{{
- this.isAllowReordering == true ? $t('Allow') : $t('Not Allow')
- }}</el-button> -->
- <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input> -->
<el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>
<label style="background-color:yellow;font-size: 23px;" for="">
- {{ isQueueWarning == true ? $t('The cage is disabled') : "" }}
+ {{ isQueueWarning == true ? $t('The slot is disabled') : "" }}
</label>
<div style="display:flex;">
<div style="width:70%;">
@@ -1025,7 +1017,7 @@
const specialChars = /[^\w\s]/g;
this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");
}
-
+
//鏌ヨ褰撳墠閾濇淇℃伅
this.CurrentFrame = obj.CurrentFrame;
@@ -1051,7 +1043,6 @@
this.InsertQueueGlass(1);
}
}
-
// if (obj.alarmmg[0].length > 0) {
@@ -1517,6 +1508,7 @@
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
+ this.glassid="";
}
else if (res.data.message == 400) {
this.$message.error(this.$t('The glass size is not within the range'));
--
Gitblit v1.8.0