From 62718fb62a1fc92ee727ce31e0ca877f3e30f503 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 17 五月 2024 09:41:34 +0800
Subject: [PATCH] 根据客户需求取消操作输入密码
---
CanadaMes-ui/src/views/home/index.vue | 147 +++++++++++++++++++++++++++----------------------
1 files changed, 81 insertions(+), 66 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 4cded1d..374493f 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -598,20 +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 && loadname == 'admin') ? 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 && (loadname == 'admin' || loadname == 'Transfer')) ? false : true"
+ :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') ? false : true"
+ :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 && loadname == 'admin') ? false : true"
+ :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>
@@ -843,8 +843,10 @@
<div style="width:30%;" v-for="(item) in CurrentFrame" :key="item['barcode']">
<div style="background-color: yellow;">
<h1 style="font-size: 40px;text-align: center;">{{ $t('Current scan') }}:</h1>
- <h1 style="font-size: 40px;text-align: center;">{{ $t('List No') }}:{{ frameInfo.listnumber }}</h1>
- <h1 style="font-size: 40px;text-align: center;">{{ $t('Box No') }}:{{ frameInfo.boxnumber }}</h1>
+ <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>
@@ -858,11 +860,11 @@
</div>
<div class="frame"
- :style="'background-color: ' + framecolor1 + ';margin-top:30px;margin:0 auto;width: 370px;height:150px;float: left;'">
+ :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('Interior Out Bypass: Left')
- :$t('Remove Frame') }}
+ : framecolor1 == "blue" ? $t('Exterior Out Bypass: Left')
+ : $t('Remove Frame') }}
</h1>
</div>
<div v-if="item['flip'] == 2"
@@ -877,7 +879,8 @@
</h1>
<div>
<h1 style="font-size: 30px;text-align: center;margin-top: 65px;">
- {{ (item['framewidthmm'] * 1) >= (item['frameheightmm'] * 1) ? item['frameheightmm'] : item['framewidthmm'] }}</h1>
+ {{ (item['frameheightmm'] * 1) > (item['framewidthmm'] * 1) ? item['frameheightmm'] :
+ item['framewidthmm'] }}</h1>
</div>
</div>
@@ -931,40 +934,39 @@
</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'])">{{
+ <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: ' + framecolor + ';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('Interior 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>
+ <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>
- <h1 style="font-size: 30px;text-align: center;margin-top: 50px;">{{
- (item['framelength'] * 1) > (item['frameheightmm'] * 1) ? item['frameheightmm'] :
+ <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['framelength'] * 1) >= (item['frameheightmm'] * 1) ? item['frameheightmm'] : item['framelength'] }}</h1>
- </div>
-
+ </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>
@@ -1132,6 +1134,13 @@
}
,
methods: {
+ Colorchange(i) {
+ if (i == 0) {
+ return this.framecolor;
+ } else {
+ return this.framecolor1;
+ }
+ },
init() {
let viewname = "Home";
if (typeof (WebSocket) == "undefined") {
@@ -1198,28 +1207,31 @@
//鏌ヨ褰撳墠閾濇淇℃伅
this.CurrentFrame = obj.CurrentFrame;
- 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.framecolo1 = "green";
+ 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 {
- this.framecolor1 = "blue";
- }
+ 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";
+ if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205) {
+ this.framecolor1 = "red";
} else {
- this.framecolor1 = "blue";
+ if (this.CurrentFrame[0].flip == 2) {
+ this.framecolor1 = "green";
+ } else {
+ this.framecolor1 = "blue";
+ }
}
}
}
+
// 鑾峰彇璁惧鐘舵��
if (obj.DeviceList != null) {
this.DeviceList = obj.DeviceList[0];
@@ -1239,9 +1251,8 @@
}
}
- if(obj.frameInfo!=null){
- this.frameInfo=obj.frameInfo[0];
- console.log(this.frameInfo);
+ if (obj.frameInfo != null) {
+ this.frameInfo = obj.frameInfo[0];
}
if (obj.AluminumFrameInfo != null) {
@@ -1657,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'
@@ -1696,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'
@@ -1726,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'),
@@ -1764,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'),
@@ -1816,7 +1827,7 @@
},
//鍚敤//鐞嗙墖绗肩鐢�
UpdateDisabled(cage, cell, disabled) {
- 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'),
@@ -1958,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'));
}
});
--
Gitblit v1.8.0