Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-05-10 3ab0fb6281f55924d49d7e28bd6655d59b2a346d

Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

 CanadaMes-ui/src/lang/locales/en-US.json

@@ -1,5 +1,5 @@
{

  "Clear":"Clear",

  "Confirmation needed":"Confirmation needed",

  "ip":"192.168.10.21",

  "Mes Connection failed":"Mes Connection failed",

  "Plc1 Connection failed":"Plc1 Connection failed",

@@ -251,7 +251,7 @@
  "Length":"Length",

  "Width":"Width",

  "Operate":"Operate",

  "Terminate Task":"Terminate Task",

  "Task Complete":"Task Complete",

  "cancel":"cancel",

  "confirm":"confirm",

  "Number":"Number",

@@ -271,7 +271,7 @@
  "List No":"List No",

  "Box No":"Box No",

  "Delete":"Delete",

  "Out":"Out",

  "Outfeed":"Outfeed",



  "Operation successful":"Operation successful",

  "Operation canceled":"Operation canceled",

@@ -313,7 +313,7 @@
  "Confirm":"Confirm",

  "The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",

  "This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage",

  "Outing Queue":"Outing Queue",

  "Outfeed Queue":"Outfeed Queue",

  "Enter the Frame No":"Enter the Frame No",

  "Frame No":"Frame No",

  "Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",


 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -1,5 +1,5 @@
{

  "Clear":"清除",

  "Confirmation needed":"清除",

  "ip":"192.168.10.21",

  "Mes Connection failed":"Mes连接失败",

  "Plc1 Connection failed":"Plc1连接失败",

@@ -241,7 +241,7 @@
  "Length": "长",

  "Width": "宽",

  "Operate": "操作",

  "Terminate Task":"结束任务",

  "Task Complete":"结束任务",

  "end task": "完成任务",

  "Number": "数量",

  "Outfeed glass barcode": "出片玻璃id",

@@ -259,7 +259,7 @@
  "Slot No": "格子",

  "Barcode": "玻璃id",

  "Delete": "删除",

  "Out": "出片",

  "Outfeed": "出片",

  "Operation successful": "操作成功",

  "Operation canceled": "操作取消",

  "There is no such order": "没有此订单的玻璃",

@@ -308,7 +308,7 @@
  "Confirm": "确认",

  "The glass ID already exists in the loading queue": "上片队列已存在此玻璃id",

  "This glass ID already exists in the sorting cage": "理片笼内已存在此玻璃id",

  "Outing Queue":"出片队列",

  "Outfeed Queue":"出片队列",

  "Enter the Aluminum Frame No":"请输入铝框id",

  "Frame No":"铝框id",

  "Glass information corresponding to aluminum frame":"铝框对应的玻璃信息",


 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>