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

wu

2024-04-23 d426473660914f321ba593cf7f2203d4bb2d3d7c

 CanadaMes-ui/src/views/home/index.vue

@@ -264,7 +264,8 @@
                <el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"

                    :class="StopTask == true ? 'hide' : ''">

                    {{ $t('Terminate Feeding') }}</el-button>

                <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask" :class="StopTask == true ? 'hide' : ''">

                <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask"

                    :class="StopTask == true ? 'hide' : ''">

                    {{ $t('Terminate Outing') }}</el-button>

                <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStopState"

                    :class="SoftEmergencyStopState == true ? 'hide' : ''">

@@ -274,7 +275,8 @@
            </div>

            <div>

                <el-table :data="this.tasklist1" border style="width: 100%">

                    <el-table-column :min-width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="180" prop="glassId"

                        :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

@@ -294,7 +296,8 @@
                    </el-table-column>

                </el-table>

                <el-table :data="this.tasklist2" border style="width: 100%">

                    <el-table-column :min-width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="180" prop="glassId"

                        :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :min-width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :min-width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

@@ -361,19 +364,28 @@
                <div class="blocks-img2"></div>

                <div class="blocks-img3"></div>



                <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01</div>

                <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01

                </div>

                <div class="device" :style="'top: 105px;left: 1027px;background-color: ' + ShowDeviceList(1) + ';'">D02

                </div>

                <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01</div>

                <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02</div>

                <div class="blocks-img" :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">

                <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01

                </div>

                <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02

                </div>

                <div class="blocks-img"

                    :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">

                    A01</div>

                <div class="blocks-img" :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">

                <div class="blocks-img"

                    :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">

                    A02</div>

                <div class="device" :style="'top: 108px;left: 150px;background-color: ' + ShowDeviceList(6) + ';'">D03</div>

                <div class="device" :style="'top: 185px;left: 150px;background-color: ' + ShowDeviceList(7) + ';'">D04</div>

                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05</div>

                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06</div>

                <div class="device" :style="'top: 108px;left: 150px;background-color: ' + ShowDeviceList(6) + ';'">D03

                </div>

                <div class="device" :style="'top: 185px;left: 150px;background-color: ' + ShowDeviceList(7) + ';'">D04

                </div>

                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05

                </div>

                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06

                </div>



                <div class="device" :style="'top: 395px;left: 90px;background-color: ;'">E01</div>

                <div class="device" :style="'top: 395px;left: 243px;background-color: ;'">E02</div>

@@ -457,7 +469,8 @@
        <el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">

            <el-form :model="form" label-width="100px" style="padding-right: 30px">

                <el-form-item :label="$t('Barcode')">

                    <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid"></el-input>

                    <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')"

                        v-model="glassid"></el-input>

                    <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>

                </el-form-item>

                <el-form-item :label="$t('Barcode')">

@@ -527,8 +540,8 @@
        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">

            <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="cageglassid"></el-input>

            <el-button type="primary" @click="showcageinfo(1)">{{ $t('Query') }}</el-button>

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700" border

                style="width: 100%;overflow: auto;">

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700"

                border style="width: 100%;overflow: auto;">

                <el-table-column :min-width="50" prop="cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column :min-width="55" prop="tier" :label="$t('The Side')">

@@ -545,14 +558,16 @@
                <el-table-column :min-width="80" prop="state" :label="$t('Glass State')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?

                scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state ==

                    3 ?

                                $t('Outing') : ""

                        }}

                    </template>

                </el-table-column>

                <el-table-column :min-width="150" prop="lengthWidth" :label="$t('Dim')">

                    <template slot-scope='scope'>

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{

                scope.row.glassHeightMm }}

                    </template>

                </el-table-column>



@@ -601,10 +616,11 @@
                <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>

                <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>

            </el-table>

            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"

                :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"

                layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"

                background style="float: right; margin-top: 20px">

            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange"

                @current-change="handleCurrentChange" :pager-count="7" :current-page="currentPage"

                :page-sizes="[5, 10, 15, 20]" :page-size="pagesize" layout="total, sizes, prev, pager, next, jumper"

                :total="GlassInfo.length > 0 ? GlassInfo.length : null" background

                style="float: right; margin-top: 20px">

            </el-pagination>

        </el-dialog>

        <el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">

@@ -616,7 +632,8 @@
                            {{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand Movement') }}

                        {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand

                        Movement') }}

                        <el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')

                        }}</el-button>

                    </el-form-item>

@@ -628,7 +645,8 @@
                    </el-form-item>

                    <el-form-item>

                        {{ $t('Barcode') }}:

                        <el-input style="width:70%;" maxlength="14" :disabled="true" v-model="CurrrentGlassId"></el-input>

                        <el-input style="width:70%;" maxlength="14" :disabled="true"

                            v-model="CurrrentGlassId"></el-input>

                    </el-form-item>

                </div>

                <div style="display: flex;justify-content: space-around;">

@@ -740,7 +758,8 @@
            {{ this.isAllowQueue

                == true ? $t('Start') : $t('Stop')

            }}

            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue

            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{

                this.isAllowQueue

                == true ? $t('Stop') : $t('Start')

            }}</el-button>

            <el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>

@@ -794,7 +813,8 @@
                        {{ item['flip'] == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')

                            : $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}

                    </h1>

                    <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm'] }}

                    <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm']

                        }}

                    </h1>



                    <div class="frame" :style="'background-color: green;margin-top:30px;margin:0 auto;width: ' +

@@ -826,7 +846,8 @@
                <el-table-column prop="storageCage.tier" :label="$t('The Side')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') : $t('Outside')

                scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') :

                    $t('Outside')

                        }}

                    </template>

                </el-table-column>

@@ -1104,6 +1125,7 @@


                    //是否需要手动确认上片

                    this.isConfirm = obj.isConfirm[0];





                    //扫码位玻璃信息

                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {

@@ -1509,6 +1531,12 @@
                        this.$message.success(this.$t('Operation successful'));

                        this.dialogFormVisible = false;

                        this.glassid="";

                        this.form = {

                            orderId: "",

                            glassId: "",

                            height: "",

                            width: ""

                        };

                    }

                    else if (res.data.message == 400) {

                        this.$message.error(this.$t('The glass size is not within the range'));

@@ -1525,11 +1553,27 @@
        },

        //启用//理片笼禁用

        UpdateDisabled(cage, cell, disabled) {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

                inputPlaceholder: this.$t('Please enter the password'),

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(({ value }) => {

                if (this.password == value) {

            Disabled(cage, cell, disabled).then(res => {

                if (res.data.message == 200) {

                    this.$message.success(this.$t('Operation successful'));

                }

            });

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            });



        },

        //删除出片队列玻璃

        deleteproductionqueueglass(id) {