CanadaMes.git - Gitblit

			@@ -235,6 +235,7 @@
			height: 15px;
			position: absolute;
			}

			</style>
			<template>
			<el-container>
			@@ -243,20 +244,23 @@
			<div class="box" @click="dialogFormVisible2 = true">
			<div class="text">
			<!-- Alarm: -->
			{{ this.text }}
			{{ this.text }}{{this.plc1}}{{this.plc2}}
			<label v-for="item in this.alarm" :key="item['id']">
			{{ item['content'] }}
			</label>
			</div>
			</div>
			<div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">
			<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
			<!-- <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"
			:class="ManuallyInfeedGlass == true ? 'hide' : ''"></el-input> -->
			<el-button type="primary" @click="SelectGlassByGlassIDs()" :disabled="ManuallyInfeedGlass"
			:class="ManuallyInfeedGlass == true ? 'hide' : ''">
			{{ $t('Manually Infeed Glass') }}</el-button>
			<el-button type="primary" @click="showform2()" :disabled="OrderInfo"
			:class="OrderInfo == true ? 'hide' : ''">{{ $t('OrderInfo')
			:class="OrderInfo == true ? 'hide' : ''">{{ $t('Order Info')
			}}</el-button>
			<el-button type="primary" @click="showcageinfo(1)" :disabled="OrderInfo"
			:class="CageDetails == true ? 'hide' : ''">{{ $t('Cage Details')
			}}</el-button>
			<el-button type="primary" @click="showform6()" :disabled="OutingQueue"
			:class="OutingQueue == true ? 'hide' : ''">
			@@ -264,7 +268,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,9 +279,14 @@
			</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="cell" :label="$t('Slot No')">
			<template slot-scope='scope'>
			{{ (scope.row.cage - 1) * 21 + scope.row.cell }}
			</template>
			</el-table-column>
			<el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column prop="orderId" :label="$t('List No')"></el-table-column>
			<el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>
			@@ -294,9 +304,14 @@
			</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="cell" :label="$t('Slot No')">
			<template slot-scope='scope'>
			{{ (scope.row.cage - 1) * 21 + scope.row.cell }}
			</template>
			</el-table-column>
			<el-table-column :min-width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column prop="orderId" :label="$t('List No')"></el-table-column>
			<el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>
			@@ -330,6 +345,9 @@
			</el-main>
			<el-footer>
			<div class="blocks" style="position: relative;">
			<div :style="'position:absolute;width:40px;height:40px;top:40px;left:50px;background-Color:'+StateColor+';font-size:30px;text-align:center;border-radius: 50%;'">
			{{ CountDowns }}
			</div>
			<div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:237px;">
			<div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist1" :key="item['date']"
			:style="{ height: 35 * item['glassWidth'] + 'px', left: 3.07 * index + Math.abs(item['cage'] - 10) * 6.8 + 'px' }"
			@@ -361,19 +379,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>
			@@ -393,7 +420,7 @@
			</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.2', 1)">
			<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.3', 1)">
			{{ $t('Clear') }}</el-button>
			</div>
			<div class="glass B01" style="top: 270px;left: 640px;position: absolute;">
			@@ -457,7 +484,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')">
			@@ -493,7 +521,7 @@
			$t('confirm') }}</el-button> -->
			<el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
			type="primary">{{
			$t('confirm') }}</el-button>
			$t('confirm') }}</el-button>
			<el-button @click="cancel()">{{ $t('cancel') }}</el-button>
			</span>
			</template>
			@@ -527,15 +555,19 @@
			<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="50" prop="cell" :label="$t('Slot No')">
			<template slot-scope='scope'>
			{{ (scope.row.cage - 1) * 21 + scope.row.cell }}
			</template>
			</el-table-column>
			<el-table-column :min-width="55" prop="tier" :label="$t('The Side')">
			<template slot-scope='scope'>
			{{
			scope.row.tier == 1 ? $t('Inside') : $t('Outside')
			}}
			scope.row.tier == 1 ? $t('Inside') : $t('Outside')
			}}
			</template>
			</el-table-column>
			<el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
			@@ -545,14 +577,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 ?
			$t('Outing') : ""
			}}
			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>

			@@ -585,10 +619,9 @@
			:page-sizes="[42, 84, 126, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"
			:total="cageinfo.length > 0 ? cageinfo.length : null" background style="float: right; margin-top: 20px">
			</el-pagination>

			</el-dialog>

			<el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
			<el-dialog :visible.sync="dialogFormVisible4" :title="$t('Order Info')" top="5vh">
			<el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
			<el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
			<el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
			@@ -601,136 +634,145 @@
			<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')">
			<el-form :model="form" label-width="100px" style="padding-right: 30px">
			<div style="display: flex;justify-content: center;">
			<el-form-item>
			<!-- <el-form-item>
			{{ $t('Confirm State') }}:{{ this.isConfirm == true ? $t('Allow') : $t('Not Allow') }}
			<el-button type="primary" @click="isConfirmState()">
			{{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}</el-button>
			</el-form-item>
			</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-button>
			</el-form-item>
			<el-form-item>
			<el-input style="width:70%;" maxlength="13" :placeholder="$t('Enter the glass barcode')"
			<el-input style="width:70%;" maxlength="14" :placeholder="$t('Enter the glass barcode')"
			v-model="glassid1"></el-input>
			<el-button type="primary" :disabled="!Scanningmethod" @click="WriteGlassID()">{{ $t('Add')
			}}</el-button>
			}}</el-button>
			</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;">
			<!-- <div style="display: flex;justify-content: space-around;">
			<label for="">{{ $t('Upper film position') }}</label>

			<label for="">{{ $t('Scan Code Point') }}</label>
			</div>
			</div> -->
			<div style="display: flex;justify-content: space-around;height: 40px;">
			<label for="">{{ $t('current Information') }}</label>
			<label for="">{{ $t('Modify Information') }}</label>
			<label for="">{{ $t('current Information') }}</label>
			<label for="">{{ $t('Modify Information') }}</label>
			<label for="">{{ $t('D02 Current Information') }}</label>
			<!-- <label for="">{{ $t('D01 Current Information') }}</label> -->
			<label for="">{{ $t('D01 Modify Information') }}</label>
			<label for="">{{ $t('Scan Code Information') }}</label>
			</div>

			<div style="display: flex;justify-content: space-around;">
			<el-form-item :label="$t('Barcode')">
			<el-form-item :label="$t('Barcode')" >
			<el-input v-model="form2.glassId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Barcode')">
			<el-input v-model="form4.glassId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Barcode')">
			<!-- <el-form-item :label="$t('Barcode')">
			<el-input v-model="form3.glassId" readonly autocomplete="off" />
			</el-form-item>
			</el-form-item> -->
			<el-form-item :label="$t('Barcode')">
			<el-input v-model="form5.glassId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Barcode')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">
			<el-input v-model="form6.barcode" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			<el-form-item :label="$t('Order No')">
			<el-input v-model="form2.orderId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Order No')">
			<el-input v-model="form4.orderId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Order No')">
			<el-input v-model="form3.orderId" readonly autocomplete="off" />
			</el-form-item>
			<!-- <el-form-item :label="$t('Order No')">
			<el-input v-model="form3.orderId" readonly autocomplete="off" />
			</el-form-item>-->
			<el-form-item :label="$t('Order No')">
			<el-input v-model="form5.orderId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Order No')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">
			<el-input v-model="form6.ordernumber" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			<el-form-item :label="$t('List No')">
			<el-input v-model="form2.listId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('List No')">
			<el-input v-model="form4.listId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('List No')">
			<!-- <el-form-item :label="$t('List No')">
			<el-input v-model="form3.listId" readonly autocomplete="off" />
			</el-form-item>
			</el-form-item> -->
			<el-form-item :label="$t('List No')">
			<el-input v-model="form5.listId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('List No')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">
			<el-input v-model="form6.listnumber" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			<el-form-item :label="$t('Box No')">
			<el-input v-model="form2.boxId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Box No')">
			<el-input v-model="form4.boxId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Box No')">
			<!-- <el-form-item :label="$t('Box No')">
			<el-input v-model="form3.boxId" readonly autocomplete="off" />
			</el-form-item>
			</el-form-item> -->
			<el-form-item :label="$t('Box No')">
			<el-input v-model="form5.boxId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Box No')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">
			<el-input v-model="form6.boxnumber" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			<el-form-item :label="$t('Length')">
			<el-input v-model="form2.glasswidthmm" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Length')">
			<el-input v-model="form4.glasswidthmm" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Length')">
			<!-- <el-form-item :label="$t('Length')">
			<el-input v-model="form3.glasswidthmm" readonly autocomplete="off" />
			</el-form-item>
			</el-form-item> -->
			<el-form-item :label="$t('Length')">
			<el-input v-model="form5.glasswidthmm" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Length')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">
			<el-input v-model="form6.glasslength" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			<el-form-item :label="$t('Width')">
			<el-input v-model="form2.glassheightmm" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Width')">
			<el-input v-model="form4.glassheightmm" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Width')">
			<!-- <el-form-item :label="$t('Width')">
			<el-input v-model="form3.glassheightmm" readonly autocomplete="off" />
			</el-form-item>
			</el-form-item> -->
			<el-form-item :label="$t('Width')">
			<el-input v-model="form5.glassheightmm" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Width')" :style="'background-Color:'+(form6state==1?'yellow':'')+';'">
			<el-input v-model="form6.glassheight" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: right;">
			<el-button @click="InsertQueueGlass(1)" style="margin-right: 100px;" type="primary"
			<el-button @click="InsertQueueGlass(1)" style="margin-right: 28%;" type="primary"
			:disabled="disabled1">
			{{ $t('Confirm') }}</el-button>
			<span style="margin-right: 12%;">
			{{ $t('Remaining width:') }}
			{{ (108.27 - (Object.keys(this.form6).length === 0 ? 0 : (form6.glassheight > form6.glasslength ?
			form6.glassheight : form6.glasslength))).toFixed(2) }}

			</span>
			</div>
			</el-form>
			</el-dialog>
			@@ -740,20 +782,13 @@
			{{ this.isAllowQueue
			== true ? $t('Start') : $t('Stop')
			}}
			<el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
			== true ? $t('Stop') : $t('Start')
			<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%;">
			@@ -764,51 +799,52 @@
			<el-table-column :min-width="70" prop="orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column :min-width="70" prop="listId" :label="$t('List No')"></el-table-column>
			<el-table-column :min-width="70" prop="boxId" :label="$t('Box No')"></el-table-column>
			<el-table-column :min-width="70" prop="cell" :label="$t('Slot No')"></el-table-column>
			<el-table-column :min-width="100" prop="glasswidthmm" :label="$t('Length')"></el-table-column>
			<el-table-column :min-width="100" prop="glassheightmm" :label="$t('Width')"></el-table-column>
			<el-table-column :min-width="90" prop="state" :label="$t('Glass State')">
			<template slot-scope='scope'>
			{{ scope.row.state == 0 ? $t('Waiting') : scope.row.state == 1 ? $t('Outing') :
			scope.row.state
			== 2
			? $t('Outed') : scope.row.state == 3 ? $t('Absent') : $t('Completed') }}
			{{ scope.row.state == 0 ? $t('Waiting') : scope.row.state == 1 ?
			$t('Outing') : scope.row.state == 2 ? $t('Outed') : scope.row.state == 3 ? $t('Absent')
			: $t('Completed') }}
			</template>
			</el-table-column>
			<el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
			<el-table-column :min-width="90" prop="barcode" :label="$t('Complete')">
			<!-- <el-table-column :min-width="90" prop="barcode" :label="$t('Complete')">
			<template slot-scope='scope' style="height:100px;height:100px;">
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
			:disabled="!(!isAllowQueue && scope.row.state != 1 && scope.row.state != 2)"
			@click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{
			$t('Complete')
			}}</el-button>
			$t('Complete')
			}}</el-button>
			</template>
			</el-table-column>
			</el-table-column> -->

			<el-table-column :width="100" :label="$t('Operate')">
			<template slot-scope='scope'>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
			:disabled="isAllowQueue" @click="deleteproductionqueueglass(scope.row.barcode)">{{
			$t('Delete') }}</el-button>
			$t('Delete') }}</el-button>
			</template>
			</el-table-column>
			</el-table>
			</div>
			<div style="width:30%;" v-for="(item) in CurrentFrame" :key="item['barcode']">
			<el-button style="margin-left: 42%;" type="primary" @click="FrameStateUpdate(item['barcode'])">{{
			$t('Next') }}</el-button>
			$t('Next') }}</el-button>
			<h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame') }}:{{ item['barcode'] }}</h1>
			<h1 style="font-size: 30px;text-align: center;">
			{{ item['flip'] == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')
			: $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}
			: $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: ' +
			FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +
			FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'
			">
			FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +
			FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'
			">
			</div>
			</div>
			</div>
			@@ -830,12 +866,17 @@
			<el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>
			<el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
			<el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>
			<el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>
			<el-table-column prop="storageCage.cell" :label="$t('Slot No')">
			<template slot-scope='scope'>
			{{ (scope.row.cage - 1) * 21 + scope.row.cell }}
			</template>
			</el-table-column>
			<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>

			@@ -872,6 +913,7 @@

			import LanguageMixin from '../../lang/LanguageMixin'
			let socket;
			let timer;
			export default {
			name: "Home",
			data() {
			@@ -903,6 +945,7 @@
			form3: {},
			form4: {},
			form5: {},
			form6: {},
			alarm: [],
			tableData: [],
			cagelist1: [],
			@@ -955,7 +998,7 @@
			ClearGlassID: true,
			StopTask: true,
			SoftEmergencyStopState: true,
			CountDowns: "0",
			CountDowns: "",
			D01RequestState: false,
			EmergencyStop: false,
			PromptSize: 250,
			@@ -965,12 +1008,28 @@
			DeviceList: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
			GlassIdList: [],
			Scanningmethod: true,
			CurrrentGlassId: ""
			CurrrentGlassId: "",
			feedglassid: "",
			count1: 0,
			count2: 1,
			loadname: "",
			form6state:0,
			StateColor:"green",
			plc1:"",
			plc2:""
			};
			},
			created() {
			this.load();

			setInterval(() => {
			if(this.count1<this.count2){
			this.count1=this.count2;
			}else{
			const now = new Date();
			console.log(this.count1,this.count2);
			console.log(this.$t('Mes Connection failed')+now);
			}
			}, 60000);
			},
			activated() {
			this.init();
			@@ -996,6 +1055,7 @@
			};
			// 浏览器端收消息，获得从服务端发送过来的文本消息
			socket.onmessage = function (msg) {
			this.count2 = this.count2 + 1;
			//console.log("收到数据====" + msg.data);
			let obj = JSON.parse(msg.data);
			if (obj.params != null) {
			@@ -1005,6 +1065,20 @@
			this.car2 = 210 + 8.15 * Math.abs(zhi2 - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;
			// this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
			// this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
			}
			if (obj.Plc1 != null) {
			if(obj.Plc1[0]==true){
			this.plc1="";
			}else{
			this.plc1=this.$t('Plc1 Connection failed');
			}
			}
			if (obj.Plc2 != null) {
			if(obj.Plc2[0]==true){
			this.plc2="";
			}else{
			this.plc2=this.$t('Plc2 Connection failed');
			}
			}

			this.tableData = obj.tableData[0];
			@@ -1039,10 +1113,22 @@
			}
			//获取待确认的铝框玻璃信息
			if (obj.AluminumFrame != null) {

			this.AluminumFrame = obj.AluminumFrame[0];
			if (this.dialogFormVisible6 == true) {
			this.dialogFormVisible7 = true;
			}
			}

			//根据进片状态出发进片任务
			if (obj.FeedState != null) {
			if (obj.FeedState[0] == true) {
			this.InsertQueueGlass(1);
			}
			}

			if (obj.feedglassid != null) {
			this.feedglassid = obj.feedglassid[0];
			}

			// if (obj.alarmmg[0].length > 0) {
			@@ -1056,28 +1142,47 @@
			// this.dialogFormVisible2 = true;
			// }
			// }
			// //是否急停
			// if (obj.emergencystop != null) {
			// this.EmergencyStop = obj.emergencystop[0];
			// }
			//是否急停
			if (obj.emergencystop != null) {
			this.EmergencyStop = obj.emergencystop[0];
			}
			//复位倒计时
			if (obj.countdown != null) {
			if ((obj.countdown[0] == true && this.CountDowns == 0) \|\| this.EmergencyStop == true) {
			this.CountDown();
			}
			}

			// //复位倒计时
			// if (obj.countdown != null) {
			// if ((obj.countdown[0] == true && this.CountDowns == 0) \|\| this.EmergencyStop == true) {
			// this.CountDown();
			// }
			// }

			// //复位完成信号
			// if (obj.reset != null) {
			// this.reset = obj.reset[0];
			// }
			//复位完成信号
			if (obj.reset != null) {
			this.reset = obj.reset[0];
			}

			//是否有进片请求
			if (obj.D01RequestState != null) {
			this.D01RequestState = obj.D01RequestState[0];
			}
			// this.D01RequestState=true;

			if (obj.zhi != null) {
			if (obj.zhi[0] != 0) {
			if (obj.zhi[0] == 200) {
			this.form5 = {};
			this.$message.success(this.$t('Operation successful'));
			}
			else if (obj.zhi[0] == 300) {
			this.$message.error(this.$t('There is no such glass'));
			}
			else if (obj.zhi[0] == 400) {
			this.$message.error(this.$t('There is no such slot'));
			} else if(obj.zhi[0] == 500) {
			this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
			} else if(obj.zhi[0] == 600) {
			this.$message.error(this.$t('The glass size is not within the range'));
			}
			}

			}

			//是否允许出片
			this.isAllowQueue = obj.isAllowQueue[0];
			@@ -1104,6 +1209,8 @@

			//是否需要手动确认上片
			this.isConfirm = obj.isConfirm[0];


			//扫码位玻璃信息
			if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
			this.form3 = obj.form3[0];
			@@ -1114,8 +1221,10 @@

			if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
			this.loadglassheight1 = 70;
			if (this.form5.glassId != obj.form3[0].glassId) {
			this.showform3();
			if (this.form5.glassId != obj.form3[0].glassId && this.ManuallyInfeedGlass == false) {
			if (this.loadname == "Buffer") {
			this.showform3();
			}
			}
			this.form5 = obj.form3[0];
			this.glassid1 = "";
			@@ -1128,6 +1237,17 @@
			if (this.glassid1 == "") {
			this.DeleteBarcodeGlass();
			}
			}
			if (obj.form6 != null) {
			this.form6state=1;
			this.form6 = obj.form6[0];
			if(this.form6.glassheight=="0"){
			this.form6.glassheight="";
			this.form6.glasslength="";
			}
			} else {
			this.form6 = {};
			this.form6state=0;
			}
			//数据库连接是否正常
			if (obj.dbconnected == "false") {
			@@ -1159,6 +1279,7 @@
			load() {
			//加载用户权限
			currentUsername().then(res => {
			this.loadname = res.data;
			SelectPermissionByUserName(res.data).then(res => {
			res.data.permission.forEach(item => {
			if (item.permissionId == "32" && item.state == 1) {
			@@ -1247,7 +1368,16 @@
			//手动上片
			sbumitglassid() {
			if (this.form.order != "") {
			if (this.form.height < 380 \|\| this.form.width < 390 \|\| this.form.height > 1810 \|\| this.form.width > 2760) {
			let width = 0;
			let height = 0;
			if (this.form.glassheight < this.form.glasswidth) {
			width = this.form.glasswidth;
			height = this.form.glassheight;
			} else {
			height = this.form.glasswidth;
			width = this.form.glassheight;
			}
			if (height < 380 \|\| width < 380 \|\| height > 1810 \|\| width > 2760) {
			this.$message.error(this.$t('The glass size is not within the range'));
			} else {
			if (this.zhuangtai == true) {
			@@ -1331,9 +1461,9 @@
			},
			//显示客户玻璃信息
			showform2() {
			SelectGlass(this.orderid).then(res => {
			this.GlassInfo = res.data.glass;
			});
			// SelectGlass(this.orderid).then(res => {
			// this.GlassInfo = res.data.glass;
			// });
			this.dialogFormVisible4 = true;
			},
			//显示出片队列
			@@ -1506,6 +1636,13 @@
			if (res.data.message == 200) {
			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'));
			@@ -1522,11 +1659,27 @@
			},
			//启用//理片笼禁用
			UpdateDisabled(cage, cell, disabled) {
			Disabled(cage, cell, disabled).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			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) {
			@@ -1583,9 +1736,12 @@
			this.form5 = {};
			this.$message.success(this.$t('Operation successful'));
			}
			else if (res.data.message == 300) {
			this.$message.error(this.$t('There is no such glass'));
			}
			else if (res.data.message == 400) {
			this.$message.error(this.$t('The glass size is not within the range'));
			} else {
			this.$message.error(this.$t('There is no such slot'));
			}else if (res.data.message == 500) {
			this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
			}
			});
			@@ -1855,8 +2011,18 @@
			},
			//判断玻璃是否超出范围
			Sizerange(Glass, position) {
			console.log(position);
			if (this.ManuallyInfeedGlass == false) {
			if ((Glass.glassheight < 380 \|\| Glass.glasswidth < 390 \|\| Glass.glassheight > 1810 \|\| Glass.glasswidth > 2760) \|\| (Glass.glassheight < 390 \|\| Glass.glasswidth < 380 \|\| Glass.glassheight > 2760 \|\| Glass.glasswidth > 1810)) {
			let width = 0;
			let height = 0;
			if (Glass.glassheight < Glass.glasswidth) {
			width = Glass.glasswidth;
			height = Glass.glassheight;
			} else {
			height = Glass.glasswidth;
			width = Glass.glassheight;
			}
			if (height < 380 \|\| width < 380 \|\| height > 1810 \|\| width > 2760) {
			this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
			confirmButtonText: this.$t('Yes'),
			type: 'info',
			@@ -1900,34 +2066,34 @@
			},
			//60秒复位倒数计时
			CountDown() {
			clearInterval(timer);
			let count = 60;
			let timer = setInterval(
			timer = setInterval(
			() => {
			if (this.EmergencyStop == true) {
			this.dialogFormCountDown = false;
			clearInterval(timer);
			this.CountDowns = "0";
			this.StateColor="red";
			this.CountDowns = "";
			} else {
			if (count > 0) {
			this.PromptSize = 500;
			count--;
			this.CountDowns = count;
			this.dialogFormCountDown = true;
			this.StateColor="yellow";
			this.PromptSize = 500;
			this.CountDowns = count;
			count--;
			}
			else {
			this.PromptSize = 200;
			this.CountDowns = "Waiting for reset";
			if (this.reset == true) {
			clearInterval(timer);
			this.dialogFormCountDown = false;
			}
			this.PromptSize = 200;
			this.CountDowns = "";
			this.StateColor="green";
			if (this.reset == true) {
			clearInterval(timer);
			}
			}
			}
			},
			1000
			);

			},
			},
			//更换当前铝框
			FrameStateUpdate(frameno) {
			FrameStateUpdate(frameno).then(res => {
			@@ -1998,28 +2164,28 @@
			if (this.ClearGlassID == false) {
			console.log(this.DeviceList, num);
			if (this.DeviceList[num] == 0) {
			if (this.GlassIdList[num].length <= 14) {
			this.$confirm(this.$t('Are you sure to clear this barcode ?'), this.$t('confirm'), {
			confirmButtonText: this.$t('Yes'),
			cancelButtonText: this.$t('No'),
			type: 'warning'
			}).then(() => {
			ClearGlassId(position, this.GlassIdList[num]).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			} else {
			this.$message.success(this.$t('operation failed'));
			}
			});
			}).catch(() => {
			this.$message({
			type: 'info',
			message: this.$t('Operation canceled')
			});
			// if (this.GlassIdList[num].length <= 14) {
			this.$confirm(this.$t('Are you sure to clear this barcode ?'), this.$t('confirm'), {
			confirmButtonText: this.$t('Yes'),
			cancelButtonText: this.$t('No'),
			type: 'warning'
			}).then(() => {
			ClearGlassId(position, this.GlassIdList[num]).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			} else {
			this.$message.success(this.$t('operation failed'));
			}
			});
			} else {
			this.$message.error(this.$t('There is no glass ID here'));
			}
			}).catch(() => {
			this.$message({
			type: 'info',
			message: this.$t('Operation canceled')
			});
			});
			// } else {
			// this.$message.error(this.$t('There is no glass ID here'));
			// }
			} else {
			//自动状态不能清除玻璃id
			this.$message.error(this.$t('Unable to clear glass ID in automatic mode'));