From b092806a662b99310cdb050292de2721ba06acd9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 十一月 2024 14:43:18 +0800
Subject: [PATCH] 增加测量台直通模式，增加手动参数界面的JSON文件
---
Albania_Mes-ui/src/views/home/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 5f748db..20501a8 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -609,7 +609,7 @@
<br> -->
<el-table :data="this.tasklist3" :height="700" :row-class-name="rowClassName"
style="width: 100%;padding:0;">
- <el-table-column prop="flowcard" :label="$t('Flowcard')"></el-table-column>
+ <el-table-column prop="flowcard" :label="$t('Order')"></el-table-column>
<el-table-column prop="mateid" :label="$t('Mateid')"></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>
@@ -628,14 +628,14 @@
:span-method="spanMethod" class="bold-center">
<el-table-column :min-width="80" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :min-width="80" prop="cell" :label="$t('Slot No')"></el-table-column>
- <el-table-column :min-width="80" prop="flowcard" :label="$t('Flowcard')"></el-table-column>
+ <el-table-column :min-width="80" prop="flowcard" :label="$t('Order')"></el-table-column>
<el-table-column :min-width="80" prop="customer" :label="$t('Customer')"></el-table-column>
- <el-table-column :min-width="80" prop="mateid" :label="$t('Mateid')"></el-table-column>
<el-table-column :min-width="80" prop="glassWidth" :label="$t('Width')"></el-table-column>
<el-table-column :min-width="80" prop="glassHeight" :label="$t('Height')"></el-table-column>
<el-table-column :min-width="80" prop="thickness" :label="$t('Thickness')"></el-table-column>
<el-table-column :min-width="80" prop="films" :label="$t('Films')"></el-table-column>
<el-table-column :min-width="80" prop="number" :label="$t('number')"></el-table-column>
+ <el-table-column :min-width="80" prop="mateid" :label="$t('Mateid')"></el-table-column>
<!-- <el-table-column :min-width="80" prop="width" :label="$t('Width')"></el-table-column> -->
<el-table-column :min-width="250" :label="$t('Operate')">
<template slot-scope='scope'>
@@ -770,7 +770,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="flowcard" :label="$t('Flowcard')" align="center">
+ <el-table-column prop="flowcard" :label="$t('Order')" align="center">
<template slot-scope="scope">
<div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
{{ scope.row.flowcard }}
@@ -816,7 +816,7 @@
</el-table-column>
<el-table-column prop="cell" :label="$t('Slot No')" align="center">
<template slot-scope="scope">
- <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ <div :style="{backgroundColor: scope.row.state === 0 ? '#00FFFF' : '', width: '105%', height: '100%', lineHeight: '38px' }">
{{ scope.row.cell }}
</div>
</template>
@@ -848,7 +848,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="flowcard" :label="$t('Flowcard')" align="center">
+ <el-table-column prop="flowcard" :label="$t('Order')" align="center">
<template slot-scope="scope">
<div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
{{ scope.row.flowcard }}
@@ -943,7 +943,7 @@
{{ $t('Select') }}</el-button>
</div>
<el-table :data="this.StorageCageAddInfo" :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column prop="flowcard" :label="$t('Flowcard')"></el-table-column>
+ <el-table-column prop="flowcard" :label="$t('Order')"></el-table-column>
<el-table-column prop="tier" :label="$t('Tier')"></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>
--
Gitblit v1.8.0