CanadaMes.git - Gitblit

			@@ -46,8 +46,8 @@
			background-color: blue;
			}

			.red {
			background-color: red;
			.black {
			background-color: black;
			}

			.yellow {
			@@ -155,7 +155,7 @@
			.box {
			width: 90%;
			margin-left: 5%;
			color: red;
			color: black;
			font-size: 12px;
			overflow: hidden;
			height: 20px;
			@@ -643,13 +643,15 @@
			<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">{{
			<el-button type="primary" @click="isAllowReorderings()" :disabled="this.isAllowQueue">{{
			this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
			}}</el-button>
			<el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input>
			<el-button type="primary" @click="AddOutSliceS()">{{ $t('Add') }}</el-button>
			<el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
			style="width: 100%;overflow: auto;font-size: 18px;">
			<el-table-column :min-width="175" prop="glassId" :label="$t('Barcode')"></el-table-column>
			<el-table-column :min-width="90" prop="orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column :min-width="100" 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="100" prop="glasswidthmm" :label="$t('Length')"></el-table-column>
			@@ -657,14 +659,14 @@
			<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('Completed') : scope.row.state == 3 ? $t('Absent') : $t('Deleted') }}
			? $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')">
			<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 != 2&&scope.row.state != 4)"
			:disabled="!(!isAllowQueue && scope.row.state != 2 && scope.row.state != 4)"
			@click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{ $t('Complete')
			}}</el-button>
			</template>
			@@ -688,7 +690,7 @@
			<el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>


			<el-table-column :width="280" :label="$t('Operate')">
			<el-table-column :width="200" :label="$t('Operate')">
			<template slot-scope='scope'>
			<el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"
			style="font-size: 15px;"
			@@ -749,7 +751,6 @@
			</el-table-column>
			</el-table>
			</el-dialog>

			<el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">
			<div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">
			<!-- {{ this.CountDowns }} -->
			@@ -763,7 +764,8 @@
			import {
			home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
			SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
			SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue
			SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue,
			isAllowReorderings
			} from "../../api/home";


			@@ -897,12 +899,16 @@
			this.cagelist4 = obj.cagelist4[0];
			this.tasklist1 = obj.tasklist1[0];
			this.tasklist2 = obj.tasklist2[0];
			this.alarm = obj.alarmmg[0];
			if (this.alarm.length > 0&&this.alarm!=obj.alarmmg[0]) {
			this.dialogFormVisible2 = true;
			}
			// else {
			// this.dialogFormVisible2 = false;
			// if (obj.alarmmg[0].length > 0) {
			// if (this.alarm.length > 0) {
			// if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
			// this.alarm = obj.alarmmg[0];
			// this.dialogFormVisible2 = true;
			// }
			// } else {
			// this.alarm = obj.alarmmg[0];
			// this.dialogFormVisible2 = true;
			// }
			// }
			//是否急停
			if (obj.emergencystop != null) {
			@@ -929,6 +935,8 @@

			//是否允许出片
			this.isAllowQueue = obj.isAllowQueue[0];
			//是否允许出片队列调序
			this.isAllowReordering = obj.isAllowReordering[0];
			//出片队列
			if (this.isAllowReordering == true) {
			this.OutSlice = obj.listoutslice[0];
			@@ -1061,7 +1069,7 @@
			} else if (state == 2) {
			return "yellow gezi";
			} else if (state == 3) {
			return "red gezi";
			return "black gezi";
			} else {
			return "black gezi";
			}
			@@ -1079,7 +1087,6 @@
			this.load();
			});
			}

			},
			//手动上片
			sbumitglassid() {
			@@ -1504,19 +1511,24 @@
			this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })
			},
			//添加到出片队列
			addoutslice() {
			var dats_ = new Array();
			this.AluminumFrame.forEach(item => {
			var dats2_ = new Array();
			dats2_[0] = item.barcode;
			dats2_[1] = item.isCheck;
			dats2_[2] = item.Flip;
			dats2_[3] = item.FrameNo;
			dats2_[4] = item.glasslengthmm;
			dats2_[5] = item.glassheightmm;
			dats_[dats_.length] = dats2_;
			});
			AddOutSliceS(dats_).then(res => {
			AddOutSliceS() {
			// var dats_ = new Array();
			// this.AluminumFrame.forEach(item => {
			// var dats2_ = new Array();
			// dats2_[0] = item.barcode;
			// dats2_[1] = item.isCheck;
			// dats2_[2] = item.Flip;
			// dats2_[3] = item.FrameNo;
			// dats2_[4] = item.glasslengthmm;
			// dats2_[5] = item.glassheightmm;
			// dats_[dats_.length] = dats2_;
			// });
			// AddOutSliceS(dats_).then(res => {
			// if (res.data.message == 200) {
			// this.$message.success(this.$t('Operation successful'));
			// }
			// });
			AddOutSliceS(this.framebarcode).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			@@ -1641,9 +1653,13 @@
			}
			})
			},
			//
			isAllowReorderingState() {
			this.isAllowReordering = !this.isAllowReordering;
			//是否允许出片队列排序
			isAllowReorderings() {
			isAllowReorderings(!this.isAllowReordering, this.OutSlice).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			})
			},
			//切换上片是否需要确认玻璃信息
			isConfirmState() {
			@@ -1654,8 +1670,8 @@
			});
			}
			,
			cellStyle({ column, rowIndex, columnIndex }) {
			// console.log(row, column, "ss");
			//表格样式
			cellStyle({ column, rowIndex, columnIndex }) {
			column = rowIndex;
			rowIndex = column;
			let style = "";
			@@ -1753,8 +1769,8 @@
			}
			});
			},
			//45秒复位倒数计时
			CountDown() {
			//50秒倒数计时
			let count = 45;
			let timer = setInterval(
			() => {
			@@ -1767,6 +1783,7 @@
			this.PromptSize = 500;
			this.CountDowns = count;
			count--;
			this.dialogFormCountDown = true;
			}
			else {
			this.PromptSize = 200;
			@@ -1780,7 +1797,7 @@
			},
			1000
			);
			this.dialogFormCountDown = true;

			}
			}
			}