From 70f2265af5c8ec078ef2a7be65dd7229ab5f2924 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 六月 2024 10:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
Albania_Mes-ui/src/views/home/index.vue | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 3332efd..a562313 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -306,7 +306,9 @@
.cells {
height: 100%;
}
-
+.custom-row-class{
+ background-color: rgb(150, 238, 234) !important;
+}
</style>
<template>
<el-container>
@@ -478,12 +480,12 @@
<div style="height: 780px;">
<!--鍔熻兘-->
<div>
- <el-button type="primary" @click="ManualMatching()" :disabled="(this.LastQueue.state<=0)"
+ <el-button type="primary" @click="ManualMatching()" :disabled="(this.LastQueue.state <= 0)"
style="z-index: 999;">{{ $t('Manual matching') }}</el-button>
- <el-button type="primary" @click="ManualTake()" :disabled="(this.LastQueue.state<=0)"
+ <el-button type="primary" @click="ManualTake()" :disabled="(this.LastQueue.state <= 0)"
style="z-index: 999;">{{
$t('Manual removal') }}</el-button>
- <el-button type="primary" @click="AnewMeasure()" :disabled="(this.LastQueue.state<=0)"
+ <el-button type="primary" @click="AnewMeasure()" :disabled="(this.LastQueue.state <= 0)"
style="z-index: 999;">{{
$t('Remeasure') }}</el-button>
</div>
@@ -493,28 +495,36 @@
<!--鐜荤拑鍥� #81b337-->
<div
:style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:' + ((720 - (this.LastQueue.glassheight / 25 * 7)) / 2) + 'px auto;width:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
- + (this.LastQueue.state > 0 ? '#4CCCE4' : (this.LastQueue.state == 0 ? '#E4CA4C' : '#E4CA4C')) + ';text-align: center;'">
- {{
- (this.LastQueue.glasswidth + this.LastQueue.glassheight) != 0 ? (this.LastQueue.glasswidth + "*" + this.LastQueue.glassheight) : ""
- }}
+ + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ + (this.LastQueue.glassheight / 25 * 7/3) + 'px; background-color: '
+ + (this.LastQueue.state > 0 ? '#4CCCE4' : (this.LastQueue.state == 0 ? '#E4CA4C' : '#E4CA4C')) + ';text-align: center;font-size:50px'">
+ <div>
+ {{ $t('Measure')}}
+ </div>
+ <div>
+ {{ $t('Width')+"*"+$t('Height') }}:{{(this.LastQueue.glasswidth + this.LastQueue.glassheight) != 0 ? (this.LastQueue.glasswidth + "*"+this.LastQueue.glassheight)+"" : ""}}
+ </div>
+
+ <div>
+ {{ $t('results') }}:{{this.LastState[this.LastQueue.state]}}
+ </div>
+
</div>
</div>
<!--鏄剧ず-->
<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">{{ $t('Width') }}锛�</span> <span class="measureValue">{{
+ <div style="width:600px;height: 720px;border: 2px solid #d1d1d1;float: left;">
+ <!--鐜荤拑鍥� #81b337 padding: 50px 50px;-->
+ <!-- <span class="measuretitle">{{ $t('Width') }}锛�</span> <span class="measureValue">{{
this.LastQueue.glasswidth
}}</span> <span class="measureUnit">mm</span>
<br>
<span class="measuretitle">{{ $t('Height') }}锛�</span> <span class="measureValue">{{
this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
<br>
-
+
<span class="measuretitle">{{ $t('Measure Width') }}锛�</span> <span class="measureValue">{{
this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
<br>
@@ -522,10 +532,20 @@
this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
<br>
<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>
+ this.LastQueue.state > 0 ? $t('Matching successful') :
+ (this.LastQueue.state == 0 ? $t('Multiple data matching') : $t('Matching failed')) }}</span>
+ <br> -->
+ <el-table :data="this.tasklist3" :row-class-name="rowClassName" style="width: 100%;padding:0;">
+ <el-table-column prop="flowcard" :label="$t('flowcard')"></el-table-column>
+ <el-table-column prop="films" :label="$t('Films')"></el-table-column>
+ <el-table-column prop="width" :label="$t('Width')"></el-table-column>
+ <el-table-column prop="height" :label="$t('Height')"></el-table-column>
+ <el-table-column prop="thickness" :label="$t('Thickness')"></el-table-column>
+ <el-table-column prop="number" :label="$t('Number')"></el-table-column>
+ <el-table-column prop="measurenumber" :label="$t('MeasureNumber')"></el-table-column>
+ </el-table>
</div>
+
</div>
</el-dialog>
@@ -598,7 +618,7 @@
</el-table-column>
<el-table-column prop="line" :label="$t('Task Line')">
</el-table-column>
- <el-table-column width="300" :label="$t('Operate')">
+ <el-table-column width="350" :label="$t('Operate')">
<template slot-scope='scope'>
<el-select v-model="selected[scope.$index]" :placeholder="$t('Line')"
@@ -612,10 +632,17 @@
@click="ClaimTasks(scope.row.flowcard, scope.row.state, selected[scope.$index])">
{{ scope.row.state > 0 ? $t('Stop Task') : $t('Start Task') }}</el-button>
+
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
v-show="scope.row.state >= 0 ? true : false"
@click="ModeChange(scope.row.flowcard, scope.row.method)">
{{ $t('Mode Change') }}</el-button>
+
+
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ v-show="scope.row.state >= 0 ? true : false"
+ @click="StartChange(scope.row.flowcard)">
+ {{ $t('start work') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -661,7 +688,7 @@
Disabled, SelectPermissionByUserName, currentUsername, CompleteQueue,
isAllowReorderings,
- UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue, importData, ManualTake, AnewMeasure
+ UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue, importData, ManualTake, AnewMeasure,StartChange
} from "../../api/home";
@@ -724,6 +751,7 @@
task2: 2,
tasklist1: [],
tasklist2: [],
+ tasklist3: [],
order: "",
glassid: "",
glassid1: "",
@@ -777,7 +805,8 @@
GlassIdList: [],
Scanningmethod: true,
CurrrentGlassId: "",
- LastQueue: {}
+ LastQueue: {},
+ LastState: ["",this.$t('Matching successful'),this.$t('Multiple data matching'),this.$t('Matching failed')]
};
},
created() {
@@ -833,6 +862,7 @@
this.cagelist2 = obj.cagelist2[0];
this.cagelist3 = obj.cagelist3[0];
this.cagelist4 = obj.cagelist4[0];
+ this.tasklist3 = obj.glassInfoFlowCard[0];
this.tasklist2 = obj.StoragTaskeTaskFeed[0];
this.tasklist1 = obj.StoragTaskeTaskOut[0];
if (obj.alarmmg[0].length > 0) {
@@ -960,6 +990,13 @@
//淇敼鍑虹墖鏂瑰紡
ModeChange(flowcard, method) {
ModeChange(flowcard, method).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ },//閫夋嫨寮�濮嬪伐绋�
+ StartChange(flowcard) {
+ StartChange(flowcard).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
@@ -1133,6 +1170,14 @@
del() {
this.StorageCageAdd = true;
+ },
+ rowClassName({ row, rowIndex }) {
+ if (row.glasstype!=0&&row.glasstype == this.LastQueue.glasstype) {
+ console.log(rowIndex);
+ return 'custom-row-class';
+ } else {
+ return ''; // 杩斿洖绌哄瓧绗︿覆琛ㄧず涓嶆坊鍔犱换浣曢澶栫殑绫诲悕
+ }
}
--
Gitblit v1.8.0