From 4b4545d1e3ad228ba819e3313853a6e987ef36e6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 01:19:50 +0800
Subject: [PATCH] 1,取消在开始进片或出片时结束之前的任务，改为进片车或出片车变空闲后立即结束数据库任务表的任务状态； 2，手动删除玻璃时恢复数据库理片笼信息中的剩余宽度
---
CanadaMes-ui/src/views/home/index.vue | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index d1c95f8..049b252 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -211,7 +211,7 @@
<el-table-column :label="$t('Operate')">
<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('end task') }}</el-button>
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -225,7 +225,7 @@
<el-table-column :label="$t('Operate')">
<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('end task') }}</el-button>
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('end task') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -401,8 +401,8 @@
cagelist2: [],
cagelist3: [],
cagelist4: [],
- task1: 2,
- task2: 3,
+ task1: 3,
+ task2: 2,
tasklist1: [],
tasklist2: [],
order: "",
@@ -417,7 +417,8 @@
carlist: [],
loadglassheight: 0,
password: 1,
- text: ""
+ text: "DataBase Connection failed",
+ zhuangtai: ""
};
},
created() {
@@ -449,11 +450,12 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
- this.car1 = 145 + 8.1 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;
- this.car2 = 210 + 8.25 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;
+ this.car1 = 145 + 8.15 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;
+ this.car2 = 210 + 8.15 * Math.abs(obj.params[0][1] - 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;
console.log(obj.params[0][1], this.carlist[1]['start']);
+ console.log(obj.params[0][0], this.carlist[0]['start']);
}
this.tableData = obj.tableData[0];
this.cagelist1 = obj.cagelist1[0];
@@ -462,12 +464,13 @@
this.cagelist4 = obj.cagelist4[0];
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
+ // console.log(this.cagelist4);
this.alarm = obj.alarmmg[0];
this.loadglassheight = obj.loadglassheight;
-
- if (obj.dbconnected == "false") {
- this.text = this.$t('DataBase Connection failed');
- }
+ this.zhuangtai = obj.zhuangtai[0];
+ //if (obj.dbconnected == "false") {
+ this.text = this.$t('DataBase Connection failed');
+ // }
SelectCageInfo(this.cage).then(res => {
this.cageinfo = res.data.cageinfo;
});
@@ -554,20 +557,25 @@
//鎵嬪姩涓婄墖
sbumitglassid() {
if (this.form.order != "") {
- Addglassid(this.glassid).then(res => {
- if (res.data.message2 == 200) {
- this.$message.success(this.$t('Operation successful'));
- this.cancal();
- } else if (res.data.message2 == 500) {
- this.$message.success(this.$t('There are currently tasks'));
- }
- else if (res.data.message2 == 300) {
- this.$message.success(this.$t('There is no such glass'));
- }
- else if (res.data.message2 == 400) {
- this.$message.success(this.$t('There is no such grid'));
- }
- });
+ if (this.zhuangtai == true) {
+ Addglassid(this.glassid).then(res => {
+ if (res.data.message2 == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ this.cancal();
+ } else if (res.data.message2 == 500) {
+ this.$message.success(this.$t('There are currently tasks'));
+ }
+ else if (res.data.message2 == 300) {
+ this.$message.success(this.$t('There is no such glass'));
+ }
+ else if (res.data.message2 == 400) {
+ this.$message.success(this.$t('There is no such grid'));
+ }
+ });
+ } else {
+ this.$message.success(this.$t('There are currently tasks'));
+ }
+
}
},
showform() {
--
Gitblit v1.8.0