From e1921a8bf98c9bd612f7093628c3a4bc7bef6e5a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 09 四月 2024 13:56:38 +0800
Subject: [PATCH] 添加手动界面，IO界面
---
Albania_Mes-ui/src/views/home/index.vue | 77 +++++++++++---------------------------
1 files changed, 22 insertions(+), 55 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 1fa1da7..aef672e 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -346,14 +346,14 @@
</div>
<div style="display: flex;align-items: center;overflow: hidden;">
<div class="blocks" style="position: relative;width: 100%;">
- <div class="blocks-img" :style="'z-index:999;left:150px;top:555px;'">
+ <div class="blocks-img" :style="'z-index:999;left:150px;top:'+carposition+'px;'">
</div>
<div
:style="'position: absolute;z-index:99;left:271px;top:987px;width:210px;height:38px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
- :style="'position: absolute;z-index:1000;left:553px;top:956px;width:110px;height:74px;background-color:' + ShowDeviceList(0) + ';'">
+ :style="'position: absolute;z-index:1000;left:553px;top:'+(400+carposition)+'px;width:110px;height:88px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
:style="'position: absolute;z-index:99;left:800px;top:450px;width:115px;height:30px;background-color:' + ShowDeviceList(0) + ';'">
@@ -421,7 +421,7 @@
<el-table-column :min-width="100" :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="FinishTask(0, scope.row.id)">{{ $t('Complete') }}</el-button>
+ @click="FinishTask(scope.row.id)">{{ $t('Complete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -437,7 +437,7 @@
<el-table-column :min-width="100" :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="FinishTask(1, scope.row.id)">{{ $t('Complete') }}</el-button>
+ @click="FinishTask(scope.row.id)">{{ $t('Complete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -469,38 +469,6 @@
<el-table-column prop="glasstype" :label="$t('Glasstype')"></el-table-column>
<el-table-column prop="productname" :label="$t('Productname')"></el-table-column>
</el-table>
- <!-- <table id="table">
- <thead>
- <tr>
- <th>Customer</th>
- <th>order</th>
- <th>base</th>
- <th>height</th>
- <th>thickness</th>
- <th>films</th>
- <th>quantity</th>
- <th>tier</th>
- <th>matching</th>
- <th>glasstype</th>
- <th>productname</th>
- </tr>
- </thead>
- <tbody style="text-align: center">
- <tr v-for="item in dataList" :key="item.id">
- <td>{{ item.Customer }}</td>
- <td>{{ item.order }}</td>
- <td>{{ item.base }}</td>
- <td>{{ item.height }}</td>
- <td>{{ item.thickness }}</td>
- <td>{{ item.films }}</td>
- <td>{{ item.quantity }}</td>
- <td>{{ item.tier }}</td>
- <td>{{ item.matching }}</td>
- <td>{{ item.glasstype }}</td>
- <td>{{ item.productname }}</td>
- </tr>
- </tbody>
- </table> -->
</div>
</el-dialog>
@@ -510,11 +478,11 @@
<!--鍔熻兘-->
<div>
<el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">浜哄伐鍖归厤</el-button>
+ style="z-index: 999;">{{ $t('Manual matching') }}</el-button>
<el-button type="primary" @click="ManualTake()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">浜哄伐鎷胯蛋</el-button>
+ style="z-index: 999;">{{ $t('Manual removal') }}</el-button>
<el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">閲嶆柊娴嬮噺</el-button>
+ style="z-index: 999;">{{ $t('Remeasure') }}</el-button>
</div>
<br>
<!--鏄剧ず-->
@@ -537,17 +505,17 @@
<div style="width:20px;height: 720px;float: left;"></div>
<div style="width:500px;height: 620px;border: 2px solid #d1d1d1;float: left;padding: 50px 50px;">
<!--鐜荤拑鍥� #81b337-->
- <span class="measuretitle">闀匡細</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Width') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">瀹斤細</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Height') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">鍘氾細</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Thickness') }}锛�</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">娴嬮噺闀匡細</span> <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Measure Width') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">娴嬮噺瀹斤細</span> <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
+ <span class="measuretitle">{{ $t('Measure Height') }}锛�</span> <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">鍖归厤缁撴灉锛�</span> <span class="measureValue">{{ this.LastQueue.state>0?"鍖归厤鎴愬姛":(this.LastQueue.state==0?"澶氭暟鎹尮閰�":"鍖归厤澶辫触") }}</span>
+ <span class="measuretitle">{{ $t('Matching results') }}锛�</span> <span class="measureValue">{{ this.LastQueue.state>0?$t('Matching successful'):(this.LastQueue.state==0?$t('Multiple data matching'):$t('Matching failed')) }}</span>
<br>
</div>
</div>
@@ -696,6 +664,7 @@
name: "Home",
data() {
return {
+ carposition:0,
selected: [],
options: [{
value: '1',
@@ -844,13 +813,8 @@
socket.onmessage = function (msg) {
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
- if (obj.params != null) {
- var zhi1 = obj.params[0][0];
- var zhi2 = obj.params[0][1];
- this.car1 = 145 + 8.15 * Math.abs(zhi1 - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;
- this.car2 = 210 + 8.15 * Math.abs(zhi2 - 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;
+ if(obj.carposition != null){
+ this.carposition = obj.carposition[0];
}
// 鑾峰彇璁惧鐘舵��
if (obj.DeviceList != null) {
@@ -951,6 +915,7 @@
StorageCageAddGlass(this.cell, this.StorageCageAddInfo[index]).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
+ this.StorageCageAdd=false;
}
})
} else {
@@ -987,9 +952,9 @@
})
},
//瀹屾垚杩�/鍑虹墖浠诲姟
- FinishTask(tasktype, id) {
- FinishTask(tasktype, id).then(res => {
- if (res.data.message3 == 200) {
+ FinishTask(id) {
+ FinishTask(id).then(res => {
+ if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
});
@@ -998,6 +963,7 @@
UpdateStroageCageByCell(cell, nownum, num) {
if (nownum == null && num == 1) {
this.StorageCageAdd = true;
+ this.Measuermode=true;
this.cell = cell;
} else {
if (nownum + num == 0) {
@@ -1085,6 +1051,7 @@
//浜哄伐鍖归厤
ManualMatching() {
this.StorageCageAdd = true;
+ this.Measuermode=false;
},
//浜哄伐鎷胯蛋
ManualTake() {
--
Gitblit v1.8.0