样式

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -85,17 +85,12 @@
         size="small"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-<<<<<<< HEAD
       <el-tooltip effect="dark" content="设定设备参数有效时间" placement="top">
         <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
       </el-tooltip>
       <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
         <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
       </el-tooltip>
-=======
-      <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
-      <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     </el-card>
 
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
@@ -262,11 +257,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-<<<<<<< HEAD
       this.title = '新增车间设备'
-=======
-      this.title = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.form = {
         设备名称: '',
         设备编号: '',
@@ -285,11 +276,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-<<<<<<< HEAD
       this.title = row.设备名称
-=======
-      this.title = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible = true
       this.form.设备名称 = row.设备名称
       this.form.设备编号 = row.设备编号