From 36de27dcf89a1a651c6498f3dc4c8fd872ca3f92 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 13 九月 2023 17:17:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 291 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 192 insertions(+), 99 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 6695ee4..c2448cd 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -91,11 +91,36 @@
background-size: 46px 94px;
background-attachment: local;
width: 32px;
-
position: absolute;
/* left: 116px; */
/* left:1060px;18.88px */
background-image: url('../../img/bigcar01.png');
+}
+
+.blocks-img2 {
+ height: 100px;
+ max-width: 100vw;
+ background-repeat: no-repeat;
+ background-size: 85px 100px;
+ background-attachment: local;
+ width: 100px;
+ position: absolute;
+ /* left: 116px; */
+ /* left:1060px;18.88px */
+ background-image: url('../../img/dipan.png');
+}
+
+.blocks-img3 {
+ height: 90px;
+ max-width: 100vw;
+ background-repeat: no-repeat;
+ background-size: 160px 40px;
+ background-attachment: local;
+ width: 160px;
+ position: absolute;
+ /* left: 116px; */
+ /* left:1060px;18.88px */
+ background-image: url('../../img/taimian.png');
}
.el-table td,
@@ -150,34 +175,39 @@
</label>
</div>
</div>
-
<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
- <el-input style="width:15%;" placeholder="Enter the glass lD" v-model="glassid"></el-input>
- <el-button type="primary" @click="showform()">Manually feed the glass</el-button>
- <el-input style="width:15%;" placeholder="Enter the order number" v-model="order"></el-input>
- <el-button type="warning" @click="showform1();">Exit the glass by order number</el-button>
+ <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-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="Coming out glass ID"></el-table-column>
- <el-table-column :width="250" prop="cell" label="The Grille number being used"></el-table-column>
- <el-table-column prop="orderId" label="Order Nmuber"></el-table-column>
- <el-table-column prop="lengthWidth" label="Length and width"></el-table-column>
- <el-table-column prop="coating" label="coating"></el-table-column>
- <el-table-column label="Operate">
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(0)">end
- task</el-button>
+ <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 :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>
+ </template>
</el-table-column>
</el-table>
<el-table :data="this.tasklist2" border style="width: 100%">
- <el-table-column prop="glassId" label="Incoming glass ID"></el-table-column>
- <el-table-column :width="250" prop="cell" label="The Grille number being used"></el-table-column>
- <el-table-column prop="orderId" label="Order Nmuber"></el-table-column>
- <el-table-column prop="lengthWidth" label="Length and width"></el-table-column>
- <el-table-column prop="coating" label="coating"></el-table-column>
- <el-table-column label="Operate">
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(1)">end
- task</el-button>
+ <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 :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>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -197,78 +227,100 @@
<el-footer>
<div class="blocks" style="position: relative;">
<div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"></div>
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"
+ @click="showcageinfo(item['cage'])"></div>
</div>
<div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:885px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"></div>
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"
+ @click="showcageinfo(item['cage'])"></div>
</div>
<div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:328px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"></div>
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"
+ @click="showcageinfo(item['cage'])"></div>
</div>
<div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:885px;">
- <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"></div>
+ <div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"
+ @click="showcageinfo(item['cage'])"></div>
</div>
- <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }">
-
- </div>
- <div class="blocks-img" :style="{ left: car2 + 'px', top: '194px' }">
-
- </div>
+ <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
+ <div class="blocks-img" :style="{ left: car2 + 'px', top: '194px' }"></div>
+ <div class="blocks-img2" :style="{ left: '912px', top: '366px' }"></div>
+ <div class="blocks-img3" :style="{ left: '875px', top: '455px' }"></div>
</div>
</el-footer>
- <el-dialog :visible.sync="dialogFormVisible" title="Please confirm the information">
+ <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="order">
+ <el-form-item :label="$t('order')">
<el-input v-model="form.orderno" autocomplete="off" />
</el-form-item>
- <el-form-item label="length">
+ <el-form-item :label="$t('length')">
<el-input v-model="form.length" autocomplete="off" />
</el-form-item>
- <el-form-item label="width">
+ <el-form-item :label="$t('width')">
<el-input v-model="form.width" autocomplete="off" />
</el-form-item>
- <el-form-item label="coating">
+ <el-form-item :label="$t('coating')">
<el-input v-model="form.coating" autocomplete="off" />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="cancal()">cancal</el-button>
- <el-button @click="sbumitglassid()" type="primary">confirm</el-button>
+ <el-button @click="cancal()">{{ $t('cancal') }}</el-button>
+ <el-button @click="sbumitglassid()" type="primary">{{ $t('confirm') }}</el-button>
</span>
</template>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible1" title="Ordering Information">
+ <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
<el-form :model="form1" label-width="100px" style="padding-right: 30px">
- <el-form-item label="order">
+ <el-form-item :label="$t('order')">
<el-input v-model="form1.order" autocomplete="off" />
</el-form-item>
- <el-form-item label="number">
+ <el-form-item :label="$t('number')">
<el-input v-model="form1.number" autocomplete="off" />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="cancal1()">cancal</el-button>
- <el-button @click="getOrder();" type="primary">confirm</el-button>
+ <el-button @click="cancal1()">{{ $t('cancal') }}</el-button>
+ <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
</span>
</template>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible2" title="Ordering Information">
+ <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
<el-table :data="this.alarm" border style="width: 100%;">
- <el-table-column prop="id" label="id"></el-table-column>
- <el-table-column prop="content" label="content"></el-table-column>
- <el-table-column prop="timeons" label="timeon"></el-table-column>
-
- <el-table-column prop="endTime" label="endTime"></el-table-column>
+ <el-table-column prop="id" :label="$t('id')"></el-table-column>
+ <el-table-column prop="content" :label="$t('content')"></el-table-column>
+ <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
+ <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-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
+ <el-table-column :width="150" 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 :width="130" prop="orderId" :label="$t('order number')"></el-table-column>
+ <el-table-column :width="150" 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="140" :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>
+ </template>
+ </el-table-column>
</el-table>
</el-dialog>
</el-container>
</template>
-
<script>
-import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo } from "../../api/home";
+import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID } from "../../api/home";
+
import LanguageMixin from '../../lang/LanguageMixin'
let socket;
@@ -280,6 +332,7 @@
dialogFormVisible: false,
dialogFormVisible1: false,
dialogFormVisible2: false,
+ dialogFormVisible3: false,
form: {
orderno: "NG2210210",
length: 800,
@@ -305,8 +358,8 @@
url: "../../img/bigcar01.png",
car1: 150,
car2: 242,
- incell: "",
- outcell: ""
+ cageinfo: [],
+ cage: 0
};
},
created() {
@@ -337,9 +390,10 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
-
- this.car1 = 150 + 24.6 * obj.params[0][0];
- this.car2 = 242 + 24.6 * obj.params[0][1];
+ if (obj.params != null) {
+ this.car1 = 150 + 24.6 * obj.params[0][0];
+ this.car2 = 242 + 24.6 * obj.params[0][1];
+ }
this.tableData = obj.tableData[0];
this.cagelist1 = obj.cagelist1[0];
this.cagelist2 = obj.cagelist2[0];
@@ -347,23 +401,12 @@
this.cagelist4 = obj.cagelist4[0];
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
- if (this.tasklist1.length > 0) {
- this.incell = this.tasklist1[0]['cell'];
- }
- if (this.tasklist1.length > 0) {
- this.outcell = this.tasklist2[0]['cell'];
- }
this.alarm = obj.alarmmg[0];
- // for (let a = 0; a <= this.record.params.length - 1; a++) {
- // // this.record.xyData[a] = [this.record.canshu[a], this.record.params[0][a]];
- // // this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
- // // this.record.xyData[a].value = this.record.params[0][a];
- // this.car1=this.record.params[0][a];
- // console.log(this.record.params[0][a]);
+ SelectCageInfo(this.cage).then(res => {
+ this.cageinfo = res.data.cageinfo;
+ });
-
- // }
this.$forceUpdate();
}.bind(this);
@@ -427,9 +470,11 @@
if (this.form1.order != "") {
InsertOrder(this.order).then(res => {
if (res.data.message == 200) {
- this.$message.success("Operation successful");
+ this.dialogFormVisible1 = false;
+ this.$message.success(this.$t('Operation successful'));
+
} else {
- this.$message.success("There is no such order");
+ this.$message.success(this.$t('There is no glass for this order'));
}
this.load();
});
@@ -441,10 +486,16 @@
if (this.form.order != "") {
Addglassid(this.glassid).then(res => {
if (res.data.message2 == 200) {
- this.$message.success("Operation successful");
+ this.$message.success(this.$t('Operation successful'));
this.cancal();
- } else {
- this.$message.success("There are currently tasks");
+ } 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'));
}
});
}
@@ -481,37 +532,79 @@
this.dialogFormVisible1 = false;
this.form1 = {};
},
- endtask(type) {
- if (type == 0) {
- UpdateTask(type, this.incell).then(res => {
+ endtask(type, glassid, cell) {
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(() => {
+ UpdateTask(type, glassid, cell).then(res => {
if (res.data.message3 == 200) {
- this.$message.success("Operation successful");
+ this.$message.success(this.$t('Operation successful'));
}
});
- } else {
- UpdateTask(type, this.outcell).then(res => {
- if (res.data.message3 == 200) {
- this.$message.success("Operation successful");
- }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
});
- }
-
+ });
},
- formatDate(timestamp) {
- const date = new Date(timestamp);
- const year = date.getFullYear();
- const month = date.getMonth() + 1;
- const day = date.getDate();
- const hours = date.getHours();
- const minutes = date.getMinutes();
- const seconds = date.getSeconds();
- return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ showcageinfo(cage) {
+ this.cage = cage;
+ SelectCageInfo(cage).then(res => {
+ this.cageinfo = res.data.cageinfo;
+ this.dialogFormVisible3 = true;
+ });
+ },
+ deleteglass(glassid, state) {
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(() => {
+ if (state == 1) {
+ DeleteByGlassID(glassid).then(res => {
+ if (res.data.message3 == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ } else {
+ this.$message.success(this.$t('No delete allowed'));
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ },
+ outglass(glassid, state) {
+ this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(() => {
+ if (state == 1) {
+ OutByGlassID(glassid).then(res => {
+ if (res.data.message3 == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ } else {
+ this.$message.success(this.$t('No out allowed'));
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+
}
-
}
+
}
-
-
</script>
\ No newline at end of file
--
Gitblit v1.8.0