From d75d7d7d76fe16e133f793cc31bfaea17a10cd24 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 十一月 2023 13:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 782 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 682 insertions(+), 100 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 2b76515..f6c4317 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -66,16 +66,6 @@
/* width: 4.22px; */
}
-/* .gezi:nth-child(22),
-.gezi:nth-child(43),
-.gezi:nth-child(64),
-.gezi:nth-child(85) {
- margin-left: 7px;
- margin-left: 10px;
-} */
-
-
-
.blocks {
@@ -121,6 +111,18 @@
top: 366px; */
}
+.orderbutton1 {
+ position: absolute;
+ left: 1070px;
+ top: 70px;
+}
+
+.orderbutton2 {
+ position: absolute;
+ left: 1170px;
+ top: 70px;
+}
+
.blocks-img3 {
height: 90px;
max-width: 100vw;
@@ -139,7 +141,7 @@
.el-table td,
.el-table th {
- padding: 8px 0;
+ padding: 5px 0;
}
.el-table__empty-block {
@@ -153,18 +155,21 @@
.box {
width: 90%;
margin-left: 5%;
- height: 35px;
color: red;
font-size: 12px;
overflow: hidden;
+ height: 20px;
+ /* height: 35px; */
}
.text {
width: auto;
- line-height: 35px;
+
white-space: nowrap;
animation: textScroll 20s linear infinite;
margin: 0 auto;
+ line-height: 20px;
+ /* line-height: 35px; */
}
@keyframes textScroll {
@@ -178,7 +183,7 @@
}
.el-dialog {
- width: 80%;
+ width: 90%;
}
</style>
<template>
@@ -195,37 +200,46 @@
</div>
</div>
<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
- <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
- <el-button type="primary" @click="showform()">{{ $t('Manually feed the glass') }}</el-button>
- <el-input style="width:15%;" :placeholder="$t('Enter the order number')" v-model="order"></el-input>
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"></el-input>
+ <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Manually Infeed Glass') }}</el-button>
+ <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
</div>
<div>
<el-table :data="this.tasklist1" border style="width: 100%">
- <el-table-column prop="glassId" :label="$t('Coming out glass ID')"></el-table-column>
- <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
- <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
- <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
- <el-table-column :label="$t('Operate')">
+ <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="150" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
+ <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :label="$t('Terminate Task')">
<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('end task') }}</el-button>
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ }}</el-button>
</template>
</el-table-column>
</el-table>
<el-table :data="this.tasklist2" border style="width: 100%">
- <el-table-column prop="glassId" :label="$t('Incoming glass ID')"></el-table-column>
- <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
- <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
- <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
- <el-table-column :label="$t('Operate')">
+ <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="150" prop="glassId" :labelf="$t('Infeed glass barcode')"></el-table-column>
+ <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Dim')">
+ <template slot-scope='scope'>
+ {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight }}
+ </template>
+ </el-table-column>
+
+ <el-table-column :label="$t('Terminate Task')">
<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('end task') }}</el-button>
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -234,11 +248,11 @@
<div v-for="item in tableData" :key="item['cageno']" class="occupy">
<el-col style="text-align:left;font-weight: bold;">#{{ item['cage'] }}</el-col>
<el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span class="biao">Usage</span><span class="zhi">{{ item['cell'] }}%</span>
+ <span class="biao">{{ $t('Usage') }}</span><span class="zhi">{{ item['cell'] }}%</span>
</el-col>
<hr style="width:80%;margin: 0 auto;" />
<el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
- <span class="biao">Space (Pieces)</span><span class="zhi">{{ item['state'] }}</span>
+ <span class="biao">{{ $t('Space (Pieces)') }}</span><span class="zhi">{{ item['state'] }}</span>
</el-col>
</div>
</div>
@@ -273,6 +287,9 @@
<div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>
<div class="blocks-img2"></div>
<div class="blocks-img3"></div>
+ <el-button class="orderbutton1" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>
+ <el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Production queue') }}</el-button>
+
<!-- <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' }"
@@ -301,42 +318,66 @@
</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('order')">
- <el-input v-model="form.orderId" autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <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('glassid')">
- <el-input v-model="form.glassId" autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form.height" autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form.width" autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form.listnumber" readonly autocomplete="off" />
</el-form-item>
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form.boxnumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form.glasslengthMm" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form.glassheightMm" readonly autocomplete="off" />
+ </el-form-item>
+
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="sbumitglassid()" type="primary">{{ $t('confirm') }}</el-button>
- <el-button @click="cancal()">{{ $t('cancal') }}</el-button>
+ <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
+ type="primary">{{
+ $t('confirm') }}</el-button>
+ <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
+ type="primary">{{
+ $t('confirm') }}</el-button>
+ <el-button @click="cancel()">{{ $t('cancel') }}</el-button>
</span>
</template>
</el-dialog>
+
<el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
<el-form :model="form1" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('order')">
+ <el-form-item :label="$t('Order No')">
<el-input v-model="form1.order" autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('number')">
+ <el-form-item :label="$t('Number')">
<el-input v-model="form1.number" autocomplete="off" />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
- <el-button @click="cancal1()">{{ $t('cancal') }}</el-button>
+ <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
</span>
</template>
</el-dialog>
+
<el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
<el-table :data="this.alarm" border style="width: 100%;">
<el-table-column prop="id" :label="$t('id')"></el-table-column>
@@ -345,23 +386,237 @@
<el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
</el-table>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')">
+
+ <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
<el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column prop="cage" :label="$t('The Cage number')"></el-table-column>
- <el-table-column prop="cell" :label="$t('cell')"></el-table-column>
- <el-table-column prop="tier" :label="$t('tier')"></el-table-column>
- <el-table-column prop="glassId" :label="$t('glassid')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('order number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>
- <el-table-column prop="coating" :label="$t('coating')"></el-table-column>
- <el-table-column :label="$t('Operate')">
+ <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="100" 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="100" prop="north_glass_buffer1s.listnumber"
+ :label="$t('List No')"></el-table-column>
+ <el-table-column :width="100" prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column :width="170" prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :width="280" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>
- <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="open">{{ $t('delete')
- }}</el-button> -->
+ @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>
+ @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
+ {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')
+ }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" 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)
+ " :height="700" border style="width: 100%;overflow: auto;">
+
+ <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>
+ <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
+ <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>
+ </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;">
+ <el-form-item>
+ <label for="">{{ $t('Upper film position') }}</label>
+ <label for="">{{ $t('Scan Code Point') }}</label>
+ </el-form-item>
+ </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;">
+ <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)" :disabled="disabled">{{ $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)" :disabled="disabled">{{ $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.barcode" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form4.barcode" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form3.barcode" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form5.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.ordernumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form4.ordernumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form3.ordernumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form5.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.listnumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form4.listnumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form3.listnumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form5.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.boxnumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form4.boxnumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form3.boxnumber" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form5.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.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form4.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form3.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form5.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.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form4.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form3.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form5.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-button @click="DeleteQueueGlasss(2)" type="primary" :disabled="disabled1">{{ $t('Clear Current')
+ }}</el-button>
+ <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled1">
+ {{ $t('Confirm Modification') }}</el-button>
+ <el-button @click="DeleteQueueGlasss(1)" type="primary" :disabled="disabled1">{{ $t('Clear Current')
+ }}</el-button>
+ <el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">
+ {{ $t('Confirm Modification') }}</el-button>
+ </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-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">
+ <el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="barCode" :label="$t('Frame No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.glasslength" :label="$t('Length')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.glassheight" :label="$t('Width')"></el-table-column>
+ <el-table-column :width="280" :label="$t('Operate')">
+ <template slot-scope='scope'>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </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-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>
+ <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
+ <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="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') }}
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="storageCage.tier" :label="$t('In the cage')">
+ <template slot-scope='scope'>
+ {{ 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>
@@ -370,7 +625,11 @@
</template>
<script>
-import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID } from "../../api/home";
+import {
+ home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
+ SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
+ SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS
+} from "../../api/home";
import LanguageMixin from '../../lang/LanguageMixin'
@@ -379,22 +638,32 @@
name: "Home",
data() {
return {
+ confirm1: false,
+ confirm2: false,
+ insertcage: 0,
+ insertcell: 0,
+ inserttier: 0,
name: 'Confirm',
mixins: [LanguageMixin],
dialogFormVisible: false,
dialogFormVisible1: false,
dialogFormVisible2: false,
dialogFormVisible3: false,
+ dialogFormVisible4: false,
+ dialogFormVisible5: false,
+ dialogFormVisible6: false,
+ dialogFormVisible7: false,
form: {
orderId: "",
glassId: "",
height: "",
width: ""
},
- form1: {
- order: "NG2210210",
- number: 800,
- },
+ form1: {},
+ form2: {},
+ form3: {},
+ form4: {},
+ form5: {},
alarm: [],
tableData: [],
cagelist1: [],
@@ -407,6 +676,8 @@
tasklist2: [],
order: "",
glassid: "",
+ glassid1: "",
+ glassid2: "",
url: "../../img/bigcar01.png",
car1: 145,
car2: 210,
@@ -417,8 +688,18 @@
carlist: [],
loadglassheight: 0,
password: 1,
- text: "DataBase Connection failed",
- zhuangtai: ""
+ text: "",
+ zhuangtai: "",
+ orderid: "",
+ GlassInfo: [],
+ disabled: false,
+ disabled1: false,
+ currentPage: 1, //榛樿鍒濆椤�
+ pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+ pageCount: 0,
+ OutSlice: [],
+ AluminumFrame: [],
+ framebarcode: ""
};
},
created() {
@@ -446,7 +727,6 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
-
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
@@ -464,12 +744,51 @@
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
this.loadglassheight = obj.loadglassheight;
- this.zhuangtai = obj.zhuangtai[0];
+ if (obj.zhuangtai != null) {
+ this.zhuangtai = obj.zhuangtai[0];
+ }
+ if(this.dialogFormVisible7==true){
+ this.showform7();
+ }
+ // this.glassid1 = obj.queid[0];
+ // if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 0) {
+ // this.state = false;
+ // this.disabled = true;
+ // this.disabled1 = false;
+ // this.showform3();
+ // } else if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 1) {
+ // this.state = true;
+ // this.disabled = true;
+ // this.disabled1 = true;
+ // }
+ // else {
+ // this.state = true;
+ // this.disabled = false;
+ // this.disabled1 = false;
+ // }
+ if (obj.form2 != null && obj.form2 != "") {
+ this.form2 = obj.form2[0];
+ } else {
+ this.form2 = {};
+ }
+
+ if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
+ this.form3 = obj.form3[0];
+ } else {
+ this.form3 = {};
+
+ }
+ if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
+ this.form5 = obj.form3[0];
+ }
//if (obj.dbconnected == "false") {
this.text = this.$t('DataBase Connection failed');
// }
SelectCageInfo(this.cage).then(res => {
this.cageinfo = res.data.cageinfo;
+ });
+ SelectGlass(this.orderid).then(res => {
+ this.GlassInfo = res.data.glass;
});
this.$forceUpdate();
@@ -486,36 +805,34 @@
}
},
load() {
+ //鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
home().then(res => {
this.tableData = res.data.list;
});
+ //鍔犺浇鐞嗙墖绗肩幓鐠冩暟鎹�
home2().then(res => {
this.cagelist1 = res.data.list1;
this.cagelist2 = res.data.list2;
this.cagelist3 = res.data.list3;
this.cagelist4 = res.data.list4;
});
+ //鍔犺浇杩涚墖浠诲姟鏁版嵁
loadtask(this.task1).then(res => {
this.tasklist1 = res.data.list;
- if (res.data.list.length > 0) {
- this.incell = this.tasklist1[0]['cell'];
- }
});
- loadtask(this.task2).then(res => {
- this.tasklist2 = res.data.list;
- if (res.data.list.length > 0) {
- this.outcell = this.tasklist2[0]['cell'];
- }
- });
+ //鍔犺浇杩涘嚭鐗囦换鍔℃暟鎹�
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;
});
@@ -560,7 +877,7 @@
Addglassid(this.glassid).then(res => {
if (res.data.message2 == 200) {
this.$message.success(this.$t('Operation successful'));
- this.cancal();
+ this.cancel();
} else if (res.data.message2 == 500) {
this.$message.error(this.$t('There are currently tasks'));
}
@@ -577,32 +894,116 @@
}
}
},
- showform() {
- if (this.glassid != "") {
- SelectGlassByGlassID(this.glassid).then(res => {
- if(res.data.form!=null){
- this.form = res.data.form;
- this.dialogFormVisible = true;
- }else{
- this.$message.error(this.$t('There is no such glass'));
- }
- });
-
+ //鏄剧ず纭鐜荤拑淇℃伅涔熸病
+ showform(buttons) {
+ if (buttons == 1) {
+ this.confirm1 = true;
+ this.confirm2 = false;
+ } else if (buttons == 2) {
+ this.confirm1 = false;
+ this.confirm2 = true;
}
+ //鏍规嵁杈撳叆鐨勭幓鐠僫d鑾峰彇鐜荤拑淇℃伅
+ SelectGlassByGlassID(this.glassid).then(res => {
+ if (res.data.form != null) {
+ this.form = res.data.form;
+ this.dialogFormVisible = true;
+ this.$message.success(this.$t('query was successful'));
+ } else {
+ this.dialogFormVisible = true;
+ this.$message.error(this.$t('There is no such glass'));
+ }
+ });
},
+ //鏄剧ず璁㈠崟淇℃伅椤甸潰
showform1() {
if (this.order != "") {
- this.form1 =
- {
- order: "NG2210210",
- number: 800,
- };
+ SelectGlassNo(this.order).then(res => {
+ this.form1.order = this.order;
+ this.form1.number = res.data.count;
+ });
this.dialogFormVisible1 = true;
}
+ },
+ //鏄剧ず鎵爜浣嶅拰涓婄墖浣�
+ 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'));
+ } 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'));
+ } 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;
+ }
+ }
+
+ });
+ }
},
- cancal() {
+ selectglassinfo() {
+ SelectGlass(this.orderid).then(res => {
+ this.currentPage = 1;
+ this.GlassInfo = res.data.glass;
+ });
+ },
+ showform2() {
+ SelectGlass(this.orderid).then(res => {
+ this.GlassInfo = res.data.glass;
+ });
+ this.dialogFormVisible4 = true;
+ },
+ showform6() {
+ SelectProductionqueue().then(res => {
+ this.OutSlice = res.data.listoutslice;
+ });
+ this.dialogFormVisible6 = true;
+ },
+ showform7() {
+ SelectAluminumFrameInfoById(this.framebarcode).then(res => {
+ this.AluminumFrame = res.data.listAluminumFrame;
+ 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;
+ },
+ //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+ cancel() {
this.dialogFormVisible = false;
this.form = {
orderId: "",
@@ -611,10 +1012,16 @@
width: ""
};
},
- cancal1() {
+ //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+ cancel1() {
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',
@@ -639,13 +1046,16 @@
});
});
},
+ //鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
showcageinfo(cage) {
this.cage = cage;
SelectCageInfo(cage).then(res => {
this.cageinfo = res.data.cageinfo;
+ console.log(this.cageinfo)
this.dialogFormVisible3 = true;
});
},
+ //鍒犻櫎鐞嗙墖绗肩幓鐠�
deleteglass(glassid, state) {
this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
inputType: 'password',
@@ -675,6 +1085,7 @@
});
});
},
+ //鎵嬪姩鍑虹墖
outglass(glassid, state) {
this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
inputType: 'password',
@@ -692,6 +1103,9 @@
else if (res.data.message2 == 300) {
this.$message.error(this.$t('There is no such grid'));
}
+ else if (res.data.message2 == 500) {
+ this.$message.error(this.$t('This glass is already in the cage'));
+ }
});
} else {
this.$message.error(this.$t('No out allowed'));
@@ -705,10 +1119,178 @@
message: this.$t('Operation canceled')
});
});
+ },
+ //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
+ insertglass(cage, cell, tier) {
+ this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(({ value }) => {
+ if (this.password == value) {
+ this.insertcage = cage;
+ this.insertcell = cell;
+ this.inserttier = tier;
+ this.showform(2);
+ } else {
+ this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ },
+ //鎵嬪姩涓婄墖
+ FeedInglassid() {
+ Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
+ if (this.form.barcode != "") {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ this.dialogFormVisible = false;
+ } else {
+ this.$message.error(this.$t('This glass is already in the cage'));
+ }
+ } 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'), {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(({ value }) => {
+ if (this.password == value) {
+ DeleteProductionQueueGlass(id).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ }, handleEdit(index, row) {
+ console.log(index, row);
+ },
+ //琛ㄦ牸鍒犻櫎
+ handleDelete(index, row) {
+ console.log(index, row);
+ },
+ //鏀瑰彉姣忛〉瀹圭撼鐨勬暟鎹噺
+ handleSizeChange: function (size) {
+ this.pagesize = size;
+ },
+ //鍒囨崲椤电爜
+ handleCurrentChange: function (currentPage) {
+ this.currentPage = currentPage;
+ },
+ //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ InsertQueueGlass(parameter) {
+ if (parameter == 1 && this.form5.barcode != "") {
+ if (this.form5.barcode != this.form2.barcode) {
+ InsertQueueGlassId(this.form5.barcode, 1).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'));
+ }
+ });
+ } else {
+ this.$message.error(this.$t('The glass ID already exists in the loading queue'));
+ }
+ } else if (parameter == 2 && this.form4.barcode != "") {
+ if (this.form4.barcode != this.form3.barcode) {
+ InsertQueueGlassId(this.form4.barcode, 2).then(res => {
+ if (res.data.message == 200) {
+ this.form4 = {};
+ this.$message.success(this.$t('Operation successful'));
+ } else {
+ 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'));
+ }
+
+
+ }
+ },
+ //娓呴櫎涓婄墖闃熷垪鐜荤拑
+ DeleteQueueGlasss(parameter) {
+ if (parameter == 1) {
+ DeleteQueueGlass(1).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ } else {
+ DeleteQueueGlass(2).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ },
+ //淇敼鎵爜浣嶇幓鐠冪姸鎬�
+ UpdateQueueStates() {
+ UpdateQueueState().then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ },
+ CheckBoxchange(glassid,isChecked){
+ this.AluminumFrame.forEach(item=>{item.barcode=glassid;item.isCheck=isChecked})
+ console.log(this.AluminumFrame);
+ },
+ addoutslice(){
+ // var AluminumFrames1=this.AluminumFrame.map(item=>{return item.barcode});
+ // var AluminumFrames2=this.AluminumFrame.map(item=>{return item.isCheck});
+ // var AluminumFrames3=this.AluminumFrame.map(item=>{return item.Flip});
+ var dats_=new Array();
+ this.AluminumFrame.forEach(item => {
+ var dats2_=new Array();
+ 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_;
+ });
+ console.log(dats_);
+ //var AluminumFrames=this.AluminumFrame.map((item)=>({barcode,isCheck,Flip}) );
+ // console.log(AluminumFrames1);
+ // console.log(AluminumFrames2);
+ // console.log(AluminumFrames3);
+ AddOutSliceS(dats_).then(res=>{
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
}
}
-
}
-
</script>
\ No newline at end of file
--
Gitblit v1.8.0