From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 03 十一月 2023 15:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 264 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 211 insertions(+), 53 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 7012203..8b8aa91 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -195,7 +195,7 @@
</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="glassid1"></el-input>
- <el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Infeed barcodid') }}</el-button>
+ <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $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>
@@ -336,24 +336,44 @@
<el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
- <el-form-item style="text-align: center;">
- <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
- <el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Query') }}</el-button>
- </el-form-item>
+ <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('Scan Code Point') }}</label>
- <label for="">{{ $t('Upper film position') }}</label>
- <label for="">{{ $t('Glass Information') }}</label>
+ <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 lD')"
+ 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 lD')"
+ 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('Barcodid')">
<el-input v-model="form2.glassId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form4.glassId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcodid')">
<el-input v-model="form3.glassId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Barcodid')">
- <el-input v-model="form4.glassId" readonly autocomplete="off" />
+ <el-input v-model="form5.glassId" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
@@ -361,10 +381,13 @@
<el-input v-model="form2.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('order')">
+ <el-input v-model="form4.orderId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('order')">
<el-input v-model="form3.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('order')">
- <el-input v-model="form4.orderId" readonly autocomplete="off" />
+ <el-input v-model="form5.orderId" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
@@ -372,10 +395,13 @@
<el-input v-model="form2.height" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('length')">
+ <el-input v-model="form4.height" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('length')">
<el-input v-model="form3.height" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('length')">
- <el-input v-model="form4.height" readonly autocomplete="off" />
+ <el-input v-model="form5.height" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
@@ -383,20 +409,29 @@
<el-input v-model="form2.width" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('width')">
+ <el-input v-model="form4.width" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('width')">
<el-input v-model="form3.width" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('width')">
- <el-input v-model="form4.width" readonly autocomplete="off" />
+ <el-input v-model="form5.width" 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="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm')
- }}</el-button>
- <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm')
- }}</el-button>
+
<el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
</span>
</template>
@@ -494,7 +529,7 @@
//: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, SelectGlass, InsertQueueGlassId
+ SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass
} from "../../api/home";
@@ -528,18 +563,24 @@
number: 800,
},
form2: {
- orderId: "1145",
- glassId: "112",
- height: "59.06",
- width: "48.03"
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
},
form3: {
- orderId: "1",
- glassId: "2",
- height: "3",
- width: "4"
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
},
form4: {
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
+ },
+ form5: {
orderId: "",
glassId: "",
height: "",
@@ -558,6 +599,7 @@
order: "",
glassid: "",
glassid1: "",
+ glassid2: "",
url: "../../img/bigcar01.png",
car1: 145,
car2: 210,
@@ -572,8 +614,8 @@
zhuangtai: "",
orderid: "",
GlassInfo: [],
- disabled: true,
- disabled1: true,
+ disabled: false,
+ disabled1: false,
currentPage: 1, //榛樿鍒濆椤�
pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
pageCount: 0
@@ -621,16 +663,50 @@
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
this.loadglassheight = obj.loadglassheight;
- this.zhuangtai = obj.zhuangtai[0];
-
- this.glassid1 = obj.queid[0];
- if (this.glassid1 != "") {
- this.disabled1=false;
- this.showform3();
+ if (obj.zhuangtai != null) {
+ this.zhuangtai = obj.zhuangtai[0];
}
- this.form2 = obj.form2;
- this.form2 = obj.form3;
+ // 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 = {
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
+ };
+ }
+
+ if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
+ this.form3 = obj.form3[0];
+ } else {
+ this.form3 = {
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
+ };
+ }
+ 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');
// }
@@ -777,25 +853,48 @@
}
},
//鏄剧ず鎵爜浣嶅拰涓婄墖浣�
- showform3(){
+ showform3() {
this.dialogFormVisible5 = true;
},
//鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
- SelectGlassByGlassIDs() {
+ SelectGlassByGlassIDs(parameter) {
this.showform3();
- SelectGlassByGlassID(this.glassid1).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.form2.glassId == "") {
- this.disabled = false;
- } else {
- this.disabled = true;
- }
- });
+ 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;
+ }
+ }
+
+ });
+ }
+
},
selectglassinfo() {
SelectGlass(this.orderid).then(res => {
@@ -988,8 +1087,67 @@
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage;
},
- InsertQueueGlass() {
- InsertQueueGlassId(this.glassid1).then(res => {
+ //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ InsertQueueGlass(parameter) {
+ if (parameter == 1 && this.form5.glassId != "") {
+ if (this.form5.glassId != this.form2.glassId) {
+ InsertQueueGlassId(this.form5.glassId, 1).then(res => {
+ if (res.data.message == 200) {
+ this.form5 = {
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
+ };
+ 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.glassId != "") {
+ if (this.form4.glassId != this.form3.glassId) {
+ InsertQueueGlassId(this.form4.glassId, 2).then(res => {
+ if (res.data.message == 200) {
+ this.form4 = {
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
+ };
+ 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'));
}
--
Gitblit v1.8.0