CanadaMes.git - Gitblit

			@@ -104,7 +104,7 @@
			position: absolute;
			background-image: url('../../img/dipan.png');
			background-size: 70px 85px;
			left: 654px;
			left: 501px;
			top: 333px;
			/* background-size: 85px 100px;
			left: 912px;
			@@ -132,7 +132,7 @@
			position: absolute;
			background-image: url('../../img/taimian.png');
			background-size: 120px 30px;
			left: 630px;
			left: 477px;
			top: 420px;
			/* background-size: 160px 40px;
			left: 875px;
			@@ -186,6 +186,31 @@
			width: 90%;
			}

			.el-message-box__message {
			font-size: 27px;
			}

			.el-message-box {
			height: 200px;
			width: 600px;
			}

			.el-button--small {
			font-size: 25px;
			}

			@media screen and (min-width: 1900px) {
			.blocks {
			transform: scale(1.5, 1.05);
			width: 1210px;
			}
			}

			.el-message-box__btns {
			padding: 0px 15px 0;
			text-align: right;
			}

			/* .el-table td,
			.el-table th {
			padding: 0px 0;
			@@ -204,24 +229,24 @@
			</label>
			</div>
			</div>
			<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
			<div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">
			<el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"></el-input>
			<el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Manually Infeed Glass') }}</el-button>
			<el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
			<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
			<el-button type="primary" @click="SelectGlassByGlassIDs(2)" :disabled="ManuallyInfeedGlass">
			{{ $t('Manually Infeed Glass') }}</el-button>
			<!-- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
			<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button> -->
			</div>
			<div>
			<el-table :data="this.tasklist1" border style="width: 100%">
			<el-table-column :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
			<el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
			<el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
			<el-table-column :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
			<el-table-column :width="130" prop="orderId"
			:label="$t('Order No')"></el-table-column>
			<el-table-column :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>
			<el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">
			<template slot-scope='scope'>
			{{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}
			{{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}
			</template>
			</el-table-column>
			<el-table-column :label="$t('Terminate Task')">
			@@ -233,16 +258,15 @@
			</el-table-column>
			</el-table>
			<el-table :data="this.tasklist2" border style="width: 100%">
			<el-table-column :width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>
			<el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
			<el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
			<el-table-column :width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>
			<el-table-column :width="130" prop="orderId"
			:label="$t('Order No')"></el-table-column>
			<el-table-column :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>
			<el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">
			<template slot-scope='scope'>
			{{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}
			{{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}
			</template>
			</el-table-column>

			@@ -292,14 +316,19 @@
			@click="showcageinfo(item['cage'])"></div>
			</div>
			<div class="blue gezi"
			:style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + 'px' }">
			:style="{ display: 'flex', position: 'absolute', float: 'left', top: 28 + 'px', left: 1050 + 'px', height: loadglassheight1 + 'px', width: 4 + 'px' }">
			</div>
			<div class="blue gezi"
			:style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight2 + 'px', width: 4 + 'px' }">
			</div>
			<div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
			<div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>
			<div class="blocks-img2"></div>
			<div class="blocks-img3"></div>
			<el-button class="orderbutton1" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>
			<el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Production queue') }}</el-button>
			<el-button class="orderbutton1" type="primary" @click="showform2()" :disabled="OrderInfo">{{ $t('OrderInfo')
			}}</el-button>
			<el-button class="orderbutton2" type="primary" @click="showform6()" :disabled="OutingQueue">
			{{ $t('Outing Queue') }}</el-button>

			<!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
			<div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"
			@@ -361,9 +390,9 @@
			</el-form>
			<template #footer>
			<span class="dialog-footer">
			<el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
			<!-- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
			type="primary">{{
			$t('confirm') }}</el-button>
			$t('confirm') }}</el-button> -->
			<el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
			type="primary">{{
			$t('confirm') }}</el-button>
			@@ -399,40 +428,54 @@
			</el-dialog>

			<el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
			<el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
			<el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>
			<el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>
			<el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
			<el-table-column :width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
			<el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column :width="80" prop="listId"
			:label="$t('List No')"></el-table-column>
			<el-table-column :width="100" prop="boxId" :label="$t('Box No')"></el-table-column>
			<el-table-column :width="100" prop="state" :label="$t('State')">
			<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-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')"></el-table-column>
			<el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
			<el-table-column :min-width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column :min-width="80" prop="listId" :label="$t('List No')"></el-table-column>
			<el-table-column :min-width="100" prop="boxId" :label="$t('Box No')"></el-table-column>
			<el-table-column :min-width="90" 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 :width="150" prop="lengthWidth" :label="$t('Dim')">
			<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>
			<el-table-column :width="280" :label="$t('Operate')">
			<el-table-column :min-width="250" :label="$t('Operate')">
			<template slot-scope='scope'>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state == 1 ? false : true"
			@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"
			<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>
			<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('Enable') : $t('Disable') }}</el-button>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.glassId!=null?true:false"
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
			:disabled="scope.row.glassId != null ? true : false"
			@click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')
			}}</el-button>
			</template>
			</el-table-column>
			</el-table>

			<el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChanges"
			@current-change="handleCurrentChanges" :pager-count="7" :current-page="currentPages"
			:page-sizes="[21, 42, 84, 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">
			@@ -457,10 +500,10 @@
			<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: space-around;">
			<el-form-item>
			<label for="">{{ $t('Upper film position') }}</label>
			<label for="">{{ $t('Scan Code Point') }}</label>
			</el-form-item>
			<label for="">{{ $t('Upper film position') }}</label>
			<el-button type="primary" @click="isConfirmState()">
			{{ this.isConfirm == true ? "Allow" : "Not Allow" }}</el-button>
			<label for="">{{ $t('Scan Code Point') }}</label>
			</div>
			<div style="display: flex;justify-content: space-around;height: 40px;">
			<label for="">{{ $t('current Information') }}</label>
			@@ -472,13 +515,13 @@
			<el-form-item>
			<el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
			v-model="glassid2"></el-input>
			<el-button type="primary" @click="SelectGlassByGlassIDs(1)" >{{ $t('Query')
			<el-button type="primary" @click="SelectGlassByGlassIDs(1)">{{ $t('Query')
			}}</el-button>
			</el-form-item>
			<el-form-item>
			<el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
			v-model="glassid1"></el-input>
			<el-button type="primary" @click="SelectGlassByGlassIDs(2)" >{{ $t('Query')
			<el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Query')
			}}</el-button>
			</el-form-item>
			</div>
			@@ -567,11 +610,11 @@
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			<el-button @click="DeleteQueueGlasss(2)" type="primary" >{{ $t('Clear Current')
			<el-button @click="DeleteQueueGlasss(2)" type="primary">{{ $t('Clear Current')
			}}</el-button>
			<el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled">
			{{ $t('Confirm Modification') }}</el-button>
			<el-button @click="DeleteQueueGlasss(1)" type="primary" >{{ $t('Clear Current')
			<el-button @click="DeleteQueueGlasss(1)" type="primary">{{ $t('Clear Current')
			}}</el-button>
			<el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">
			{{ $t('Confirm Modification') }}</el-button>
			@@ -584,33 +627,65 @@
			</template>
			</el-dialog>

			<el-dialog :visible.sync="dialogFormVisible6" :title="$t('Production queue')" top="5vh">
			<el-button type="primary" @click="showform7()">{{ $t('Increase') }}</el-button>
			<el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue==true?$t('Stop'):$t('Start') }}</el-button>

			<el-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">
			<el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
			<el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">
			<el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
			== true ? $t('Start') : $t('Stop')
			}}</el-button>
			<el-button type="primary" @click="isAllowReorderingState()" :disabled="this.isAllowQueue">{{
			this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
			}}</el-button>
			<el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
			style="width: 100%;overflow: auto;">
			<el-table-column :min-width="100" prop="glassId" :label="$t('Barcode')"></el-table-column>
			<el-table-column prop="storageCage.orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column prop="storageCage.listId" :label="$t('List No')"></el-table-column>
			<el-table-column prop="storageCage.boxId" :label="$t('Box No')"></el-table-column>
			<el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>
			<el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>
			<el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></el-table-column>
			<el-table-column 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('Completed') :scope.row.state == 3 ? $t('Absent') :$t('Deleted') }}
			</template>
			</el-table-column>
			<el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
			<el-table-column prop="position" :label="$t('Position')" style="font-size: 20px;">
			<template slot-scope='scope'>
			{{ scope.row.position == 1 ? "▄▄▄" : "▋" }}
			</template>
			</el-table-column>
			<el-table-column prop="position" :label="$t('Flip')">
			<template slot-scope='scope'>
			{{ scope.row.flip == 1 ? $t('Yes') : $t('No') }}
			</template>
			</el-table-column>
			<el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>

			<el-table-column prop="barcode" :label="$t('Complete')">
			<template slot-scope='scope'>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="(!isAllowQueue\|\|scope.row.state!=1)"
			@click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{ $t('Complete')
			}}</el-button>
			</template>
			</el-table-column>
			<el-table-column :width="280" :label="$t('Operate')">
			<template slot-scope='scope'>
			<el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"
			:disabled="scope.$index == 0">
			置顶
			style="font-size: 15px;"
			:disabled="(scope.$index == 0 \|\| isAllowReordering == true \|\| scope.row.state == 1)">
			{{ $t('Top') }}
			</el-button>
			<el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"
			:disabled="scope.$index == 0">
			上移
			style="font-size: 15px;"
			:disabled="(scope.$index == 0 \|\| isAllowReordering == true \|\| scope.row.state == 1)">
			{{ $t('Up') }}
			</el-button>
			<el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"
			:disabled="OutSlice.length - 1 == scope.$index">下移
			style="font-size: 15px;"
			:disabled="(OutSlice.length - 1 == scope.$index \|\| isAllowReordering == true \|\| scope.row.state == 1)">
			{{ $t('Down') }}
			</el-button>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
			@click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="isAllowQueue"
			@click="deleteproductionqueueglass(scope.row.barcode)">{{ $t('Delete') }}</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -632,9 +707,7 @@
			<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.tier" :label="$t('The Side')"></el-table-column>

			<el-table-column prop="FrameNo" :label="$t('Frame No')"></el-table-column>

			<el-table-column prop="Flip" :label="$t('Flip')"></el-table-column>
			<el-table-column prop="out_slice.state" :label="$t('In the queue')">
			<template slot-scope='scope'>
			@@ -662,7 +735,7 @@
			import {
			home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
			SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
			SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues
			SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue
			} from "../../api/home";


			@@ -712,6 +785,7 @@
			glassid: "",
			glassid1: "",
			glassid2: "",
			cageglassid: "",
			url: "../../img/bigcar01.png",
			car1: 145,
			car2: 210,
			@@ -720,7 +794,8 @@
			cageinfo: [],
			cage: 0,
			carlist: [],
			loadglassheight: 0,
			loadglassheight1: 0,
			loadglassheight2: 0,
			password: 1,
			text: "",
			zhuangtai: "",
			@@ -731,24 +806,38 @@
			currentPage: 1, //默认初始页
			pagesize: 15, //每页默认显示的数据
			pageCount: 0,
			currentPages: 1, //默认初始页
			pagesizes: 21, //每页默认显示的数据
			pageCounts: 0,
			OutSlice: [],
			AluminumFrame: [],
			framebarcode: "",
			isAllowQueue:true
			isAllowQueue: true,
			isAllowReordering: true,
			FrameNoFlag: "",
			isConfirm: true,
			ManuallyInfeedGlass: true,
			OutingQueue: true,
			OrderInfo: true,
			CageDetails: true,

			};
			},
			created() {
			this.load();
			this.init();
			},
			}
			,
			methods: {


			init() {
			let viewname = "Home";
			if (typeof (WebSocket) == "undefined") {
			console.log("您的浏览器不支持WebSocket");
			} else {
			//console.log("您的浏览器支持WebSocket");
			let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
			let socketUrl = "ws://" + this.$t('ip') + ":8888" + "/springboot-vue3/api/talk/" + viewname;
			if (socket != null) {
			socket.close();
			socket = null;
			@@ -777,58 +866,59 @@
			this.tasklist1 = obj.tasklist1[0];
			this.tasklist2 = obj.tasklist2[0];
			this.alarm = obj.alarmmg[0];
			//铝框id提示

			this.isAllowQueue=obj.isAllowQueue;
			console.log(obj);

			//是否允许出片
			this.isAllowQueue = obj.isAllowQueue[0];
			//出片队列
			this.OutSlice = obj.listoutslice[0];
			this.loadglassheight = obj.loadglassheight;
			if (this.isAllowReordering == true) {
			this.OutSlice = obj.listoutslice[0];
			}
			//获取上片位玻璃信息

			if (obj.zhuangtai != null) {
			this.zhuangtai = obj.zhuangtai[0];
			}
			if (this.dialogFormVisible7 == true) {
			this.showform7();
			}
			//上片位玻璃信息
			if (obj.form2 != null && obj.form2 != "") {
			this.form2 = obj.form2[0];
			this.loadglassheight2 = 70;
			} else {
			this.form2 = {};
			}

			//是否需要手动确认上片
			this.isConfirm = obj.isConfirm[0];
			//扫码位玻璃信息
			if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
			this.form3 = obj.form3[0];

			this.loadglassheight1 = 70;
			} else {
			this.form3 = {};
			}
			if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
			this.loadglassheight1 = 70;
			this.form5 = obj.form3[0];
			this.showform3();
			if (this.form5.glassheight < 380 \|\| this.form5.glasswidth < 390 \|\| this.form5.glassheight > 1810 \|\| this.form5.glasswidth > 2760) {
			if (this.disabled1 == false) {
			this.disabled1 = true;
			this.$message.error(this.$t('The glass size is not within the range'));
			}
			} else {
			this.disabled1 = false;
			}
			this.Sizerange(this.form5, 3);
			this.glassid1 = "";
			} else {
			if (this.form5.glassheight < 380 \|\| this.form5.glasswidth < 390 \|\| this.form5.glassheight > 1810 \|\| this.form5.glasswidth > 2760) {
			if (this.disabled1 == false) {
			this.disabled1 = true;
			// this.$message.error(this.$t('The glass size is not within the range'));
			}
			} else {
			this.disabled1 = false;
			if (this.glassid1 == "") {
			this.DeleteBarcodeGlass();
			}
			}
			//if (obj.dbconnected == "false") {
			this.text = this.$t('DataBase Connection failed');
			// }
			//数据库连接是否正常
			if (obj.dbconnected == "false") {
			this.text = this.$t('DataBase Connection failed');
			}
			//理片笼玻璃信息
			if (this.dialogFormVisible3 == true) {
			SelectCageInfo(this.cage).then(res => {
			SelectCageInfo(this.cageglassid).then(res => {
			this.cageinfo = res.data.cageinfo;
			});
			}


			this.$forceUpdate();

			@@ -844,9 +934,34 @@
			}
			},
			load() {
			//加载用户权限
			currentUsername().then(res => {
			SelectPermissionByUserName(res.data).then(res => {
			res.data.permission.forEach(item => {
			if (item.permissionId == "32" && item.state == 1) {
			this.ManuallyInfeedGlass = false;
			}
			if (item.permissionId == "33" && item.state == 1) {
			this.OutingQueue = false;
			}
			if (item.permissionId == "34" && item.state == 1) {
			this.OrderInfo = false;
			}
			if (item.permissionId == "35" && item.state == 1) {
			this.CageDetails = false;
			}
			});
			});

			});
			//加载笼子使用情况数据
			home().then(res => {
			this.tableData = res.data.list;
			});
			//加载理片笼玻璃信息
			SelectCageInfo("").then(res => {
			this.cageinfo = res.data.cageinfo;
			this.currentPages = 1;
			});
			//加载理片笼玻璃数据
			home2().then(res => {
			@@ -897,7 +1012,6 @@
			if (res.data.message == 200) {
			this.dialogFormVisible1 = false;
			this.$message.success(this.$t('Operation successful'));

			} else {
			this.$message.error(this.$t('There is no glass for this order'));
			}
			@@ -946,7 +1060,6 @@
			SelectGlassByGlassID(this.glassid).then(res => {
			if (res.data.form != null) {
			this.form = res.data.form;
			console.log(this.form);
			this.dialogFormVisible = true;
			this.$message.success(this.$t('query was successful'));
			} else {
			@@ -975,77 +1088,63 @@
			if (parameter == 1) {
			SelectGlassByGlassID(this.glassid2).then(res => {
			if (res.data.form != null) {
			this.form4 = res.data.form;
			this.$message.success(this.$t('query was successful'));
			if (this.form4.glassheight < 380 \|\| this.form4.glasswidth < 390 \|\| this.form4.glassheight > 1810 \|\| this.form4.glasswidth > 2760) {
			if (this.disabled == false) {
			this.disabled = true;
			this.$message.error(this.$t('The glass size is not within the range'));
			}
			if (res.data.form.glassId != null) {
			this.form4 = res.data.form;
			this.$message.success(this.$t('query was successful'));
			this.Sizerange(this.form4, 2);
			} else {
			this.disabled = false;
			this.$message.error(this.$t('There is no such glass'));
			}

			} else {
			this.$message.error(this.$t('There is no such glass'));
			}
			if (this.form4.length > 0) {
			if (this.form4.glassId == "") {
			this.disabled = false;
			} else {
			this.disabled = true;
			}
			}

			});
			} else {
			SelectGlassByGlassID(this.glassid1).then(res => {
			if (res.data.form != null) {
			this.form5 = res.data.form;
			this.$message.success(this.$t('query was successful'));
			if (this.form5.glassheight < 380 \|\| this.form5.glasswidth < 390 \|\| this.form5.glassheight > 1810 \|\| this.form5.glasswidth > 2760) {
			if (this.disabled1 == false) {
			this.disabled1 = true;
			this.$message.error(this.$t('The glass size is not within the range'));
			}
			if (res.data.form.glassId != null) {
			this.form5 = res.data.form;
			this.$message.success(this.$t('query was successful'));
			this.Sizerange(this.form5, 1);
			} else {
			this.disabled1 = false;
			this.$message.error(this.$t('There is no such glass'));
			}
			} else {
			this.$message.error(this.$t('There is no such glass'));
			}
			if (this.form5.length > 0) {
			if (this.form5.glassId == "") {
			this.disabled = false;
			} else {
			this.disabled = true;
			}
			}

			});
			}

			},
			//查询客户玻璃信息
			selectglassinfo() {
			SelectGlass(this.orderid).then(res => {
			this.currentPage = 1;
			this.GlassInfo = res.data.glass;
			});
			},
			//显示客户玻璃信息
			showform2() {
			SelectGlass(this.orderid).then(res => {
			this.GlassInfo = res.data.glass;
			});
			this.dialogFormVisible4 = true;
			},
			//显示出片队列
			showform6() {
			SelectProductionqueue().then(res => {
			this.OutSlice = res.data.listoutslice;
			});
			this.dialogFormVisible6 = true;
			},
			//显示铝框对应玻璃信息
			showform7() {
			//查询铝框id对应玻璃信息
			SelectAluminumFrameInfoById(this.framebarcode).then(res => {
			this.AluminumFrame = res.data.listAluminumFrame;
			this.AluminumFrame.sort(function (x, y) {
			if (x['storageCage'] != null && y['storageCage'] != null) {
			return y['storageCage']['tier'] - x['storageCage']['tier'];
			}
			});
			this.AluminumFrame.forEach(item => {
			if (item.storageCage != null && item.out_slice == null) {
			item.isCheck = true;
			@@ -1056,7 +1155,7 @@
			item.FrameNo = this.framebarcode;
			});
			});
			this.dialogFormVisible7 = true;
			// this.dialogFormVisible7 = true;
			},
			//取消操作时关闭页面
			cancel() {
			@@ -1073,6 +1172,7 @@
			this.dialogFormVisible1 = false;
			this.form1 = {};
			},
			//取消操作时关闭页面
			cancel3() {
			this.dialogFormVisible5 = false;
			this.form1 = {};
			@@ -1104,11 +1204,17 @@
			},
			//显示理片笼详情信息
			showcageinfo(cage) {
			this.cage = cage;
			SelectCageInfo(cage).then(res => {
			this.cageinfo = res.data.cageinfo;
			this.dialogFormVisible3 = true;
			});
			if (this.CageDetails == false) {
			cage = this.cageglassid;
			SelectCageInfo(cage).then(res => {
			this.cageinfo = res.data.cageinfo;
			this.currentPages = 1;
			this.dialogFormVisible3 = true;
			});
			} else {
			this.$message.error(this.$t('You do not have this permission'));
			}

			},
			//删除理片笼玻璃
			deleteglass(glassid, state) {
			@@ -1152,8 +1258,14 @@
			if (this.password == value) {
			if (state == 1) {
			OutByGlassID(glassid).then(res => {
			if (res.data.message3 == 200) {
			if (res.data.message2 == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			else if (res.data.message2 == 300) {
			this.$message.error(this.$t('Unable to find the placement method of the aluminum frame'));
			}
			else if (res.data.message2 == 400) {
			this.$message.error(this.$t('Unable to find whether the aluminum frame is flipped or not'));
			}
			else if (res.data.message2 == 500) {
			this.$message.error(this.$t('This glass is already in the Queue'));
			@@ -1198,19 +1310,24 @@
			},
			//手动上片
			FeedInglassid() {
			Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
			if (this.form.barcode != "") {
			if (this.form.glassId != ""&&this.form.glassId != null) {
			Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			this.dialogFormVisible = false;
			} else {
			}
			else if (res.data.message == 400) {
			this.$message.error(this.$t('The glass size is not within the range'));
			}
			else if (res.data.message == 300) {
			this.$message.error(this.$t('This glass is already in the cage'));
			}
			} else {
			this.$message.error(this.$t('There is no such glass'));
			}
			});
			} else {
			this.$message.error(this.$t('There is no such glass'));
			}

			});

			},
			//启用//理片笼禁用
			UpdateDisabled(cage, cell, disabled) {
			@@ -1242,8 +1359,6 @@
			message: this.$t('Operation canceled')
			});
			});
			}, handleEdit(index, row) {
			console.log(index, row);
			},
			//表格删除
			handleDelete(index, row) {
			@@ -1257,11 +1372,19 @@
			handleCurrentChange: function (currentPage) {
			this.currentPage = currentPage;
			},
			//改变每页容纳的数据量
			handleSizeChanges: function (size) {
			this.pagesizes = size;
			},
			//切换页码
			handleCurrentChanges: function (currentPage) {
			this.currentPages = currentPage;
			},
			//手动添加扫码位玻璃
			InsertQueueGlass(parameter) {
			if (parameter == 1 && this.form5.glassId != "") {
			if (this.form5.glassId != this.form2.glassId) {
			InsertQueueGlassId(1,this.form5).then(res => {
			if (this.form5.glassId != this.form2.glassId && this.form5.glassId != this.form3.glassId) {
			InsertQueueGlassId(1, this.form5).then(res => {
			if (res.data.message == 200) {
			this.form5 = {};
			this.$message.success(this.$t('Operation successful'));
			@@ -1273,8 +1396,8 @@
			this.$message.error(this.$t('The glass ID already exists in the loading queue'));
			}
			} else if (parameter == 2 && this.form4.glassId != "") {
			if (this.form4.glassId != this.form3.glassId) {
			InsertQueueGlassId(2,this.form4).then(res => {
			if (this.form4.glassId != this.form3.glassId && this.form4.glassId != this.form2.glassId) {
			InsertQueueGlassId(2, this.form4).then(res => {
			if (res.data.message == 200) {
			this.form4 = {};
			this.$message.success(this.$t('Operation successful'));
			@@ -1294,12 +1417,14 @@
			if (parameter == 1) {
			DeleteQueueGlass(1).then(res => {
			if (res.data.message == 200) {
			this.form3 = {};
			this.$message.success(this.$t('Operation successful'));
			}
			});
			} else {
			DeleteQueueGlass(2).then(res => {
			if (res.data.message == 200) {
			this.form2 = {};
			this.$message.success(this.$t('Operation successful'));
			}
			});
			@@ -1313,13 +1438,12 @@
			}
			});
			},
			//铝框对应玻璃信息添加铝框id和是否添加到队列
			CheckBoxchange(glassid, isChecked) {
			this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })
			},
			//添加到出片队列
			addoutslice() {
			// var AluminumFrames1=this.AluminumFrame.map(item=>{return item.barcode});
			// var AluminumFrames2=this.AluminumFrame.map(item=>{return item.isCheck});
			// var AluminumFrames3=this.AluminumFrame.map(item=>{return item.Flip});
			var dats_ = new Array();
			this.AluminumFrame.forEach(item => {
			var dats2_ = new Array();
			@@ -1336,27 +1460,236 @@
			this.$message.success(this.$t('Operation successful'));
			}
			});
			}, getTopMove(row, index) {
			this.OutSlice.splice(index, 1)
			this.OutSlice.unshift(row)
			},
			//置顶
			getTopMove(row, index) {
			let Sequence = [];
			this.OutSlice.forEach(item => {
			Sequence.push(item.sequence);
			});
			let OutSliceArr = [];
			OutSliceArr.push(row);
			let belowstop = 1;
			let hereframeno = this.OutSlice[index].barcode;
			let upperstop = 0;
			for (let i = index + 1; i < this.OutSlice.length; i++) {
			if (this.OutSlice[i].barcode == hereframeno) {
			OutSliceArr.push(this.OutSlice[i]);
			belowstop += 1;
			} else {
			break;
			}
			}
			this.OutSlice.splice(index, belowstop);
			for (let i = 0; i < OutSliceArr.length; i++) {
			this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
			upperstop += 1;
			}
			this.UpdateSequence(Sequence);
			},
			//上移
			getUpMove(row, index) {
			let arr = this.OutSlice;
			arr.splice(index - 1, 1, ...arr.splice(index, 1, arr[index - 1]));
			let Sequence = [];
			this.OutSlice.forEach(item => {
			Sequence.push(item.sequence);
			});
			let OutSliceArr = [];
			OutSliceArr.push(row);
			let belowstop = 1;
			let upperstop = 0;
			let index_x = index - 1;
			let hereframeno = this.OutSlice[index].barcode;
			let upperframeno = this.OutSlice[index_x].barcode;
			for (let i = index + 1; i < this.OutSlice.length; i++) {
			if (this.OutSlice[i].barcode == hereframeno) {
			OutSliceArr.push(this.OutSlice[i]);
			belowstop += 1;
			} else {
			break;
			}
			}
			this.OutSlice.splice(index, belowstop);
			for (let i = index_x; i >= 0; i--) {
			if (this.OutSlice[i].barcode != upperframeno) {
			upperstop = i + 1;
			break;
			}
			}
			for (let i = 0; i < OutSliceArr.length; i++) {
			this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
			upperstop += 1;
			}
			this.UpdateSequence(Sequence);
			},
			//下移
			getDownMove(row, index) {
			let arr = this.OutSlice;
			arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]));
			let Sequence = [];
			this.OutSlice.forEach(item => {
			Sequence.push(item.sequence);
			});
			let OutSliceArr = [];
			OutSliceArr.push(row);

			let belowstop = 1;
			let upperstop = this.OutSlice.length - 1;
			let flag = 0;
			let hereframeno = this.OutSlice[index].barcode;
			let upperframeno;
			for (let i = index + 1; i < this.OutSlice.length; i++) {
			if (this.OutSlice[i].barcode == hereframeno) {
			OutSliceArr.push(this.OutSlice[i]);
			belowstop += 1;
			} else {
			break;
			}
			}
			this.OutSlice.splice(index, belowstop);
			for (let i = index; i < this.OutSlice.length; i++) {
			if (this.OutSlice[i].barcode != hereframeno && this.OutSlice[i].barcode != upperframeno) {
			upperframeno = this.OutSlice[i].barcode;
			flag += 1;
			upperstop = i;
			}
			if (i == this.OutSlice.length - 1 && flag == 1) {
			flag += 1;
			upperstop = i + 1;
			}
			if (flag == 2) {
			break;
			}
			}
			for (let i = 0; i < OutSliceArr.length; i++) {
			this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
			upperstop += 1;
			}
			this.UpdateSequence(Sequence);
			},
			//修改顺序
			UpdateSequence(Sequence) {
			let i = 0;
			this.OutSlice.forEach(item => {
			item.sequence = Sequence[i];
			i++;
			});
			},
			//切换出片队列状态
			isAllowQueueState(){
			isAllowQueues(!this.isAllowQueue).then(res=>{
			isAllowQueueState() {
			isAllowQueues(!this.isAllowQueue, this.OutSlice).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			})
			},
			//
			isAllowReorderingState() {
			this.isAllowReordering = !this.isAllowReordering;
			},
			//切换上片是否需要确认玻璃信息
			isConfirmState() {
			isConfirmStates(!this.isConfirm).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			});
			}
			,
			cellStyle({ row, column, rowIndex, columnIndex }) {
			// console.log(row, column, "ss");
			column = rowIndex;
			rowIndex = column;
			let style = "";
			if (columnIndex === 8 ) {
			style = "font-size:25px;";
			}
			if (columnIndex === 9 && row.flip == 1) {
			style = "background-Color:yellow;";
			}
			style
			return style;
			}
			,
			//合并行
			objectSpanMethod({ row, column, rowIndex, columnIndex }) {
			// console.log(row, column, "ss");
			row = column;
			column = row
			let arrOutSlice = this.OutSlice;
			let rowspans = 0;
			let colspans = 1;
			let barcode = arrOutSlice[rowIndex].barcode;

			let barcode2;
			if (rowIndex != 0) {
			barcode2 = arrOutSlice[rowIndex - 1].barcode;
			}
			if (columnIndex === 12) {
			if (barcode != barcode2) {
			// this.FrameNoFlag = barcode;
			for (let i = rowIndex; i < this.OutSlice.length; i++) {
			if (barcode == arrOutSlice[i].barcode) {
			barcode = arrOutSlice[i].barcode;
			rowspans += 1;
			} else {

			break;
			}
			}
			return {
			rowspan: rowspans,
			colspan: colspans
			};
			} else {
			return {
			rowspan: 0,
			colspan: 0
			};
			}
			}
			},
			//判断玻璃是否超出范围
			Sizerange(Glass, position) {
			if (this.ManuallyInfeedGlass == true) {
			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)) {
			this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
			confirmButtonText: this.$t('Yes'),
			type: 'info',
			callback: (action) => {
			this.$message({
			type: 'info',
			message: `action: ${action}`
			}).then(
			this.DeleteBarcodeGlass()
			);
			}
			});
			if (position == 1 \|\| position == 3) {
			this.disabled1 = true;
			} else {
			this.disabled = true;
			}
			} else {
			if (position == 1 \|\| position == 3) {
			this.disabled1 = false;
			} else {
			this.disabled = false;
			}
			if (position == 3 && this.isConfirmState == true) {
			this.InsertQueueGlass(1);
			}
			}
			}
			},
			//清空待确认玻璃信息
			DeleteBarcodeGlass() {
			this.form5 = {};
			},
			//手动完成出片任务
			CompleteQueue(id, frameid, glassid) {
			CompleteQueue(id, frameid, glassid).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			});
			}
			}
			}