From 4f3aa71ed602c1abbafa638591b20abc3c7be224 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 一月 2024 10:03:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 1060 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 763 insertions(+), 297 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 3474222..c2e1186 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>
@@ -223,20 +250,38 @@
</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>
+ <!-- <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(2)" :disabled="ManuallyInfeedGlass"
+ :class="ManuallyInfeedGlass == true ? 'hide' : ''">
+ {{ $t('Manually Infeed Glass') }}</el-button>
+ <el-button type="primary" @click="showform2()" :disabled="OrderInfo"
+ :class="OrderInfo == true ? 'hide' : ''">{{ $t('OrderInfo')
+ }}</el-button>
+ <el-button type="primary" @click="showform6()" :disabled="OutingQueue"
+ :class="OutingQueue == true ? 'hide' : ''">
+ {{ $t('Outing Queue') }}</el-button>
+ <el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"
+ :class="StopTask == true ? 'hide' : ''">
+ {{ $t('Stop Feeding') }}</el-button>
+ <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask"
+ :class="StopTask == true ? 'hide' : ''">
+ {{ $t('Stop Outing') }}</el-button>
+ <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStop"
+ :class="SoftEmergencyStop == 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')"></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>
@@ -250,13 +295,13 @@
</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')"></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>
@@ -308,39 +353,62 @@
@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 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: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>
- <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>
- <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>
- <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="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01</div>
+ <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02</div>
+ <div class="blocks-img" :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">
+ A01</div>
+ <div class="blocks-img" :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">
+ 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="glass D01" style="top: 54px;left: 1055px;position: absolute;"
+ @click="ClearGlassId('DB101.9.2', 0)">{{ ShowGlassIdList(0) }}</div>
+ <div class="glass D02" style="top: 132px;left: 1055px;position: absolute;"
+ @click="ClearGlassId('DB101.9.2', 1)">{{ ShowGlassIdList(1) }}</div>
+ <div class="glass B01" style="top: 270px;left: 640px;position: absolute;"
+ @click="ClearGlassId('DB101.10.2', 2)">
+ B01:{{ ShowGlassIdList(2) }}</div>
+ <div class="glass B02" style="top: 290px;left: 640px;position: absolute;"
+ @click="ClearGlassId('DB101.10.3', 3)">B02:{{ ShowGlassIdList(3) }}</div>
+ <div class="glass A01" style="top: 270px;left: 289px;position: absolute;"
+ @click="ClearGlassId('DB101.10.0', 4)">
+ A01.1:{{ ShowGlassIdList(4) }}</div>
+
+ <div class="glass A01" style="top: 290px;left: 289px;position: absolute;"
+ @click="ClearGlassId('DB101.10.1,5')">A01.2:{{ ShowGlassIdList(5) }}</div>
+
+ <div class="glass A02" style="top: 310px;left: 300px;position: absolute;"
+ @click="ClearGlassId('DB101.10.2,6')">A02:{{ ShowGlassIdList(6) }}</div>
+
+ <div class="glass D03" style="top: 137px;left: 42px;position: absolute;"
+ @click="ClearGlassId('DB101.9.4', 7)">
+ {{ ShowGlassIdList(7) }}</div>
+ <div class="glass D04" style="top: 213px;left: 42px;position: absolute;"
+ @click="ClearGlassId('DB101.9.5', 8)">
+ {{ ShowGlassIdList(8) }}</div>
+ <div class="glass D05" style="top: 290px;left: 42px;position: absolute;"
+ @click="ClearGlassId('DB101.9.6', 9)">
+ {{ ShowGlassIdList(9) }}</div>
+ <div class="glass D06" style="top: 367px;left: 42px;position: absolute;"
+ @click="ClearGlassId('DB101.9.5', 10)">
+ {{ ShowGlassIdList(10) }}</div>
+
+
</div>
</el-footer>
<el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">
@@ -377,9 +445,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>
@@ -406,11 +474,10 @@
</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>
@@ -419,14 +486,20 @@
<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-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')">
+ <template slot-scope='scope'>
+ {{
+ scope.row.tier == 1 ? $t('Inside') : $t('Outside')
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <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.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?
@@ -434,24 +507,31 @@
}}
</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 }}
</template>
</el-table-column>
- <el-table-column :width="280" :label="$t('Operate')">
+
+ <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 ? 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>
<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>
+ {{ 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')
+ @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Add')
}}</el-button>
</template>
</el-table-column>
@@ -459,7 +539,7 @@
<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>
@@ -486,10 +566,27 @@
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
+ <div style="display: flex;justify-content: center;">
+ <!-- <el-form-item>
+ <el-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>
+ </el-form-item> -->
+ <el-form-item>
+ <el-input style="width:70%;" :placeholder="$t('Enter the glass barcode')"
+ v-model="glassid1"></el-input>
+ <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Add')
+ }}</el-button>
+ </el-form-item>
+ </div>
<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>
+ <div>
+ {{ $t('Confirm State') }}:{{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}
+ <el-button type="primary" @click="isConfirmState()">
+ {{ this.isConfirm == true ? $t('Allow') : $t('Not Allow') }}</el-button>
+ </div>
<label for="">{{ $t('Scan Code Point') }}</label>
</div>
<div style="display: flex;justify-content: space-around;height: 40px;">
@@ -498,20 +595,7 @@
<label for="">{{ $t('current Information') }}</label>
<label for="">{{ $t('Modify Information') }}</label>
</div>
- <div style="display: flex;justify-content: space-around;">
- <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>
- </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>
- </el-form-item>
- </div>
+
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('Barcode')">
<el-input v-model="form2.glassId" readonly autocomplete="off" />
@@ -596,14 +680,15 @@
<el-input v-model="form5.glassheightmm" 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')
+ <div style="display: flex;justify-content: right;">
+ <!-- <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">
+ }}</el-button> -->
+ <el-button @click="InsertQueueGlass(1)" style="margin-right: 100px;" type="primary"
+ :disabled="disabled1">
{{ $t('Confirm Modification') }}</el-button>
</div>
</el-form>
@@ -614,54 +699,130 @@
</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('Outing 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-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')">
+ <!-- {{ $t('Sorting State') }}:
+ {{
+ this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
+ }}
+ <el-button type="primary" @click="isAllowReorderings()" :disabled="this.isAllowQueue">{{
+ this.isAllowReordering == true ? $t('Allow') : $t('Not Allow')
+ }}</el-button> -->
+ <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input> -->
+ <el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>
+ <label style="background-color:yellow;font-size: 23px;" for="">
+ {{ isQueueWarning == true ? $t('The cage is disabled') : "" }}
+ </label>
+ <!-- <span style="background-color:yellow;">
+ {{ isQueueWarning== true ? $t('The cage is disabled') : $t('The cage is disabled') }}
+ </span> -->
+ <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="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 != 2 && scope.row.state != 4)"
+ @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{
+ $t('Complete')
+ }}</el-button>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column :min-width="300" prop="position" :label="$t('Position')" style="font-size: 20px;">
<template slot-scope='scope'>
- {{ scope.row.state == 0 ? "Waiting" : "Outing" }}
+ <div
+ :style="'width:' + (scope.row.position == 1 ? '300' : '100') + 'px;height:' + (scope.row.position == 1 ? '100' : '200') + 'px;background-Color:gray;margin:0 auto;'">
+
+ </div>
</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')">
+ </el-table-column> -->
+ <!-- <el-table-column prop="position" :label="$t('Flipped')" :min-width="200">
<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)">
- 缃《
+ {{ scope.row.flip == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')
+ : $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}
+ </template>
+ </el-table-column> -->
+
+ <el-table-column :width="100" :label="$t('Operate')">
+ <template slot-scope='scope'>
+ <!-- <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"
+ 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 || isAllowQueue == true || scope.row.state == 1)">
- 涓婄Щ
+ 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 || 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>
+ 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;"
+ :disabled="isAllowQueue" @click="deleteproductionqueueglass(scope.row.barcode)">{{
+ $t('Delete') }}</el-button>
+
+ <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="isAllowQueue"
+ @click="FrameStateUpdate(scope.row.barcode,scope.row.framestate)">{{
+ scope.row.framestate == 0 ? $t('Stop') : $t('Start') }}</el-button> -->
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div style="width:30%;" v-for="(item) in CurrentFrame" :key="item['barcode']">
+ <el-button style="margin-left: 42%;" type="primary" @click="FrameStateUpdate(item['barcode'])">{{
+ $t('Next') }}</el-button>
+ <h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame') }}:{{ item['barcode'] }}</h1>
+ <h1 style="font-size: 30px;text-align: center;">
+ {{ item['flip'] == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')
+ : $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}
+ </h1>
+ <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm'] }}
+ </h1>
+
+ <div class="frame" :style="'background-color: green;margin-top:30px;margin:0 auto;width: ' +
+ FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +
+ FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'
+ ">
+ </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-button type="primary" @click="AddOutSliceS()">{{ $t('Add') }}</el-button>
+ <el-button type="primary" @click="CloseForm7()">{{ $t('Cancel') }}</el-button>
<el-table :data="this.AluminumFrame" :height="700" 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>
@@ -670,11 +831,15 @@
<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.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="Flip" :label="$t('Flipped')"></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 +851,19 @@
{{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}
</template>
</el-table-column>
- <el-table-column :width="80" :label="$t('Operate')">
+ <!-- <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-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 }} -->
+ {{ this.CountDowns }}
+ </div>
</el-dialog>
</el-container>
</template>
@@ -701,7 +872,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
+ SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue,
+ isAllowReorderings, FrameStateUpdate, WriteGlassID, ClearGlassId, CloseForm7, TaskStop, SoftEmergencyStop
} from "../../api/home";
@@ -726,6 +898,7 @@
dialogFormVisible5: false,
dialogFormVisible6: false,
dialogFormVisible7: false,
+ dialogFormCountDown: false,
form: {
orderId: "",
glassId: "",
@@ -760,7 +933,8 @@
cageinfo: [],
cage: 0,
carlist: [],
- loadglassheight: 0,
+ loadglassheight1: 0,
+ loadglassheight2: 0,
password: 1,
text: "",
zhuangtai: "",
@@ -771,23 +945,40 @@
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,
+ SoftEmergencyStop:true,
+ CountDowns: "0",
+ D01RequestState: false,
+ EmergencyStop: false,
+ PromptSize: 250,
+ reset: false,
+ isQueueWarning: false,
+ CurrentFrame: [],
+ DeviceList: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+ GlassIdList: []
};
},
created() {
this.load();
+
this.init();
- },
+ }
+ ,
methods: {
init() {
let viewname = "Home";
@@ -795,7 +986,7 @@
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;
@@ -811,6 +1002,7 @@
//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;
// this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
@@ -824,57 +1016,115 @@
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
- //閾濇id鎻愮ず
+ //鏌ヨ褰撳墠閾濇淇℃伅
+ this.CurrentFrame = obj.CurrentFrame;
+ //鑾峰彇璁惧鐘舵��
+ 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.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;
//鏄惁鍏佽鍑虹墖
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.loadglassheight1 = 70;
this.form5 = obj.form3[0];
this.showform3();
- this.Sizerange(this.form5);
-
+ 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.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);
@@ -889,11 +1139,45 @@
}
},
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;
+ }
+ if (item.permissionId == "36" && item.state == 1) {
+ this.ClearGlassID = false;
+ }
+ if (item.permissionId == "37" && item.state == 1) {
+ this.StopTask = false;
+ }
+ if (item.permissionId == "38" && item.state == 1) {
+ this.SoftEmergencyStop = 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;
});
@@ -916,10 +1200,7 @@
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 +1215,7 @@
} else if (state == 2) {
return "yellow gezi";
} else if (state == 3) {
- return "red gezi";
+ return "black gezi";
} else {
return "black gezi";
}
@@ -946,14 +1227,12 @@
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() {
@@ -973,7 +1252,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 +1296,85 @@
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'));
- }
- 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;
- }
- }
-
+ //鎵嬪姩鍐欏叆plc鎵爜浣嶇幓鐠僫d
+ WriteGlassID() {
+ if (this.glassid1 != "") {
+ WriteGlassID(this.glassid1).then(res => {
+ console.log(res.data);
+ this.$message.success(this.$t('Successful operation'));
});
}
+ },
+ //鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
+ SelectGlassByGlassIDs(parameter) {
+ this.showform3();
+ // if (parameter == 1) {
+ // SelectGlassByGlassID(this.glassid2).then(res => {
+ // if (res.data.form != null) {
+ // 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.$message.error(this.$t('There is no such glass'));
+ // }
+
+ // } else {
+ // this.$message.error(this.$t('There is no such glass'));
+ // }
+ // });
+ // } else {
+ // SelectGlassByGlassID(this.glassid1).then(res => {
+ // if (res.data.form != null) {
+ // 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.$message.error(this.$t('There is no such glass'));
+ // }
+ // } else {
+ // this.$message.error(this.$t('There is no such glass'));
+ // }
+ // });
+ // }
},
+ //鏌ヨ瀹㈡埛鐜荤拑淇℃伅
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() {
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;
+ console.log(this.AluminumFrame);
+ // 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.dialogFormVisible7 = true;
+ this.dialogFormVisible7 = true;
},
//鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel() {
@@ -1111,6 +1391,7 @@
this.dialogFormVisible1 = false;
this.form1 = {};
},
+ //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel3() {
this.dialogFormVisible5 = false;
this.form1 = {};
@@ -1142,12 +1423,17 @@
},
//鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
showcageinfo(cage) {
- cage = this.cageglassid;
- SelectCageInfo(cage).then(res => {
- this.cageinfo = res.data.cageinfo;
- this.currentPages = 1;
- 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) {
@@ -1191,8 +1477,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'));
@@ -1237,19 +1529,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) {
@@ -1281,8 +1578,6 @@
message: this.$t('Operation canceled')
});
});
- }, handleEdit(index, row) {
- console.log(index, row);
},
//琛ㄦ牸鍒犻櫎
handleDelete(index, row) {
@@ -1307,7 +1602,7 @@
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
InsertQueueGlass(parameter) {
if (parameter == 1 && this.form5.glassId != "") {
- if (this.form5.glassId != this.form2.glassId) {
+ 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 = {};
@@ -1320,7 +1615,7 @@
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 = {};
@@ -1341,14 +1636,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'));
}
});
@@ -1362,27 +1657,34 @@
}
});
},
+ //閾濇瀵瑰簲鐜荤拑淇℃伅娣诲姞閾濇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.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ },
+ //鍏抽棴寰呯‘璁ら摑妗嗕俊鎭晫闈㈠苟娓呴櫎寰呯‘璁や俊鎭�
+ CloseForm7() {
+ if (this.AluminumFrame != null) {
+ CloseForm7().then(res => {
+ if (res.data.message == 200) {
+ this.AluminumFrame = null;
+ this.dialogFormVisible7 = false;
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ },
+ //缃《
+ getTopMove(row, index) {
let Sequence = [];
this.OutSlice.forEach(item => {
Sequence.push(item.sequence);
@@ -1484,6 +1786,7 @@
}
this.UpdateSequence(Sequence);
},
+ //淇敼椤哄簭
UpdateSequence(Sequence) {
let i = 0;
this.OutSlice.forEach(item => {
@@ -1499,6 +1802,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 => {
@@ -1508,16 +1819,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");
@@ -1532,7 +1851,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++) {
@@ -1540,7 +1859,6 @@
barcode = arrOutSlice[i].barcode;
rowspans += 1;
} else {
-
break;
}
}
@@ -1557,46 +1875,194 @@
}
},
//鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
- 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) {
+ 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 => {
+ 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.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'));
+ }
+ });
+ },
+ //45绉掑浣嶅�掓暟璁℃椂
+ CountDown() {
+ let count = 45;
+ let timer = setInterval(
+ () => {
+ if (this.EmergencyStop == true) {
+ this.dialogFormCountDown = false;
+ clearInterval(timer);
+ this.CountDowns = "0";
+ } else {
+ if (count > 0) {
+ this.PromptSize = 500;
+ count--;
+ this.CountDowns = count;
+ this.dialogFormCountDown = true;
+ }
+ else {
+ this.PromptSize = 200;
+ this.CountDowns = "Waiting for reset";
+ if (this.reset == true) {
+ clearInterval(timer);
+ this.dialogFormCountDown = false;
+ }
+ }
+ }
+ },
+ 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) {
+ if (this.DeviceList[position] != null) {
+ 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.message3 == 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() {
+ SoftEmergencyStop.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