From 74edb80b30728b2a94389f8bc180229a727f86c8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 26 九月 2023 15:36:34 +0800
Subject: [PATCH] 主界面理片笼添加添加玻璃信息功能，优化界面样式
---
CanadaMes-ui/src/views/home/index.vue | 203 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 140 insertions(+), 63 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 2b76515..cae044e 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 {
@@ -139,7 +129,7 @@
.el-table td,
.el-table th {
- padding: 8px 0;
+ padding: 5px 0;
}
.el-table__empty-block {
@@ -153,18 +143,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 +171,7 @@
}
.el-dialog {
- width: 80%;
+ width: 90%;
}
</style>
<template>
@@ -196,18 +189,19 @@
</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-button type="primary" @click="showform(1)">{{ $t('Infeed barcodid') }}</el-button>
<el-input style="width:15%;" :placeholder="$t('Enter the order number')" 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 :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
+ <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
+ <el-table-column :width="150" prop="glassId" :label="$t('Outfeed Barcodid')"></el-table-column>
+ <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
+ <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
+ <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -216,12 +210,13 @@
</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 :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>
+ <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>
+ <el-table-column :width="150" prop="glassId" :label="$t('Infeed Barcodid')"></el-table-column>
+ <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
+ <el-table-column prop="list" :label="$t('List Number')"></el-table-column>
+ <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -234,11 +229,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>
@@ -301,22 +296,32 @@
</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('Barcodid')">
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
+ <el-button type="primary" @click="showform(3)">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('order')">
+ <el-input v-model="form.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('length')">
- <el-input v-model="form.height" autocomplete="off" />
+ <el-input v-model="form.height" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('width')">
- <el-input v-model="form.width" autocomplete="off" />
+ <el-input v-model="form.width" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form.glassId" 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="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="cancal()">{{ $t('cancal') }}</el-button>
</span>
</template>
@@ -345,23 +350,28 @@
<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('The Cage number')"></el-table-column>
+ <el-table-column :width="90" prop="cell" :label="$t('The Slot Number')"></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('Barcodid')"></el-table-column>
+ <el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
+ <el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>
+ <el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>
+ <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and 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="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> -->
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@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>
@@ -369,8 +379,11 @@
</el-container>
</template>
<script>
-
-import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID } from "../../api/home";
+//:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false"
+import {
+ home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo,
+ SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID, Disabled, Inglassid
+} from "../../api/home";
import LanguageMixin from '../../lang/LanguageMixin'
@@ -379,6 +392,11 @@
name: "Home",
data() {
return {
+ confirm1: false,
+ confirm2: false,
+ insertcage: 0,
+ insertcell: 0,
+ inserttier: 0,
name: 'Confirm',
mixins: [LanguageMixin],
dialogFormVisible: false,
@@ -417,7 +435,7 @@
carlist: [],
loadglassheight: 0,
password: 1,
- text: "DataBase Connection failed",
+ text: "",
zhuangtai: ""
};
},
@@ -577,18 +595,24 @@
}
}
},
- 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;
}
+ SelectGlassByGlassID(this.glassid).then(res => {
+ if (res.data.form != null) {
+ this.form = res.data.form;
+ this.dialogFormVisible = true;
+ this.$message.success('query was successful');
+ } else {
+ this.dialogFormVisible = true;
+ this.$message.error(this.$t('There is no such glass'));
+ }
+ });
},
showform1() {
if (this.order != "") {
@@ -692,6 +716,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 +732,60 @@
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) {
+ // OutByGlassID(glassid).then(res => {
+ // if (res.data.message3 == 200) {
+ // this.$message.success(this.$t('Operation successful'));
+ // }
+ // else if (res.data.message2 == 300) {
+ // this.$message.error(this.$t('There is no such grid'));
+ // }
+ // });
+ 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.glassId != "") {
+ 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'));
+ }
+ });
}
}
-
}
-
</script>
\ No newline at end of file
--
Gitblit v1.8.0