From 3ab0fb6281f55924d49d7e28bd6655d59b2a346d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 10 五月 2024 09:37:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index a5a1780..a3b57e4 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -264,7 +264,7 @@
}}</el-button>
<el-button type="primary" @click="showform6()" :disabled="OutingQueue"
:class="OutingQueue == true ? 'hide' : ''">
- {{ $t('Outing Queue') }}</el-button>
+ {{ $t('Outfeed Queue') }}</el-button>
<el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"
:class="StopTask == true ? 'hide' : ''">
{{ $t('Terminate Feeding') }}</el-button>
@@ -295,10 +295,10 @@
{{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}
</template>
</el-table-column>
- <el-table-column :label="$t('Terminate Task')">
+ <el-table-column :label="$t('Task Complete')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Task Complete')
}}</el-button>
</template>
</el-table-column>
@@ -321,10 +321,10 @@
</template>
</el-table-column>
- <el-table-column :label="$t('Terminate Task')">
+ <el-table-column :label="$t('Task Complete')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Task Complete')
}}</el-button>
</template>
</el-table-column>
@@ -416,66 +416,66 @@
<div class="glass D01" style="top: 39px;left: 1055px;position: absolute;">{{ ShowGlassIdList(0) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 0)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass D02" style="top: 117px;left: 1055px;position: absolute;">{{ ShowGlassIdList(1) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.3', 1)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass B01" style="top: 270px;left: 640px;position: absolute;">
B01:{{ ShowGlassIdList(2) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2', 2)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass B02" style="top: 315px;left: 640px;position: absolute;">B02:{{ ShowGlassIdList(3) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.3', 3)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass A01" style="top: 270px;left: 289px;position: absolute;">
A01.1:{{ ShowGlassIdList(4) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 4)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass A01" style="top: 315px;left: 289px;position: absolute;">A01.2:{{ ShowGlassIdList(5) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 5)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass A02" style="top: 360px;left: 289px;position: absolute;">A02:{{ ShowGlassIdList(6) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.1', 6)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass D03" style="top: 122px;left: 42px;position: absolute;">
{{ ShowGlassIdList(7) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.4', 7)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass D04" style="top: 198px;left: 42px;position: absolute;">
{{ ShowGlassIdList(8) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 8)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass D05" style="top: 275px;left: 42px;position: absolute;">
{{ ShowGlassIdList(9) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.6', 9)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
<div class="glass D06" style="top: 352px;left: 42px;position: absolute;">
{{ ShowGlassIdList(10) }}
<br />
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 10)">
- {{ $t('Clear') }}</el-button>
+ {{ $t('Confirmation needed') }}</el-button>
</div>
@@ -602,7 +602,7 @@
@click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
:disabled="scope.row.state == 1 ? false : true"
- @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>
+ @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Outfeed') }}</el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
{{ scope.row.disabled == 0 ? $t('Disable') : $t('Enable') }}</el-button>
@@ -777,7 +777,7 @@
</el-form>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">
+ <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outfeed Queue')" top="5vh">
{{ $t('Queue State') }}:
{{ this.isAllowQueue
== true ? $t('Start') : $t('Stop')
@@ -855,7 +855,7 @@
top="5vh">
<el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input>
<el-button type="primary" @click="showform7()">{{ $t('Query') }}</el-button>
- <el-button type="primary" @click="AddOutSliceS()">{{ $t('Add') }}</el-button>
+ <el-button type="primary" @click="AddOutSliceS()">{{ $t('Outfeed') }}</el-button>
<el-button type="primary" @click="CloseForm7()">{{ $t('Cancel') }}</el-button>
<el-table :data="this.AluminumFrame" :height="700" border style="width: 100%;overflow: auto;">
<el-table-column prop="frameBarcode" :label="$t('Frame No')"></el-table-column>
--
Gitblit v1.8.0