样式

src/views/ManufacturingCenter/ProcessingStatus/index.vue

@@ -311,10 +311,7 @@
 </template>
 <script>
 import { getNames, getMachines, getGroups, getTable, getTable2, getExport } from '@/api/ManufacturingCenter/ProcessingStatus'
-<<<<<<< HEAD
-=======
 import Cookie from 'js-cookie'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 
 export default {
   data() {
@@ -384,12 +381,6 @@ export default {
       pageCurrent: 1
     }
   },
-<<<<<<< HEAD
-  created() {
-    this.getMachine()
-    this.getTableData()
-  },
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -404,7 +395,6 @@ export default {
   // created() {
   //   this.getMachine()
   // },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   methods: {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {
@@ -433,10 +423,6 @@ export default {
         })
       })
     },
-<<<<<<< HEAD
-    // 查询供应商名称
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     fetchData() {
       this.projects = []
       getNames().then(response => {
@@ -450,21 +436,6 @@ export default {
       this.part = 1
     },
     getMachine() {
-<<<<<<< HEAD
-      this.Machine = ''
-      this.Machines = []
-      this.Group = ''
-      this.Groups = []
-      getMachines().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machines.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号,
-            value2: response.data[i].项目名称
-          })
-        }
-      })
-=======
       if (Cookie.get('machineValue') !== undefined) {
         this.Machine = ''
         this.Machines = []
@@ -502,7 +473,6 @@ export default {
         })
         this.getTableData()
       }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     getGroup() {
       this.Group = ''