优化

src/components/collectionTable.vue

@@ -64,12 +64,7 @@
                         <span style="font-size: 13px;">操作</span>
                     </template>
                     <template #default="{ row }">
-<<<<<<< HEAD
-                        <img style="width: 38px;height: 28px;vertical-align: bottom;cursor: pointer;"
-                            src="../assets/close.svg" @click.stop="columnDelete(row)" v-if="row.xpath !== ''">
-=======
                         <img style="width: 38px;height: 28px;vertical-align: bottom;cursor: pointer;" src="../assets/close.svg" @click.stop="columnDelete(row)" v-if="row.xpath !== ''">
->>>>>>> 5509792c37aa1abff718eb8e1a32b1f5cb234afd
                         <template v-else>
                             <el-tooltip class="item" effect="dark" content="点击按钮,右击页面元素添加数据" placement="top">
                                 <img style="width: 24px;height: 24px;vertical-align: bottom;cursor: pointer;background-color: transparent;" src="../assets/addTable.svg" @click.stop="selectElement">
@@ -268,17 +263,9 @@ export default {
             info.title = 'columnName'
             _this.selectTableData.unshift(info)
             if (this.$refs.xTableColumn !== undefined) {
-<<<<<<< HEAD
-                this.$refs.xTableColumn.setCurrentRow(_this.selectTableData[0])
-            }
-            if (this.selectedRow !== null) {
-                this.setElementBackgroundColor(this.selectedRow.xpath, '');
-=======
                 // if (this.SelectTableData.length > 1) {
                 this.$refs.xTableColumn.setCurrentRow(_this.SelectTableData[0])
                 // }
-
->>>>>>> 5509792c37aa1abff718eb8e1a32b1f5cb234afd
             }
             // 移除先前元素的背景色（如果有）
             if (window.currentlyHighlighted) {