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 | 757 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 548 insertions(+), 209 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 14792be..374493f 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -243,40 +243,49 @@
<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;">
+ <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('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('Outing Queue') }}</el-button>
- <el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"
+ {{ $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' : ''">
+ <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>
+ {{ $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 :min-width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></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="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>
@@ -285,18 +294,23 @@
{{ 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 :min-width="180" prop="glassId" :label="$t('Infeed glass barcode')"></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="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>
@@ -306,10 +320,10 @@
</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>
@@ -330,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' }"
@@ -361,19 +379,28 @@
<div class="blocks-img2"></div>
<div class="blocks-img3"></div>
- <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01</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 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) + ''">
+ <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) + ''">
+ <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: 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>
@@ -393,7 +420,7 @@
</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.2', 1)">
+ <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;">
@@ -457,7 +484,8 @@
<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')">
@@ -493,7 +521,7 @@
$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>
@@ -527,15 +555,19 @@
<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 :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700"
+ border style="width: 100%;overflow: auto;">
<el-table-column :min-width="50" prop="cage" :label="$t('Cage No')"></el-table-column>
- <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>
+ <el-table-column :min-width="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.tier == 1 ? $t('Inside') : $t('Outside')
- }}
+ 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>
@@ -545,14 +577,16 @@
<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 ?
- $t('Outing') : ""
- }}
+ scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state ==
+ 3 ?
+ $t('Outing') : ""
+ }}
</template>
</el-table-column>
<el-table-column :min-width="150" prop="lengthWidth" :label="$t('Dim')">
<template slot-scope='scope'>
- {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}
+ {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{
+ scope.row.glassHeightMm }}
</template>
</el-table-column>
@@ -564,16 +598,20 @@
<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"
+ :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('Disable') : $t('Enable') }}</el-button>
+
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- :disabled="scope.row.glassId != null ? true : false"
+ :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>
@@ -585,10 +623,9 @@
: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)
@@ -601,159 +638,168 @@
<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: center;">
- <el-form-item>
+ <!-- <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-form-item>
- {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand Movement') }}
+ {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') :
+ $t('Hand Movement') }}
<el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')
- }}</el-button>
+ }}</el-button>
</el-form-item>
<el-form-item>
- <el-input style="width:70%;" maxlength="13" :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" :disabled="!Scanningmethod" @click="WriteGlassID()">{{ $t('Add')
- }}</el-button>
+ }}</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-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;">
+ <!-- <div style="display: flex;justify-content: space-around;">
<label for="">{{ $t('Upper film position') }}</label>
<label for="">{{ $t('Scan Code Point') }}</label>
- </div>
+ </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>
+ <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: right;">
- <el-button @click="InsertQueueGlass(1)" style="margin-right: 100px;" type="primary"
+ <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>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">
+ <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 type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{
+ this.isAllowQueue
+ == true ? $t('Stop') : $t('Start')
}}</el-button>
- <!-- {{ $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') : "" }}
+ {{ isQueueWarning == true ? $t('The slot is disabled') : "" }}
</label>
<div style="display:flex;">
<div style="width:70%;">
@@ -764,52 +810,79 @@
<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') }}
+ {{ 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')">
+ <!-- <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>
+ $t('Complete')
+ }}</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
<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>
+ $t('Delete') }}</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 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>
@@ -817,11 +890,12 @@
<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="AddOutSliceS()">{{ $t('Add') }}</el-button>
+ <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="700" border style="width: 100%;overflow: auto;">
+ <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>
@@ -830,12 +904,20 @@
<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.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')
- }}
+ scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') :
+ $t('Outside')
+ }}
</template>
</el-table-column>
@@ -851,6 +933,59 @@
</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;'">
@@ -872,6 +1007,7 @@
import LanguageMixin from '../../lang/LanguageMixin'
let socket;
+let timer;
export default {
name: "Home",
data() {
@@ -903,6 +1039,7 @@
form3: {},
form4: {},
form5: {},
+ form6: {},
alarm: [],
tableData: [],
cagelist1: [],
@@ -955,7 +1092,7 @@
ClearGlassID: true,
StopTask: true,
SoftEmergencyStopState: true,
- CountDowns: "0",
+ CountDowns: "",
D01RequestState: false,
EmergencyStop: false,
PromptSize: 250,
@@ -965,18 +1102,45 @@
DeviceList: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
GlassIdList: [],
Scanningmethod: true,
- CurrrentGlassId: ""
+ CurrrentGlassId: "",
+ feedglassid: "",
+ count1: 0,
+ count2: 1,
+ loadname: "",
+ form6state: 0,
+ StateColor: "green",
+ plc1: "",
+ plc2: "",
+ AluminumFrameInfo: {},
+ framestate: false,
+ framecolor: "green",
+ framecolor1: "green",
+ frameInfo: {}
};
},
created() {
this.load();
-
+ 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") {
@@ -996,6 +1160,7 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
+ this.count2 = this.count2 + 1;
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
@@ -1005,6 +1170,20 @@
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];
@@ -1028,6 +1207,30 @@
//鏌ヨ褰撳墠閾濇淇℃伅
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) {
@@ -1039,10 +1242,60 @@
}
//鑾峰彇寰呯‘璁ょ殑閾濇鐜荤拑淇℃伅
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) {
@@ -1056,28 +1309,47 @@
// this.dialogFormVisible2 = true;
// }
// }
- // //鏄惁鎬ュ仠
- // if (obj.emergencystop != null) {
- // this.EmergencyStop = obj.emergencystop[0];
- // }
+ //鏄惁鎬ュ仠
+ 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.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.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];
@@ -1104,6 +1376,8 @@
//鏄惁闇�瑕佹墜鍔ㄧ‘璁や笂鐗�
this.isConfirm = obj.isConfirm[0];
+
+
//鎵爜浣嶇幓鐠冧俊鎭�
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
@@ -1114,8 +1388,10 @@
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
this.loadglassheight1 = 70;
- if (this.form5.glassId != obj.form3[0].glassId) {
- this.showform3();
+ if (this.form5.glassId != obj.form3[0].glassId && this.ManuallyInfeedGlass == false) {
+ if (this.loadname == "Buffer") {
+ this.showform3();
+ }
}
this.form5 = obj.form3[0];
this.glassid1 = "";
@@ -1128,6 +1404,17 @@
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") {
@@ -1159,6 +1446,7 @@
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) {
@@ -1247,7 +1535,16 @@
//鎵嬪姩涓婄墖
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) {
@@ -1310,8 +1607,9 @@
WriteGlassID() {
if (this.glassid1.length == 14) {
WriteGlassID(this.glassid1).then(res => {
- console.log(res.data);
- this.$message.success(this.$t('Successful operation'));
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Successful operation'));
+ }
});
} else {
this.$message.error(this.$t('Please enter the correct glassID'));
@@ -1331,9 +1629,9 @@
},
//鏄剧ず瀹㈡埛鐜荤拑淇℃伅
showform2() {
- SelectGlass(this.orderid).then(res => {
- this.GlassInfo = res.data.glass;
- });
+ // SelectGlass(this.orderid).then(res => {
+ // this.GlassInfo = res.data.glass;
+ // });
this.dialogFormVisible4 = true;
},
//鏄剧ず鍑虹墖闃熷垪
@@ -1370,9 +1668,9 @@
},
//缁撴潫杩�/鍑虹墖浠诲姟
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'
@@ -1409,9 +1707,9 @@
},
//鍒犻櫎鐞嗙墖绗肩幓鐠�
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'
@@ -1439,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'),
@@ -1477,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'),
@@ -1506,6 +1804,13 @@
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
+ 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'));
@@ -1522,15 +1827,7 @@
},
//鍚敤//鐞嗙墖绗肩鐢�
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'),
@@ -1538,14 +1835,38 @@
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'));
- } else {
- this.$message.error(this.$t('This frame has glass that is currently outing'));
}
});
}
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+
+ },
+ //鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ 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',
@@ -1583,9 +1904,12 @@
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('The glass size is not within the range'));
- } else {
+ 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'));
}
});
@@ -1645,6 +1969,10 @@
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'));
}
});
@@ -1656,7 +1984,9 @@
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'));
}
});
@@ -1856,7 +2186,16 @@
//鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
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)) {
+ 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',
@@ -1900,33 +2239,33 @@
},
//60绉掑浣嶅�掓暟璁℃椂
CountDown() {
+ clearInterval(timer);
let count = 60;
- let timer = setInterval(
+ timer = setInterval(
() => {
if (this.EmergencyStop == true) {
- this.dialogFormCountDown = false;
clearInterval(timer);
- this.CountDowns = "0";
+ this.StateColor = "red";
+ this.CountDowns = "";
} else {
if (count > 0) {
+ this.StateColor = "yellow";
this.PromptSize = 500;
- count--;
this.CountDowns = count;
- this.dialogFormCountDown = true;
+ count--;
}
else {
this.PromptSize = 200;
- this.CountDowns = "Waiting for reset";
+ this.CountDowns = "";
+ this.StateColor = "green";
if (this.reset == true) {
clearInterval(timer);
- this.dialogFormCountDown = false;
}
}
}
},
1000
);
-
},
//鏇存崲褰撳墠閾濇
FrameStateUpdate(frameno) {
@@ -1998,28 +2337,28 @@
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')
- });
+ // 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'));
+ }
});
- } else {
- this.$message.error(this.$t('There is no glass ID here'));
- }
+ }).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'));
--
Gitblit v1.8.0