From 5db14138646f88b780fcf90000abdd0cd925c1b9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 09:54:21 +0800
Subject: [PATCH] 主界面添加扫码枪二维码显示，添加软急停，调整终止任务功能
---
CanadaMes-ui/src/views/home/index.vue | 106 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index c2e1186..b1e9558 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -263,12 +263,11 @@
{{ $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('Terminate Feeding') }}</el-button>
+ <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask" :class="StopTask == true ? 'hide' : ''">
+ {{ $t('Terminate Outing') }}</el-button>
+ <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStopState"
+ :class="SoftEmergencyStopState == true ? 'hide' : ''">
{{ $t('SoftEmergencyStop') }}</el-button>
<!-- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button> -->
@@ -392,7 +391,7 @@
<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;"
+ <div class="glass A02" style="top: 310px;left: 289px;position: absolute;"
@click="ClearGlassId('DB101.10.2,6')">A02:{{ ShowGlassIdList(6) }}</div>
<div class="glass D03" style="top: 137px;left: 42px;position: absolute;"
@@ -574,19 +573,29 @@
}}</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')
+ {{ $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>
+ </el-form-item>
+ <el-form-item>
+ {{ $t('Current State') }}:{{ this.Scanningmethod==true?$t('Automatic'):$t('Hand Movement')}}
+ <el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')
}}</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-input style="width: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-form-item>
+ <el-form-item>
+ {{ $t('Barcode') }}:
+ <el-input style="width:70%;" maxlength="14" :disabled="true" v-model="glassid1"></el-input>
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<label for="">{{ $t('Upper film position') }}</label>
- <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;">
@@ -684,12 +693,12 @@
<!-- <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>
+ {{ $t('Confirm') }}</el-button>
<el-button @click="DeleteQueueGlasss(1)" type="primary">{{ $t('Clear Current')
}}</el-button> -->
<el-button @click="InsertQueueGlass(1)" style="margin-right: 100px;" type="primary"
:disabled="disabled1">
- {{ $t('Confirm Modification') }}</el-button>
+ {{ $t('Confirm') }}</el-button>
</div>
</el-form>
<template #footer>
@@ -873,7 +882,7 @@
home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue,
- isAllowReorderings, FrameStateUpdate, WriteGlassID, ClearGlassId, CloseForm7, TaskStop, SoftEmergencyStop
+ isAllowReorderings, FrameStateUpdate, WriteGlassID, ClearGlassId, CloseForm7, TaskStop, SoftEmergencyStop, SwitchScanMethod
} from "../../api/home";
@@ -959,9 +968,9 @@
OutingQueue: true,
OrderInfo: true,
CageDetails: true,
- ClearGlassID:true,
- StopTask:true,
- SoftEmergencyStop:true,
+ ClearGlassID: true,
+ StopTask: true,
+ SoftEmergencyStopState: true,
CountDowns: "0",
D01RequestState: false,
EmergencyStop: false,
@@ -970,7 +979,8 @@
isQueueWarning: false,
CurrentFrame: [],
DeviceList: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
- GlassIdList: []
+ GlassIdList: [],
+ Scanningmethod: true
};
},
created() {
@@ -1016,6 +1026,16 @@
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
+ //鑾峰彇褰撳墠鎵爜鏂瑰紡
+ if (obj.Scanningmethod != null) {
+ if (obj.Scanningmethod == 0) {
+ this.Scanningmethod = true;
+ }
+ else {
+ this.Scanningmethod = false;
+ }
+ }
+
//鏌ヨ褰撳墠閾濇淇℃伅
this.CurrentFrame = obj.CurrentFrame;
//鑾峰彇璁惧鐘舵��
@@ -1155,14 +1175,14 @@
if (item.permissionId == "35" && item.state == 1) {
this.CageDetails = false;
}
- if (item.permissionId == "36" && item.state == 1) {
+ if (item.permissionId == "37" && item.state == 1) {
this.ClearGlassID = false;
}
- if (item.permissionId == "37" && item.state == 1) {
+ if (item.permissionId == "38" && item.state == 1) {
this.StopTask = false;
}
- if (item.permissionId == "38" && item.state == 1) {
- this.SoftEmergencyStop = false;
+ if (item.permissionId == "39" && item.state == 1) {
+ this.SoftEmergencyStopState = false;
}
});
});
@@ -1298,11 +1318,13 @@
},
//鎵嬪姩鍐欏叆plc鎵爜浣嶇幓鐠僫d
WriteGlassID() {
- if (this.glassid1 != "") {
+ if (this.glassid1.length ==14) {
WriteGlassID(this.glassid1).then(res => {
console.log(res.data);
this.$message.success(this.$t('Successful operation'));
});
+ }else{
+ this.$message.error(this.$t('Please enter the correct glassID'));
}
},
//鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
@@ -2017,7 +2039,7 @@
//娓呴櫎鐜荤拑id
ClearGlassId(position, num) {
if (this.ClearGlassID == false) {
- if (this.DeviceList[position] != null) {
+ if (this.DeviceList[position] == 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'),
@@ -2056,8 +2078,34 @@
}
});
},
+ //杞�ュ仠
SoftEmergencyStop() {
- SoftEmergencyStop.then(res => {
+ this.$confirm(this.$t('Are you sure you want an emergency stop ?'), this.$t('confirm'), {
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(() => {
+ SoftEmergencyStop.then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ },
+ //鍒囨崲浜岀淮鐮佽幏鍙栨柟寮�
+ SwitchScanMethod(){
+ var Scanmethod;
+ if(this.Scanningmethod == true){
+ this.Scanmethod = 1;
+ }else{
+ this.Scanmethod = 0;
+ }
+ SwitchScanMethod(Scanmethod).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
--
Gitblit v1.8.0