样式

src/views/TechnologyCenter/ImportParts/index.vue

@@ -1,19 +1,11 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
-<<<<<<< HEAD
       <div style="width: 650px;margin: 0 auto">
         <div style="overflow: hidden">
           <div style="margin-bottom: 10px;">
             <span>项目：</span>
             <el-select v-model="projectValue" filterable size="small" placeholder="项目名称" style="margin-top: 3px">
-=======
-      <div style="width: 620px;margin: 0 auto">
-        <div style="overflow: hidden">
-          <div style="margin-bottom: 10px;">
-            <span>项目：</span>
-            <el-select v-model="projectValue" filterable size="small" placeholder="项目名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-option
                 v-for="item in project"
                 :key="item.value"
@@ -28,11 +20,7 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-<<<<<<< HEAD
             <el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
-=======
-            <el-button type="primary" size="small" @click="opendialogVisibleMachine()">上传总图</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </div>
           <upload-excel-component @on-selected-file="selected"/>
         </div>
@@ -42,11 +30,7 @@
           </el-tooltip>
           <el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
         </div>
-<<<<<<< HEAD
         <div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">
-=======
-        <div v-if="worksheet.length !== 0" style="float: right;margin: 20px 0">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
         </div>
       </div>