Browse Source

Merge branch 'master' of http://39.106.8.246:3003/web/ibms

chuwu 5 years ago
parent
commit
b5c7acdd6c

+ 28 - 6
src/components/config_point/step3_point/3_identify.vue

@@ -6,11 +6,19 @@
                     {{item.Group}}
                 </template>
                 <div class="collapse-item">
-                    <div style="line-height: 40px;padding-left: 5px;box-sizing:border-box;">
-                        <el-input v-model="fillData" placeholder="批量填充空白的设备标识" style="width: 180px;"></el-input>
-                        <el-button @click="fillClick">填充</el-button>
+                    <div style="display: flex;justify-content: space-between; height: 40px; line-height: 40px;padding:0 5px;box-sizing:border-box;">
+                        <p>
+                            <el-input  v-model="fillData" placeholder="批量填充空白的设备标识" style="width: 180px; margin-right: 10px;"></el-input>
+                            <el-button @click="fillClick">填充</el-button>
+                        </p>
+                        <p style="display: flex">
+                            <span style="margin-right: 10px; color: #909399;" >AI建议的设备标识</span>
+                            <span class='ai-eq' :title="item.EquipmentMark" @click="aiHandle(item.EquipmentMark)">{{item.EquipmentMark || '--'}}</span>
+                        </p>
+                    </div>
+                    <div style="flex: 1">                    
+                        <handsontable-component ref="handsontable"></handsontable-component>
                     </div>
-                    <handsontable-component ref="handsontable"></handsontable-component>
                 </div>
             </el-collapse-item>
         </el-collapse>
@@ -52,9 +60,14 @@
                 "protocolType"
             ])
         },
-        created() {},
-        mounted() {},
         methods: {
+            aiHandle(value) {
+                if(value == '--') {
+                    return false;
+                }  else {
+                    this.fillData = value;
+                }
+            },
             save() {
                 console.log(this.renderData,'renderData')
                 // let data = this.hotArr[this.activeName - 1].getSourceData()
@@ -318,6 +331,15 @@
         }
         .collapse-item {
             height: 230px;
+            display: flex;
+            flex-direction: column;
+            .ai-eq {
+                cursor: pointer;
+                width: 60px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
         }
     }
 </style>

+ 1 - 1
src/components/config_point/step3_point/dialog_main.vue

@@ -358,7 +358,7 @@
         .own-collape {
             border: 1px solid #ccc;
             float: right;
-            width: calc(100% - 520px);
+            width: calc(100% - 490px);
             height: 340px;
             position: relative;
         }