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/tileMatchKb/index.vue |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/jcdm-ui/src/views/main/cfkb/tileMatchKb/index.vue b/jcdm-ui/src/views/main/cfkb/tileMatchKb/index.vue
index d3e8197..75e4bcd 100644
--- a/jcdm-ui/src/views/main/cfkb/tileMatchKb/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/tileMatchKb/index.vue
@@ -144,7 +144,8 @@
               <span>{{queryParams.weight}}</span>
             </el-descriptions-item>
             <el-descriptions-item label="閰嶇摝棰滆壊">
-              <span  style="color: #FFFFFF;"  :style="{ backgroundColor: queryParams.tileColor }">{{queryParams.tileColor}}</span>
+<!--          <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>
@@ -173,8 +174,8 @@
         pageSize: 10,
         productSeries: null,
         //scanObject1: null,
-        scanObject1: 'P0SQ0-01FZ01-1000;T231224116;DBBBBA',
-        scanObject2: 'P0SQ0-041000-1002;T2312020675;DAABBA;S500003',
+        scanObject1: 'ONYL01FZ0120003023123;1206B0026;D2212BA',
+        scanObject2: 'P0NYK0410001000;T231107031;D2222232;S500003',
         axisName: null,
         neckName: null,
         tileName: null,
@@ -202,7 +203,9 @@
         neckParameterPosition: null,
         axisValue: null,
         neckValue: null,
-        tileColor: null,
+        tileColor: "",
+        words: ['涓�妗�   .', '浜屾。  .', '涓夋。  .', '鍥涙。  .'],
+        colors: ['#FFFFFF', '#FFFFFF', '#FFFFFF', '#FFFFFF'],
         createUser: null,
         updateUser: null,
         state: null,
@@ -216,9 +219,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();
@@ -286,7 +289,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