From 5030f3d30ccc1bd16db371c6970a48103aff9191 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 03 六月 2024 13:56:57 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-ui/src/views/main/cfkb/crankshaft/index.vue | 87 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/jcdm-ui/src/views/main/cfkb/crankshaft/index.vue b/jcdm-ui/src/views/main/cfkb/crankshaft/index.vue
index 023ed95..7bd506f 100644
--- a/jcdm-ui/src/views/main/cfkb/crankshaft/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/crankshaft/index.vue
@@ -37,28 +37,28 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="杞村悕绉�:" prop="axisName" >
- <el-select v-model="from.axisName" placeholder="" clearable style="width: 125px">
- <el-option
- v-for="dict in dict.type.axisname"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- @keyup.enter.native="handleQuery"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="棰堝悕绉�:" prop="neckName" >
- <el-select v-model="from.neckName" placeholder="" clearable style="width: 125px">
- <el-option
- v-for="dict in dict.type.neckname"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- @keyup.enter.native="handleQuery"
- />
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="杞村悕绉�:" prop="axisName" >-->
+<!-- <el-select v-model="from.axisName" placeholder="" clearable style="width: 125px">-->
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.axisname"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="棰堝悕绉�:" prop="neckName" >-->
+<!-- <el-select v-model="from.neckName" placeholder="" clearable style="width: 125px">-->
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.neckname"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="鐡﹀悕绉�:" prop="tileName" >
<el-select v-model="from.tileName" placeholder="" clearable style="width: 125px" >
<el-option
@@ -89,20 +89,20 @@
<el-descriptions-item label="鏇茶酱鐮�">
<span>{{queryParams.scanObject2}}</span>
</el-descriptions-item>
- <el-descriptions-item label="杞村悕绉�">
- <span>{{queryParams.axisName}}</span>
- </el-descriptions-item>
- <el-descriptions-item label="棰堝悕绉�">
- <span>{{queryParams.neckName}}</span>
- </el-descriptions-item>
+<!-- <el-descriptions-item label="杞村悕绉�">-->
+<!-- <span>{{queryParams.axisName}}</span>-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="棰堝悕绉�">-->
+<!-- <span>{{queryParams.neckName}}</span>-->
+<!-- </el-descriptions-item>-->
<el-descriptions-item label="鐡﹀悕绉�">
<span>{{queryParams.tileName}}</span>
</el-descriptions-item>
- <el-descriptions-item label="閲嶉噺">
- <span>{{queryParams.weight}}</span>
- </el-descriptions-item>
+<!-- <el-descriptions-item label="閲嶉噺">-->
+<!-- <span>{{queryParams.weight}}</span>-->
+<!-- </el-descriptions-item>-->
<el-descriptions-item label="閰嶇摝棰滆壊">
- <span style="color: #FFFFFF;" :style="{ backgroundColor: queryParams.tileColor }">{{queryParams.tileColor}}</span>
+ <span v-for="(word, index) in queryParams.words" :key="index" :style="{ backgroundColor: queryParams.colors[index],fontSize: '30px',}">{{ word }}</span>
</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
@@ -133,13 +133,14 @@
from:{
pageNum: 1,
pageSize: 10,
- productSeries: null,
- //scanObject1: null,
+ productSeries: '380Y',
+ // scanObject1: 'ONYL01FZ0120003023123;1206B0026;D2212BA',
+ // scanObject2: 'P0NYK0410001000;T231107031;D2222232;S500003',
scanObject1: null,
scanObject2: null,
axisName: null,
neckName: null,
- tileName: null,
+ tileName: '涓昏酱鐡�',
axisParameterNoPosition: null,
neckParameterPosition: null,
axisValue: null,
@@ -164,6 +165,8 @@
axisValue: null,
neckValue: null,
tileColor: null,
+ words: ['------', '------', '------', '------'],
+ colors: ['#FFFFFF', '#FFFFFF', '#FFFFFF', '#FFFFFF'],
createUser: null,
updateUser: null,
state: null,
@@ -223,9 +226,9 @@
this.clear();
if(this.from.scanObject1 !== null && this.from.scanObject2 !== null
- && this.from.axisName !== null && this.from.axisName !== ""
- && this.from.neckName !== null && this.from.neckName !== ""
- && this.from.tileName !== null && this.from.tileName !== ""
+ // && this.from.axisName !== null && this.from.axisName !== ""
+ // && this.from.neckName !== null && this.from.neckName !== ""
+ // && this.from.tileName !== null && this.from.tileName !== ""
&& this.from.productSeries !== null && this.from.productSeries !== "")
{
this.axisValueextracted();
@@ -293,7 +296,13 @@
}
console.log(queryParams)
listTileMatchRules(queryParams).then(response => {
- this.queryParams.tileColor = response.rows[0].tileColor;
+ this.queryParams.words= ['------', '------', '------', '------']
+ this.queryParams.colors= ['#FFFFFF', '#FFFFFF', '#FFFFFF', '#FFFFFF']
+ for (var i=0;i<response.rows.length;i++){
+ this.queryParams.colors[i]=response.rows[i].tileColor;
+ this.queryParams.words[i]=response.rows[i].tileName;
+ }
+ console.log('棰滆壊锛�',response)
});
},
clear(){
--
Gitblit v1.9.3