优化

src/views/quality/components/drawerAll.vue

@@ -91,10 +91,7 @@ export default {
     data: {
       handler(newV, oldV) {
         if (newV) {
-<<<<<<< HEAD
-=======
           // console.log(newV, this.drawer, '刚进来')
->>>>>>> 34a9fef375c066f17db37312266bcd1b7c76a7ce
           this.Statistics = newV
           this.list = newV.xaxis
           this.type = newV.name