From 1ac37f17a1e674337ea924e9f930725575cee15d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 20 五月 2024 13:47:44 +0800
Subject: [PATCH] 修改A01手动格子范围 ，A02翻转启动按钮
---
CanadaMes-ui/src/views/home/index.vue | 1632 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 1,218 insertions(+), 414 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 4005110..374493f 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -46,9 +46,6 @@
background-color: blue;
}
-.red {
- background-color: red;
-}
.yellow {
background-color: yellow;
@@ -84,7 +81,9 @@
}
.blocks-img {
- height: 100px;
+ height: 88px;
+ line-height: 90px;
+ color: white;
max-width: 100vw;
background-repeat: no-repeat;
background-attachment: local;
@@ -104,14 +103,14 @@
position: absolute;
background-image: url('../../img/dipan.png');
background-size: 70px 85px;
- left: 654px;
+ left: 501px;
top: 333px;
/* background-size: 85px 100px;
left: 912px;
top: 366px; */
}
-.orderbutton1 {
+/* .orderbutton1 {
position: absolute;
left: 1070px;
top: 70px;
@@ -121,7 +120,7 @@
position: absolute;
left: 500px;
top: -10px;
-}
+} */
.blocks-img3 {
height: 90px;
@@ -132,7 +131,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;
@@ -199,15 +198,43 @@
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;
-} */
+.hide {
+ display: none;
+}
+
+.el-table .cell {
+ display: flex;
+}
+
+.device {
+ font-weight: bold;
+ width: 25px;
+ height: 72px;
+ line-height: 72px;
+ color: white;
+ font-size: 12px;
+ position: absolute;
+}
+
+.glass {
+ font-weight: bold;
+ font-size: 12px;
+ width: 105px;
+ height: 15px;
+ position: absolute;
+}
</style>
<template>
<el-container>
@@ -216,56 +243,87 @@
<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;">
- <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>
+ <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('Order Info')
+ }}</el-button>
+ <el-button type="primary" @click="showcageinfo(1)" :disabled="CageDetails"
+ :class="CageDetails == true ? 'hide' : ''">{{ $t('Cage Details')
+ }}</el-button>
+ <el-button type="primary" @click="showform6()" :disabled="OutingQueue"
+ :class="OutingQueue == true ? 'hide' : ''">
+ {{ $t('Outfeed Queue') }}</el-button>
+ <!-- <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' : ''">
+ {{ $t('Terminate Outing') }}</el-button>
+ <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStopState"
+ :class="SoftEmergencyStopState == true ? 'hide' : ''">
+ {{ $t('SoftEmergencyStop') }}</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="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 :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')">
+ <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>
- <el-table-column :width="130" 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.glassheightmm }}
</template>
</el-table-column>
- <el-table-column :label="$t('Terminate Task')">
+ <el-table-column :label="$t('Abort')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Task Complete')
}}</el-button>
</template>
</el-table-column>
</el-table>
<el-table :data="this.tasklist2" border style="width: 100%">
- <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 :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')">
+ <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>
- <el-table-column :width="130" 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.glassheightmm }}
</template>
</el-table-column>
- <el-table-column :label="$t('Terminate Task')">
+ <el-table-column :label="$t('Abort')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Task Complete')
}}</el-button>
</template>
</el-table-column>
@@ -286,6 +344,10 @@
</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' }"
@@ -308,45 +370,122 @@
@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="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
- <div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></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-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>
- <!-- <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']"
- :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"
- @click="showcageinfo(item['cage'])"></div>
+ <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:885px;">
- <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist2" :key="item['date']"
- :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"
- @click="showcageinfo(item['cage'])"></div>
+ <div class="device" :style="'top: 105px;left: 1027px;background-color: ' + ShowDeviceList(1) + ';'">D02
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:328px;">
- <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist3" :key="item['date']"
- :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:4.22*index+'px' }"
- @click="showcageinfo(item['cage'])"></div>
+ <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:885px;">
- <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist4" :key="item['date']"
- :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:4.22*index+'px' }"
- @click="showcageinfo(item['cage'])"></div>
+ <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02
</div>
- <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
- <div class="blocks-img" :style="{ left: car2 + 'px', top: '194px' }"></div>
- <div class="blocks-img2" :style="{ left: '912px', top: '366px' }"></div>
- <div class="blocks-img3" :style="{ left: '875px', top: '455px' }"></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) + ''">
+ 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: 395px;left: 90px;background-color: ;'">E01</div>
+ <div class="device" :style="'top: 395px;left: 243px;background-color: ;'">E02</div>
+ <div class="device" :style="'top: 395px;left: 395px;background-color: ;'">E03</div>
+ <div class="device" :style="'top: 345px;left: 655px;background-color: ;'">E04</div>
+ <div class="device" :style="'top: 345px;left: 810px;background-color: ;'">E05</div>
+ <div class="device" :style="'top: 345px;left: 960px;background-color: ;'">E06</div>
+
+ <div class="device" :style="'top: 345px;left: 525px;background-color: ;'">J01</div>
+ <div class="device" :style="'top: 345px;left: 1100px;background-color: ;'">F01</div>
+ <div class="device" :style="'top: 275px;left: 1100px;background-color: ;'">G01</div>
+
+ <div class="glass D01" style="top: 39px;left: 1055px;position: absolute;">{{ ShowGlassIdList(0) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 0)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+ <div class="glass D02" style="top: 117px;left: 1055px;position: absolute;">{{ ShowGlassIdList(1) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.3', 1)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+ <div class="glass B01" style="top: 270px;left: 640px;position: absolute;">
+ B01:{{ ShowGlassIdList(2) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2', 2)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+ <div class="glass B02" style="top: 315px;left: 640px;position: absolute;">B02:{{ ShowGlassIdList(3) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.3', 3)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+ <div class="glass A01" style="top: 270px;left: 289px;position: absolute;">
+ A01.1:{{ ShowGlassIdList(4) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 4)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+
+ <div class="glass A01" style="top: 315px;left: 289px;position: absolute;">A01.2:{{ ShowGlassIdList(5) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 5)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+
+ <div class="glass A02" style="top: 360px;left: 289px;position: absolute;">A02:{{ ShowGlassIdList(6) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.1', 6)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+
+ <div class="glass D03" style="top: 122px;left: 42px;position: absolute;">
+ {{ ShowGlassIdList(7) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.4', 7)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+ <div class="glass D04" style="top: 198px;left: 42px;position: absolute;">
+ {{ ShowGlassIdList(8) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 8)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+ <div class="glass D05" style="top: 275px;left: 42px;position: absolute;">
+ {{ ShowGlassIdList(9) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.6', 9)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+ <div class="glass D06" style="top: 352px;left: 42px;position: absolute;">
+ {{ ShowGlassIdList(10) }}
+ <br />
+ <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 10)">
+ {{ $t('Clear') }}</el-button>
+ </div>
+
+
</div>
</el-footer>
<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')">
@@ -377,12 +516,12 @@
</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>
+ $t('confirm') }}</el-button>
<el-button @click="cancel()">{{ $t('cancel') }}</el-button>
</span>
</template>
@@ -406,52 +545,74 @@
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
- <el-table :data="this.alarm" border style="width: 100%;">
+ <el-table :data="this.alarm" border style="width: 100%;font-size: 25px;">
<el-table-column prop="id" :label="$t('id')"></el-table-column>
<el-table-column prop="content" :label="$t('content')"></el-table-column>
<el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
- <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
</el-table>
</el-dialog>
<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-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-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')">
+ <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.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?
- $t('Outing') : ""
- }}
+ scope.row.tier == 1 ? $t('Inside') : $t('Outside')
+ }}
</template>
</el-table-column>
- <el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')">
+ <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <el-table-column :min-width="80" 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="50" prop="boxId" :label="$t('Box No')"></el-table-column>
+ <el-table-column :min-width="80" prop="state" :label="$t('Glass State')">
<template slot-scope='scope'>
- {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}
+ {{
+ 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="280" :label="$t('Operate')">
+ <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 }}
+ </template>
+ </el-table-column>
+
+ <el-table-column :min-width="80" prop="lengthWidth" :label="$t('State')">
+ <template slot-scope='scope'>
+ {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}
+ </template>
+ </el-table-column>
+ <el-table-column :min-width="250" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ :disabled="(scope.row.state == 1 && (loadname == 'admin' || loadname == 'northglass')) ? 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"
- @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>
+ :disabled="(scope.row.state == 1 && (loadname == 'admin' || loadname == 'Transfer' || loadname == 'northglass' )) ? false : true"
+ @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Outfeed') }}</el-button>
+
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ :disabled="(loadname == 'admin' || loadname == 'northglass') ? false : true"
@click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
- {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>
+ {{ scope.row.disabled == 0 ? $t('Disable') : $t('Enable') }}</el-button>
+
<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')
+ :disabled="(scope.row.glassId == null && (loadname == 'admin' || loadname == 'northglass')) ? false : true"
+ @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Add')
}}</el-button>
</template>
</el-table-column>
@@ -459,13 +620,12 @@
<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"
+ :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)
@@ -478,190 +638,265 @@
<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: space-around;">
- <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>
- <label for="">{{ $t('Modify Information') }}</label>
- <label for="">{{ $t('current Information') }}</label>
- <label for="">{{ $t('Modify Information') }}</label>
- </div>
- <div style="display: flex;justify-content: space-around;">
+ <div style="display: flex;justify-content: center;">
+ <!-- <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-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>
+ {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') :
+ $t('Hand Movement') }}
+ <el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')
+ }}</el-button>
</el-form-item>
<el-form-item>
- <el-input style="width:50%;margin-left: 20%;" :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" @click="SelectGlassByGlassIDs(2)">{{ $t('Query')
- }}</el-button>
+ <el-button type="primary" :disabled="!Scanningmethod" @click="WriteGlassID()">{{ $t('Add')
+ }}</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-form-item>
</div>
+ <!-- <div style="display: flex;justify-content: space-around;">
+ <label for="">{{ $t('Upper film position') }}</label>
+
+ <label for="">{{ $t('Scan Code Point') }}</label>
+ </div> -->
+ <div style="display: flex;justify-content: space-around;height: 40px;">
+ <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-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: space-around;">
- <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>
- <el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">
- {{ $t('Confirm Modification') }}</el-button>
+ <div style="display: flex;justify-content: right;">
+ <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>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
- </span>
- </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('Start') : $t('Stop')
+ <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outfeed Queue')" top="5vh">
+ {{ $t('Queue State') }}:
+ {{ 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>
+ <el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>
+ <label style="background-color:yellow;font-size: 23px;" for="">
+ {{ isQueueWarning == true ? $t('The slot is disabled') : "" }}
+ </label>
+ <div style="display:flex;">
+ <div style="width:70%;">
+ <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 prop="barcode" :label="$t('Frame No')"></el-table-column>
+ <el-table-column :min-width="175" prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <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') }}
+ </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 != 1 && scope.row.state != 2)"
+ @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{
+ $t('Complete')
+ }}</el-button>
+ </template>
+ </el-table-column> -->
- <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border
- style="width: 100%;overflow: auto;">
- <el-table-column 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="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('State')">
- <template slot-scope='scope'>
- {{ scope.row.state == 0 ? "Waiting" : "Outing" }}
- </template>
- </el-table-column>
- <el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
- <el-table-column prop="position" :label="$t('Position')"></el-table-column>
- <el-table-column prop="barcode" :label="$t('Frame No')"></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 || isAllowQueue == true || scope.row.state == 1)">
- 缃《
- </el-button>
- <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"
- :disabled="(scope.$index == 0 || isAllowQueue == true || scope.row.state == 1)">
- 涓婄Щ
- </el-button>
- <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"
- :disabled="(OutSlice.length - 1 == scope.$index || isAllowQueue == true || scope.row.state == 1)">涓嬬Щ
- </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>
+ <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>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div style="width:30%;" v-for="(item) in CurrentFrame" :key="item['barcode']">
+ <div style="background-color: yellow;">
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Current scan') }}:</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('List No') }}:{{ frameInfo.listnumber }}
+ </h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Box No') }}:{{ frameInfo.boxnumber }}
+ </h1>
+ </div>
+ <el-button style="margin-left: 42%;" type="primary" @click="FrameStateUpdate(item['barcode'])">{{
+ $t('Next') }}</el-button>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame on Belt') }}:</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Barcode') }}:{{ item['barcode'] }}</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('List No') }}:{{ item['listId'] }}</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Box No') }}:{{ item['boxId'] }}</h1>
+ <div>
+ <div v-if="item['flip'] == 1"
+ style="width:40px;height:150px;border:1px solid black;float: left;">
+
+ </div>
+ <div class="frame"
+ :style="'background-color: ' + Colorchange(1) + ';margin-top:30px;margin:0 auto;width: 370px;height:150px;float: left;'">
+ <h1 style="font-size: 54px;text-align: center;color:white;margin-top: 0px;">
+ {{ framecolor1 == "green" ? $t('Interior Out Bypass: Right')
+ : framecolor1 == "blue" ? $t('Exterior Out Bypass: Left')
+ : $t('Remove Frame') }}
+ </h1>
+ </div>
+ <div v-if="item['flip'] == 2"
+ style="width:40px;height:150px;border:1px solid black;float: left;">
+
+ </div>
+ </div>
+ <h1 style="font-size: 30px;text-align: center;margin-top: 50px;">{{
+ (item['framewidthmm'] * 1) > (item['frameheightmm'] * 1) ? item['frameheightmm'] :
+ item['framewidthmm']
+ }}
+ </h1>
+ <div>
+ <h1 style="font-size: 30px;text-align: center;margin-top: 65px;">
+ {{ (item['frameheightmm'] * 1) > (item['framewidthmm'] * 1) ? item['frameheightmm'] :
+ item['framewidthmm'] }}</h1>
+ </div>
+
+ </div>
+ </div>
+
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible7" :title="$t('Glass information corresponding to aluminum frame')"
top="5vh">
+
<el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input>
<el-button type="primary" @click="showform7()">{{ $t('Query') }}</el-button>
- <el-button type="primary" @click="addoutslice()">{{ $t('Increase') }}</el-button>
- <el-table :data="this.AluminumFrame" :height="700" border style="width: 100%;overflow: auto;">
-
+ <el-button type="primary" @click="AddOutSliceS()" :disabled="framestate">{{ $t('Outfeed') }}</el-button>
+ <el-button type="primary" @click="CloseForm7()">{{ $t('Cancel') }}</el-button>
+ <el-table :data="this.AluminumFrame" :height="200" border style="width: 100%;overflow: auto;">
+ <el-table-column prop="frameBarcode" :label="$t('Frame No')"></el-table-column>
<el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
<el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
<el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
@@ -669,12 +904,23 @@
<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.tier" :label="$t('The Side')"></el-table-column>
+ <el-table-column prop="storageCage.cell" :label="$t('Slot No')">
+ <template slot-scope='scope'>
+ {{
+ scope.row.storageCage == null ? "" :
+ (scope.row.storageCage.cage - 1) * 21 + scope.row.storageCage.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')
+ }}
+ </template>
+ </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'>
{{ scope.row.out_slice != null ? $t('Yes') : $t('No') }}
@@ -686,13 +932,66 @@
{{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}
</template>
</el-table-column>
- <el-table-column :width="80" :label="$t('Operate')">
- <template slot-scope='scope'>
- <el-checkbox label="" :disabled="!(scope.row.storageCage != null && scope.row.out_slice == null)"
- :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode, $event)"></el-checkbox>
- </template>
- </el-table-column>
</el-table>
+ <div style="width:30%;" v-for="(item) in AluminumFrameInfo" :key="item['barcode']">
+ <el-button style="margin-left: 42%;" type="primary" @click="FrameStateUpdate(item['barcode'])">{{
+ $t('Next') }}</el-button>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame on Belt') }}:</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Barcode') }}:{{ item['barcode'] }}</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('List No') }}:{{ item['listnumber'] }}</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Box No') }}:{{ item['boxnumber'] }}</h1>
+ <div>
+ <div v-if="item['flip'] == 1" style="width:40px;height:150px;border:1px solid black;float: left;">
+ </div>
+ <div class="frame"
+ :style="'background-color: ' + Colorchange(0) + ';margin-top:30px;margin:0 auto;width: 370px;height:150px;float: left;'">
+ <h1 style="font-size: 54px;text-align: center;color:white;margin-top: 0px;">
+ {{ framecolor == "green" ? $t('Interior Out Bypass: Right')
+ : framecolor == "blue" ? $t('Exterior Out Bypass: Left')
+ : $t('Remove Frame') }}
+ </h1>
+ </div>
+ <div v-if="item['flip'] == 2" style="width:40px;height:150px;border:1px solid black;float: left;">
+
+ </div>
+ </div>
+ <h1 style="font-size: 30px;text-align: center;margin-top: 50px;">{{
+ (item['framelength'] * 1) > (item['frameheight'] * 1) ? item['frameheight'] :
+ item['framelength']
+ }}
+ </h1>
+ <div>
+ <h1 style="font-size: 30px;text-align: center;margin-top: 65px;">
+ {{ (item['frameheight'] * 1) > (item['framelength'] * 1) ? item['frameheight'] :
+ item['framelength']}}</h1>
+ </div>
+
+ </div>
+
+
+
+ <!-- <div style="width:30%;" v-for="(item) in AluminumFrameInfo" :key="item['barcode']">
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame on Belt') }}:</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Barcode') }}:{{ item['barcode'] }}</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('List No') }}:{{ item['listnumber'] }}</h1>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Box No') }}:{{ item['boxnumber'] }}</h1>
+ <h1 style="font-size: 30px;text-align: center;">
+ {{ item['flip'] == 1 ? $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['framelength'] }}*{{ item['frameheight']
+ }}
+ </h1>
+ <div class="frame"
+ :style="'background-color: ' + framecolor +';margin-top:30px;margin:0 auto;width:400px;height:150px;' ">
+ </div>
+ </div> -->
+ </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 }} -->
+ {{ this.CountDowns }}
+ </div>
</el-dialog>
</el-container>
</template>
@@ -701,12 +1000,14 @@
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
+ SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue,
+ isAllowReorderings, FrameStateUpdate, WriteGlassID, ClearGlassId, CloseForm7, TaskStop, SoftEmergencyStop, SwitchScanMethod
} from "../../api/home";
import LanguageMixin from '../../lang/LanguageMixin'
let socket;
+let timer;
export default {
name: "Home",
data() {
@@ -726,6 +1027,7 @@
dialogFormVisible5: false,
dialogFormVisible6: false,
dialogFormVisible7: false,
+ dialogFormCountDown: false,
form: {
orderId: "",
glassId: "",
@@ -737,6 +1039,7 @@
form3: {},
form4: {},
form5: {},
+ form6: {},
alarm: [],
tableData: [],
cagelist1: [],
@@ -760,7 +1063,8 @@
cageinfo: [],
cage: 0,
carlist: [],
- loadglassheight: 0,
+ loadglassheight1: 0,
+ loadglassheight2: 0,
password: 1,
text: "",
zhuangtai: "",
@@ -771,31 +1075,79 @@
currentPage: 1, //榛樿鍒濆椤�
pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
pageCount: 0,
-
currentPages: 1, //榛樿鍒濆椤�
- pagesizes: 21, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+ pagesizes: 42, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
pageCounts: 0,
-
OutSlice: [],
AluminumFrame: [],
framebarcode: "",
isAllowQueue: true,
+ isAllowReordering: true,
FrameNoFlag: "",
- isConfirm: true
+ isConfirm: true,
+ ManuallyInfeedGlass: true,
+ OutingQueue: true,
+ OrderInfo: true,
+ CageDetails: true,
+ ClearGlassID: true,
+ StopTask: true,
+ SoftEmergencyStopState: true,
+ CountDowns: "",
+ D01RequestState: false,
+ EmergencyStop: false,
+ PromptSize: 250,
+ reset: false,
+ isQueueWarning: false,
+ CurrentFrame: [],
+ DeviceList: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ GlassIdList: [],
+ Scanningmethod: true,
+ CurrrentGlassId: "",
+ feedglassid: "",
+ count1: 0,
+ count2: 1,
+ loadname: "",
+ form6state: 0,
+ StateColor: "green",
+ plc1: "",
+ plc2: "",
+ AluminumFrameInfo: {},
+ framestate: false,
+ framecolor: "green",
+ framecolor1: "green",
+ frameInfo: {}
};
},
created() {
this.load();
- this.init();
+ setInterval(() => {
+ if (this.count1 < this.count2) {
+ this.count1 = this.count2;
+ } else {
+ const now = new Date();
+ console.log(this.$t('Mes Connection failed') + now);
+ }
+ }, 60000);
},
+ activated() {
+ this.init();
+ }
+ ,
methods: {
+ Colorchange(i) {
+ if (i == 0) {
+ return this.framecolor;
+ } else {
+ return this.framecolor1;
+ }
+ },
init() {
let viewname = "Home";
if (typeof (WebSocket) == "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
//console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
- let socketUrl = "ws://" + this.$t('ip')+":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;
@@ -808,14 +1160,32 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
+ this.count2 = this.count2 + 1;
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
- this.car1 = 145 + 8.15 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;
- this.car2 = 210 + 8.15 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;
+ var zhi1 = obj.params[0][0];
+ var zhi2 = obj.params[0][1];
+ this.car1 = 145 + 8.15 * Math.abs(zhi1 - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;
+ 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];
this.cagelist1 = obj.cagelist1[0];
this.cagelist2 = obj.cagelist2[0];
@@ -824,57 +1194,238 @@
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
- //閾濇id鎻愮ず
+ //鑾峰彇褰撳墠鎵爜鏂瑰紡
+ if (obj.Scanningmethod != null) {
+ this.Scanningmethod = obj.Scanningmethod[0];
+ }
+ //鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
+ if (obj.CurrrentGlassId != null) {
+ const specialChars = /[^\w\s]/g;
+ this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");
+ }
+
+ //鏌ヨ褰撳墠閾濇淇℃伅
+ this.CurrentFrame = obj.CurrentFrame;
+ if (obj.CurrentFrame.length!=0) {
+ if (this.CurrentFrame[0].frameheightmm > this.CurrentFrame[0].framewidthmm) {
+ if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748) {
+ this.framecolor1 = "red";
+ } else {
+ if (this.CurrentFrame[0].flip == 2) {
+ this.framecolor1 = "green";
+ } else {
+ this.framecolor1 = "blue";
+ }
+
+ }
+ } else {
+ if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205) {
+ this.framecolor1 = "red";
+ } else {
+ if (this.CurrentFrame[0].flip == 2) {
+ this.framecolor1 = "green";
+ } else {
+ this.framecolor1 = "blue";
+ }
+ }
+ }
+ }
+
+ // 鑾峰彇璁惧鐘舵��
+ if (obj.DeviceList != null) {
+ this.DeviceList = obj.DeviceList[0];
+ }
+ //鑾峰彇璁惧涓婄殑鐜荤拑id
+ if (obj.GlassIdList != null) {
+ this.GlassIdList = obj.GlassIdList[0];
+ }
+ //鑾峰彇寰呯‘璁ょ殑閾濇鐜荤拑淇℃伅
+ if (obj.AluminumFrame != null) {
+
+ this.AluminumFrame = obj.AluminumFrame[0];
+
+
+ if (this.dialogFormVisible6 == true) {
+ this.dialogFormVisible7 = true;
+ }
+ }
+
+ if (obj.frameInfo != null) {
+ this.frameInfo = obj.frameInfo[0];
+ }
+
+ if (obj.AluminumFrameInfo != null) {
+ this.AluminumFrameInfo = obj.AluminumFrameInfo;
+ if (this.AluminumFrameInfo[0].frameheightmm > this.AluminumFrameInfo[0].framelengthmm) {
+ if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400) {
+ this.framestate = true;
+ this.framecolor = "red";
+ } else {
+ this.framestate = false;
+ if (this.AluminumFrameInfo[0].flip == 2) {
+ this.framecolor = "green";
+ } else {
+ this.framecolor = "blue";
+ }
+
+ }
+ } else {
+ if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600) {
+ this.framestate = true;
+ this.framecolor = "red";
+ } else {
+ this.framestate = false;
+ if (this.AluminumFrameInfo[0].flip == 2) {
+ this.framecolor = "green";
+ } else {
+ this.framecolor = "blue";
+ }
+ }
+ }
+ } else {
+ this.AluminumFrameInfo = {};
+ }
+
+ //鏍规嵁杩涚墖鐘舵�佸嚭鍙戣繘鐗囦换鍔�
+ 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) {
+ // 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) {
+ this.EmergencyStop = obj.emergencystop[0];
+ }
+ //澶嶄綅鍊掕鏃�
+ 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.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];
+ //褰撳墠鍑虹墖鏍煎瓙鏄惁琚鐢�
+ this.isQueueWarning = obj.isQueueWarning[0];
+ //鏄惁鍏佽鍑虹墖闃熷垪璋冨簭
+ this.isAllowReordering = obj.isAllowReordering[0];
//鍑虹墖闃熷垪
- if (this.isAllowQueue == true) {
+ if (this.isAllowReordering == true) {
this.OutSlice = obj.listoutslice[0];
}
- this.loadglassheight = obj.loadglassheight;
+ //鑾峰彇涓婄墖浣嶇幓鐠冧俊鎭�
+
if (obj.zhuangtai != null) {
this.zhuangtai = obj.zhuangtai[0];
}
- // if (this.dialogFormVisible7 == true) {
- // this.showform7();
- // } else {
- // if (obj.FrameNo != null && obj.FrameNo != "") {
- // this.framebarcode = obj.FrameNo[0];
- // this.showform7();
- // this.addoutslice();
- // }
- // }
+ //涓婄墖浣嶇幓鐠冧俊鎭�
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 = {};
}
- this.isConfirm = obj.isConfirm[0];
- if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
- this.form5 = obj.form3[0];
- this.showform3();
- this.Sizerange(this.form5);
+ if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
+ this.loadglassheight1 = 70;
+ if (this.form5.glassId != obj.form3[0].glassId && this.ManuallyInfeedGlass == false) {
+ if (this.loadname == "Buffer") {
+ this.showform3();
+ }
+ }
+ this.form5 = obj.form3[0];
+ this.glassid1 = "";
+ if (this.D01RequestState == true) {
+ this.Sizerange(this.form5, 3);
+ } else {
+ this.disabled1 = true;
+ }
} else {
- this.Sizerange(this.form5);
+ 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") {
this.text = this.$t('DataBase Connection failed');
}
+ //鐞嗙墖绗肩幓鐠冧俊鎭�
if (this.dialogFormVisible3 == true) {
SelectCageInfo(this.cageglassid).then(res => {
this.cageinfo = res.data.cageinfo;
});
}
-
-
this.$forceUpdate();
}.bind(this);
@@ -886,14 +1437,53 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
}
+ //璺宠浆椤甸潰鏃跺叧闂璼ocket
+ this.$router.afterEach(function () {
+ socket.close();
+ });
}
},
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) {
+ 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;
+ }
+ if (item.permissionId == "37" && item.state == 1) {
+ this.ClearGlassID = false;
+ }
+ if (item.permissionId == "38" && item.state == 1) {
+ this.StopTask = false;
+ }
+ if (item.permissionId == "39" && item.state == 1) {
+ this.SoftEmergencyStopState = false;
+ }
+ });
+ });
+
+ });
+ //鍔犺浇灏忚溅浣嶇疆淇℃伅
+ Loadcarlist().then(res => {
+ this.carlist = res.data.carlist;
+ });
//鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
home().then(res => {
this.tableData = res.data.list;
});
- SelectCageInfo(1).then(res => {
+ //鍔犺浇鐞嗙墖绗肩幓鐠冧俊鎭�
+ SelectCageInfo("").then(res => {
this.cageinfo = res.data.cageinfo;
this.currentPages = 1;
});
@@ -904,22 +1494,11 @@
this.cagelist3 = res.data.list3;
this.cagelist4 = res.data.list4;
});
- // //鍔犺浇杩涚墖浠诲姟鏁版嵁
- // loadtask(this.task1).then(res => {
- // this.tasklist1 = res.data.list;
- // });
- // //鍔犺浇杩涘嚭鐗囦换鍔℃暟鎹�
- // loadtask(this.task2).then(res => {
- // this.tasklist2 = res.data.list;
- // });
//鍔犺浇鎶ヨ淇℃伅
SelectAlarmmgInfo().then(res => {
this.alarm = res.data.alarmmg;
});
- //鍔犺浇灏忚溅浣嶇疆淇℃伅
- Loadcarlist().then(res => {
- this.carlist = res.data.carlist;
- });
+
//鍔犺浇纭瀵嗙爜
SelectPassword().then(res => {
this.password = res.data.password;
@@ -934,7 +1513,7 @@
} else if (state == 2) {
return "yellow gezi";
} else if (state == 3) {
- return "red gezi";
+ return "black gezi";
} else {
return "black gezi";
}
@@ -946,19 +1525,26 @@
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'));
}
this.load();
});
}
-
},
//鎵嬪姩涓婄墖
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 < 225 || width < 380 || height > 1810 || width > 2760) {
this.$message.error(this.$t('The glass size is not within the range'));
} else {
if (this.zhuangtai == true) {
@@ -973,7 +1559,7 @@
this.$message.error(this.$t('There is no such glass'));
}
else if (res.data.message2 == 400) {
- this.$message.error(this.$t('There is no such grid'));
+ this.$message.error(this.$t('There is no such slot'));
}
});
} else {
@@ -1017,84 +1603,48 @@
showform3() {
this.dialogFormVisible5 = true;
},
- //鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
- SelectGlassByGlassIDs(parameter) {
-
- this.showform3();
- 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'));
- this.Sizerange(this.form4);
- } else {
- this.$message.error(this.$t('There is no such glass'));
+ //鎵嬪姩鍐欏叆plc鎵爜浣嶇幓鐠僫d
+ WriteGlassID() {
+ if (this.glassid1.length == 14) {
+ WriteGlassID(this.glassid1).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Successful operation'));
}
- 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'));
- this.Sizerange(this.form5);
- } 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;
- }
- }
-
- });
+ this.$message.error(this.$t('Please enter the correct glassID'));
}
+ },
+ //鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
+ SelectGlassByGlassIDs() {
+ this.showform3();
},
+ //鏌ヨ瀹㈡埛鐜荤拑淇℃伅
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;
- });
+ // SelectGlass(this.orderid).then(res => {
+ // this.GlassInfo = res.data.glass;
+ // });
this.dialogFormVisible4 = true;
},
+ //鏄剧ず鍑虹墖闃熷垪
showform6() {
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;
- } else {
- item.isCheck = false;
- }
- item.Flip = res.data.flip;
- item.FrameNo = this.framebarcode;
- });
+ this.AluminumFrame = res.data.AluminumFrame;
});
- // this.dialogFormVisible7 = true;
+ this.dialogFormVisible7 = true;
},
//鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel() {
@@ -1111,15 +1661,16 @@
this.dialogFormVisible1 = false;
this.form1 = {};
},
+ //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel3() {
this.dialogFormVisible5 = false;
this.form1 = {};
},
//缁撴潫杩�/鍑虹墖浠诲姟
endtask(type, glassid, cell) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
- inputType: 'password',
- inputPlaceholder: this.$t('Please enter the password'),
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('confirm'), {
+ // inputType: 'password',
+ // inputPlaceholder: this.$t('Please enter the password'),
confirmButtonText: this.$t('Yes'),
cancelButtonText: this.$t('No'),
type: 'warning'
@@ -1142,19 +1693,23 @@
},
//鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
showcageinfo(cage) {
- cage = this.cageglassid;
- SelectCageInfo(cage).then(res => {
+ 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'));
+ }
- this.cageinfo = res.data.cageinfo;
- this.currentPages = 1;
- this.dialogFormVisible3 = true;
- });
},
//鍒犻櫎鐞嗙墖绗肩幓鐠�
deleteglass(glassid, state) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
- inputType: 'password',
- inputPlaceholder: this.$t('Please enter the password'),
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('confirm'), {
+ // inputType: 'password',
+ // inputPlaceholder: this.$t('Please enter the password'),
confirmButtonText: this.$t('Yes'),
cancelButtonText: this.$t('No'),
type: 'warning'
@@ -1182,7 +1737,7 @@
},
//鎵嬪姩鍑虹墖
outglass(glassid, state) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('confirm'), {
inputType: 'password',
inputPlaceholder: this.$t('Please enter the password'),
confirmButtonText: this.$t('Yes'),
@@ -1192,8 +1747,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'));
@@ -1214,7 +1775,7 @@
},
//鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
insertglass(cage, cell, tier) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('confirm'), {
inputType: 'password',
inputPlaceholder: this.$t('Please enter the password'),
confirmButtonText: this.$t('Yes'),
@@ -1238,31 +1799,35 @@
},
//鎵嬪姩涓婄墖
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 {
+ 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'));
+ }
+ 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) {
- Disabled(cage, cell, disabled).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- },
- //鍒犻櫎鍑虹墖闃熷垪鐜荤拑
- deleteproductionqueueglass(id) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('confirm'), {
inputType: 'password',
inputPlaceholder: this.$t('Please enter the password'),
confirmButtonText: this.$t('Yes'),
@@ -1270,7 +1835,7 @@
type: 'warning'
}).then(({ value }) => {
if (this.password == value) {
- DeleteProductionQueueGlass(id).then(res => {
+ Disabled(cage, cell, disabled).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
@@ -1282,8 +1847,32 @@
message: this.$t('Operation canceled')
});
});
- }, handleEdit(index, row) {
- console.log(index, row);
+
+ },
+ //鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ deleteproductionqueueglass(id) {
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('confirm'), {
+ // inputType: 'password',
+ // inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(() => {
+ // if (this.password == value) {
+ DeleteProductionQueueGlass(id).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ } else {
+ this.$message.error(this.$t('This frame has glass that is currently outing'));
+ }
+ });
+ // }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
},
//琛ㄦ牸鍒犻櫎
handleDelete(index, row) {
@@ -1308,20 +1897,28 @@
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
InsertQueueGlass(parameter) {
if (parameter == 1 && this.form5.glassId != "") {
- if (this.form5.glassId != this.form2.glassId) {
- InsertQueueGlassId(1, this.form5).then(res => {
- if (res.data.message == 200) {
- this.form5 = {};
- this.$message.success(this.$t('Operation successful'));
- } else {
- this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
- }
- });
+ if (this.form5.glassId != this.form2.glassId && this.form5.glassId != this.form3.glassId) {
+ if (this.dialogFormVisible5 == true) {
+ InsertQueueGlassId(1, this.form5).then(res => {
+ if (res.data.message == 200) {
+ 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('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'));
+ }
+ });
+ }
} else {
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) {
+ 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 = {};
@@ -1342,14 +1939,14 @@
if (parameter == 1) {
DeleteQueueGlass(1).then(res => {
if (res.data.message == 200) {
- this.form2 = {};
+ this.form3 = {};
this.$message.success(this.$t('Operation successful'));
}
});
} else {
DeleteQueueGlass(2).then(res => {
if (res.data.message == 200) {
- this.form3 = {};
+ this.form2 = {};
this.$message.success(this.$t('Operation successful'));
}
});
@@ -1363,27 +1960,40 @@
}
});
},
+ //閾濇瀵瑰簲鐜荤拑淇℃伅娣诲姞閾濇id鍜屾槸鍚︽坊鍔犲埌闃熷垪
CheckBoxchange(glassid, isChecked) {
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 => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }, getTopMove(row, index) {
+ //娣诲姞鍒板嚭鐗囬槦鍒�
+ AddOutSliceS() {
+ if (this.AluminumFrame != null) {
+ AddOutSliceS(this.AluminumFrame[0].frameBarcode).then(res => {
+ if (res.data.message == 200) {
+ this.AluminumFrame = null;
+ this.AluminumFrameInfo = null;
+ this.dialogFormVisible7 = false;
+ this.framebarcode = "";
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ },
+ //鍏抽棴寰呯‘璁ら摑妗嗕俊鎭晫闈㈠苟娓呴櫎寰呯‘璁や俊鎭�
+ CloseForm7() {
+ if (this.AluminumFrame != null) {
+ CloseForm7().then(res => {
+ if (res.data.message == 200) {
+ this.AluminumFrame = null;
+ this.AluminumFrameInfo = null;
+ this.dialogFormVisible7 = false;
+ this.framebarcode = "";
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ },
+ //缃《
+ getTopMove(row, index) {
let Sequence = [];
this.OutSlice.forEach(item => {
Sequence.push(item.sequence);
@@ -1485,6 +2095,7 @@
}
this.UpdateSequence(Sequence);
},
+ //淇敼鍑虹墖椤哄簭
UpdateSequence(Sequence) {
let i = 0;
this.OutSlice.forEach(item => {
@@ -1500,6 +2111,14 @@
}
})
},
+ //鏄惁鍏佽鍑虹墖闃熷垪鎺掑簭
+ isAllowReorderings() {
+ isAllowReorderings(!this.isAllowReordering, this.OutSlice).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ })
+ },
//鍒囨崲涓婄墖鏄惁闇�瑕佺‘璁ょ幓鐠冧俊鎭�
isConfirmState() {
isConfirmStates(!this.isConfirm).then(res => {
@@ -1509,16 +2128,24 @@
});
}
,
- arraySpanMethod({ row, column, rowIndex, columnIndex }) {
- console.log(row, column);
- if (rowIndex % 2 === 0) {
- if (columnIndex === 0) {
- return [1, 2];
- } else if (columnIndex === 1) {
- return [0, 0];
- }
+ //琛ㄦ牸鏍峰紡
+ cellStyle({ column, rowIndex, columnIndex }) {
+ column = rowIndex;
+ rowIndex = column;
+ let style = "";
+ if (columnIndex === 8) {
+ // style = "font-size:200px;text-align: center;";
+ style = "";
}
- },
+ // if (columnIndex === 9 && row.flip == 1) {
+ // style = "background-Color:yellow;";
+ // }
+ // if (columnIndex === 6 && row.state == 3) {
+ // style = "background-Color:gray;";
+ // }
+ return style;
+ }
+ ,
//鍚堝苟琛�
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// console.log(row, column, "ss");
@@ -1533,7 +2160,7 @@
if (rowIndex != 0) {
barcode2 = arrOutSlice[rowIndex - 1].barcode;
}
- if (columnIndex === 9) {
+ if (columnIndex === 0 || columnIndex === 10) {
if (barcode != barcode2) {
// this.FrameNoFlag = barcode;
for (let i = rowIndex; i < this.OutSlice.length; i++) {
@@ -1541,7 +2168,6 @@
barcode = arrOutSlice[i].barcode;
rowspans += 1;
} else {
-
break;
}
}
@@ -1558,46 +2184,224 @@
}
},
//鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
- Sizerange(Glass) {
- 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)) {
- // if (this.disabled == false) {
- this.disabled = true;
- // this.$message.error(this.$t('The glass size is not within the range'));
+ Sizerange(Glass, position) {
+ if (this.ManuallyInfeedGlass == false) {
+ 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 < 225 || 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',
- callback: action => {
+ type: 'info',
+ callback: (action) => {
this.$message({
type: 'info',
- action: action
+ message: `action: ${action}`
}).then(
this.DeleteBarcodeGlass()
);
}
});
- // }
- // this.$message(this.$t('The glass size is not within the range'), this.$t('confirm'), {
- // // confirmwidth: 7000,
- // // height: 8000,
- // confirmButtonText: this.$t('Yes'),
- // type: 'info'
- // }).then(() => {
- // this.$message.success(this.$t('Operation successful'));
- // }).catch(() => {
- // this.$message({
- // type: 'warning',
- // message: this.$t('Operation canceled')
- // });
- // });
- // }
- this.disabled1 = true;
- } else {
- this.disabled1 = false;
+ 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.isConfirm == true && this.D01RequestState == true && this.dialogFormVisible5 == 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'));
+ }
+ });
+ },
+ //60绉掑浣嶅�掓暟璁℃椂
+ CountDown() {
+ clearInterval(timer);
+ let count = 60;
+ timer = setInterval(
+ () => {
+ if (this.EmergencyStop == true) {
+ clearInterval(timer);
+ this.StateColor = "red";
+ this.CountDowns = "";
+ } else {
+ if (count > 0) {
+ this.StateColor = "yellow";
+ this.PromptSize = 500;
+ this.CountDowns = count;
+ count--;
+ }
+ else {
+ this.PromptSize = 200;
+ this.CountDowns = "";
+ this.StateColor = "green";
+ if (this.reset == true) {
+ clearInterval(timer);
+ }
+ }
+ }
+ },
+ 1000
+ );
+ },
+ //鏇存崲褰撳墠閾濇
+ FrameStateUpdate(frameno) {
+ FrameStateUpdate(frameno).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success("Operation successful");
+ }
+ });
+ },
+ //褰撳墠閾濇鍥惧舰
+ FrameWidthHeight(state, width, height, position) {
+ if (state == "before") {
+ if (position == 0) {
+ if (width > height) {
+ return 400;
+ }
+ else {
+ return width / height * 400;
+ }
+ } else {
+ if (width > height) {
+ return height / width * 400;
+ }
+ else {
+ return 400;
+ }
+ }
+ }
+ if (state == "after") {
+ if (position == 0) {
+ if (width < height) {
+ return 400;
+ }
+ else {
+ return height / width * 400;
+ }
+ } else {
+ if (width < height) {
+ return width / height * 400;
+ }
+ else {
+ return 400;
+ }
+ }
+ }
+ },
+ //鑾峰彇璁惧鏄剧ず鐘舵��
+ ShowDeviceList(num) {
+ if (this.DeviceList != null && this.DeviceList.length > 0) {
+
+ if (this.DeviceList[num] == 0) {
+ return "";
+ } else if (this.DeviceList[num] == 1) {
+ return "rgba(0,128,0,0.5)";
+ } else if (this.DeviceList[num] == 2) {
+ return "rgba(255,0,0)";
+ }
+ }
+ },
+ //鑾峰彇璁惧鐜荤拑id
+ ShowGlassIdList(num) {
+ if (this.GlassIdList != null && this.GlassIdList.length > 0) {
+ const specialChars = /[^\w\s]/g;
+ return this.GlassIdList[num].replace(specialChars, "");
+ }
+ },
+ //娓呴櫎鐜荤拑id
+ ClearGlassId(position, num) {
+ 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')
+ });
+ });
+ // } else {
+ // this.$message.error(this.$t('There is no glass ID here'));
+ // }
+ } else {
+ //鑷姩鐘舵�佷笉鑳芥竻闄ょ幓鐠僫d
+ this.$message.error(this.$t('Unable to clear glass ID in automatic mode'));
+ }
+ } else {
+ this.$message.error(this.$t('You do not have this permission'));
+ }
+ },
+ //缁堟杩�/鍑虹墖浠诲姟
+ TaskStop(num) {
+ TaskStop(num).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ },
+ //杞�ュ仠
+ SoftEmergencyStop() {
+ this.$confirm(this.$t('Are you sure you want an emergency stop ?'), this.$t('confirm'), {
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(() => {
+ SoftEmergencyStop.then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ },
+ //鍒囨崲浜岀淮鐮佽幏鍙栨柟寮�
+ SwitchScanMethod() {
+ SwitchScanMethod(!this.Scanningmethod).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
}
- },
- DeleteBarcodeGlass(){
- this.form5={};
}
-}
}
</script>
\ No newline at end of file
--
Gitblit v1.8.0